diff --git a/adc-da-activiti/src/main/java/com/adc/da/FeignClient/workFlowFeignClient.java b/adc-da-activiti/src/main/java/com/adc/da/FeignClient/workFlowFeignClient.java index 7c9d952c..ff88272a 100644 --- a/adc-da-activiti/src/main/java/com/adc/da/FeignClient/workFlowFeignClient.java +++ b/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 { diff --git a/adc-da-slrs/src/main/java/com/adc/da/scheduled/ScheduledJob.java b/adc-da-slrs/src/main/java/com/adc/da/scheduled/ScheduledJob.java index ce35933c..15007290 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/scheduled/ScheduledJob.java +++ b/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 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"://已修订 diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/service/impl/SarLawsAttrDetailedListServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/service/impl/SarLawsAttrDetailedListServiceImpl.java index d8e134a6..992781b5 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/service/impl/SarLawsAttrDetailedListServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/service/impl/SarLawsAttrDetailedListServiceImpl.java @@ -49,7 +49,7 @@ public class SarLawsAttrDetailedListServiceImpl extends ServiceImpl selectPage = sarLawsAttrDetailedListDao.selectPage(pageRes,wrapper); //?????? //查询标准id - List lawsIds = sarLawsAttrDetailedListDao.selectLawsId(sarFindDto.getId(),(sarFindDto.getPage())-1,sarFindDto.getSize(),sarFindDto); + List lawsIds = sarLawsAttrDetailedListDao.selectLawsId(sarFindDto.getId(),((sarFindDto.getPage())-1)*sarFindDto.getSize(),sarFindDto.getSize(),sarFindDto); if (CollectionUtils.isEmpty(lawsIds)){ IPage list1 = new Page<>(); list1.setCurrent(selectPage.getCurrent()); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/service/impl/SarLawsDetailedListServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/service/impl/SarLawsDetailedListServiceImpl.java index a85754ab..f4234b35 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/service/impl/SarLawsDetailedListServiceImpl.java +++ b/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 { dict.put(stringStringMap.get("label"), stringStringMap.get("value")); }); - if (null == res) { - stringBuilder.append("请误导入空文件;"); + if (CollectionUtils.isEmpty(res)) { + stringBuilder.append("请勿导入空文件;"); } //先校验是否存在一堆空数据 if (null != res && "".equals(stringBuilder.toString())) { @@ -894,22 +895,28 @@ public class SarLawsDetailedListServiceImpl extends ServiceImpl 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 ServiceImpl0L) { p.setUnCount(s.getUnCount()); }else if (s.getUnCount() == 0L && s.getCounts()==0L){ @@ -542,6 +544,9 @@ public class SarStandProjectLibraryServiceImpl extends ServiceImpl userIPage = new Page<>(); @@ -559,9 +564,21 @@ public class SarStandProjectLibraryServiceImpl extends ServiceImpl 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); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/entity/WarningDate.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/entity/WarningDate.java index 156f0da3..a0c63994 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/entity/WarningDate.java +++ b/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; } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/controller/SarStandardComplianceAssessResultController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/controller/SarStandardComplianceAssessResultController.java index 4a0efcba..42640ba1 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/controller/SarStandardComplianceAssessResultController.java +++ b/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 queryWrapper = new QueryWrapper<>(); IPage 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 page = iSarInterpretationNationalStandardService.page(iPage, queryWrapper); while (page.getRecords().remove(null)) ; diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/InterpretationEO.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/InterpretationEO.java index 3b085c4e..660234f8 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/InterpretationEO.java +++ b/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; diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/SarInterpretationNationalStandard.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/SarInterpretationNationalStandard.java index b90feef2..f71a5c73 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/SarInterpretationNationalStandard.java +++ b/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; diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarStandCompareHisEOServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarStandCompareHisEOServiceImpl.java index d46b5142..825a742e 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarStandCompareHisEOServiceImpl.java +++ b/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", "
"); - anb[1] = anb[1].replaceAll("red;", "#000000;background-color: rgb(51, 145, 206);").replaceAll("i#2\n", "
"); + anb[0] = anb[0].replaceAll("red;", "#ffffff;background-color: red;").replaceAll("i#2\n", "
"); + anb[1] = anb[1].replaceAll("red;", "#ffffff;background-color: rgb(51, 145, 206);").replaceAll("i#2\n", "
"); }else { - anb[0] = anb[0].replaceAll("red;", "#000000;background-color: rgb(51, 145, 206);").replaceAll("i#2\n", "
"); - anb[1] = anb[1].replaceAll("red;", "#000000;background-color: red;").replaceAll("i#2\n", "
"); + anb[0] = anb[0].replaceAll("red;", "#ffffff;background-color: rgb(51, 145, 206);").replaceAll("i#2\n", "
"); + anb[1] = anb[1].replaceAll("red;", "#ffffff;background-color: red;").replaceAll("i#2\n", "
"); } resultMap.put("leftString",anb[0]); resultMap.put("rightString",anb[1]); diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardComplianceAssessResult/SarInterpretationNationalStandardMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardComplianceAssessResult/SarInterpretationNationalStandardMapper.xml index 1ecb92f1..c5abdfdd 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardComplianceAssessResult/SarInterpretationNationalStandardMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardComplianceAssessResult/SarInterpretationNationalStandardMapper.xml @@ -76,6 +76,9 @@ AND sins.specific_item like concat(concat('%',#{specificItem}),'%') + + AND sins.prc_num like concat(concat('%',#{prcNum}),'%') + 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 @@ AND STAND_NAME like concat(concat('%',#{standName}),'%') + + AND prc_num like concat(concat('%',#{prcNum}),'%') + AND specific_item like concat(concat('%',#{specificItem}),'%') diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarUser/TsUserMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarUser/TsUserMapper.xml index 2425755e..5950d26a 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarUser/TsUserMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarUser/TsUserMapper.xml @@ -74,7 +74,10 @@ diff --git a/doc/sql/20220901_解读流程新增字段.sql b/doc/sql/20220901_解读流程新增字段.sql new file mode 100644 index 00000000..7f8dd945 --- /dev/null +++ b/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`; \ No newline at end of file