合并分支 'dev_20230216' 到 'master'

Dev 20230216

查看合并请求 laws-foton-slrs/foton-slrs-system-rest!76

adc-da-slrs/src/main/java/com/adc/da/slrs/processModel/entity/exportExcel.java

@@ -24,10 +24,10 @@ public class exportExcel {
     @Excel(name = "评审责任人" , orderNum = "5", width = 20.0)
     private String resPersonName;
 
-    @Excel(name = "工作组组长" , orderNum = "6", width = 20.0)
+    @Excel(name = "技术委员会评审负责人" , orderNum = "6", width = 20.0)
     private String wgLeaderName;
 
-    @Excel(name = "计划初稿完成日期" , orderNum = "7", width = 20.0)
+    @Excel(name = "计划标准初稿完成日期" , orderNum = "7", width = 20.0)
     private String draftTime;
 
     @Excel(name = "计划标准发布时间", orderNum = "8", width = 18.0)

adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStandState/sync/StateSync.java

@@ -75,7 +75,7 @@ public class StateSync {
                 List<SarBussionessStand> standList = new ArrayList<>();
                 if(!standLists.isEmpty()) {
                     for (SarBussionessStand data : standLists) {
-                        if (!data.getValidFlag().equals("1") || data.getValidFlag() != 1) {
+                        if (data.getValidFlag() == 0) {
                             standList.add(data);
                         }
                     }

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/controller/SarStandardComplianceAssessResultController.java

@@ -292,6 +292,11 @@ public class SarStandardComplianceAssessResultController {
             iPage.setTotal(datasCount);
             iPage.setRecords(standards);
             while (iPage.getRecords().remove(null)) ;
+            if(StringUtils.isNotBlank(eo.getOrder())){
+                if(eo.getOrder().equals("desc")){
+                    iPage.getRecords().sort((m1,m2)-> m2.getSpecificItem().compareTo(m1.getSpecificItem()));
+                }
+            }
             return Result.success(iPage);
         } else {
             IPage<SarInterpretationForeignStandard> iPage = new Page<>(eo.getCurrent(), eo.getSize());
@@ -307,7 +312,11 @@ public class SarStandardComplianceAssessResultController {
             if (eo.getStandId() != null) queryWrapper.eq("STAND_ID", eo.getStandId());
             IPage<SarInterpretationForeignStandard> page = iSarInterpretationForeignStandardService.page(iPage, queryWrapper);
             while (page.getRecords().remove(null)) ;
-
+            if(StringUtils.isNotBlank(eo.getOrder())){
+                if(eo.getOrder().equals("desc")){
+                    iPage.getRecords().sort((m1,m2)-> m2.getSpecificItem().compareTo(m1.getSpecificItem()));
+                }
+            }
             return Result.success(page);
         }
     }

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/InterpretationEO.java

@@ -51,4 +51,7 @@ public class InterpretationEO {
     @ApiModelProperty("页内数量")
     private Integer size=20;
 
+    @ApiModelProperty("排序")
+    private String order;
+
 }

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java

@@ -1176,6 +1176,14 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
                 sarStandMenuEODao.insert(sarStandMenuEO);
             }
         }
+        if (StringUtils.isNotEmpty(sarStandardsInfoEO.getMenuId())) {
+                SarStandMenu sarStandMenuEO = new SarStandMenu();
+                sarStandMenuEO.setStandId(sarStandardsInfoEO.getId());
+                sarStandMenuEO.setMenuId(sarStandardsInfoEO.getMenuId());
+                sarStandMenuEO.setValidFlag(ValueStateEnum.VALUE_TRUE.getValue());
+                sarStandMenuEO.setId(UUIDUtils.randomUUID20());
+                sarStandMenuEODao.insert(sarStandMenuEO);
+        }
         // 根据其他字段，生成标准状态
         updateStandState(sarStandardsInfoEO, null);
         int insertResult = dao.insertSelective(sarStandardsInfoEO);

adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStandState/SarBussionessStandStateMapper.xml

@@ -372,13 +372,13 @@
         SELECT A.* FROM (
         select <include refid="Base_Column_List" />
         from sar_bussioness_stand_state
-        LEFT JOIN sar_buss_stand_attr_info ON sar_buss_stand_attr_info.stand_id = sar_bussioness_stand_state.stand_id
+        LEFT JOIN sar_buss_stand_attr_info ON sar_buss_stand_attr_info.stand_id = sar_bussioness_stand_state.stand_id and sar_buss_stand_attr_info.VALID_FLAG = 0
         LEFT JOIN SAR_BUSS_STAND_MENU ON sar_bussioness_stand_state.stand_id = SAR_BUSS_STAND_MENU.buss_stand_id
         <include refid="SarBussionInfoRole_Where_Clause_Review_Results_N"/>
         union
         select <include refid="Base_Column_List" />
         from sar_bussioness_stand_state
-        LEFT JOIN sar_buss_stand_attr_info ON sar_buss_stand_attr_info.stand_id = sar_bussioness_stand_state.stand_id
+        LEFT JOIN sar_buss_stand_attr_info ON sar_buss_stand_attr_info.stand_id = sar_bussioness_stand_state.stand_id and sar_buss_stand_attr_info.VALID_FLAG = 0
         LEFT JOIN SAR_BUSS_STAND_MENU ON sar_bussioness_stand_state.stand_id = SAR_BUSS_STAND_MENU.buss_stand_id
         <include refid="SarBussionInfoRole_Where_Clause_Review_Results"/>
         ORDER BY
@@ -395,7 +395,7 @@
         sar_bussioness_stand_state.id
         FROM
         sar_bussioness_stand_state
-        LEFT JOIN sar_buss_stand_attr_info ON sar_buss_stand_attr_info.stand_id = sar_bussioness_stand_state.stand_id
+        LEFT JOIN sar_buss_stand_attr_info ON sar_buss_stand_attr_info.stand_id = sar_bussioness_stand_state.stand_id and sar_buss_stand_attr_info.VALID_FLAG = 0
         LEFT JOIN SAR_BUSS_STAND_MENU ON sar_bussioness_stand_state.stand_id = SAR_BUSS_STAND_MENU.buss_stand_id
         <include refid="SarBussionInfoRole_Where_Clause_Review_Results_N"/>
         union
@@ -403,7 +403,7 @@
         sar_bussioness_stand_state.id
         FROM
         sar_bussioness_stand_state
-        LEFT JOIN sar_buss_stand_attr_info ON sar_buss_stand_attr_info.stand_id = sar_bussioness_stand_state.stand_id
+        LEFT JOIN sar_buss_stand_attr_info ON sar_buss_stand_attr_info.stand_id = sar_bussioness_stand_state.stand_id and sar_buss_stand_attr_info.VALID_FLAG = 0
         LEFT JOIN SAR_BUSS_STAND_MENU ON sar_bussioness_stand_state.stand_id = SAR_BUSS_STAND_MENU.buss_stand_id
         <include refid="SarBussionInfoRole_Where_Clause_Review_Results"/>
         ) a