Merge remote-tracking branch 'origin/develop_master' into FOTON

# Conflicts:
#	adc-da-slrs/src/main/resources/mybatis/mapper/sarUser/TsUserMapper.xml

adc-da-activiti/src/main/java/com/adc/da/FeignClient/workFlowFeignClient.java

@@ -18,6 +18,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
+//@FeignClient(value = "bat-wkflow-test")
 @FeignClient(value = "bat-wkflow")
 //@FeignClient(value = "shan6")
 public interface workFlowFeignClient {

adc-da-slrs/src/main/java/com/adc/da/scheduled/ScheduledJob.java

@@ -153,9 +153,9 @@ public class ScheduledJob {
                 if (m.matches()) {
                     WarningDate warningDate = new WarningDate();
                     BeanUtils.copyProperties(item, warningDate);
-
                     warningDate.setId(UUIDUtils.randomUUID20());
                     warningDate.setSSRQ(s);
+                    warningDate.setFileType("0");
                     data.add(warningDate);
                 }
             }
@@ -165,6 +165,11 @@ public class ScheduledJob {
         List<WarningDate> warningDateOfItems = sarStandardWarningDao.getWarningDateOfItems(term);
         warningDateOfItems.forEach(item -> {
             for (String s : item.getSSRQ().split(",")) {
+                String id = item.getLawId();
+                if (id.equals("vgh0j186ve7uhxjelctt")){
+                    System.out.println(id);
+                }
+                System.out.println(id);
                 String pattern = term.getTermStr();
                 Pattern r = Pattern.compile(pattern);
                 Matcher m = r.matcher(s);
@@ -181,6 +186,7 @@ public class ScheduledJob {
                             BeanUtils.copyProperties(item, warningDate);
                             warningDate.setId(UUIDUtils.randomUUID20());
                             warningDate.setSSRQ(s);
+                            warningDate.setFileType("1");
                             data.add(warningDate);
                         }
                     }
@@ -218,19 +224,19 @@ public class ScheduledJob {
     private String convertTextStateToItemType(String textState){
         String fileType ="";
         switch (textState){
-            case "DRAFT"://草稿
+            case "hya6gay4vx"://草稿
                 fileType="CA";
                 break;
-            case "ADVICE"://征求意见稿
+            case "8rjsx83ows"://征求意见稿
                 fileType="ZQYJG";
                 break;
-            case "RADYSUBMIT"://报批稿
+            case "3dx7oy5jff"://报批稿
                 fileType="BPG";
                 break;
-            case "SUBMIT"://送审稿
+            case "ncb6osftj8"://送审稿
                 fileType="SSG";
                 break;
-            case "FJNVYX9Q7J"://发布稿
+            case "hc99551723c"://发布稿
                 fileType="FBGBJBD";
                 break;
             case "ZTJJSS"://修订中
@@ -242,7 +248,7 @@ public class ScheduledJob {
             case "ZTXXYX"://计划修订
                 fileType=null;
                 break;
-            case "5E5Z3CELX6"://已实施
+            case "vsaga7nwub"://已实施
                 fileType="FBGBJBD";
                 break;
             case "N5KLTFLNRC"://已修订

adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/service/impl/SarLawsAttrDetailedListServiceImpl.java

@@ -49,7 +49,7 @@ public class SarLawsAttrDetailedListServiceImpl extends ServiceImpl<SarLawsAttrD
         wrapper.eq("detailed_list_id", sarFindDto.getId());
         IPage<SarLawsAttrDetailedList> selectPage = sarLawsAttrDetailedListDao.selectPage(pageRes,wrapper);  //??????
         //查询标准id
-        List<String> lawsIds = sarLawsAttrDetailedListDao.selectLawsId(sarFindDto.getId(),(sarFindDto.getPage())-1,sarFindDto.getSize(),sarFindDto);
+        List<String> lawsIds = sarLawsAttrDetailedListDao.selectLawsId(sarFindDto.getId(),((sarFindDto.getPage())-1)*sarFindDto.getSize(),sarFindDto.getSize(),sarFindDto);
         if (CollectionUtils.isEmpty(lawsIds)){
             IPage<LawsDto> list1 = new Page<>();
             list1.setCurrent(selectPage.getCurrent());

adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/service/impl/SarLawsDetailedListServiceImpl.java

@@ -33,6 +33,7 @@ import com.adc.da.slrs.wgdCensusZ.entity.WgdCommiInfo;
 import com.adc.da.sys.service.IDicTypeEOService;
 import com.adc.da.util.LoginUserUtil;
 import com.adc.da.util.UUIDUtils;
+import com.adc.da.util.utils.CollectionUtils;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
@@ -874,8 +875,8 @@ public class SarLawsDetailedListServiceImpl extends ServiceImpl<SarLawsDetailedL
         arr.forEach(stringStringMap -> {
             dict.put(stringStringMap.get("label"), stringStringMap.get("value"));
         });
-        if (null == res) {
+        if (CollectionUtils.isEmpty(res)) {
-            stringBuilder.append("请误导入空文件；");
+            stringBuilder.append("请勿导入空文件；");
         }
         //先校验是否存在一堆空数据
         if (null != res && "".equals(stringBuilder.toString())) {
@@ -894,22 +895,28 @@ public class SarLawsDetailedListServiceImpl extends ServiceImpl<SarLawsDetailedL
         if (null != res && "".equals(stringBuilder.toString())) {
             for (ExportEmptyModelDto re : res) {
                 if (!(re.getSsrq().contains(",") || re.getSsrq().contains("，"))) {
-                    Date date = org.apache.poi.ss.usermodel.DateUtil
+                    if(StringUtils.isNotEmpty(re.getSsrq())){
-                            .getJavaDate(Double.valueOf(re.getSsrq()));
+                        Date date = org.apache.poi.ss.usermodel.DateUtil
-                    DateFormat format = new SimpleDateFormat("yyyy-MM-dd");
+                                .getJavaDate(Double.parseDouble(re.getSsrq()));
-                    re.setSsrq(format.format(date));
+                        DateFormat format = new SimpleDateFormat("yyyy-MM-dd");
+                        re.setSsrq(format.format(date));
+                    }
                 }
                 if (!(re.getXcxssrqgj().contains(",") || re.getXcxssrqgj().contains("，"))) {
-                    Date date = org.apache.poi.ss.usermodel.DateUtil
+                    if(StringUtils.isNotEmpty(re.getXcxssrqgj())) {
-                            .getJavaDate(Double.valueOf(re.getXcxssrqgj()));
+                        Date date = org.apache.poi.ss.usermodel.DateUtil
-                    DateFormat format = new SimpleDateFormat("yyyy-MM-dd");
+                                .getJavaDate(Double.parseDouble(re.getXcxssrqgj()));
-                    re.setXcxssrqgj(format.format(date));
+                        DateFormat format = new SimpleDateFormat("yyyy-MM-dd");
+                        re.setXcxssrqgj(format.format(date));
+                    }
                 }
                 if (!(re.getZccssrqgj().contains(",") || re.getZccssrqgj().contains("，"))) {
-                    Date date = org.apache.poi.ss.usermodel.DateUtil
+                    if(StringUtils.isNotEmpty(re.getZccssrqgj())) {
-                            .getJavaDate(Double.valueOf(re.getZccssrqgj()));
+                        Date date = org.apache.poi.ss.usermodel.DateUtil
-                    DateFormat format = new SimpleDateFormat("yyyy-MM-dd");
+                                .getJavaDate(Double.parseDouble(re.getZccssrqgj()));
-                    re.setZccssrqgj(format.format(date));
+                        DateFormat format = new SimpleDateFormat("yyyy-MM-dd");
+                        re.setZccssrqgj(format.format(date));
+                    }
                 }
             }
 

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/impl/SarStandProjectLibraryServiceImpl.java

@@ -460,7 +460,7 @@ public class SarStandProjectLibraryServiceImpl extends ServiceImpl<SarStandProje
         //cars传回值为1时判断是从车型项目库中调取
 
         QueryWrapper<SarStandardsInfo> wrapper1 = new QueryWrapper<>();
-        wrapper1.select("ID","STAND_NUMBER","STAND_SORT","STAND_YEAR","STAND_NAME","STAND_EN_NAME","TEXT_STATUS","STAND_TYPE","(select count(*) from sar_stand_unqualified " +
+        wrapper1.select("ID","STAND_NUMBER","STAND_SORT","STAND_YEAR","STAND_NAME","STAND_EN_NAME","TEXT_STATUS","STAND_TYPE","ISSUE_TIME","(select count(*) from sar_stand_unqualified " +
                 " where STAND_ID = r.stand_id and CLOSE_STATE = '1' ) as unCount ","(select count(*) from sar_stand_unqualified" +
                         " where STAND_ID = r.stand_id and CLOSE_STATE = '2' ) as counts ",
                 "(select GROUP_CONCAT( DISTINCT DATE_FORMAT( PLAN_CLOSE_TIME, '%Y-%m-%d' ) ORDER BY PLAN_CLOSE_TIME )  from sar_stand_unqualified where " +
@@ -474,8 +474,9 @@ public class SarStandProjectLibraryServiceImpl extends ServiceImpl<SarStandProje
                 "STAND_YEAR," +
                 "STAND_NAME," +
                 "STAND_EN_NAME," +
-                "'' as TEXT_STATUS," +
+                "TEXT_STATUS_BUSS as TEXT_STATUS," +
-                "'' as STAND_TYPE," +
+                "'BUSINESS_STAND' as STAND_TYPE," +
+                "ISSUE_TIME,"+
                 "( SELECT count( * ) FROM sar_stand_unqualified WHERE STAND_ID = r.stand_id AND CLOSE_STATE = '1' ) AS unCount," +
                 "( SELECT count( * ) FROM sar_stand_unqualified WHERE STAND_ID = r.stand_id AND CLOSE_STATE = '2' ) AS counts," +
                 "(" +
@@ -526,6 +527,7 @@ public class SarStandProjectLibraryServiceImpl extends ServiceImpl<SarStandProje
             p.setStandType(s.getStandType());
             p.setStandEnName(s.getStandEnName());
             p.setTextStatus(s.getTextStatus());
+
             if (s.getUnCount()==0L && s.getCounts()>0L) {
                 p.setUnCount(s.getUnCount());
             }else if (s.getUnCount() == 0L && s.getCounts()==0L){
@@ -542,6 +544,9 @@ public class SarStandProjectLibraryServiceImpl extends ServiceImpl<SarStandProje
                     p.setZRBM(a.getZrbm());
                 }
             }
+            if(StringUtils.equals(s.getStandType(),"BUSINESS_STAND")){
+                p.setSSRQ(s.getIssueTime());
+            }
             list.add(p);
         }
         IPage<StandAttrInfoDto> userIPage = new Page<>();
@@ -559,9 +564,21 @@ public class SarStandProjectLibraryServiceImpl extends ServiceImpl<SarStandProje
     @Override
     public void batchInsert(List<StandProjectRelationDto> list) {
         if(list!=null && !list.isEmpty()){
+            for (StandProjectRelationDto relationDto : list){
+                SarStandProjectLibrary sarStandProjectLibrary = sarStandProjectLibraryDao.selectById(relationDto.getProjectId());
+                if ("G9".equals(sarStandProjectLibrary.getCurrentNode())){
+                    sarStandProjectLibraryDao.updateFlag(relationDto.getProjectId());
+                }else if ("G8".equals(sarStandProjectLibrary.getCurrentNode())){
+                    sarStandProjectLibraryDao.updateFlag(relationDto.getProjectId());
+                }else if ("G7".equals(sarStandProjectLibrary.getCurrentNode())){
+                    sarStandProjectLibraryDao.updateFlag(relationDto.getProjectId());
+                }else if ("G4".equals(sarStandProjectLibrary.getCurrentNode())){
+                    sarStandProjectLibraryDao.updateFlag(relationDto.getProjectId());
+                }
+            }
             StandProjectRelationDto standProjectRelationDto = list.get(0);
             if(standProjectRelationDto!=null && StringUtils.isNotBlank(standProjectRelationDto.getProjectId())){
-                sarStandProjectLibraryDao.updateFlag(standProjectRelationDto.getProjectId());
+//                sarStandProjectLibraryDao.updateFlag(standProjectRelationDto.getProjectId());
                 sarStandProjectLibraryDao.deleteByProjectId(standProjectRelationDto.getProjectId());
             }
             sarStandProjectLibraryDao.batchInsert(list);

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/entity/WarningDate.java

@@ -23,5 +23,6 @@ public class WarningDate {
     @TableField("time_Name")
     private String timeName;
 
+    @TableField("type")
     private String fileType;
 }

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

@@ -76,14 +76,14 @@ public class SarStandardComplianceAssessResultController {
             if (eo.getPosition() == 1) {
                 QueryWrapper<SarInterpretationNationalStandard> queryWrapper = new QueryWrapper<>();
                 IPage<SarInterpretationNationalStandard> iPage = new Page<>(eo.getCurrent(), eo.getSize());
-                queryWrapper.select("distinct STAND_ID, STAND_NUMBER, STAND_NAME, STAND_TYPE, INTERPRETATION_TIME,risk_degree");
+                queryWrapper.select("distinct STAND_ID, STAND_NUMBER, STAND_NAME, STAND_TYPE, min(INTERPRETATION_TIME) as INTERPRETATION_TIME,risk_degree,prc_num");
                 if (eo.getStandName() != null && !eo.getStandName().trim().equals("")) {
                     queryWrapper.like("STAND_NAME", eo.getStandName().trim());
                 }
                 if (eo.getStandNumber() != null && !eo.getStandNumber().trim().equals("")) {
                     queryWrapper.like("STAND_NUMBER", eo.getStandNumber().trim());
                 }
-
+                queryWrapper.groupBy("STAND_ID, STAND_NUMBER, STAND_NAME, STAND_TYPE,risk_degree,prc_num");
                 IPage<SarInterpretationNationalStandard> page = iSarInterpretationNationalStandardService.page(iPage, queryWrapper);
 
                 while (page.getRecords().remove(null)) ;

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

@@ -39,6 +39,9 @@ public class InterpretationEO {
     @JsonFormat(locale = "zh", timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
     private Date interpretationTime;
 
+    @ApiModelProperty(value = "流程编号")
+    private String prcNum;
+
     @ApiModelProperty(value = "国内(1)/外(2)")
     private Integer position=1;
 

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

@@ -98,6 +98,9 @@ public class SarInterpretationNationalStandard extends BaseEntity {
     @TableField("risk_degree")
     private String riskDegree;
 
+    @ApiModelProperty(value = "流程编号")
+    private String prcNum;
+
 
     @TableField(exist = false)
     private String applyArctic;

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

@@ -181,11 +181,11 @@ public class SarStandCompareHisEOServiceImpl implements SarStandCompareHisEOServ
 //            }
             String[] anb = EventEditHistoryHighLightUtil.getHighLightDifferent(oldTxt.trim(), newTxt.trim());
             if(StringUtils.isNotBlank(flag) && flag.equals("2")){
-                anb[0] = anb[0].replaceAll("red;", "#000000;background-color: red;").replaceAll("i#2\n", "<br/>");
+                anb[0] = anb[0].replaceAll("red;", "#ffffff;background-color: red;").replaceAll("i#2\n", "<br/>");
-                anb[1] = anb[1].replaceAll("red;", "#000000;background-color: rgb(51, 145, 206);").replaceAll("i#2\n", "<br/>");
+                anb[1] = anb[1].replaceAll("red;", "#ffffff;background-color: rgb(51, 145, 206);").replaceAll("i#2\n", "<br/>");
             }else {
-                anb[0] = anb[0].replaceAll("red;", "#000000;background-color: rgb(51, 145, 206);").replaceAll("i#2\n", "<br/>");
+                anb[0] = anb[0].replaceAll("red;", "#ffffff;background-color: rgb(51, 145, 206);").replaceAll("i#2\n", "<br/>");
-                anb[1] = anb[1].replaceAll("red;", "#000000;background-color: red;").replaceAll("i#2\n", "<br/>");
+                anb[1] = anb[1].replaceAll("red;", "#ffffff;background-color: red;").replaceAll("i#2\n", "<br/>");
             }
             resultMap.put("leftString",anb[0]);
             resultMap.put("rightString",anb[1]);

adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardComplianceAssessResult/SarInterpretationNationalStandardMapper.xml

@@ -76,6 +76,9 @@
                 <if test="specificItem!=null and specificItem!=''">
                     AND sins.specific_item like concat(concat('%',#{specificItem}),'%')
                 </if>
+                <if test="prcNum!=null and prcNum!=''">
+                    AND sins.prc_num like concat(concat('%',#{prcNum}),'%')
+                </if>
                 ORDER BY sins.STAND_ID, sins.specific_item
 
                 ) c  ORDER BY c.STAND_ID, CONVERT(SUBSTRING(c.specific_item,1,(SELECT LOCATE('.',CONCAT(c.specific_item,'.')))),SIGNED) ,rows
@@ -100,6 +103,9 @@
             <if test="standName!=null and standName!=''">
                 AND STAND_NAME like concat(concat('%',#{standName}),'%')
             </if>
+            <if test="prcNum!=null and prcNum!=''">
+                AND prc_num like concat(concat('%',#{prcNum}),'%')
+            </if>
             <if test="specificItem!=null and specificItem!=''">
                 AND specific_item like concat(concat('%',#{specificItem}),'%')
             </if>

adc-da-slrs/src/main/resources/mybatis/mapper/sarUser/TsUserMapper.xml

@@ -74,7 +74,10 @@
 
 
     <select id="userUnderInstitution" parameterType="com.adc.da.slrs.sarUser.entity.TsUser" resultMap="UserPosition">
-        select u.*,p.id p_id,p.name p_name from ts_user u
+        select u.USID,u.ACCOUNT,u.PASSWORD,u.OPER_USER,u.UNAME,u.SEX,u.USER_SOURCE,u.PHONE,u.EMAIL,u.INSTITUTION_NAME,u.INSTITUTION_ID
+               ,u.POSITION_NAME,u.STATE,u.POSITION_ID,u.WORK_NUM,u.EXT_INFO,u.CREATION_TIME,u.MODIFY_TIME,u.VALID_FLAG
+             ,u.DISABLE_FLAG,u.UNLOCK_FLAG,u.USER_TYPE,u.SSO_ID,
+               p.id p_id,p.name p_name from ts_user u
         left join ts_user_position up
         on u.usid=up.user_id
         left join ts_position p
@@ -92,7 +95,7 @@
                 #{id}
             </foreach>
         </if>
-        order by u.CREATION_TIME desc,u.USID
+            ORDER BY p.id is null,p.create_time
         limit #{start},#{end}
     </select>
 

doc/sql/20220901_解读流程新增字段.sql

@@ -0,0 +1,2 @@
+ALTER TABLE sar_interpretation_national_standard
+    ADD COLUMN `prc_num` varchar(255) NULL COMMENT '流程编号' AFTER `risk_degree`;