From 96a818628da64e9267ff3fb52569e0971406130a Mon Sep 17 00:00:00 2001
From: zhangjun <879913833@qq.com>
Date: Wed, 31 Aug 2022 12:22:10 +0800
Subject: [PATCH 01/12] =?UTF-8?q?=E6=8C=89=E7=85=A7=E9=A1=BA=E5=BA=8F?=
=?UTF-8?q?=E6=9F=A5=E8=AF=A2=E7=BB=93=E6=9E=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../main/resources/mybatis/mapper/sarUser/TsUserMapper.xml | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)
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 601a5bd3..46f896e9 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
@@ -70,12 +70,7 @@
#{id}
-
- order by field(INSTITUTION_ID,
-
- #{id}
- )
-
+ ORDER BY p.id is null,p.create_time
limit #{start},#{end}
From bf349bb10066b7fc1de6032e2b22f8d8ae5f8e42 Mon Sep 17 00:00:00 2001
From: zhangjun <879913833@qq.com>
Date: Wed, 31 Aug 2022 13:54:05 +0800
Subject: [PATCH 02/12] =?UTF-8?q?=E5=88=86=E9=A1=B5=E4=B8=8D=E7=94=9F?=
=?UTF-8?q?=E6=95=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../service/impl/SarLawsAttrDetailedListServiceImpl.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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());
From 17ad8a999295f6376794f14ebaf949fbbefaecd0 Mon Sep 17 00:00:00 2001
From: zhangjun <879913833@qq.com>
Date: Wed, 31 Aug 2022 14:42:42 +0800
Subject: [PATCH 03/12] =?UTF-8?q?=E5=AF=BC=E5=85=A5=E7=A9=BA=E6=A8=A1?=
=?UTF-8?q?=E6=9D=BF=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../service/impl/SarLawsDetailedListServiceImpl.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
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..4cb1b4f5 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())) {
From 8c14a17b356a9b4c0e32c74d38f378614290eb03 Mon Sep 17 00:00:00 2001
From: zhangjun <879913833@qq.com>
Date: Thu, 1 Sep 2022 10:10:40 +0800
Subject: [PATCH 04/12] =?UTF-8?q?=E5=AF=BC=E5=85=A5=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../impl/SarLawsDetailedListServiceImpl.java | 30 +++++++++++--------
1 file changed, 18 insertions(+), 12 deletions(-)
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 4cb1b4f5..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
@@ -895,22 +895,28 @@ public class SarLawsDetailedListServiceImpl extends ServiceImpl
Date: Thu, 1 Sep 2022 14:13:49 +0800
Subject: [PATCH 05/12] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E9=A1=B9?=
=?UTF-8?q?=E7=9B=AE=E6=B8=85=E5=8D=95=E6=9B=B4=E6=96=B0=E6=B5=81=E7=A8=8B?=
=?UTF-8?q?=E4=B8=AD=E4=BC=81=E6=A0=87=E7=8A=B6=E6=80=81=E6=B2=A1=E6=9C=89?=
=?UTF-8?q?=E6=98=BE=E7=A4=BA=E7=9A=84BUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../impl/SarStandProjectLibraryServiceImpl.java | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/impl/SarStandProjectLibraryServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/impl/SarStandProjectLibraryServiceImpl.java
index 8504e688..27bfb941 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/impl/SarStandProjectLibraryServiceImpl.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/impl/SarStandProjectLibraryServiceImpl.java
@@ -460,7 +460,7 @@ public class SarStandProjectLibraryServiceImpl 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<>();
From 5b81a7e3e28389222f11da242f29eb0f55240b63 Mon Sep 17 00:00:00 2001
From: zhangjun <879913833@qq.com>
Date: Thu, 1 Sep 2022 16:08:43 +0800
Subject: [PATCH 06/12] =?UTF-8?q?=E5=8A=A0=E5=AD=97=E6=AE=B5=E5=B9=B6?=
=?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8A=80=E6=9C=AF=E8=AF=84=E4=BC=B0=E6=9F=A5?=
=?UTF-8?q?=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../SarStandardComplianceAssessResultController.java | 4 ++--
.../entity/InterpretationEO.java | 3 +++
.../entity/SarInterpretationNationalStandard.java | 3 +++
.../SarInterpretationNationalStandardMapper.xml | 6 ++++++
doc/sql/20220901_解读流程新增字段.sql | 2 ++
5 files changed, 16 insertions(+), 2 deletions(-)
create mode 100644 doc/sql/20220901_解读流程新增字段.sql
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/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/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
From b8f756a6fbbc3120d1bed51fb0567b7c0f13fafc Mon Sep 17 00:00:00 2001
From: zhangjun <879913833@qq.com>
Date: Fri, 2 Sep 2022 09:54:16 +0800
Subject: [PATCH 07/12] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AE=9A=E6=97=B6?=
=?UTF-8?q?=E4=BB=BB=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../java/com/adc/da/scheduled/ScheduledJob.java | 17 +++++++++++------
1 file changed, 11 insertions(+), 6 deletions(-)
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..cfdb2e01 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
@@ -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);
@@ -218,19 +223,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 +247,7 @@ public class ScheduledJob {
case "ZTXXYX"://计划修订
fileType=null;
break;
- case "5E5Z3CELX6"://已实施
+ case "vsaga7nwub"://已实施
fileType="FBGBJBD";
break;
case "N5KLTFLNRC"://已修订
From 7d06865f03041cc18e11f56f3841fbb1195456a6 Mon Sep 17 00:00:00 2001
From: zhangjun <879913833@qq.com>
Date: Fri, 2 Sep 2022 10:17:28 +0800
Subject: [PATCH 08/12] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AE=9A=E6=97=B6?=
=?UTF-8?q?=E4=BB=BB=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../java/com/adc/da/slrs/sarStandWarning/entity/WarningDate.java | 1 +
1 file changed, 1 insertion(+)
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;
}
From 04f10c6df995d10ee08446f60298f62e18ea9816 Mon Sep 17 00:00:00 2001
From: zhangjun <879913833@qq.com>
Date: Fri, 2 Sep 2022 10:20:49 +0800
Subject: [PATCH 09/12] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AE=9A=E6=97=B6?=
=?UTF-8?q?=E4=BB=BB=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../main/java/com/adc/da/FeignClient/workFlowFeignClient.java | 1 +
1 file changed, 1 insertion(+)
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 {
From 6f49186f7f15987f82ffefe3a69ac78d176d264b Mon Sep 17 00:00:00 2001
From: zhangjun <879913833@qq.com>
Date: Fri, 2 Sep 2022 11:14:23 +0800
Subject: [PATCH 10/12] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AE=9A=E6=97=B6?=
=?UTF-8?q?=E4=BB=BB=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../src/main/java/com/adc/da/scheduled/ScheduledJob.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
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 cfdb2e01..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);
}
}
@@ -186,6 +186,7 @@ public class ScheduledJob {
BeanUtils.copyProperties(item, warningDate);
warningDate.setId(UUIDUtils.randomUUID20());
warningDate.setSSRQ(s);
+ warningDate.setFileType("1");
data.add(warningDate);
}
}
From 15593f2afc1036a14547dfbb1c13ec9e782cb96f Mon Sep 17 00:00:00 2001
From: zhangjun <879913833@qq.com>
Date: Mon, 5 Sep 2022 11:14:19 +0800
Subject: [PATCH 11/12] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=A1=AE=E8=AE=A4?=
=?UTF-8?q?=E6=B8=85=E5=8D=95=EF=BC=8C=E6=B2=A1=E6=9C=89=E6=A0=87=E5=87=86?=
=?UTF-8?q?=E6=9C=AA=E4=BC=A0=E5=8F=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../impl/SarStandProjectLibraryServiceImpl.java | 14 +++++++++++++-
1 file changed, 13 insertions(+), 1 deletion(-)
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/impl/SarStandProjectLibraryServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/impl/SarStandProjectLibraryServiceImpl.java
index 27bfb941..4e54c974 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/impl/SarStandProjectLibraryServiceImpl.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/impl/SarStandProjectLibraryServiceImpl.java
@@ -564,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);
From 3f616818b87a558661438579c7e4aa6aec895ce5 Mon Sep 17 00:00:00 2001
From: zhangyanduan
Date: Mon, 5 Sep 2022 16:28:49 +0800
Subject: [PATCH 12/12] =?UTF-8?q?fix:=20=E4=BC=98=E5=8C=96=E5=AF=B9?=
=?UTF-8?q?=E6=AF=94=E6=95=B0=E6=8D=AE=E7=9A=84=E5=AF=B9=E6=AF=94=E5=B7=AE?=
=?UTF-8?q?=E5=BC=82=E5=86=85=E5=AE=B9=E7=9A=84=E6=98=BE=E7=A4=BA=E6=95=88?=
=?UTF-8?q?=E6=9E=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../service/impl/SarStandCompareHisEOServiceImpl.java | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
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]);