车间关联数据同步更新

ktg-mes/src/main/java/com/ktg/mes/md/mapper/MdWorkshopMapper.java

@@ -1,19 +1,20 @@
 package com.ktg.mes.md.mapper;
 
-import java.util.List;
 import com.ktg.mes.md.domain.MdWorkshop;
 
+import java.util.List;
+
 /**
  * 车间Mapper接口
- * 
+ *
  * @author yinjinlu
  * @date 2022-05-07
  */
-public interface MdWorkshopMapper 
+public interface MdWorkshopMapper
 {
     /**
      * 查询车间
-     * 
+     *
      * @param workshopId 车间主键
      * @return 车间
      */
@@ -21,7 +22,7 @@ public interface MdWorkshopMapper
 
     /**
      * 查询车间列表
-     * 
+     *
      * @param mdWorkshop 车间
      * @return 车间集合
      */
@@ -43,7 +44,7 @@ public interface MdWorkshopMapper
 
     /**
      * 新增车间
-     * 
+     *
      * @param mdWorkshop 车间
      * @return 结果
      */
@@ -51,15 +52,23 @@ public interface MdWorkshopMapper
 
     /**
      * 修改车间
-     * 
+     *
      * @param mdWorkshop 车间
      * @return 结果
      */
     public int updateMdWorkshop(MdWorkshop mdWorkshop);
 
+    /**
+     * 修改车间关联数据
+     *
+     * @param mdWorkshop 车间
+     * @return 结果
+     */
+    public int updateMdWorkshopJoin(MdWorkshop mdWorkshop);
+
     /**
      * 删除车间
-     * 
+     *
      * @param workshopId 车间主键
      * @return 结果
      */
@@ -67,7 +76,7 @@ public interface MdWorkshopMapper
 
     /**
      * 批量删除车间
-     * 
+     *
      * @param workshopIds 需要删除的数据主键集合
      * @return 结果
      */

ktg-mes/src/main/java/com/ktg/mes/md/service/impl/MdWorkshopServiceImpl.java

@@ -1,32 +1,32 @@
 package com.ktg.mes.md.service.impl;
 
-import java.util.List;
-
 import com.ktg.common.constant.UserConstants;
 import com.ktg.common.utils.DateUtils;
 import com.ktg.common.utils.StringUtils;
-import org.apache.catalina.User;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import com.ktg.mes.md.mapper.MdWorkshopMapper;
 import com.ktg.mes.md.domain.MdWorkshop;
+import com.ktg.mes.md.mapper.MdWorkshopMapper;
 import com.ktg.mes.md.service.IMdWorkshopService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
 
 /**
  * 车间Service业务层处理
- * 
+ *
  * @author yinjinlu
  * @date 2022-05-07
  */
 @Service
-public class MdWorkshopServiceImpl implements IMdWorkshopService 
+public class MdWorkshopServiceImpl implements IMdWorkshopService
 {
     @Autowired
     private MdWorkshopMapper mdWorkshopMapper;
 
     /**
      * 查询车间
-     * 
+     *
      * @param workshopId 车间主键
      * @return 车间
      */
@@ -38,7 +38,7 @@ public class MdWorkshopServiceImpl implements IMdWorkshopService
 
     /**
      * 查询车间列表
-     * 
+     *
      * @param mdWorkshop 车间
      * @return 车间
      */
@@ -70,7 +70,7 @@ public class MdWorkshopServiceImpl implements IMdWorkshopService
 
     /**
      * 新增车间
-     * 
+     *
      * @param mdWorkshop 车间
      * @return 结果
      */
@@ -83,20 +83,23 @@ public class MdWorkshopServiceImpl implements IMdWorkshopService
 
     /**
      * 修改车间
-     * 
+     *
      * @param mdWorkshop 车间
      * @return 结果
      */
+    @Transactional
     @Override
     public int updateMdWorkshop(MdWorkshop mdWorkshop)
     {
         mdWorkshop.setUpdateTime(DateUtils.getNowDate());
-        return mdWorkshopMapper.updateMdWorkshop(mdWorkshop);
+        int i = mdWorkshopMapper.updateMdWorkshop(mdWorkshop);
+        mdWorkshopMapper.updateMdWorkshopJoin(mdWorkshop);
+        return i;
     }
 
     /**
      * 批量删除车间
-     * 
+     *
      * @param workshopIds 需要删除的车间主键
      * @return 结果
      */
@@ -108,7 +111,7 @@ public class MdWorkshopServiceImpl implements IMdWorkshopService
 
     /**
      * 删除车间信息
-     * 
+     *
      * @param workshopId 车间主键
      * @return 结果
      */

ktg-mes/src/main/resources/mapper/md/MdWorkshopMapper.xml

@@ -3,7 +3,7 @@
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ktg.mes.md.mapper.MdWorkshopMapper">
-    
+
     <resultMap type="MdWorkshop" id="MdWorkshopResult">
         <result property="workshopId"    column="workshop_id"    />
         <result property="workshopCode"    column="workshop_code"    />
@@ -28,7 +28,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectMdWorkshopList" parameterType="MdWorkshop" resultMap="MdWorkshopResult">
         <include refid="selectMdWorkshopVo"/>
-        <where>  
+        <where>
             <if test="workshopCode != null  and workshopCode != ''"> and workshop_code = #{workshopCode}</if>
             <if test="workshopName != null  and workshopName != ''"> and workshop_name like concat('%', #{workshopName}, '%')</if>
             <if test="area != null "> and area = #{area}</if>
@@ -36,7 +36,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="enableFlag != null  and enableFlag != ''"> and enable_flag = #{enableFlag}</if>
         </where>
     </select>
-    
+
     <select id="selectMdWorkshopByWorkshopId" parameterType="Long" resultMap="MdWorkshopResult">
         <include refid="selectMdWorkshopVo"/>
         where workshop_id = #{workshopId}
@@ -108,15 +108,23 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </trim>
         where workshop_id = #{workshopId}
     </update>
+    <update id="updateMdWorkshopJoin" parameterType="MdWorkshop">
+        update is_hardware
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="workshopCode != null and workshopCode != ''">workshop_code = #{workshopCode},</if>
+            <if test="workshopName != null and workshopName != ''">workshop_name = #{workshopName},</if>
+        </trim>
+        where workshop_id = #{workshopId}
+    </update>
 
     <delete id="deleteMdWorkshopByWorkshopId" parameterType="Long">
         delete from md_workshop where workshop_id = #{workshopId}
     </delete>
 
     <delete id="deleteMdWorkshopByWorkshopIds" parameterType="String">
-        delete from md_workshop where workshop_id in 
+        delete from md_workshop where workshop_id in
         <foreach item="workshopId" collection="array" open="(" separator="," close=")">
             #{workshopId}
         </foreach>
     </delete>
-</mapper>
+</mapper>