Merge remote-tracking branch 'origin/develop_1' into develop_1

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/SarStandItems.java

@@ -193,5 +193,8 @@ public class SarStandItems extends BaseEntity {
     @TableField("read_content")
     private String readContent;
 
+    @ApiModelProperty(value = "编辑关联标识")
+    @TableField("edit_flag")
+    private String editFlag;
 
 }

adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/controller/SarFileSplitItemsEOController.java

@@ -133,9 +133,9 @@ public class SarFileSplitItemsEOController extends BaseController<SarFileSplitIt
 
     @ApiOperation(value = "|SarFileSplitItemsEO|批量删除")
     @PostMapping("/batchDeleteItems")
-    public ResponseMessage batchDeleteItems(String ids) throws Exception {
+    public ResponseMessage batchDeleteItems(String ids,String editFlag) throws Exception {
         if (StringUtils.isNotEmpty(ids)) {
-            int result = sarFileSplitItemsEOService.batchDeleteItems(ids);
+            int result = sarFileSplitItemsEOService.batchDeleteItems(ids,editFlag);
             if (result > 0) {
                 return Result.success("0","删除成功",null);
             } else {

adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/dao/SarFileSplitItemsEODao.java

@@ -4,6 +4,7 @@ import com.adc.da.slrs.sarStandItems.entity.SarStandItems;
 import com.adc.da.slrs.standardSplit.dto.FileSplitItemsExportDto;
 import com.adc.da.slrs.standardSplit.entity.SarFileSplitItemsEO;
 import com.adc.da.slrs.standardSplit.entity.SarFileSplitItemsEOPage;
+import com.adc.da.slrs.standardSplit.entity.SarStandItemsEO;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -32,6 +33,8 @@ public interface SarFileSplitItemsEODao extends BaseMapper<SarFileSplitItemsEO>
 
    int deleteByItemsIdList(@Param("idList") List<String> idList);
 
+   int deleteByItemsIdList1(@Param("idList") List<String> idList);
+
    List<SarFileSplitItemsEO> queryItemsByMenuId(@Param("menuId") String menuId);
 
    List<SarFileSplitItemsEO> queryByItemsIds(@Param("idList") List<String> idList);
@@ -52,6 +55,8 @@ public interface SarFileSplitItemsEODao extends BaseMapper<SarFileSplitItemsEO>
 
    int updateByPrimaryKeySelective(SarFileSplitItemsEO page);
 
+   int updateByPrimaryKeySelective1(SarFileSplitItemsEO page);
+
    int deleteByPrimaryKey(String id);
 
 }

adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/entity/SarFileSplitItemsEO.java

@@ -64,6 +64,8 @@ public class SarFileSplitItemsEO extends BaseEntity {
 
     private String responsibleUnit;//责任部门
     private String responsibleUnitShow;
+
+    private String editFlag;
     /**
      * java字段名转换为原始数据库列名。<b>如果不存在则返回null</b><br>
      * <p>字段列表：</p>
@@ -520,4 +522,12 @@ public class SarFileSplitItemsEO extends BaseEntity {
     public void setResponsibleUnitShow(String responsibleUnitShow) {
         this.responsibleUnitShow = responsibleUnitShow;
     }
+
+    public String getEditFlag() {
+        return editFlag;
+    }
+
+    public void setEditFlag(String editFlag) {
+        this.editFlag = editFlag;
+    }
 }

adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/entity/SarFileSplitItemsEOPage.java

@@ -61,10 +61,19 @@ public class SarFileSplitItemsEOPage extends BasePage {
     private String sMenuId;
     private List<String> idList;
     private List<String> menuIdList;
+    private String edirFlag;
 
     private int tableIndex = 1;
     private int imgIndex = 1;
 
+    public String getEdirFlag() {
+        return edirFlag;
+    }
+
+    public void setEdirFlag(String edirFlag) {
+        this.edirFlag = edirFlag;
+    }
+
     public String getId() {
         return this.id;
     }

adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/entity/SarStandItemsEO.java

@@ -58,6 +58,7 @@ public class SarStandItemsEO extends BaseEntity {
     private SarCompStatusInfoEO pgForm;
 
     private String menuId;
+    private String editFlag;
     /**
      * java字段名转换为原始数据库列名。<b>如果不存在则返回null</b><br>
      * <p>字段列表：</p>
@@ -483,4 +484,12 @@ public class SarStandItemsEO extends BaseEntity {
     public void setMenuId(String menuId) {
         this.menuId = menuId;
     }
+
+    public String getEditFlag() {
+        return editFlag;
+    }
+
+    public void setEditFlag(String editFlag) {
+        this.editFlag = editFlag;
+    }
 }

adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/SarFileSplitItemsEOService.java

@@ -28,7 +28,7 @@ public interface SarFileSplitItemsEOService {
 
     int deleteByPrimaryKey(String id);
 
-    int batchDeleteItems(String ids);
+    int batchDeleteItems(String ids,String editFlag);
 
     boolean judgeContaintChilds(String ids);
 

adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitInfoEOServiceImpl.java

@@ -345,7 +345,9 @@ public class SarFileSplitInfoEOServiceImpl implements SarFileSplitInfoEOService
                         .setStandId(sarFileSplitInfoEO.getStandId())
                         .setItemsNum(item.getItemsNum())
                         .setItemsName(item.getItemsName())
-                        .setTermsConditions(item.getItermsConditions());
+                        .setTermsConditions(item.getItermsConditions())
+                        .setEditFlag(item.getEditFlag());
+
                 standList.add(standItems1);
             });
             sarFileSplitItemsEODao.insertStandSplitForeach(standList);
@@ -370,6 +372,7 @@ public class SarFileSplitInfoEOServiceImpl implements SarFileSplitInfoEOService
         sarFileSplitItemsEO.setCreationUser(LoginUserUtil.getUserId());
         sarFileSplitItemsEO.setModifyTime(new Date());
         sarFileSplitItemsEO.setModifyUser(LoginUserUtil.getUserId());
+        sarFileSplitItemsEO.setEditFlag(UUIDUtils.randomUUID(32));
         return sarFileSplitItemsEO;
     }
 

adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitItemsEOServiceImpl.java

@@ -150,6 +150,7 @@ public class SarFileSplitItemsEOServiceImpl implements SarFileSplitItemsEOServic
         String itemConditions = "";
         String userId = UserUtils.getUserId();
         int resultCount = 0;
+        int resultCount1 = 0;
         //修改特殊参数要求信息
         updateParamsContent(sarFileSplitItemsEO);
         //修改条款要求内容
@@ -213,13 +214,18 @@ public class SarFileSplitItemsEOServiceImpl implements SarFileSplitItemsEOServic
             }
             sarFileSplitItemsEO.setItermsConditions(itemConditions);
             resultCount = dao.updateByPrimaryKeySelective(sarFileSplitItemsEO);
+            resultCount1 = dao.updateByPrimaryKeySelective1(sarFileSplitItemsEO);
         } else {
             sarFileSplitItemsEO.setItermsConditions("");
             resultCount = dao.updateByPrimaryKeySelective(sarFileSplitItemsEO);
+            resultCount1 = dao.updateByPrimaryKeySelective1(sarFileSplitItemsEO);
             // 删除val表全部信息
             sarFileSplitItemsValEODao.deleteByitemId(sarFileSplitItemsEO.getId());
         }
-        return resultCount;
+        Map resultCountMap = new HashMap();
+        resultCountMap.put("拆分",resultCount);
+        resultCountMap.put("标准分解单",resultCount1);
+        return resultCountMap.size();
     }
 
     /**
@@ -253,9 +259,11 @@ public class SarFileSplitItemsEOServiceImpl implements SarFileSplitItemsEOServic
     }
 
     @Override
-    public int batchDeleteItems(String ids) {
+    public int batchDeleteItems(String ids,String editFlag) {
         String[] itemIds = ids.split(",");
+        String[] itemIds1 = editFlag.split(",");
         List<String> idList = Arrays.asList(itemIds);
+        List<String> idList1 = Arrays.asList(itemIds1);
         // 查到对应menu
         List<SarFileSplitItemsEO> getMenuList = dao.queryByItemsIds(idList);
         List<SarFileSplitItemsEO> getAllItemList = new ArrayList<>();
@@ -293,6 +301,7 @@ public class SarFileSplitItemsEOServiceImpl implements SarFileSplitItemsEOServic
                 //删除file表数据
 //                sarFileSplitItemsFileEODao.deleteByItemIds(allItemIdList);
                 result = dao.deleteByItemsIdList(allItemIdList);
+                 dao.deleteByItemsIdList1(idList1);
             }else if(!idList.isEmpty()){//菜单被删掉了，数据当时被保留下来的
                 allItemIdList.clear();
                 allItemIdList.addAll(idList);
@@ -303,9 +312,12 @@ public class SarFileSplitItemsEOServiceImpl implements SarFileSplitItemsEOServic
                 //删除特殊参数要求params表数据
                 sarFileSplitItemsParamsEODao.deleteByItemIds(allItemIdList);
                 result = dao.deleteByItemsIdList(allItemIdList);
+                dao.deleteByItemsIdList1(idList1);
             }
         }
-        return result;
+        Map resultMap = new HashMap();
+        resultMap.put("拆分单删除",result);
+        return resultMap.size();
     }
 
     @Override

adc-da-slrs/src/main/resources/mybatis/mapper/standardSplit/SarFileSplitItemsEOMapper.xml

@@ -71,6 +71,17 @@
      dutyEngineerShow,tsFo.NAME as foShow
   </sql>
 
+  <sql id="Base_Column_List2" >
+     SAR_FILE_SPLIT_ITEMS.id, SAR_FILE_SPLIT_ITEMS.info_id, SAR_FILE_SPLIT_ITEMS.items_num, items_name, iterms_conditions,
+     newcar_put_time, product_put_time, menu_id, svpps, apply_arctic, reference_stand, special_request, relevance_file,
+     SAR_FILE_SPLIT_ITEMS.remarks, SAR_FILE_SPLIT_ITEMS.valid_flag, SAR_FILE_SPLIT_ITEMS.creation_user,
+     SAR_FILE_SPLIT_ITEMS.creation_time, SAR_FILE_SPLIT_ITEMS.modify_time, SAR_FILE_SPLIT_ITEMS.modify_user,
+     SAR_FILE_SPLIT_ITEMS.fo,SAR_FILE_SPLIT_ITEMS.duty_engineer, SAR_FILE_SPLIT_ITEMS.claim_type,
+     SAR_FILE_SPLIT_ITEMS.bus_stand_cover,SAR_FILE_SPLIT_ITEMS.file_type,SAR_FILE_SPLIT_ITEMS.responsible_unit,
+     TS_ORG.org_name as responsibleUnitShow, dicClaimType.DIC_TYPE_NAME as claimTypeShow,tsdutyEngineer.NAME as
+     dutyEngineerShow,tsFo.NAME as foShow, SAR_FILE_SPLIT_ITEMS.edit_flag
+  </sql>
+
   <!-- 查询条件 -->
   <sql id="Base_Where_Clause">
     where 1=1
@@ -343,6 +354,28 @@
      where id = #{id}
   </update>
 
+    <update id="updateByPrimaryKeySelective1" parameterType="com.adc.da.slrs.standardSplit.entity.SarStandItemsEO">
+        update SAR_STAND_ITEMS
+        <set >
+            <if test="itemsNum != null" >
+                items_num = #{itemsNum},
+            </if>
+
+            <if test="itemsName != null" >
+                items_name = #{itemsName},
+            </if>
+
+            <if test="itermsConditions != null" >
+                TERMS_CONDITIONS = #{itermsConditions},
+            </if>
+
+            <if test="validFlag != null" >
+                valid_flag = #{validFlag},
+            </if>
+        </set>
+        where edit_flag = #{editFlag}
+    </update>
+
   <!-- 根据id查询 SAR_FILE_SPLIT_ITEMS -->
   <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.String">
     select <include refid="Base_Column_List" />
@@ -386,7 +419,7 @@
   <select id="queryByPage" resultMap="BaseResultMap" parameterType="com.adc.da.slrs.standardSplit.entity.SarFileSplitItemsEOPage">
 	select * from
 		(select tmp_tb.* from
-			(select <include refid="Base_Column_List" /> from SAR_FILE_SPLIT_ITEMS left join SAR_FILE_SPLIT_MENU on SAR_FILE_SPLIT_ITEMS.MENU_ID = SAR_FILE_SPLIT_MENU.id
+			(select <include refid="Base_Column_List2" /> from SAR_FILE_SPLIT_ITEMS left join SAR_FILE_SPLIT_MENU on SAR_FILE_SPLIT_ITEMS.MENU_ID = SAR_FILE_SPLIT_MENU.id
                 left join TS_DICTYPE dicClaimType on (dicClaimType.dic_type_code = SAR_FILE_SPLIT_ITEMS.claim_type and dicClaimType.dic_id is
                 not null and dicClaimType.valid_flag = 0)
                 left join TS_ORG on (SAR_FILE_SPLIT_ITEMS.responsible_unit =TS_ORG.id)
@@ -454,7 +487,7 @@
      <insert id="insertForeach" parameterType="java.util.List">
         insert into SAR_FILE_SPLIT_ITEMS
         (id, info_id, items_num, items_name, newcar_put_time, product_put_time, menu_id, svpps, apply_arctic, reference_stand, special_request, relevance_file, remarks, valid_flag, creation_user, creation_time, modify_time,
-        modify_user, iterms_conditions)
+        modify_user, iterms_conditions, edit_flag)
          values
          <foreach collection="list" item="item" index="index" separator=",">
              (
@@ -466,7 +499,8 @@
              #{item.relevanceFile, jdbcType=VARCHAR}, #{item.remarks, jdbcType=VARCHAR},
              #{item.validFlag, jdbcType=INTEGER}, #{item.creationUser, jdbcType=VARCHAR},
              #{item.creationTime, jdbcType=TIMESTAMP}, #{item.modifyTime, jdbcType=TIMESTAMP},
-             #{item.modifyUser, jdbcType=VARCHAR}, #{item.itermsConditions, jdbcType=CLOB}
+             #{item.modifyUser, jdbcType=VARCHAR}, #{item.itermsConditions, jdbcType=CLOB},
+             #{item.editFlag, jdbcType=VARCHAR}
          )
          </foreach>
     </insert>
@@ -474,13 +508,14 @@
     <!--   用来往标准分解单插入数据   -->
     <insert id="insertStandSplitForeach" parameterType="java.util.List">
         insert into SAR_STAND_ITEMS
-        (id, STAND_ID, items_num, items_name,  TERMS_CONDITIONS,FILE_TYPE)
+        (id, STAND_ID, items_num, items_name,TERMS_CONDITIONS,FILE_TYPE,edit_flag)
         values
         <foreach collection="list" item="item" index="index" separator=",">
             (
             #{item.id, jdbcType=VARCHAR}, #{item.standId, jdbcType=VARCHAR}, #{item.itemsNum, jdbcType=VARCHAR},
             #{item.itemsName, jdbcType=VARCHAR}, #{item.termsConditions, jdbcType=CLOB},
-            #{item.fileType, jdbcType=VARCHAR}
+            #{item.fileType, jdbcType=VARCHAR},
+            #{item.editFlag, jdbcType=VARCHAR}
             )
         </foreach>
     </insert>
@@ -550,6 +585,14 @@
         </foreach>
     </delete>
 
+    <delete id="deleteByItemsIdList1" parameterType="java.util.List">
+        delete from SAR_STAND_ITEMS
+        where edit_flag in
+        <foreach collection="idList" index="index" item="item" open="(" separator="," close=")">
+            #{item}
+        </foreach>
+    </delete>
+
     <select id="queryByOrdersForExport" resultMap="BaseResultMapExport" parameterType="com.adc.da.slrs.standardSplit.entity.SarFileSplitItemsEOPage">
         select SAR_FILE_SPLIT_ITEMS.id,SAR_FILE_SPLIT_ITEMS.items_num,SAR_FILE_SPLIT_ITEMS.items_name,
         newcar_put_time,product_put_time,svpps,apply_arctic,reference_stand,SAR_FILE_SPLIT_ITEMS.remarks,