From 3b03f7a7ea14f84cb84402adb717dddf02c4fa31 Mon Sep 17 00:00:00 2001 From: 2510220824 <2510220824@qq.com> Date: Thu, 18 Nov 2021 17:27:08 +0800 Subject: [PATCH 001/116] =?UTF-8?q?update:=E4=BF=AE=E6=AD=A3=E7=BA=BF?= =?UTF-8?q?=E4=B8=8Aocr=E8=AF=86=E5=88=AB=E6=96=87=E4=BB=B6=E5=AD=98?= =?UTF-8?q?=E5=82=A8=E5=9C=B0=E5=9D=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- adc-da-main/src/main/resources/application-dev.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/adc-da-main/src/main/resources/application-dev.properties b/adc-da-main/src/main/resources/application-dev.properties index 3d67866a..e8488555 100644 --- a/adc-da-main/src/main/resources/application-dev.properties +++ b/adc-da-main/src/main/resources/application-dev.properties @@ -67,8 +67,8 @@ OCR.userId =dayuzhou1234 OCR.authCode =123456 OCR.publicKey =EC4KKA6ZDTCPAOCRBC5M # OCR文件存储路径 -OCR.ocrPath=/data/slrs/ocrResultFile +OCR.ocrPath=/data/slrs/ocrResultFile/ # OCR文件请求下载或在线预览时URL -OCR.ocrDownPath=/data/slrs/ocrResultFile +OCR.ocrDownPath=/data/slrs/ocrResultFile/ OCR.times=20 OCR.convertType=BOTH \ No newline at end of file From 6ba96a22ea3c8f260fc1c69b3d018d7e61dbe858 Mon Sep 17 00:00:00 2001 From: 2510220824 <2510220824@qq.com> Date: Fri, 19 Nov 2021 11:25:57 +0800 Subject: [PATCH 002/116] =?UTF-8?q?update:=E6=96=B0=E5=A2=9E=E6=8B=86?= =?UTF-8?q?=E5=88=86=E5=9B=BE=E7=89=87=E8=B7=AF=E5=BE=84=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- adc-da-main/src/main/resources/application-dev.properties | 1 + 1 file changed, 1 insertion(+) diff --git a/adc-da-main/src/main/resources/application-dev.properties b/adc-da-main/src/main/resources/application-dev.properties index e8488555..f71986ae 100644 --- a/adc-da-main/src/main/resources/application-dev.properties +++ b/adc-da-main/src/main/resources/application-dev.properties @@ -57,6 +57,7 @@ spring.rabbitmq.listener.simple.retry.max-attempts= 5 # 文档存储路径指向 # ============================================== file.path=/data/slrs/file +file.split.path=/data/slrs/file/splitImage/ # 云端OCR识别集成配置参数 #OCR请求识别URL地址 From fa76e1eb6cbb1bed4881bf96068868c20740049c Mon Sep 17 00:00:00 2001 From: 2510220824 <2510220824@qq.com> Date: Fri, 19 Nov 2021 15:14:23 +0800 Subject: [PATCH 003/116] =?UTF-8?q?update:=E6=9B=B4=E6=96=B0=E6=8B=86?= =?UTF-8?q?=E5=88=86=E5=9B=BE=E7=89=87=E5=AD=98=E5=82=A8=E4=BD=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/SarFileSplitInfoEOServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitInfoEOServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitInfoEOServiceImpl.java index d2f18ceb..0959bbe3 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitInfoEOServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitInfoEOServiceImpl.java @@ -478,7 +478,7 @@ public class SarFileSplitInfoEOServiceImpl implements SarFileSplitInfoEOService if (!file1.exists()) { file1.mkdirs(); } - String filepathandname = filePath + "/img/" + imageName; + String filepathandname = splitFilePath +"/" + imageName; try { FileOutputStream fos = new FileOutputStream(filepathandname); fos.write(bytev); From 09ebe8f3948bb80c137ee1c3e12c5554a0b05324 Mon Sep 17 00:00:00 2001 From: Superman_Main <396572590@qq.com> Date: Sat, 20 Nov 2021 11:31:26 +0800 Subject: [PATCH 004/116] feat: There is no way the --- adc-da-main/src/main/resources/application-dev.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/adc-da-main/src/main/resources/application-dev.properties b/adc-da-main/src/main/resources/application-dev.properties index f71986ae..a4aa4373 100644 --- a/adc-da-main/src/main/resources/application-dev.properties +++ b/adc-da-main/src/main/resources/application-dev.properties @@ -63,7 +63,7 @@ file.split.path=/data/slrs/file/splitImage/ #OCR请求识别URL地址 OCR.handleFileUrl = http://61.136.1.103:8091/WebService.asmx/FileConversion # OCR回调接口地址 配置客户本地的IP及端口号 -OCR.callBackUrl = https://slrs.foton.com.cn/api/ocr/OCRRestful/OcrHandleResult +OCR.callBackUrl = https://srms.foton.com.cn/api/ocr/OCRRestful/OcrHandleResult OCR.userId =dayuzhou1234 OCR.authCode =123456 OCR.publicKey =EC4KKA6ZDTCPAOCRBC5M From ed128e1403d033f9b12c0c71c44c351dc701516b Mon Sep 17 00:00:00 2001 From: Superman_Main <396572590@qq.com> Date: Sat, 20 Nov 2021 16:46:00 +0800 Subject: [PATCH 005/116] feat: There is no way the --- .../src/main/resources/application.properties | 23 +++++++------------ 1 file changed, 8 insertions(+), 15 deletions(-) diff --git a/adc-da-main/src/main/resources/application.properties b/adc-da-main/src/main/resources/application.properties index 6f42d8db..75fa37d5 100644 --- a/adc-da-main/src/main/resources/application.properties +++ b/adc-da-main/src/main/resources/application.properties @@ -9,12 +9,12 @@ spring.profiles.active=dev server.compression.enabled=true server.compression.mime-types=application/json,application/xml,text/html,text/plain,text/css,application/x-javascript # 端口号设置 -server.port=9999 +server.port=4202 #主服务session超时 server.servlet.session.timeout =600 #tomcat /resource/local/version-manager 创建tomcat指定临时目录 -server.tomcat.basedir=/resource/local/version-manager +server.tomcat.basedir=/data/slrs/temp # http-only server.session.cookie.http-only=true @@ -30,20 +30,14 @@ logging.level.org.springframework=info # 请求前缀 restPath=/api -#server.servlet.context-path=/api #是否将自己注册到Eureka Server上，默认为true eureka.client.register-with-eureka=true ##是否从Eureka Server上获取注册信息，默认为true eureka.client.fetch-registry=true +eureka.instance.prefer-ip-address=true - -#eureka.client.service-url.defaultZone=http://10.5.116.172:8672/eureka/ -#eureka.client.service-url.defaultZone=http://127.0.0.1:8671/eureka/ -#eureka.client.service-url.defaultZone=http://10.5.116.172:8672/eureka/ - -eureka.client.service-url.defaultZone=http://62.234.136.153:8761/eureka/ -#eureka.client.service-url.defaultZone=http://10.96.10.171:8761/eureka/ +eureka.client.service-url.defaultZone=http://10.100.5.117:4201/eureka/ # 请求连接的超时时间 默认的时间为 1 秒 ribbon.ConnectTimeout=500000 @@ -137,9 +131,9 @@ verifyCodeMode=1 # 文件上传管控及配置 # ============================================================================= # file模块上传文件的服务器地址 -file.path=D:/uploadfile/bus -# 文件下载地址参数 -file.downloadUrl=http://39.98.140.126:10001/uploadPath +file.path=/data/slrs/file +# 文件下载地址参数(弃用) +file.downloadUrl= #上传文件白名单-以,分隔 upload.file.white.lists = doc,docx,xls,xlsx,pdf,PDF,png,jpg,pptx,ppt @@ -147,14 +141,13 @@ upload.file.white.lists = doc,docx,xls,xlsx,pdf,PDF,png,jpg,pptx,ppt # elasticsearch 配置 # ============================================================================= elasticsearch.clustername=elasticsearch -elasticsearch.ip=172.17.0.1 +elasticsearch.ip=10.100.5.122 elasticsearch.port=9300 elasticsearch.poolSize=5 elas.flag=true # 文档转换TCP通讯地址 convert.host=127.0.0.1 -#convert.host=0.0.0.0 # ============================================================================= # scheduled 配置 From 5c358d557055b50f39a3ee46c60362fbc42be364 Mon Sep 17 00:00:00 2001 From: 2510220824 <2510220824@qq.com> Date: Mon, 29 Nov 2021 22:34:31 +0800 Subject: [PATCH 006/116] =?UTF-8?q?update:ocr=E5=9B=9E=E8=B0=83=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E5=AD=98=E5=82=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/adc/da/ocr/service/impl/OCRRestfulServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/adc-da-sys/src/main/java/com/adc/da/ocr/service/impl/OCRRestfulServiceImpl.java b/adc-da-sys/src/main/java/com/adc/da/ocr/service/impl/OCRRestfulServiceImpl.java index c79bdc83..ef8e0e7b 100644 --- a/adc-da-sys/src/main/java/com/adc/da/ocr/service/impl/OCRRestfulServiceImpl.java +++ b/adc-da-sys/src/main/java/com/adc/da/ocr/service/impl/OCRRestfulServiceImpl.java @@ -180,7 +180,7 @@ public class OCRRestfulServiceImpl implements OCRRestfulService { logger.info(saveJsonFilePath); File saveJsonFile = new File(saveJsonFilePath); System.out.println(saveJsonFile); - wordFile.transferTo(saveJsonFile); + jsonFile.transferTo(saveJsonFile); // FileUtils.copyInputStreamToFile(jsonFile.getInputStream(),new File(saveJsonFilePath)); // savePic(jsonFile.getInputStream(),saveJsonFilePath); logger.info("Json存储完成"); From bdf1692e62a67fd7410feb592f7c50cebc95cb33 Mon Sep 17 00:00:00 2001 From: Superman_Main <396572590@qq.com> Date: Wed, 8 Dec 2021 21:26:20 +0800 Subject: [PATCH 007/116] feat: There is no way the --- adc-da-main/src/main/resources/application.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/adc-da-main/src/main/resources/application.properties b/adc-da-main/src/main/resources/application.properties index 605d2d3d..21b5ccfd 100644 --- a/adc-da-main/src/main/resources/application.properties +++ b/adc-da-main/src/main/resources/application.properties @@ -135,7 +135,7 @@ file.path=/data/slrs/file stand.edit.file.path = /usr/laws/file/ # onlyoffice 预览地址 -file.downloadUrl=http://10.100.5.116:1080/file/ +file.downloadUrl=https://srms.foton.com.cn/file/ #上传文件白名单-以,分隔 upload.file.white.lists = doc,docx,xls,xlsx,pdf,PDF,png,jpg,pptx,ppt From 79e7719be447f558743849c374d18b54a8ae57ee Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Wed, 15 Dec 2021 14:26:03 +0800 Subject: [PATCH 008/116] feat: There is no way the --- adc-da-main/src/main/resources/application.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/adc-da-main/src/main/resources/application.properties b/adc-da-main/src/main/resources/application.properties index 21b5ccfd..be7c405b 100644 --- a/adc-da-main/src/main/resources/application.properties +++ b/adc-da-main/src/main/resources/application.properties @@ -133,7 +133,7 @@ verifyCodeMode=1 # file模块上传文件的服务器地址 file.path=/data/slrs/file -stand.edit.file.path = /usr/laws/file/ +stand.edit.file.path = /data/slrs/file/ # onlyoffice 预览地址 file.downloadUrl=https://srms.foton.com.cn/file/ From e605e9d93c947b877001cb7f5627ca5c7a09571e Mon Sep 17 00:00:00 2001 From: 2510220824 <2510220824@qq.com> Date: Thu, 18 Nov 2021 17:27:08 +0800 Subject: [PATCH 009/116] =?UTF-8?q?update:=E4=BF=AE=E6=AD=A3=E7=BA=BF?= =?UTF-8?q?=E4=B8=8Aocr=E8=AF=86=E5=88=AB=E6=96=87=E4=BB=B6=E5=AD=98?= =?UTF-8?q?=E5=82=A8=E5=9C=B0=E5=9D=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/application-dev.properties | 39 ++++++++----------- 1 file changed, 17 insertions(+), 22 deletions(-) diff --git a/adc-da-main/src/main/resources/application-dev.properties b/adc-da-main/src/main/resources/application-dev.properties index bd254d7d..e8488555 100644 --- a/adc-da-main/src/main/resources/application-dev.properties +++ b/adc-da-main/src/main/resources/application-dev.properties @@ -3,10 +3,9 @@ # 数据库配置 #============================================= spring.datasource.driverClassName = com.mysql.cj.jdbc.Driver -spring.datasource.url = jdbc:mysql://39.100.23.127:3306/foton_slrs_test2?useUnicode=true&characterEncoding=utf8&serverTimezone=Asia/Shanghai&useSSL=false -#spring.datasource.url = jdbc:mysql://10.96.10.54/foton_slrs_test?useUnicode=true&characterEncoding=utf8&serverTimezone=UTC&useSSL=false -spring.datasource.username = root -spring.datasource.password = root +spring.datasource.url = jdbc:mysql://10.100.5.111:3306/foton_slrs?useUnicode=true&characterEncoding=utf8&serverTimezone=UTC&useSSL=false +spring.datasource.username = tempuser +spring.datasource.password = Fting&8g35g#geg2 @@ -16,10 +15,10 @@ spring.application.name=FotonLAWSSystem application.code=20200101 application.center=1 #============================================== -#Eruept +#Eureka eureka.client.allow-redirects=true eureka.client.register-with-eureka=true -eureka.client.service-url.defaultZone=http://62.234.136.153:8761/eureka/ +eureka.client.service-url.defaultZone=http://10.100.5.117:4201/eureka/ #============================================== # 邮箱配置1 @@ -35,22 +34,18 @@ spring.mail.properties.smtp.starttls.required=false spring.mail.properties.mail.smtp.ssl.enable=false spring.mail.port=587 -# ============================================== -# rabbitMQ -# ============================================== -#spring.rabbitmq.host=10.2.186.93 -#spring.rabbitmq.port=5672 -#spring.rabbitmq.username=ca -#spring.rabbitmq.password=cs986432 -spring.rabbitmq.host=62.234.118.181 +#============================================== +# MQ配置 +#============================================== +spring.rabbitmq.host=10.100.5.119 spring.rabbitmq.port=5672 spring.rabbitmq.username=admin -spring.rabbitmq.password=admin +spring.rabbitmq.password=foton@admin spring.rabbitmq.listener.simple.acknowledge-mode= manual # 生产者 默认关闭 发版 需改为 true -spring.rabbitmq.listener.direct.auto-startup=false +spring.rabbitmq.listener.direct.auto-startup=true # 消费者 默认关闭 发版 需改为 true -spring.rabbitmq.listener.simple.auto-startup=false +spring.rabbitmq.listener.simple.auto-startup=true #消费失败消息干掉 spring.rabbitmq.listener.simple.default-requeue-rejected= true #5秒 @@ -58,22 +53,22 @@ spring.rabbitmq.listener.simple.retry.initial-interval= 5000 spring.rabbitmq.listener.simple.retry.enabled= true #最大重试5次 spring.rabbitmq.listener.simple.retry.max-attempts= 5 +# ============================================== # 文档存储路径指向 # ============================================== -file.path=/usr/laws/file/ -file.split.path=/usr/laws/file/ +file.path=/data/slrs/file # 云端OCR识别集成配置参数 #OCR请求识别URL地址 OCR.handleFileUrl = http://61.136.1.103:8091/WebService.asmx/FileConversion # OCR回调接口地址 配置客户本地的IP及端口号 -OCR.callBackUrl = http://62.234.136.153:8033/api/ocr/OCRRestful/OcrHandleResult +OCR.callBackUrl = https://slrs.foton.com.cn/api/ocr/OCRRestful/OcrHandleResult OCR.userId =dayuzhou1234 OCR.authCode =123456 OCR.publicKey =EC4KKA6ZDTCPAOCRBC5M # OCR文件存储路径 -OCR.ocrPath=/opt/foton-slrs/front/dist/file/ +OCR.ocrPath=/data/slrs/ocrResultFile/ # OCR文件请求下载或在线预览时URL -OCR.ocrDownPath=http://62.234.136.153:8038/file/ +OCR.ocrDownPath=/data/slrs/ocrResultFile/ OCR.times=20 OCR.convertType=BOTH \ No newline at end of file From 7ee5bab2e4f6985a44aa199b3f86def5186335cb Mon Sep 17 00:00:00 2001 From: 2510220824 <2510220824@qq.com> Date: Fri, 19 Nov 2021 11:25:57 +0800 Subject: [PATCH 010/116] =?UTF-8?q?update:=E6=96=B0=E5=A2=9E=E6=8B=86?= =?UTF-8?q?=E5=88=86=E5=9B=BE=E7=89=87=E8=B7=AF=E5=BE=84=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- adc-da-main/src/main/resources/application-dev.properties | 1 + 1 file changed, 1 insertion(+) diff --git a/adc-da-main/src/main/resources/application-dev.properties b/adc-da-main/src/main/resources/application-dev.properties index e8488555..f71986ae 100644 --- a/adc-da-main/src/main/resources/application-dev.properties +++ b/adc-da-main/src/main/resources/application-dev.properties @@ -57,6 +57,7 @@ spring.rabbitmq.listener.simple.retry.max-attempts= 5 # 文档存储路径指向 # ============================================== file.path=/data/slrs/file +file.split.path=/data/slrs/file/splitImage/ # 云端OCR识别集成配置参数 #OCR请求识别URL地址 From b030fb3e892e574d8884acdf98203bb280283fee Mon Sep 17 00:00:00 2001 From: 2510220824 <2510220824@qq.com> Date: Fri, 19 Nov 2021 15:14:23 +0800 Subject: [PATCH 011/116] =?UTF-8?q?update:=E6=9B=B4=E6=96=B0=E6=8B=86?= =?UTF-8?q?=E5=88=86=E5=9B=BE=E7=89=87=E5=AD=98=E5=82=A8=E4=BD=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/SarFileSplitInfoEOServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitInfoEOServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitInfoEOServiceImpl.java index b0f15bbd..40bc2020 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitInfoEOServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitInfoEOServiceImpl.java @@ -486,7 +486,7 @@ public class SarFileSplitInfoEOServiceImpl implements SarFileSplitInfoEOService if (!file1.exists()) { file1.mkdirs(); } - String filepathandname = filePath + "/img/" + imageName; + String filepathandname = splitFilePath +"/" + imageName; try { FileOutputStream fos = new FileOutputStream(filepathandname); fos.write(bytev); From 5ef31f98375b023025e7b8d5b05c6a472517054b Mon Sep 17 00:00:00 2001 From: Superman_Main <396572590@qq.com> Date: Sat, 20 Nov 2021 11:31:26 +0800 Subject: [PATCH 012/116] feat: There is no way the --- adc-da-main/src/main/resources/application-dev.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/adc-da-main/src/main/resources/application-dev.properties b/adc-da-main/src/main/resources/application-dev.properties index f71986ae..a4aa4373 100644 --- a/adc-da-main/src/main/resources/application-dev.properties +++ b/adc-da-main/src/main/resources/application-dev.properties @@ -63,7 +63,7 @@ file.split.path=/data/slrs/file/splitImage/ #OCR请求识别URL地址 OCR.handleFileUrl = http://61.136.1.103:8091/WebService.asmx/FileConversion # OCR回调接口地址 配置客户本地的IP及端口号 -OCR.callBackUrl = https://slrs.foton.com.cn/api/ocr/OCRRestful/OcrHandleResult +OCR.callBackUrl = https://srms.foton.com.cn/api/ocr/OCRRestful/OcrHandleResult OCR.userId =dayuzhou1234 OCR.authCode =123456 OCR.publicKey =EC4KKA6ZDTCPAOCRBC5M From 0877fb2df86b0168cbe848cc93efb62544af5c45 Mon Sep 17 00:00:00 2001 From: Superman_Main <396572590@qq.com> Date: Sat, 20 Nov 2021 16:46:00 +0800 Subject: [PATCH 013/116] feat: There is no way the --- .../src/main/resources/application.properties | 26 ++++++------------- 1 file changed, 8 insertions(+), 18 deletions(-) diff --git a/adc-da-main/src/main/resources/application.properties b/adc-da-main/src/main/resources/application.properties index a6f3ac0c..75fa37d5 100644 --- a/adc-da-main/src/main/resources/application.properties +++ b/adc-da-main/src/main/resources/application.properties @@ -9,12 +9,12 @@ spring.profiles.active=dev server.compression.enabled=true server.compression.mime-types=application/json,application/xml,text/html,text/plain,text/css,application/x-javascript # 端口号设置 -server.port=9999 +server.port=4202 #主服务session超时 server.servlet.session.timeout =600 #tomcat /resource/local/version-manager 创建tomcat指定临时目录 -server.tomcat.basedir=/resource/local/version-manager +server.tomcat.basedir=/data/slrs/temp # http-only server.session.cookie.http-only=true @@ -30,20 +30,14 @@ logging.level.org.springframework=info # 请求前缀 restPath=/api -#server.servlet.context-path=/api #是否将自己注册到Eureka Server上，默认为true eureka.client.register-with-eureka=true ##是否从Eureka Server上获取注册信息，默认为true eureka.client.fetch-registry=true +eureka.instance.prefer-ip-address=true - -#eureka.client.service-url.defaultZone=http://10.5.116.172:8672/eureka/ -#eureka.client.service-url.defaultZone=http://127.0.0.1:8671/eureka/ -#eureka.client.service-url.defaultZone=http://10.5.116.172:8672/eureka/ - -eureka.client.service-url.defaultZone=http://62.234.136.153:8761/eureka/ -#eureka.client.service-url.defaultZone=http://10.96.10.171:8761/eureka/ +eureka.client.service-url.defaultZone=http://10.100.5.117:4201/eureka/ # 请求连接的超时时间 默认的时间为 1 秒 ribbon.ConnectTimeout=500000 @@ -137,12 +131,9 @@ verifyCodeMode=1 # 文件上传管控及配置 # ============================================================================= # file模块上传文件的服务器地址 -file.path=D:/uploadfile/bus - -stand.edit.file.path = /usr/laws/file/ -# onlyoffice 预览地址 -file.downloadUrl=http://10.100.5.116:1080/file/ - +file.path=/data/slrs/file +# 文件下载地址参数(弃用) +file.downloadUrl= #上传文件白名单-以,分隔 upload.file.white.lists = doc,docx,xls,xlsx,pdf,PDF,png,jpg,pptx,ppt @@ -150,14 +141,13 @@ upload.file.white.lists = doc,docx,xls,xlsx,pdf,PDF,png,jpg,pptx,ppt # elasticsearch 配置 # ============================================================================= elasticsearch.clustername=elasticsearch -elasticsearch.ip=172.17.0.1 +elasticsearch.ip=10.100.5.122 elasticsearch.port=9300 elasticsearch.poolSize=5 elas.flag=true # 文档转换TCP通讯地址 convert.host=127.0.0.1 -#convert.host=0.0.0.0 # ============================================================================= # scheduled 配置 From 9dc572e3d9babbd6f052da8b968ec563be54c8b1 Mon Sep 17 00:00:00 2001 From: Superman_Main <396572590@qq.com> Date: Wed, 8 Dec 2021 21:26:20 +0800 Subject: [PATCH 014/116] feat: There is no way the --- adc-da-main/src/main/resources/application.properties | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/adc-da-main/src/main/resources/application.properties b/adc-da-main/src/main/resources/application.properties index 75fa37d5..21b5ccfd 100644 --- a/adc-da-main/src/main/resources/application.properties +++ b/adc-da-main/src/main/resources/application.properties @@ -132,8 +132,11 @@ verifyCodeMode=1 # ============================================================================= # file模块上传文件的服务器地址 file.path=/data/slrs/file -# 文件下载地址参数(弃用) -file.downloadUrl= + +stand.edit.file.path = /usr/laws/file/ +# onlyoffice 预览地址 +file.downloadUrl=https://srms.foton.com.cn/file/ + #上传文件白名单-以,分隔 upload.file.white.lists = doc,docx,xls,xlsx,pdf,PDF,png,jpg,pptx,ppt From f8309fdce0b13f399aa9fd1e6436d7a4ec1523c2 Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Wed, 15 Dec 2021 14:26:03 +0800 Subject: [PATCH 015/116] feat: There is no way the --- adc-da-main/src/main/resources/application.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/adc-da-main/src/main/resources/application.properties b/adc-da-main/src/main/resources/application.properties index 21b5ccfd..be7c405b 100644 --- a/adc-da-main/src/main/resources/application.properties +++ b/adc-da-main/src/main/resources/application.properties @@ -133,7 +133,7 @@ verifyCodeMode=1 # file模块上传文件的服务器地址 file.path=/data/slrs/file -stand.edit.file.path = /usr/laws/file/ +stand.edit.file.path = /data/slrs/file/ # onlyoffice 预览地址 file.downloadUrl=https://srms.foton.com.cn/file/ From 2302a139014cbd5abc7e32efcccb7ae4b28ea2dd Mon Sep 17 00:00:00 2001 From: zj <1376702416@qq.com> Date: Fri, 17 Dec 2021 10:55:36 +0800 Subject: [PATCH 016/116] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=86=B2=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/WorkFlowController.java | 36 +++++++++++++++++++ .../adc/da/login/security/WebMvcConfig.java | 2 ++ 2 files changed, 38 insertions(+) diff --git a/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java b/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java index 67f29c56..f5ba655b 100644 --- a/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java +++ b/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java @@ -12,6 +12,7 @@ import com.adc.da.http.PageInfo; import com.adc.da.http.ResponseMessage; import com.adc.da.http.Result; import com.adc.da.common.Page; +import com.adc.da.login.util.JwtUtils; import com.adc.da.sys.common.EmailUtils; import com.adc.da.sys.entity.UserEO; import com.adc.da.sys.service.IUserEOService; @@ -30,9 +31,14 @@ import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.web.bind.annotation.*; +import sun.misc.BASE64Encoder; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.io.OutputStream; +import java.io.UnsupportedEncodingException; +import java.net.URLEncoder; import java.io.*; import java.net.URL; import java.net.URLConnection; @@ -48,6 +54,10 @@ public class WorkFlowController { @Autowired private workFlowFeignClientImpl workFlowFeignClient; + @Autowired + private IUserEOService userService; + @Autowired + private JwtUtils jwtUtils; @Value("${stand.edit.file.path}") private String standEditFilePath; @@ -821,4 +831,30 @@ public class WorkFlowController { } + @ApiOperation(value = "手机端登录") + @PostMapping(value = "/loginMobile") + @ResponseBody + public ResponseMessage loginMobile(@RequestParam("taskIds") String taskIds, @RequestParam("pId") String pId)throws UnsupportedEncodingException { + BusProcessNew busProcessNew = workFlowFeignClient.inboundLiaisonDetail(taskIds,pId); + if(busProcessNew == null || StringUtils.isBlank(busProcessNew.getUserId())){ + return Result.error("","未通过流程实例获取到用户信息"); + } + UserEO userEO = userService.getUserByLoginNameNotDeleted(busProcessNew.getUserId()); + if (null == userEO) { + return Result.error("r0011", "用户不存在"); + } + if(userEO.getDisableFlag()==1){ + return Result.error("r0011", "帐号已禁用"); + } + String token = jwtUtils.generateToken(userEO.getUsid()); + userEO.setToken(token); + // 加密重要信息 + BASE64Encoder encoder = new BASE64Encoder(); + String userStr = JSON.toJSONString(userEO); + String userStr2 = URLEncoder.encode(userStr,"UTF-8"); + userStr = encoder.encode(userStr2.getBytes()); + return Result.success(userStr); + } + + } diff --git a/adc-da-jwtLogin/src/main/java/com/adc/da/login/security/WebMvcConfig.java b/adc-da-jwtLogin/src/main/java/com/adc/da/login/security/WebMvcConfig.java index 774fdae4..72af556e 100644 --- a/adc-da-jwtLogin/src/main/java/com/adc/da/login/security/WebMvcConfig.java +++ b/adc-da-jwtLogin/src/main/java/com/adc/da/login/security/WebMvcConfig.java @@ -97,6 +97,8 @@ public class WebMvcConfig implements WebMvcConfigurer { addInterceptor.excludePathPatterns("/api/lawss/activiti/getImg"); + addInterceptor.excludePathPatterns("/api/lawss/activiti/loginMobile"); + // //测试接口使用 // addInterceptor.excludePathPatterns("/api/**"); From b8c494d4c56e0af1a660f5c12a0a5d278f627b0f Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Wed, 29 Dec 2021 15:55:58 +0800 Subject: [PATCH 017/116] =?UTF-8?q?=E5=9B=BD=E5=86=85=E5=A4=96excel?= =?UTF-8?q?=E5=AF=BC=E5=87=BAcode=E8=BD=AC=E5=AD=97=E7=AC=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/SarStandardsInfoServiceImpl.java | 97 ++++++++++--------- .../mybatis/mapper/sys/DicTypeEOMapper.xml | 5 + 2 files changed, 56 insertions(+), 46 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java index aab3ee7c..5a211419 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java @@ -714,12 +714,9 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl sarlist) throws Exception { + public void attrInfoShowExport(List sarlist,Map dicMap) throws Exception { + - List dicInfo = dicTypeEODao.getDicInfo("dic_type_code", "dic_type_name"); - Map dicMap = - dicInfo.stream() - .collect(Collectors.toMap(DicTypeEO::getDicTypeCode,DicTypeEO::getDicTypeName,(value1, value2 )->value2)); for (SarStandardsInfo row : sarlist) { @@ -732,26 +729,7 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl 0 && InitStandAttrUtil.fileFieldList.contains(name)) { - value = entry.getValue().toString(); - if (StringUtils.isNotBlank(value)) { - List fileObj = attFileEOService.getMultiFileInfos(value); - entry.setValue(fileObj); - } - } else if (entry.getValue() != null && InitStandAttrUtil.selectionFieldList != null && InitStandAttrUtil.selectionFieldList.size() > 0 && InitStandAttrUtil.selectionFieldList.contains(name)) { - value = entry.getValue().toString(); - if ("GZZXX".equals(name)) { - value = sysInfoEOService.getGroupNamesByIds(value); - } else { - String selVal = InitStandAttrUtil.selectFieldMap.get(name); - if (SelectionTypeEnum.ORGLIST.getValue().equals(selVal) || SelectionTypeEnum.USERLIST.getValue().equals(selVal) || SelectionTypeEnum.ROLELIST.getValue().equals(selVal)) { - if (getAttrMap.get(name + "Name") != null) { - value = String.valueOf(getAttrMap.get(name + "Name")); + } +// else if (entry.getValue() != null && InitStandAttrUtil.fileFieldList != null && InitStandAttrUtil.fileFieldList.size() > 0 && InitStandAttrUtil.fileFieldList.contains(name)) { +// value = entry.getValue().toString(); +// if (StringUtils.isNotBlank(value)) { +// List fileObj = attFileEOService.getMultiFileInfos(value); +// entry.setValue(fileObj); +// } +// } + else if (entry.getValue() != null && InitStandAttrUtil.selectionFieldList != null && InitStandAttrUtil.selectionFieldList.size() > 0 && InitStandAttrUtil.selectionFieldList.contains(name)) { +// value = entry.getValue().toString(); +// String selVal = InitStandAttrUtil.selectFieldMap.get(name); +// if (SelectionTypeEnum.ORGLIST.getValue().equals(selVal) || SelectionTypeEnum.USERLIST.getValue().equals(selVal) || SelectionTypeEnum.ROLELIST.getValue().equals(selVal)) { +// if (getAttrMap.get(name + "Name") != null) { +// value = String.valueOf(getAttrMap.get(name + "Name")); +// } +// +// +// } else { + /** + *============================ 对getAttrMap的value赋值中文名称=============================== + */ + if(entry.getValue()!=null) { + StringBuilder builder = new StringBuilder(""); + for (String s : entry.getValue().toString().split(",")) { + if (dicMap.containsKey(s) && !"ZRBM".equals(name)){ + builder.append(dicMap.get(s)+" "); + } + + } + + + if (builder.toString().isEmpty()){ + getAttrMap.put(name, entry.getValue().toString()); + }else { + getAttrMap.put(name, builder.toString()); + } } - } else { - List valArr = Arrays.asList(value.split(",")); - value = dicTypeEODao.getDicNamesByCodes(valArr); - } - } - entry.setValue(value); + /** + *============================ 对getAttrMap的value赋值中文名称=============================== + */ +// } + +// entry.setValue(value); } } getAttrMap.put("SVPPSTips", svppsTip); @@ -1705,7 +1704,13 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl getList = dao.getSarStandardsExportInfo(page); - attrInfoShowExport(getList); + + //查询字典表,形成Hash映射提升速度 + List dicInfo = dicTypeEODao.getDicInfo("dic_type_code", "dic_type_name"); + Map dicMap = dicInfo.stream() + .filter(item-> !item.getDicTypeCode().isEmpty()) + .collect(Collectors.toMap(DicTypeEO::getDicTypeCode,DicTypeEO::getDicTypeName,(value1, value2 )->value2)); + attrInfoShowExport(getList,dicMap); return getList; } diff --git a/adc-da-sys/src/main/resources/mybatis/mapper/sys/DicTypeEOMapper.xml b/adc-da-sys/src/main/resources/mybatis/mapper/sys/DicTypeEOMapper.xml index 8cc364d0..af630bc2 100644 --- a/adc-da-sys/src/main/resources/mybatis/mapper/sys/DicTypeEOMapper.xml +++ b/adc-da-sys/src/main/resources/mybatis/mapper/sys/DicTypeEOMapper.xml @@ -602,6 +602,11 @@ FROM TS_DICTYPE + + + ${item} is not NULL + + From 466b2d84582569c730943097a68a82de288696d3 Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Wed, 29 Dec 2021 15:57:01 +0800 Subject: [PATCH 018/116] =?UTF-8?q?=E6=A8=A1=E5=9D=97=E7=BB=93=E6=9E=84?= =?UTF-8?q?=E5=8D=95=E5=85=83=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sarModelTree/service/impl/SarModelTreeServiceImpl.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarModelTree/service/impl/SarModelTreeServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarModelTree/service/impl/SarModelTreeServiceImpl.java index ee783e2a..0dd69717 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarModelTree/service/impl/SarModelTreeServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarModelTree/service/impl/SarModelTreeServiceImpl.java @@ -77,6 +77,9 @@ public class SarModelTreeServiceImpl extends ServiceImpl Date: Wed, 29 Dec 2021 17:58:16 +0800 Subject: [PATCH 019/116] =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E6=A0=87=E5=87=86id?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=88=86=E8=A7=A3=E5=8D=95=E7=9A=84=E6=96=87?= =?UTF-8?q?=E6=9C=AC=E7=B1=BB=E5=9E=8B=E8=BF=94=E5=9B=9E=E7=BB=93=E6=9E=84?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/SarStandItemsController.java | 4 ++-- .../service/impl/SarStandItemsServiceImpl.java | 14 +++++++++----- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/controller/SarStandItemsController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/controller/SarStandItemsController.java index 053e1756..f43caaab 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/controller/SarStandItemsController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/controller/SarStandItemsController.java @@ -123,8 +123,8 @@ public class SarStandItemsController extends BaseController { @ApiOperation(value = "|SarFileSplitInfoEO|根据标准id查询分解单的文本类型") @GetMapping("getFileType") - public ResponseMessage> getFileType(String standId){ - Map fileType = ServiceImpl.getFileType(standId); + public ResponseMessage>> getFileType(String standId){ + List> fileType = ServiceImpl.getFileType(standId); return Result.success(fileType); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/impl/SarStandItemsServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/impl/SarStandItemsServiceImpl.java index 5f0fadbb..1c08045b 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/impl/SarStandItemsServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/impl/SarStandItemsServiceImpl.java @@ -242,13 +242,17 @@ public class SarStandItemsServiceImpl extends ServiceImpl getFileType(String standId){ + public List> getFileType(String standId){ List fileType = dao.getFileType(standId); - Map typeNameMap = InitStandAttrUtil.standInlandAttrFieldList.stream() - .collect(Collectors.toMap(SarStandAttrDetails::getAttrField, SarStandAttrDetails::getAttrName)); + List> collect = InitStandAttrUtil.standInlandAttrFieldList.stream() + .map(item -> { + Map map = new HashMap<>(); + map.put("label", item.getAttrName()); + map.put("value", item.getAttrField()); + return map; + }).collect(Collectors.toList()); + - Map collect = fileType.stream() - .collect(Collectors.toMap(a -> a, b -> typeNameMap.get(b))); return collect; } } From 7b8ebde570b263c15dc1e911f77c38895ea0ad0e Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Wed, 29 Dec 2021 18:03:40 +0800 Subject: [PATCH 020/116] =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E6=A0=87=E5=87=86id?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=88=86=E8=A7=A3=E5=8D=95=E7=9A=84=E6=96=87?= =?UTF-8?q?=E6=9C=AC=E7=B1=BB=E5=9E=8B=E8=BF=94=E5=9B=9E=E7=BB=93=E6=9E=84?= =?UTF-8?q?=E4=BF=AE=E6=94=B90.1.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/SarStandItemsServiceImpl.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/impl/SarStandItemsServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/impl/SarStandItemsServiceImpl.java index 1c08045b..24adca2b 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/impl/SarStandItemsServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/impl/SarStandItemsServiceImpl.java @@ -244,11 +244,14 @@ public class SarStandItemsServiceImpl extends ServiceImpl> getFileType(String standId){ List fileType = dao.getFileType(standId); - List> collect = InitStandAttrUtil.standInlandAttrFieldList.stream() + Map typeNameMap = InitStandAttrUtil.standInlandAttrFieldList.stream() + .collect(Collectors.toMap(SarStandAttrDetails::getAttrField, SarStandAttrDetails::getAttrName)); + + List> collect = fileType.stream() .map(item -> { Map map = new HashMap<>(); - map.put("label", item.getAttrName()); - map.put("value", item.getAttrField()); + map.put("label", typeNameMap.get(item)); + map.put("value", item); return map; }).collect(Collectors.toList()); From 84ca72d6400e91dc2c9cc5c350086c2cb33a2ee4 Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Wed, 29 Dec 2021 19:15:41 +0800 Subject: [PATCH 021/116] =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E6=A0=87=E5=87=86id?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=88=86=E8=A7=A3=E5=8D=95=E7=9A=84=E6=96=87?= =?UTF-8?q?=E6=9C=AC=E7=B1=BB=E5=9E=8B=E8=BF=94=E5=9B=9E=E7=BB=93=E6=9E=84?= =?UTF-8?q?=E4=BF=AE=E6=94=B90.1.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/SarStandItemsServiceImpl.java | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/impl/SarStandItemsServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/impl/SarStandItemsServiceImpl.java index 24adca2b..28d866ac 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/impl/SarStandItemsServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/impl/SarStandItemsServiceImpl.java @@ -248,12 +248,8 @@ public class SarStandItemsServiceImpl extends ServiceImpl> collect = fileType.stream() - .map(item -> { - Map map = new HashMap<>(); - map.put("label", typeNameMap.get(item)); - map.put("value", item); - return map; - }).collect(Collectors.toList()); + .map(item -> new HashMap(){ { put("label", typeNameMap.get(item));put("value", item);} } + ).collect(Collectors.toList()); return collect; From e2c70d68f8bf4358802eef56b2bdf0cf1f05f748 Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Wed, 29 Dec 2021 19:40:58 +0800 Subject: [PATCH 022/116] =?UTF-8?q?=E5=AE=9E=E6=96=BD=E6=97=A5=E6=9C=9F=20?= =?UTF-8?q?=E5=92=8C=20=E5=9B=9B=E4=B8=AA=E5=A4=9A=E9=80=89=E9=80=82?= =?UTF-8?q?=E7=94=A8=E8=BD=A6=E5=9E=8B=20,=20=E9=80=82=E7=94=A8=E8=AE=A4?= =?UTF-8?q?=E8=AF=81..=20REGEXP=E6=AD=A3=E5=88=99=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E5=92=8CBETWEEN=E6=97=A5=E6=9C=9F=E8=8C=83=E5=9B=B4=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../da/utils/util/SarAdvanceSearchUtil.java | 37 +++++++++++++++++-- 1 file changed, 33 insertions(+), 4 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/utils/util/SarAdvanceSearchUtil.java b/adc-da-slrs/src/main/java/com/adc/da/utils/util/SarAdvanceSearchUtil.java index 811274f5..72b2f6bc 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/utils/util/SarAdvanceSearchUtil.java +++ b/adc-da-slrs/src/main/java/com/adc/da/utils/util/SarAdvanceSearchUtil.java @@ -95,10 +95,39 @@ public class SarAdvanceSearchUtil { String sql = ""; SarAdvanceSearchVO searchVO=searchVOList.get(i); if (StringUtils.isNotBlank(searchVO.getValue())); - if (i==0){ - sql+=tableName+searchVO.getField()+" " + searchVO.getType() + " " + "concat(concat('%','" +searchVO.getValue() + "'),'%') "; - }else { - sql+="AND"+" "+tableName+searchVO.getField()+" " + searchVO.getType() + " " + "concat(concat('%','" +searchVO.getValue() + "'),'%') "; + + + + switch (searchVO.getType()){ + //多个正则查询 + case "regexp": + case "REGEXP": + if (i==0){ + sql+=tableName+searchVO.getField()+" " + "REGEXP" + " " + "\'" + searchVO.getValue().replaceAll(",","|").replaceAll("\\s*","") + "\'"; + }else { + sql+=" AND "+" "+tableName+searchVO.getField()+" " + "REGEXP" + " " +"\'"+ searchVO.getValue().replaceAll(",","|").replaceAll("\\s*","") + "\'" ; + } + break; + //模糊查询 + case "LIKE": + case "like": + if (i==0){ + sql+=tableName+searchVO.getField()+" " + "LIKE" + " " + "concat(concat('%','" +searchVO.getValue() + "'),'%') "; + }else { + sql+=" AND "+" "+tableName+searchVO.getField()+" " +"LIKE" + " " + "concat(concat('%','" +searchVO.getValue() + "'),'%') "; + } + break; + //日期范围查询 + case "between": + case "BETWEEN": + String[] boundaryArray = searchVO.getValue().split(","); + if (i==0){ + sql+= "DATE_FORMAT("+ tableName+searchVO.getField() + ",'%Y-%m-%d')"+" " + "BETWEEN" + " " +"DATE_FORMAT("+ "\'" + boundaryArray[0].replaceAll("\\s*","") + "\'" +",'%Y-%m-%d')" +" AND "+ "DATE_FORMAT("+ "\'" + boundaryArray[1].replaceAll("\\s*","") + "\'" + ",'%Y-%m-%d')"; + }else { + sql+=" AND "+" "+"DATE_FORMAT("+ tableName+searchVO.getField() + ",'%Y-%m-%d')"+" " + "BETWEEN" + " " +"DATE_FORMAT("+ "\'" + boundaryArray[0].replaceAll("\\s*","") + "\'" + ",'%Y-%m-%d')" +" AND "+ "DATE_FORMAT("+ "\'" + boundaryArray[1].replaceAll("\\s*","") + "\'" + ",'%Y-%m-%d')"; + } + break; + default: } sqlBuilder.append(sql); } From 8f95ccce5bd43aa788b2090ba7081998dda2b8f1 Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Wed, 29 Dec 2021 20:40:16 +0800 Subject: [PATCH 023/116] =?UTF-8?q?=E6=B5=81=E7=A8=8B=E5=8E=86=E5=8F=B2?= =?UTF-8?q?=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/adc/da/workFlow/controller/WorkFlowController.java | 6 ------ .../com/adc/da/workFlow/entity/ProcessDetailExport.java | 2 +- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java b/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java index dcddca3d..944b20e2 100644 --- a/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java +++ b/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java @@ -641,13 +641,7 @@ public class WorkFlowController { map.put("comment","不同意"); break; default: - String commentText=""; - map.put("comment",comment+map.get("commentText")); } - - }else if (map.get("commentText")!=null && !"".equals(map.get("commentText"))){ - map.put("comment",map.get("commentText").toString()); - } ProcessDetailExport user = JSON.parseObject(JSON.toJSONString(map), ProcessDetailExport.class); exportDatas.add(user); diff --git a/adc-da-activiti/src/main/java/com/adc/da/workFlow/entity/ProcessDetailExport.java b/adc-da-activiti/src/main/java/com/adc/da/workFlow/entity/ProcessDetailExport.java index 1cde1409..0dbc9112 100644 --- a/adc-da-activiti/src/main/java/com/adc/da/workFlow/entity/ProcessDetailExport.java +++ b/adc-da-activiti/src/main/java/com/adc/da/workFlow/entity/ProcessDetailExport.java @@ -16,7 +16,7 @@ public class ProcessDetailExport { @Excel(name = "完成时间", orderNum = "4",exportFormat = "yyyy/MM/dd",width = 15) private Date endTime; @Excel(name = "流程信息", orderNum = "5",width = 15) - private String comment; + private String commentText; @Excel(name = "状态", orderNum = "6",width = 15) private String flag; } From e74e5ded2253c129352c96599bff73619e33a576 Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Thu, 30 Dec 2021 14:27:25 +0800 Subject: [PATCH 024/116] feat: There is no way the, --- adc-da-slrs/src/main/java/com/adc/da/mq/SendBussMQService.java | 2 +- adc-da-slrs/src/main/java/com/adc/da/mq/SendStandMQService.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/mq/SendBussMQService.java b/adc-da-slrs/src/main/java/com/adc/da/mq/SendBussMQService.java index bca2139e..3ea60c6e 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/mq/SendBussMQService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/mq/SendBussMQService.java @@ -133,7 +133,7 @@ public class SendBussMQService { saveMap.put("stand_year",infoEO.getStandYear()); saveMap.put("standNumber",infoEO.getStandCode()); saveMap.put("stand_code",infoEO.getStandCode()); - saveMap = dealNumberMsg(saveMap,infoEO,getCodeName); + saveMap = dealNumberMsg(saveMap,infoEO,infoEO.getStandSort()); saveMap.put("nameshow",infoEO.getStandName()); saveMap.put("stand_name",infoEO.getStandName()); saveMap.put("standEnName",infoEO.getStandEnName()); diff --git a/adc-da-slrs/src/main/java/com/adc/da/mq/SendStandMQService.java b/adc-da-slrs/src/main/java/com/adc/da/mq/SendStandMQService.java index 4cf2e4e8..e439dc21 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/mq/SendStandMQService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/mq/SendStandMQService.java @@ -107,7 +107,7 @@ public class SendStandMQService { } saveMap.put("standNumber",infoEO.getStandNumber()); saveMap.put("stand_number",infoEO.getStandNumber()); - saveMap = dealNumberMsg(saveMap,infoEO,getCodeName); + saveMap = dealNumberMsg(saveMap,infoEO,infoEO.getStandSort()); saveMap.put("standYear",infoEO.getStandYear()); saveMap.put("stand_year",infoEO.getStandYear()); saveMap.put("nameshow",infoEO.getStandName()); From 36dbbec524761680315ae35947c295f1f986359c Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Thu, 30 Dec 2021 18:29:30 +0800 Subject: [PATCH 025/116] =?UTF-8?q?=E4=BC=81=E4=B8=9A=E6=A0=87=E5=87=86?= =?UTF-8?q?=E7=B1=BB=E5=88=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/adc/da/sys/service/impl/DicTypeEOServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/service/impl/DicTypeEOServiceImpl.java b/adc-da-sys/src/main/java/com/adc/da/sys/service/impl/DicTypeEOServiceImpl.java index 98c3ccaf..a8b96227 100644 --- a/adc-da-sys/src/main/java/com/adc/da/sys/service/impl/DicTypeEOServiceImpl.java +++ b/adc-da-sys/src/main/java/com/adc/da/sys/service/impl/DicTypeEOServiceImpl.java @@ -97,7 +97,7 @@ public class DicTypeEOServiceImpl extends ServiceImpl im @Override public Integer saveDictype(DicTypeEO dicTypeEO){ // 此处存在问题， 当当前参数为标准类别时需要输入的code为name值 - if(StringUtils.isNotEmpty(dicTypeEO.getDicId()) && !"JKSADFH564S".equals(dicTypeEO.getDicId())){ + if(StringUtils.isNotEmpty(dicTypeEO.getDicId()) && !"JKSADFH564S".equals(dicTypeEO.getDicId()) && !"NGETEMDJDI".equals(dicTypeEO.getDicId()) ){ if(!StringUtils.isNotEmpty(dicTypeEO.getDicTypeCode())){ dicTypeEO.setDicTypeCode(UUIDUtils.randomUUID10()); } From b0cd4806c47e8845a1428a52bcc9c0b422e794ad Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Thu, 30 Dec 2021 21:55:15 +0800 Subject: [PATCH 026/116] commit --- .../service/impl/SarStandardsInfoServiceImpl.java | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java index 5a211419..16353926 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java @@ -714,9 +714,13 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl sarlist,Map dicMap) throws Exception { - + public void attrInfoShowExport(List sarlist) throws Exception { + //查询字典表,形成Hash映射提升速度 + List dicInfo = dicTypeEODao.getDicInfo("dic_type_code", "dic_type_name"); + Map dicMap = dicInfo.stream() + .filter(item-> !item.getDicTypeCode().isEmpty()) + .collect(Collectors.toMap(DicTypeEO::getDicTypeCode,DicTypeEO::getDicTypeName,(value1, value2 )->value2)); for (SarStandardsInfo row : sarlist) { @@ -1705,12 +1709,7 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl getList = dao.getSarStandardsExportInfo(page); - //查询字典表,形成Hash映射提升速度 - List dicInfo = dicTypeEODao.getDicInfo("dic_type_code", "dic_type_name"); - Map dicMap = dicInfo.stream() - .filter(item-> !item.getDicTypeCode().isEmpty()) - .collect(Collectors.toMap(DicTypeEO::getDicTypeCode,DicTypeEO::getDicTypeName,(value1, value2 )->value2)); - attrInfoShowExport(getList,dicMap); + attrInfoShowExport(getList); return getList; } From 1a3d317c056d305c9e84537de089bb4fed4c9ba4 Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Fri, 31 Dec 2021 03:49:23 +0800 Subject: [PATCH 027/116] feat: There is no way the, xxx --- .../service/ActSarItemsBussEOService.java | 2 ++ .../SarBussionessStandController.java | 14 ++++++++++++++ .../dao/SarBussionessStandDao.java | 2 ++ .../entity/SarBussionessStand.java | 12 ++++++++++++ .../service/ISarBussionessStandService.java | 2 ++ .../impl/SarBussionessStandServiceImpl.java | 5 +++++ .../mapper/esRevisePlan/EsRevisePlanMapper.xml | 18 +++++++++--------- .../SarBussionessStandMapper.xml | 10 ++++++++++ 8 files changed, 56 insertions(+), 9 deletions(-) diff --git a/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsBussEOService.java b/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsBussEOService.java index 047bfa43..b12e5a5c 100644 --- a/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsBussEOService.java +++ b/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsBussEOService.java @@ -408,6 +408,8 @@ public class ActSarItemsBussEOService { case "standName": sarBussionessStand.setStandName(valueStr); break; case "standEnName": sarBussionessStand.setStandEnName(valueStr); break; case "textStatusBuss": sarBussionessStand.setTextStatusBuss(valueStr); break; + case "reviseStatus": sarBussionessStand.setReviseStatus(valueStr); break; + case "standSn": sarBussionessStand.setStandSn(valueStr); break; case "issueTime": if (StringUtils.isNotBlank(valueStr)) { sarBussionessStand.setIssueTime(tTo(valueStr)); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/controller/SarBussionessStandController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/controller/SarBussionessStandController.java index 3270c493..2b43e214 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/controller/SarBussionessStandController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/controller/SarBussionessStandController.java @@ -70,6 +70,20 @@ public class SarBussionessStandController extends BaseController getStandInfoByReviseStatus(String reviseStatus) { + SarBussionessStand result = sarBussionessStandEOService.getStandInfoByReviseStatus(reviseStatus); + return Result.success(result); + } + @ApiOperation(value = "|SarBussionessStandEO|删除") @PostMapping("deleteSarBussionessStand") //401问题2021-03-31暂时注释掉 liuhuiwen diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/dao/SarBussionessStandDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/dao/SarBussionessStandDao.java index 0b7d0854..6129a753 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/dao/SarBussionessStandDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/dao/SarBussionessStandDao.java @@ -22,6 +22,8 @@ import java.util.List; @Repository public interface SarBussionessStandDao extends BaseMapper { + SarBussionessStand getStandInfoByReviseStatus(String reviseStatus); + SarBussionessStand selectByPrimaryKey(String standId); List selectStandardsByStandNumber(SarBussionessStand sarBussionessStand); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/entity/SarBussionessStand.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/entity/SarBussionessStand.java index 3f411919..7b663965 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/entity/SarBussionessStand.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/entity/SarBussionessStand.java @@ -111,8 +111,20 @@ public class SarBussionessStand extends BaseEntity { @TableField("TEXT_STATUS_BUSS") private String textStatusBuss; + @ApiModelProperty(value = "计划库制定状态 0 默认 1 制定 2修订") + @TableField("REVISE_STATUS") + private String reviseStatus; + + @ApiModelProperty(value = "标准顺序号") + @TableField("STAND_SN") + private String standSn; + // 非表字段 + @TableField(exist = false) + private String newStandSn; + + @TableField(exist = false) @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") private String firstPutTime; diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/ISarBussionessStandService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/ISarBussionessStandService.java index 39fa8d65..efd61892 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/ISarBussionessStandService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/ISarBussionessStandService.java @@ -18,6 +18,8 @@ import java.util.List; */ public interface ISarBussionessStandService extends IService { + SarBussionessStand getStandInfoByReviseStatus(String reviseStatus); + void attrInfoDetails (SarBussionessStand row) throws Exception; ResponseMessage deleteSarBussionessStand(SarBussionessStandEOPage page) throws Exception; diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java index c68dc1d7..9c2998f9 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java @@ -145,6 +145,11 @@ public class SarBussionessStandServiceImpl extends ServiceImpl deleteSarBussionessStand(SarBussionessStandEOPage page) throws Exception { SarBussionessStand sarStandardsInfoEO = new SarBussionessStand(); sarStandardsInfoEO.setValidFlag(1); diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/esRevisePlan/EsRevisePlanMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/esRevisePlan/EsRevisePlanMapper.xml index 49d60d62..a6f35511 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/esRevisePlan/EsRevisePlanMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/esRevisePlan/EsRevisePlanMapper.xml @@ -220,34 +220,34 @@ left join sar_bussioness_stand on sar_bussioness_stand.ID = es_revise_plan.rqb_json - and es_name like concat('%',#{esName},'%') + and es_revise_plan.es_name like concat('%',#{esName},'%') - and area = #{area} + and es_revise_plan.area = #{area} - and plan_status in + and es_revise_plan.plan_status in #{item} - and revise_status = #{reviseStatus} + and es_revise_plan.revise_status = #{reviseStatus} - and drafter = #{drafter} + and es_revise_plan.drafter = #{drafter} - and res_person = #{resPerson} + and es_revise_plan.res_person = #{resPerson} - and wg_leader = #{wgLeader} + and es_revise_plan.wg_leader = #{wgLeader} - and DATE_FORMAT(draft_time,'%Y-%m-%d')=DATE_FORMAT(#{draftTime},'%Y-%m-%d') + and DATE_FORMAT(es_revise_plan.draft_time,'%Y-%m-%d')=DATE_FORMAT(#{draftTime},'%Y-%m-%d') - and DATE_FORMAT(release_time,'%Y-%m-%d')=DATE_FORMAT(#{releaseTime},'%Y-%m-%d') + and DATE_FORMAT(es_revise_plan.release_time,'%Y-%m-%d')=DATE_FORMAT(#{releaseTime},'%Y-%m-%d') and (select group_concat(ts_institution.name) from ts_institution where find_in_set(ts_institution.id,unit)) like concat('%',#{unit},'%') diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStand/SarBussionessStandMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStand/SarBussionessStandMapper.xml index 982af830..bc5ebed9 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStand/SarBussionessStandMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStand/SarBussionessStandMapper.xml @@ -170,6 +170,8 @@ stand_sort, stand_year, stand_number, + REVISE_STATUS, + STAND_SN, #{modifyTime, jdbcType=TIMESTAMP}, @@ -190,6 +192,8 @@ #{standSort, jdbcType=VARCHAR}, #{standYear, jdbcType=VARCHAR}, #{standNumber, jdbcType=VARCHAR}, + #{reviseStatus, jdbcType=VARCHAR}, + #{standSn, jdbcType=VARCHAR}, @@ -322,6 +326,12 @@ + + delete from SAR_BUSSIONESS_STAND From 692bffa7d0c773caf1e1348d4f4eabb3090bd6d3 Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Fri, 31 Dec 2021 09:47:11 +0800 Subject: [PATCH 028/116] =?UTF-8?q?=E9=A2=84=E8=AD=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/adc/da/scheduled/ScheduledJob.java | 2 +- .../sarStandWarning/SarStandardWarningDao.xml | 13 ++++++++++--- 2 files changed, 11 insertions(+), 4 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 c371bc49..7178ddf2 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 @@ -126,7 +126,7 @@ public class ScheduledJob { for (String s : item.getSSRQ().split(",")) { - String pattern = "^\\d{4}-\\d{1,2}-\\d{1,2}"; + String pattern = "^\\d{4}-\\d{1,2}-\\d{1,2}$"; Pattern r = Pattern.compile(pattern); Matcher m = r.matcher(s); diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandWarning/SarStandardWarningDao.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandWarning/SarStandardWarningDao.xml index 1f4b15bd..8cea401f 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandWarning/SarStandardWarningDao.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandWarning/SarStandardWarningDao.xml @@ -29,7 +29,7 @@ FROM warning_date WHERE - DATE_FORMAT(SSRQ, '%Y-%m-%d') > DATE_FORMAT(now(), '%Y-%m-%d') + DATE_FORMAT(SSRQ, '%Y-%m-%d') < DATE_FORMAT(now(), '%Y-%m-%d') ) OR @@ -39,7 +39,7 @@ FROM warning_date WHERE - DATE_FORMAT(SSRQ, '%Y-%m-%d') > DATE_FORMAT(now(), '%Y-%m-%d') + DATE_FORMAT(SSRQ, '%Y-%m-%d') < DATE_FORMAT(now(), '%Y-%m-%d') ) @@ -79,12 +79,15 @@ From e17f8710b1716f0c111096d2de2e04faf1ef10fd Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Tue, 4 Jan 2022 14:14:08 +0800 Subject: [PATCH 029/116] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E7=BB=84=E9=A2=9C?= =?UTF-8?q?=E8=89=B2bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/WgWorkGroupController.java | 6 + .../slrs/wgWorkGroup/dao/WgWorkGroupDao.java | 2 + .../service/IWgWorkGroupService.java | 2 + .../service/impl/WgWorkGroupServiceImpl.java | 317 ++++++++++-------- .../wg_work_group/WgWorkGroupMapper.xml | 4 + 5 files changed, 190 insertions(+), 141 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgWorkGroup/controller/WgWorkGroupController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgWorkGroup/controller/WgWorkGroupController.java index e838fcd2..05bee0a3 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgWorkGroup/controller/WgWorkGroupController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgWorkGroup/controller/WgWorkGroupController.java @@ -63,6 +63,12 @@ public class WgWorkGroupController extends BaseController { return wgWorkGroupService.updateData(wgWorkGroupShowDTO); } + @ApiOperation("修改工作组节点数据") + @PostMapping("/updateDataByWk") + public ResponseMessage updateDataByWk(@RequestBody WgWorkGroupShowDTO wgWorkGroupShowDTO){ + return wgWorkGroupService.updateDataByWk(wgWorkGroupShowDTO); + } + diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgWorkGroup/dao/WgWorkGroupDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgWorkGroup/dao/WgWorkGroupDao.java index 12341a91..f15f4d5a 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgWorkGroup/dao/WgWorkGroupDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgWorkGroup/dao/WgWorkGroupDao.java @@ -26,4 +26,6 @@ public interface WgWorkGroupDao extends BaseMapper { List researchDownCheck(@Param(value = "data") String data,@Param(value = "status")String status); + List researchDatasCheck(@Param(value = "data") String data,@Param(value = "status")String status); + } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgWorkGroup/service/IWgWorkGroupService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgWorkGroup/service/IWgWorkGroupService.java index 29b3096b..e6f56e74 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgWorkGroup/service/IWgWorkGroupService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgWorkGroup/service/IWgWorkGroupService.java @@ -31,6 +31,8 @@ public interface IWgWorkGroupService extends IService { ResponseMessage updateData(WgWorkGroupShowDTO wgWorkGroupShowDTO); + ResponseMessage updateDataByWk(WgWorkGroupShowDTO wgWorkGroupShowDTO); + } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgWorkGroup/service/impl/WgWorkGroupServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgWorkGroup/service/impl/WgWorkGroupServiceImpl.java index 2525d233..e30304b5 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgWorkGroup/service/impl/WgWorkGroupServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgWorkGroup/service/impl/WgWorkGroupServiceImpl.java @@ -126,33 +126,33 @@ public class WgWorkGroupServiceImpl extends ServiceImpl wgStandorpolicyInfos= wgStandorpolicyInfoDao.researchDatas(); - Map map=new HashMap<>(); + List wgStandorpolicyInfos = wgStandorpolicyInfoDao.researchDatas(); + Map map = new HashMap<>(); wgStandorpolicyInfos.forEach(wgStandorpolicyInfo -> { - map.put(wgStandorpolicyInfo.getStandId()+"-"+wgStandorpolicyInfo.getWgId(),wgStandorpolicyInfo); + map.put(wgStandorpolicyInfo.getStandId() + "-" + wgStandorpolicyInfo.getWgId(), wgStandorpolicyInfo); }); - if (null!=wgWorkGroupDTO.getWgStandorpolicyInfos() && wgWorkGroupDTO.getWgStandorpolicyInfos().size()>0){ - List wgWorkGroups=new ArrayList<>(); + if (null != wgWorkGroupDTO.getWgStandorpolicyInfos() && wgWorkGroupDTO.getWgStandorpolicyInfos().size() > 0) { + List wgWorkGroups = new ArrayList<>(); wgWorkGroupDTO.getWgStandorpolicyInfos().forEach(wgStandorpolicyInfo -> { - WgWorkGroup wgWorkGroup=new WgWorkGroup(); - BeanUtils.copyProperties(wgWorkGroupDTO,wgWorkGroup); + WgWorkGroup wgWorkGroup = new WgWorkGroup(); + BeanUtils.copyProperties(wgWorkGroupDTO, wgWorkGroup); wgWorkGroup.setId(String.valueOf(UUID.randomUUID())); wgStandorpolicyInfo.setWgId(wgWorkGroup.getId()); - if (null==map.get(wgStandorpolicyInfo.getStandId()+"-"+wgWorkGroup.getPid())) { + if (null == map.get(wgStandorpolicyInfo.getStandId() + "-" + wgWorkGroup.getPid())) { wgWorkGroups.add(wgWorkGroup); } }); - if (wgWorkGroups.size()==0){ + if (wgWorkGroups.size() == 0) { return "政策已存在，请勿重复添加"; } - boolean flag=wgWorkGroupService.saveOrUpdateBatch(wgWorkGroups); - boolean flag1=wgStandorpolicyInfoService.saveOrUpdateBatch(wgWorkGroupDTO.getWgStandorpolicyInfos()); - if (flag && flag1){ + boolean flag = wgWorkGroupService.saveOrUpdateBatch(wgWorkGroups); + boolean flag1 = wgStandorpolicyInfoService.saveOrUpdateBatch(wgWorkGroupDTO.getWgStandorpolicyInfos()); + if (flag && flag1) { return "添加成功"; - }else { + } else { return "添加失败"; } - }else { + } else { return "数据有误，请检查数据"; } } @@ -179,82 +179,82 @@ public class WgWorkGroupServiceImpl extends ServiceImpl wgMeetingUserRelations = wgMeetingUserRelationService.getMeetingAllPeoples(type); //处理数据 //part1 会议数据组装 提速第一步建造数据的map集合 - Map wgWorkGroupMap=new HashMap<>(); + Map wgWorkGroupMap = new HashMap<>(); wgWorkGroupShowDTOS.forEach(wgWorkGroupShowDTO -> { - wgWorkGroupMap.put(wgWorkGroupShowDTO.getId(),wgWorkGroupShowDTO); + wgWorkGroupMap.put(wgWorkGroupShowDTO.getId(), wgWorkGroupShowDTO); }); Map meetMap = new HashMap<>(); - if (null!=wgMeetingInfos && wgMeetingInfos.size()>0) { + if (null != wgMeetingInfos && wgMeetingInfos.size() > 0) { wgMeetingInfos.forEach(wgMeetingInfo -> { meetMap.put(wgMeetingInfo.getId(), wgMeetingInfo); }); } //组装会议数据 - if (null!=wgMeetingUserRelations && wgMeetingUserRelations.size()>0) { + if (null != wgMeetingUserRelations && wgMeetingUserRelations.size() > 0) { wgMeetingUserRelations.forEach(wgMeetingUserRelationShow -> { - if (null!=meetMap.get(wgMeetingUserRelationShow.getMeetingId()).getJoinMeetingPeopleInfo()) { + if (null != meetMap.get(wgMeetingUserRelationShow.getMeetingId()).getJoinMeetingPeopleInfo()) { meetMap.get(wgMeetingUserRelationShow.getMeetingId()).getJoinMeetingPeopleInfo().add(wgMeetingUserRelationShow); - }else { - List wgMeetingUserRelationShows=new ArrayList<>(); + } else { + List wgMeetingUserRelationShows = new ArrayList<>(); wgMeetingUserRelationShows.add(wgMeetingUserRelationShow); meetMap.get(wgMeetingUserRelationShow.getMeetingId()).setJoinMeetingPeopleInfo(wgMeetingUserRelationShows); } }); } //组装总数据 - if (null!=wgDeptShows && wgDeptShows.size()>0) { + if (null != wgDeptShows && wgDeptShows.size() > 0) { wgDeptShows.forEach(wgDeptShow -> { - if (null!=wgWorkGroupMap.get(wgDeptShow.getWgId()).getWgDepts()) { + if (null != wgWorkGroupMap.get(wgDeptShow.getWgId()).getWgDepts()) { wgWorkGroupMap.get(wgDeptShow.getWgId()).getWgDepts().add(wgDeptShow); - }else { + } else { List wgDepts = new ArrayList<>(); wgDepts.add(wgDeptShow); wgWorkGroupMap.get(wgDeptShow.getWgId()).setWgDepts(wgDepts); } }); } - if (null!=wgMeetingInfos && wgMeetingInfos.size()>0) { + if (null != wgMeetingInfos && wgMeetingInfos.size() > 0) { wgMeetingInfos.forEach(wgMeetingInfo -> { - if (null!=wgWorkGroupMap.get(wgMeetingInfo.getWgId()).getWgMeetingInfos()) { + if (null != wgWorkGroupMap.get(wgMeetingInfo.getWgId()).getWgMeetingInfos()) { wgWorkGroupMap.get(wgMeetingInfo.getWgId()).getWgMeetingInfos().add(meetMap.get(wgMeetingInfo.getId())); - }else { + } else { List wgMeetingInfos1 = new ArrayList<>(); wgMeetingInfos1.add(wgMeetingInfo); wgWorkGroupMap.get(wgMeetingInfo.getWgId()).setWgMeetingInfos(wgMeetingInfos1); } }); } - if (null!=wgNetInfoDTOS && wgNetInfoDTOS.size()>0) { + if (null != wgNetInfoDTOS && wgNetInfoDTOS.size() > 0) { wgNetInfoDTOS.forEach(wgNetInfoDTO -> { - if (null!=wgWorkGroupMap.get(wgNetInfoDTO.getWgId()).getWgNetInfos()) { + if (null != wgWorkGroupMap.get(wgNetInfoDTO.getWgId()).getWgNetInfos()) { wgWorkGroupMap.get(wgNetInfoDTO.getWgId()).getWgNetInfos().add(wgNetInfoDTO); - }else { - List wgNetInfos=new ArrayList<>(); + } else { + List wgNetInfos = new ArrayList<>(); wgNetInfos.add(wgNetInfoDTO); wgWorkGroupMap.get(wgNetInfoDTO.getWgId()).setWgNetInfos(wgNetInfos); } }); } - if (null!=wgPayInfos && wgPayInfos.size()>0) { + if (null != wgPayInfos && wgPayInfos.size() > 0) { wgPayInfos.forEach(wgPayInfo -> { - if (null!=wgWorkGroupMap.get(wgPayInfo.getWgId()).getWgPayInfos()) { + if (null != wgWorkGroupMap.get(wgPayInfo.getWgId()).getWgPayInfos()) { wgWorkGroupMap.get(wgPayInfo.getWgId()).getWgPayInfos().add(wgPayInfo); - }else { - List wgPayInfos1=new ArrayList<>(); + } else { + List wgPayInfos1 = new ArrayList<>(); wgPayInfos1.add(wgPayInfo); wgWorkGroupMap.get(wgPayInfo.getWgId()).setWgPayInfos(wgPayInfos1); } }); } //处理标准政策数据 - if (null!=wgStandorpolicyInfos && wgStandorpolicyInfos.size()>0) { + if (null != wgStandorpolicyInfos && wgStandorpolicyInfos.size() > 0) { wgStandorpolicyInfos.forEach(wgStandorpolicyInfo -> { - if (null!=wgWorkGroupMap.get(wgStandorpolicyInfo.getWgId()).getWgStandorpolicyInfos()) { + if (null != wgWorkGroupMap.get(wgStandorpolicyInfo.getWgId()).getWgStandorpolicyInfos()) { wgWorkGroupMap.get(wgStandorpolicyInfo.getWgId()).setName(wgStandorpolicyInfo.getName()); wgWorkGroupMap.get(wgStandorpolicyInfo.getWgId()).getWgStandorpolicyInfos().add(wgStandorpolicyInfo); - }else { - List wgStandorpolicyInfos1=new ArrayList<>(); + } else { + List wgStandorpolicyInfos1 = new ArrayList<>(); wgStandorpolicyInfos1.add(wgStandorpolicyInfo); wgWorkGroupMap.get(wgStandorpolicyInfo.getWgId()).setName(wgStandorpolicyInfo.getName()); wgWorkGroupMap.get(wgStandorpolicyInfo.getWgId()).setWgStandorpolicyInfos(wgStandorpolicyInfos1); @@ -262,27 +262,27 @@ public class WgWorkGroupServiceImpl extends ServiceImpl nums=new ArrayList<>(); - Map> map=new HashMap<>(); + List nums = new ArrayList<>(); + Map> map = new HashMap<>(); wgWorkGroupShowDTOS.forEach(wgWorkGroupShowDTO -> { - if (null!=map.get(Integer.valueOf(wgWorkGroupShowDTO.getLevel()))){ + if (null != map.get(Integer.valueOf(wgWorkGroupShowDTO.getLevel()))) { map.get(Integer.valueOf(wgWorkGroupShowDTO.getLevel())).add(wgWorkGroupShowDTO); - }else { + } else { List middle = new ArrayList<>(); middle.add(wgWorkGroupShowDTO); nums.add(Integer.valueOf(wgWorkGroupShowDTO.getLevel())); - map.put(Integer.valueOf(wgWorkGroupShowDTO.getLevel()),middle); + map.put(Integer.valueOf(wgWorkGroupShowDTO.getLevel()), middle); } }); //组装数据 - for (int i=nums.size()-1;i>0;i--){ + for (int i = nums.size() - 1; i > 0; i--) { int finalI = i; - map.get(i-1).forEach(wgWorkGroupShowDTO -> { + map.get(i - 1).forEach(wgWorkGroupShowDTO -> { map.get(finalI).forEach(wgWorkGroupShowDTO1 -> { - if (wgWorkGroupShowDTO.getId().equals(wgWorkGroupShowDTO1.getPid())){ - if (null!=wgWorkGroupShowDTO.getChildren()) { + if (wgWorkGroupShowDTO.getId().equals(wgWorkGroupShowDTO1.getPid())) { + if (null != wgWorkGroupShowDTO.getChildren()) { wgWorkGroupShowDTO.getChildren().add(wgWorkGroupShowDTO1); - }else { + } else { List children = new ArrayList<>(); children.add(wgWorkGroupShowDTO1); wgWorkGroupShowDTO.setChildren(children); @@ -322,104 +322,139 @@ public class WgWorkGroupServiceImpl extends ServiceImpl updateData(WgWorkGroupShowDTO wgWorkGroupShowDTO) { - List wgWorkGroupShowDTOS = wgWorkGroupDao.researchDownCheck(wgWorkGroupShowDTO.getId(), "1"); + List wgWorkGroupShowDTOS = wgWorkGroupDao.researchDatasCheck(wgWorkGroupShowDTO.getId(), "0"); if (null != wgWorkGroupShowDTOS && wgWorkGroupShowDTOS.size() > 0) { return Result.error("工作组处在流程中，无法修改"); } else { - WgWorkGroup wgWorkGroup = new WgWorkGroup(); - BeanUtils.copyProperties(wgWorkGroupShowDTO, wgWorkGroup); - boolean flag = false; - flag = wgWorkGroupService.saveOrUpdate(wgWorkGroup); - if (null != wgWorkGroupShowDTO.getWgDepts() && wgWorkGroupShowDTO.getWgDepts().size() > 0) { - if (StringUtils.isNotEmpty(wgWorkGroupShowDTO.getWgDeptsDel())){ - List strings=new ArrayList<>(Arrays.asList(wgWorkGroupShowDTO.getWgDeptsDel().split(","))); - wgDeptService.removeByIds(strings); - } - List wgDepts=new ArrayList<>(); - wgWorkGroupShowDTO.getWgDepts().forEach(wgDeptShow -> { - WgDept wgDept=new WgDept(); - BeanUtils.copyProperties(wgDeptShow,wgDept); - if (null==wgDept.getWgId()){ - wgDept.setWgId(wgWorkGroupShowDTO.getId()); - } - wgDepts.add(wgDept); - }); - flag = wgDeptService.saveOrUpdateBatch(wgDepts); - } - if (null != wgWorkGroupShowDTO.getWgMeetingInfos() && wgWorkGroupShowDTO.getWgMeetingInfos().size() > 0) { - if (StringUtils.isNotEmpty(wgWorkGroupShowDTO.getWgMeetingInfosDel())){ - List strings=new ArrayList<>(Arrays.asList(wgWorkGroupShowDTO.getWgMeetingInfosDel().split(","))); - wgDeptService.removeByIds(strings); - wgMeetingUserRelationService.removeByIds(strings); - } - List removeMeet = new ArrayList<>(); - List wgMeetingUserRelations = new ArrayList<>(); - wgWorkGroupShowDTO.getWgMeetingInfos().forEach(wgMeetingInfo -> { - if (null==wgMeetingInfo.getId()){ - wgMeetingInfo.setId(String.valueOf(UUID.randomUUID())); - wgMeetingInfo.setWgId(wgWorkGroupShowDTO.getId()); - } - wgMeetingInfo.getMeetingPeople().forEach(s -> { - WgMeetingUserRelation wgMeetingUserRelation = new WgMeetingUserRelation(); - wgMeetingUserRelation.setUserId(s); - wgMeetingUserRelation.setMeetingId(wgMeetingInfo.getId()); - wgMeetingUserRelations.add(wgMeetingUserRelation); - }); - removeMeet.add(wgMeetingInfo.getId()); - }); - flag = wgMeetingInfoService.saveOrUpdateBatch(wgWorkGroupShowDTO.getWgMeetingInfos()); - if (!removeMeet.isEmpty()) { - wgMeetingUserRelationService.removeByIds(removeMeet); - wgMeetingUserRelationService.saveBatch(wgMeetingUserRelations); - } - } - if (null != wgWorkGroupShowDTO.getWgNetInfos() && wgWorkGroupShowDTO.getWgNetInfos().size() > 0) { - if (StringUtils.isNotEmpty(wgWorkGroupShowDTO.getWgNetInfosDel())){ - List strings=new ArrayList<>(Arrays.asList(wgWorkGroupShowDTO.getWgNetInfosDel().split(","))); - wgNetInfoService.removeByIds(strings); - } - List wgNetInfos = new ArrayList<>(); - wgWorkGroupShowDTO.getWgNetInfos().forEach(wgNetInfoDTO -> { - WgNetInfo wgNetInfo = new WgNetInfo(); - BeanUtils.copyProperties(wgNetInfoDTO, wgNetInfo); - if (null==wgNetInfo.getWgId()){ - wgNetInfo.setWgId(wgWorkGroupShowDTO.getId()); - } - wgNetInfos.add(wgNetInfo); - }); - flag = wgNetInfoService.saveOrUpdateBatch(wgNetInfos); - } - if (null != wgWorkGroupShowDTO.getWgPayInfos() && wgWorkGroupShowDTO.getWgPayInfos().size() > 0) { - if (StringUtils.isNotEmpty(wgWorkGroupShowDTO.getWgPayInfosDel())){ - List strings=new ArrayList<>(Arrays.asList(wgWorkGroupShowDTO.getWgPayInfosDel().split(","))); - wgPayInfoService.removeByIds(strings); - } - if (!wgWorkGroupShowDTO.getWgPayInfos().isEmpty()){ - wgWorkGroupShowDTO.getWgPayInfos().forEach(wgPayInfo -> { - if (null==wgPayInfo.getWgId()){ - wgPayInfo.setWgId(wgWorkGroupShowDTO.getId()); - } - }); - } - flag = wgPayInfoService.saveOrUpdateBatch(wgWorkGroupShowDTO.getWgPayInfos()); - } - if (null != wgWorkGroupShowDTO.getWgStandorpolicyInfos() && wgWorkGroupShowDTO.getWgStandorpolicyInfos().size() > 0) { - if (!wgWorkGroupShowDTO.getWgStandorpolicyInfos().isEmpty()){ - wgWorkGroupShowDTO.getWgStandorpolicyInfos().forEach(wgStandorpolicyInfo -> { - if (null==wgStandorpolicyInfo.getWgId()){ - wgStandorpolicyInfo.setWgId(wgWorkGroupShowDTO.getId()); - } - }); - } - flag = wgStandorpolicyInfoService.saveOrUpdateBatch(wgWorkGroupShowDTO.getWgStandorpolicyInfos()); - } + return dealAllDatas(wgWorkGroupShowDTO); + } + } - if (flag) { - return Result.success("更新成功"); - } else { - return Result.error("无法更新"); + @Override + public ResponseMessage updateDataByWk(WgWorkGroupShowDTO wgWorkGroupShowDTO) { + return dealAllDatas(wgWorkGroupShowDTO); + } + + private ResponseMessage dealAllDatas(WgWorkGroupShowDTO wgWorkGroupShowDTO) { + WgWorkGroup wgWorkGroup = new WgWorkGroup(); + BeanUtils.copyProperties(wgWorkGroupShowDTO, wgWorkGroup); + boolean flag = false; + flag = wgWorkGroupService.saveOrUpdate(wgWorkGroup); + saveBathDept(wgWorkGroupShowDTO, flag); + saveBathMeetingUserRelations(wgWorkGroupShowDTO, flag); + saveBathNetInfo(wgWorkGroupShowDTO, flag); + saveBathPayInfo(wgWorkGroupShowDTO, flag); + saveBathStandardPolicyInfo(wgWorkGroupShowDTO, flag); + + if (flag) { + return Result.success("更新成功"); + } else { + return Result.error("无法更新"); + } + } + + private boolean saveBathPayInfo(WgWorkGroupShowDTO wgWorkGroupShowDTO, boolean flag) { + if (null != wgWorkGroupShowDTO.getWgPayInfos() && wgWorkGroupShowDTO.getWgPayInfos().size() > 0) { + if (StringUtils.isNotEmpty(wgWorkGroupShowDTO.getWgPayInfosDel())) { + List strings = new ArrayList<>(Arrays.asList(wgWorkGroupShowDTO.getWgPayInfosDel().split(","))); + wgPayInfoService.removeByIds(strings); + } + if (!wgWorkGroupShowDTO.getWgPayInfos().isEmpty()) { + wgWorkGroupShowDTO.getWgPayInfos().forEach(wgPayInfo -> { + if (null == wgPayInfo.getWgId()) { + wgPayInfo.setWgId(wgWorkGroupShowDTO.getId()); + } + }); + } + flag = wgPayInfoService.saveOrUpdateBatch(wgWorkGroupShowDTO.getWgPayInfos()); + } + return flag; + } + + private boolean saveBathNetInfo(WgWorkGroupShowDTO wgWorkGroupShowDTO, boolean flag) { + if (null != wgWorkGroupShowDTO.getWgNetInfos() && wgWorkGroupShowDTO.getWgNetInfos().size() > 0) { + if (StringUtils.isNotEmpty(wgWorkGroupShowDTO.getWgNetInfosDel())) { + List strings = new ArrayList<>(Arrays.asList(wgWorkGroupShowDTO.getWgNetInfosDel().split(","))); + wgNetInfoService.removeByIds(strings); + } + List wgNetInfos = new ArrayList<>(); + wgWorkGroupShowDTO.getWgNetInfos().forEach(wgNetInfoDTO -> { + WgNetInfo wgNetInfo = new WgNetInfo(); + BeanUtils.copyProperties(wgNetInfoDTO, wgNetInfo); + if (null == wgNetInfo.getWgId()) { + wgNetInfo.setWgId(wgWorkGroupShowDTO.getId()); + } + wgNetInfos.add(wgNetInfo); + }); + flag = wgNetInfoService.saveOrUpdateBatch(wgNetInfos); + } + return flag; + } + + private boolean saveBathMeetingUserRelations(WgWorkGroupShowDTO wgWorkGroupShowDTO, boolean flag) { + if (null != wgWorkGroupShowDTO.getWgMeetingInfos() && wgWorkGroupShowDTO.getWgMeetingInfos().size() > 0) { + if (StringUtils.isNotEmpty(wgWorkGroupShowDTO.getWgMeetingInfosDel())) { + List strings = new ArrayList<>(Arrays.asList(wgWorkGroupShowDTO.getWgMeetingInfosDel().split(","))); + wgDeptService.removeByIds(strings); + wgMeetingUserRelationService.removeByIds(strings); + } + List removeMeet = new ArrayList<>(); + List wgMeetingUserRelations = new ArrayList<>(); + wgWorkGroupShowDTO.getWgMeetingInfos().forEach(wgMeetingInfo -> { + if (null == wgMeetingInfo.getId()) { + wgMeetingInfo.setId(String.valueOf(UUID.randomUUID())); + wgMeetingInfo.setWgId(wgWorkGroupShowDTO.getId()); + } + wgMeetingInfo.getMeetingPeople().forEach(s -> { + WgMeetingUserRelation wgMeetingUserRelation = new WgMeetingUserRelation(); + wgMeetingUserRelation.setUserId(s); + wgMeetingUserRelation.setMeetingId(wgMeetingInfo.getId()); + wgMeetingUserRelations.add(wgMeetingUserRelation); + }); + removeMeet.add(wgMeetingInfo.getId()); + }); + flag = wgMeetingInfoService.saveOrUpdateBatch(wgWorkGroupShowDTO.getWgMeetingInfos()); + if (!removeMeet.isEmpty()) { + wgMeetingUserRelationService.removeByIds(removeMeet); + wgMeetingUserRelationService.saveBatch(wgMeetingUserRelations); } } + return flag; + } + + private boolean saveBathDept(WgWorkGroupShowDTO wgWorkGroupShowDTO, boolean flag) { + if (null != wgWorkGroupShowDTO.getWgDepts() && wgWorkGroupShowDTO.getWgDepts().size() > 0) { + if (StringUtils.isNotEmpty(wgWorkGroupShowDTO.getWgDeptsDel())) { + List strings = new ArrayList<>(Arrays.asList(wgWorkGroupShowDTO.getWgDeptsDel().split(","))); + wgDeptService.removeByIds(strings); + } + List wgDepts = new ArrayList<>(); + wgWorkGroupShowDTO.getWgDepts().forEach(wgDeptShow -> { + WgDept wgDept = new WgDept(); + BeanUtils.copyProperties(wgDeptShow, wgDept); + if (null == wgDept.getWgId()) { + wgDept.setWgId(wgWorkGroupShowDTO.getId()); + } + wgDepts.add(wgDept); + }); + flag = wgDeptService.saveOrUpdateBatch(wgDepts); + } + return flag; + } + + + private boolean saveBathStandardPolicyInfo(WgWorkGroupShowDTO wgWorkGroupShowDTO, boolean flag) { + if (null != wgWorkGroupShowDTO.getWgStandorpolicyInfos() && wgWorkGroupShowDTO.getWgStandorpolicyInfos().size() > 0) { + if (!wgWorkGroupShowDTO.getWgStandorpolicyInfos().isEmpty()) { + wgWorkGroupShowDTO.getWgStandorpolicyInfos().forEach(wgStandorpolicyInfo -> { + if (null == wgStandorpolicyInfo.getWgId()) { + wgStandorpolicyInfo.setWgId(wgWorkGroupShowDTO.getId()); + } + }); + } + flag = wgStandorpolicyInfoService.saveOrUpdateBatch(wgWorkGroupShowDTO.getWgStandorpolicyInfos()); + } + return flag; } diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/wg_work_group/WgWorkGroupMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/wg_work_group/WgWorkGroupMapper.xml index fde7c4e7..5c94098d 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/wg_work_group/WgWorkGroupMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/wg_work_group/WgWorkGroupMapper.xml @@ -45,6 +45,10 @@ select * from wg_work_group where wg_work_group.pid = #{data} and wg_work_group.status = #{status} + + From 0a287e59c7a3be305fec70d3f8fbd5fd711fc120 Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Tue, 4 Jan 2022 15:44:18 +0800 Subject: [PATCH 030/116] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E7=BB=84bug=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../da/slrs/wgNetInfo/entity/WgNetInfo.java | 8 +++ .../service/impl/WgWorkGroupServiceImpl.java | 54 ++++++++++++++----- .../mapper/wgNetInfo/WgNetInfoMapper.xml | 8 ++- 3 files changed, 52 insertions(+), 18 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgNetInfo/entity/WgNetInfo.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgNetInfo/entity/WgNetInfo.java index 6ec1cf93..f671536f 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgNetInfo/entity/WgNetInfo.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgNetInfo/entity/WgNetInfo.java @@ -52,6 +52,14 @@ public class WgNetInfo extends BaseEntity { @TableField("email") private String email; + @ApiModelProperty(value = "联络人") + @TableField("name") + private String name; + + @ApiModelProperty(value = "单位") + @TableField("unit") + private String unit; + } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgWorkGroup/service/impl/WgWorkGroupServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgWorkGroup/service/impl/WgWorkGroupServiceImpl.java index e30304b5..aeee43bc 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgWorkGroup/service/impl/WgWorkGroupServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgWorkGroup/service/impl/WgWorkGroupServiceImpl.java @@ -326,25 +326,25 @@ public class WgWorkGroupServiceImpl extends ServiceImpl 0) { return Result.error("工作组处在流程中，无法修改"); } else { - return dealAllDatas(wgWorkGroupShowDTO); + return dealAllDatas(wgWorkGroupShowDTO,"sys"); } } @Override public ResponseMessage updateDataByWk(WgWorkGroupShowDTO wgWorkGroupShowDTO) { - return dealAllDatas(wgWorkGroupShowDTO); + return dealAllDatas(wgWorkGroupShowDTO,"wk"); } - private ResponseMessage dealAllDatas(WgWorkGroupShowDTO wgWorkGroupShowDTO) { + private ResponseMessage dealAllDatas(WgWorkGroupShowDTO wgWorkGroupShowDTO,String part) { WgWorkGroup wgWorkGroup = new WgWorkGroup(); BeanUtils.copyProperties(wgWorkGroupShowDTO, wgWorkGroup); boolean flag = false; flag = wgWorkGroupService.saveOrUpdate(wgWorkGroup); - saveBathDept(wgWorkGroupShowDTO, flag); - saveBathMeetingUserRelations(wgWorkGroupShowDTO, flag); - saveBathNetInfo(wgWorkGroupShowDTO, flag); - saveBathPayInfo(wgWorkGroupShowDTO, flag); - saveBathStandardPolicyInfo(wgWorkGroupShowDTO, flag); + saveBathDept(wgWorkGroupShowDTO, flag,part); + saveBathMeetingUserRelations(wgWorkGroupShowDTO, flag,part); + saveBathNetInfo(wgWorkGroupShowDTO, flag,part); + saveBathPayInfo(wgWorkGroupShowDTO, flag,part); + saveBathStandardPolicyInfo(wgWorkGroupShowDTO, flag,part); if (flag) { return Result.success("更新成功"); @@ -353,7 +353,7 @@ public class WgWorkGroupServiceImpl extends ServiceImpl 0) { if (StringUtils.isNotEmpty(wgWorkGroupShowDTO.getWgPayInfosDel())) { List strings = new ArrayList<>(Arrays.asList(wgWorkGroupShowDTO.getWgPayInfosDel().split(","))); @@ -367,11 +367,15 @@ public class WgWorkGroupServiceImpl extends ServiceImpl queryWrapper=new QueryWrapper<>(); + queryWrapper.eq("wg_id",wgWorkGroupShowDTO.getId()); + wgPayInfoService.remove(queryWrapper); } return flag; } - private boolean saveBathNetInfo(WgWorkGroupShowDTO wgWorkGroupShowDTO, boolean flag) { + private boolean saveBathNetInfo(WgWorkGroupShowDTO wgWorkGroupShowDTO, boolean flag,String part) { if (null != wgWorkGroupShowDTO.getWgNetInfos() && wgWorkGroupShowDTO.getWgNetInfos().size() > 0) { if (StringUtils.isNotEmpty(wgWorkGroupShowDTO.getWgNetInfosDel())) { List strings = new ArrayList<>(Arrays.asList(wgWorkGroupShowDTO.getWgNetInfosDel().split(","))); @@ -387,11 +391,15 @@ public class WgWorkGroupServiceImpl extends ServiceImpl queryWrapper=new QueryWrapper<>(); + queryWrapper.eq("wg_id",wgWorkGroupShowDTO.getId()); + wgNetInfoService.remove(queryWrapper); } return flag; } - private boolean saveBathMeetingUserRelations(WgWorkGroupShowDTO wgWorkGroupShowDTO, boolean flag) { + private boolean saveBathMeetingUserRelations(WgWorkGroupShowDTO wgWorkGroupShowDTO, boolean flag,String part) { if (null != wgWorkGroupShowDTO.getWgMeetingInfos() && wgWorkGroupShowDTO.getWgMeetingInfos().size() > 0) { if (StringUtils.isNotEmpty(wgWorkGroupShowDTO.getWgMeetingInfosDel())) { List strings = new ArrayList<>(Arrays.asList(wgWorkGroupShowDTO.getWgMeetingInfosDel().split(","))); @@ -418,11 +426,23 @@ public class WgWorkGroupServiceImpl extends ServiceImpl queryWrapper=new QueryWrapper<>(); + queryWrapper.eq("wg_id",wgWorkGroupShowDTO.getId()); + wgMeetingInfoService.remove(queryWrapper); + List wgMeetingInfos=wgMeetingInfoService.list(queryWrapper); + List removeIds=new ArrayList<>(); + wgMeetingInfos.forEach(wgMeetingInfo -> { + removeIds.add(wgMeetingInfo.getId()); + }); + if (removeIds.size()>0) { + wgMeetingUserRelationService.removeByIds(removeIds); + } } return flag; } - private boolean saveBathDept(WgWorkGroupShowDTO wgWorkGroupShowDTO, boolean flag) { + private boolean saveBathDept(WgWorkGroupShowDTO wgWorkGroupShowDTO, boolean flag,String part) { if (null != wgWorkGroupShowDTO.getWgDepts() && wgWorkGroupShowDTO.getWgDepts().size() > 0) { if (StringUtils.isNotEmpty(wgWorkGroupShowDTO.getWgDeptsDel())) { List strings = new ArrayList<>(Arrays.asList(wgWorkGroupShowDTO.getWgDeptsDel().split(","))); @@ -438,12 +458,16 @@ public class WgWorkGroupServiceImpl extends ServiceImpl queryWrapper=new QueryWrapper<>(); + queryWrapper.eq("wg_id",wgWorkGroupShowDTO.getId()); + wgDeptService.remove(queryWrapper); } return flag; } - private boolean saveBathStandardPolicyInfo(WgWorkGroupShowDTO wgWorkGroupShowDTO, boolean flag) { + private boolean saveBathStandardPolicyInfo(WgWorkGroupShowDTO wgWorkGroupShowDTO, boolean flag,String part) { if (null != wgWorkGroupShowDTO.getWgStandorpolicyInfos() && wgWorkGroupShowDTO.getWgStandorpolicyInfos().size() > 0) { if (!wgWorkGroupShowDTO.getWgStandorpolicyInfos().isEmpty()) { wgWorkGroupShowDTO.getWgStandorpolicyInfos().forEach(wgStandorpolicyInfo -> { @@ -453,6 +477,10 @@ public class WgWorkGroupServiceImpl extends ServiceImpl queryWrapper=new QueryWrapper<>(); + queryWrapper.eq("wg_id",wgWorkGroupShowDTO.getId()); + wgStandorpolicyInfoService.remove(queryWrapper); } return flag; } diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/wgNetInfo/WgNetInfoMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/wgNetInfo/WgNetInfoMapper.xml index 97768a6b..f7f5dd81 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/wgNetInfo/WgNetInfoMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/wgNetInfo/WgNetInfoMapper.xml @@ -11,13 +11,11 @@ From d6e5fe038d04eb109d331722229d574b63f00ca1 Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Tue, 4 Jan 2022 21:44:03 +0800 Subject: [PATCH 031/116] =?UTF-8?q?=E9=A2=84=E8=AD=A6=E6=9C=9F=E9=99=90?= =?UTF-8?q?=E4=B8=BA12=E4=B8=AA=E6=9C=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/adc/da/scheduled/entity/TermDTO.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/scheduled/entity/TermDTO.java b/adc-da-slrs/src/main/java/com/adc/da/scheduled/entity/TermDTO.java index 17e093b8..1c9aa42e 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/scheduled/entity/TermDTO.java +++ b/adc-da-slrs/src/main/java/com/adc/da/scheduled/entity/TermDTO.java @@ -38,7 +38,7 @@ public class TermDTO { //系统当前日期 LocalDate starDate = LocalDate.now(); //系统当前日期3个月后 - LocalDate endDate = LocalDate.now().plusMonths(3); + LocalDate endDate = LocalDate.now().plusMonths(12); convertToStr(starDate,endDate); } From d458dffdb872ffde98b0fd8a7b07ecc3c1fe3cec Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Wed, 5 Jan 2022 00:04:11 +0800 Subject: [PATCH 032/116] =?UTF-8?q?=E9=A2=84=E8=AD=A6=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/adc/da/scheduled/ScheduledJob.java | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 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 7178ddf2..cc442699 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 @@ -109,13 +109,18 @@ public class ScheduledJob { // }; // // runnable.run(); + + logger.info("========================================================================================================="); + logger.info("========================================================================================================="); + + logger.info("开始执行预警!!!"); + logger.info("========================================================================================================"); + + logger.info("========================================================================================================"); //删除不在预警范围的标准 int remove = sarStandardWarningDao.autoCancelWarning(); - - logger.info("=========================================================================="); logger.info("取消"+remove+"条预警"); - logger.info("开始执行预警!!!"); - logger.info("=========================================================================="); + //预警期限(当前日期至3个月后) TermDTO term = new TermDTO(); //查询符合预警期限的标准 多个 From 509e68b6d50a96cc6392adff9f59913466f539e9 Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Wed, 5 Jan 2022 10:13:32 +0800 Subject: [PATCH 033/116] =?UTF-8?q?=E9=A2=84=E8=AD=A6=E6=97=A5=E6=9C=9F?= =?UTF-8?q?=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/sarStandWarning/EarlyWraningEOMapper.xml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandWarning/EarlyWraningEOMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandWarning/EarlyWraningEOMapper.xml index 165cf244..e8abcc3b 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandWarning/EarlyWraningEOMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandWarning/EarlyWraningEOMapper.xml @@ -191,7 +191,7 @@ APPLY_TYPE , attr .ZRGCS AS DUTY_ENGINEER , - NULL AS ITEMS_ID , + ITEMS_ID , NULL AS ITEMS_NUM , NULL AS ITEMS_NAME , NULL AS POLICY_ID , NULL AS POLICY_NAME , @@ -273,10 +273,11 @@ WARNING_RESULT LEFT JOIN ( - SELECT law_id,MIN(SSRQ) SSRQ_MIN FROM warning_date - GROUP BY warning_date.law_id + SELECT item_id,law_id,MIN(SSRQ) SSRQ_MIN FROM warning_date + GROUP BY warning_date.law_id,item_id ) warning_date ON warning_date.law_id = WARNING_RESULT.STAND_ID + AND warning_date.item_id = WARNING_RESULT.ITEMS_ID ORDER BY warning_date.SSRQ_MIN From 475a245e392cdb0a3e70501c9df9c0b1c9f233e0 Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Wed, 5 Jan 2022 10:14:14 +0800 Subject: [PATCH 034/116] =?UTF-8?q?=E6=94=B9=E4=BA=86=E6=97=A5=E5=BF=97?= =?UTF-8?q?=E8=BE=93=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/adc/da/scheduled/ScheduledJob.java | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 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 cc442699..9424c392 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 @@ -115,7 +115,6 @@ public class ScheduledJob { logger.info("开始执行预警!!!"); logger.info("========================================================================================================"); - logger.info("========================================================================================================"); //删除不在预警范围的标准 int remove = sarStandardWarningDao.autoCancelWarning(); @@ -186,6 +185,14 @@ public class ScheduledJob { // @Scheduled(cron="*/5 * * * * ?") @Async public void TextStatusSchedulingTasks() { + Logger logger = LoggerFactory.getLogger(ScheduledJob.class); + + + logger.info("========================================================================================================="); + logger.info("========================================================================================================="); + logger.info("开始更新文本状态!!!"); + logger.info("========================================================================================================="); + logger.info("========================================================================================================="); QueryWrapper wrapper = new QueryWrapper<>(); TermDTO data = new TermDTO(LocalDate.now(), LocalDate.now()); @@ -294,7 +301,8 @@ public class ScheduledJob { System.out.println("代替标准状态更新:id为"+key+"文本状态更新失败"); } } - + logger.info("==================================更新文本状态结束======================================"); + logger.info("==================================更新文本状态结束======================================"); } } From 8eeb61a354a93bccfd4a65fea7615ec8c0f004b2 Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Wed, 5 Jan 2022 14:26:28 +0800 Subject: [PATCH 035/116] =?UTF-8?q?=E9=A2=84=E8=AD=A6=E6=97=A5=E6=9C=9F3?= =?UTF-8?q?=E5=B9=B436=E4=B8=AA=E6=9C=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/adc/da/scheduled/entity/TermDTO.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/scheduled/entity/TermDTO.java b/adc-da-slrs/src/main/java/com/adc/da/scheduled/entity/TermDTO.java index 1c9aa42e..a148c45d 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/scheduled/entity/TermDTO.java +++ b/adc-da-slrs/src/main/java/com/adc/da/scheduled/entity/TermDTO.java @@ -37,8 +37,8 @@ public class TermDTO { public TermDTO() { //系统当前日期 LocalDate starDate = LocalDate.now(); - //系统当前日期3个月后 - LocalDate endDate = LocalDate.now().plusMonths(12); + //系统当前日期36个月后 + LocalDate endDate = LocalDate.now().plusMonths(36); convertToStr(starDate,endDate); } From d7c9a117b5ef1c4a4083bc051ea0da48724de80c Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Wed, 5 Jan 2022 15:44:52 +0800 Subject: [PATCH 036/116] =?UTF-8?q?=E5=BE=81=E6=B1=82=E6=84=8F=E8=A7=81?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/Impl/SarPublicIdeaServiceImpl.java | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/service/Impl/SarPublicIdeaServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/service/Impl/SarPublicIdeaServiceImpl.java index 2a9b9275..28c53f45 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/service/Impl/SarPublicIdeaServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/service/Impl/SarPublicIdeaServiceImpl.java @@ -47,11 +47,19 @@ public class SarPublicIdeaServiceImpl extends ServiceImpl selectAllP(Integer p, Integer size, String category, String cname, Date start, Date end, String type) { QueryWrapper list = new QueryWrapper<>(); if ("1".equals(type)) { - list.like(StringUtils.isNotEmpty(category), "category", category) - .like(StringUtils.isNotEmpty(cname), "cid", cname) - .ge(start != null, "start_time", start) - .le(end != null, "end_time", end) - .orderByDesc("start_time"); + if (start!=null && end !=null){ + list.like(StringUtils.isNotEmpty(category), "category", category) + .like(StringUtils.isNotEmpty(cname), "cid", cname) + .ge(start != null, "start_time", start) + .le(end != null, "end_time", end) + .orderByDesc("start_time"); + }else { + list.like(StringUtils.isNotEmpty(category), "category", category) + .like(StringUtils.isNotEmpty(cname), "cid", cname) + .le(start != null, "start_time", start) + .ge(end != null, "end_time", end) + .orderByDesc("start_time"); + } } else { list.like(StringUtils.isNotEmpty(category), "category", category) .like(StringUtils.isNotEmpty(cname), "cname", cname) From 055b3a7fc5419cd3b710afe949c2b9f710c5cecf Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Wed, 5 Jan 2022 16:18:42 +0800 Subject: [PATCH 037/116] =?UTF-8?q?=E5=85=AC=E5=BC=80=E5=BE=81=E6=B1=82?= =?UTF-8?q?=E6=84=8F=E8=A7=81=20=E5=AF=BC=E5=87=BAbug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/SarPublicIdeaAllController.java | 6 +++++- .../sarStandIdea/dao/SarPublicIdeaAllDao.java | 2 ++ .../sarStandIdea/SarPublicIdeaAllMapper.xml | 15 +++++++++++++++ 3 files changed, 22 insertions(+), 1 deletion(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/controller/SarPublicIdeaAllController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/controller/SarPublicIdeaAllController.java index 7c8206fc..dbd56663 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/controller/SarPublicIdeaAllController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/controller/SarPublicIdeaAllController.java @@ -118,7 +118,11 @@ public class SarPublicIdeaAllController extends BaseController response.setHeader("Content-disposition", "attachment;filename*=utf-8''" + fileName + ".xlsx"); List data=new ArrayList<>(); if (!StringUtils.isEmpty(cid)){ - data=sarPublicIdeaAllDao.getPublicAllIdea(cid,type); + if (null!=type) { + data = sarPublicIdeaAllDao.getPublicAllIdea(cid, type); + }else { + data = sarPublicIdeaAllDao.getPublicAllIdeaExport(cid,type); + } } List standExcel=new ArrayList<>(); List standExcel2=new ArrayList<>(); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/dao/SarPublicIdeaAllDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/dao/SarPublicIdeaAllDao.java index d361e5ee..2f4ffad1 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/dao/SarPublicIdeaAllDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/dao/SarPublicIdeaAllDao.java @@ -28,4 +28,6 @@ public interface SarPublicIdeaAllDao extends BaseMapper { Integer getAllDataByIdeaCount( @Param("ideaId")String ideaId); List getPublicAllIdea(@Param("cid") String cid,@Param("type")String type); + + List getPublicAllIdeaExport(@Param("cid") String cid,@Param("type")String type); } diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandIdea/SarPublicIdeaAllMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandIdea/SarPublicIdeaAllMapper.xml index 7809c344..a9f5c8c2 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandIdea/SarPublicIdeaAllMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandIdea/SarPublicIdeaAllMapper.xml @@ -46,4 +46,19 @@ ORDER BY part_code ASC + + From a956ea2526389bb268e97c0ba0a2324f4373b1f4 Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Wed, 5 Jan 2022 17:53:15 +0800 Subject: [PATCH 038/116] feat: There is no way the, --- .../esRevisePlan/entity/EsRevisePlan.java | 4 ++++ .../controller/TsInstitutionController.java | 6 ++++++ .../sarInstitution/dao/TsInstitutionDao.java | 2 ++ .../service/ITsInstitutionService.java | 2 ++ .../impl/TsInstitutionServiceImpl.java | 7 +++++++ .../esRevisePlan/EsRevisePlanMapper.xml | 1 + .../sarInstitution/TsInstitutionMapper.xml | 20 +++++++++++++++++++ 7 files changed, 42 insertions(+) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/entity/EsRevisePlan.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/entity/EsRevisePlan.java index 9fb2b8e5..e355d68a 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/entity/EsRevisePlan.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/entity/EsRevisePlan.java @@ -94,6 +94,10 @@ public class EsRevisePlan extends BasePage { //企标类别 private String standType; + // 标准编号 + private String standNum; + + @ApiModelProperty(value = "企标类别") private String esMatingRelations; private String esStandRelations; diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/controller/TsInstitutionController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/controller/TsInstitutionController.java index 606e6e98..9028d757 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/controller/TsInstitutionController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/controller/TsInstitutionController.java @@ -80,6 +80,12 @@ public class TsInstitutionController extends BaseController { return Result.success(); } + @ApiOperation("根据部门ID获取部门下所有用户") + @GetMapping("/getInstitutionIdToDept") + public List getInstitutionIdToDept(String institutionIds,String userName){ + return tsInstitutionService.getInstitutionIdToDept(institutionIds,userName); + } + @ApiOperation("获得下一级的部门和人员") @GetMapping("/getNext") public List getNext(String institutionId,String userName){ diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/dao/TsInstitutionDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/dao/TsInstitutionDao.java index 619e6efd..c2565c52 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/dao/TsInstitutionDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/dao/TsInstitutionDao.java @@ -29,6 +29,8 @@ public interface TsInstitutionDao extends BaseMapper { */ List selectNextUser(@Param("institutionId") String institutionId,@Param("userName") String userName); + List selectNextUsers(@Param("institutionIds") List institutionIds,@Param("userName") String userName); + List selectNextUserByIds(@Param("ids") List ids); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/service/ITsInstitutionService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/service/ITsInstitutionService.java index 892228b0..92409ed4 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/service/ITsInstitutionService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/service/ITsInstitutionService.java @@ -37,6 +37,8 @@ public interface ITsInstitutionService extends IService { */ public List getNext(String institutionId,String userName); + public List getInstitutionIdToDept(String institutionIds,String userName); + public List getNextById(String ids); /** diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/service/impl/TsInstitutionServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/service/impl/TsInstitutionServiceImpl.java index 5f117ceb..d3e52881 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/service/impl/TsInstitutionServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/service/impl/TsInstitutionServiceImpl.java @@ -200,6 +200,13 @@ public class TsInstitutionServiceImpl extends ServiceImpl getInstitutionIdToDept(String institutionIds,String userName){ + List strings=new ArrayList<>(Arrays.asList(institutionIds.split(","))); + List tsUsers=tsInstitutionDao.selectNextUsers(strings,userName); + return tsUsers; + } + /** * 通过部门id获得这个部门下的下一级部门 * @return diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/esRevisePlan/EsRevisePlanMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/esRevisePlan/EsRevisePlanMapper.xml index a6f35511..6128110c 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/esRevisePlan/EsRevisePlanMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/esRevisePlan/EsRevisePlanMapper.xml @@ -209,6 +209,7 @@ es_revise_plan.buss_sort, sar_bussioness_stand.STAND_CODE as rqbName, sar_bussioness_stand.STAND_SORT as standType, + sar_bussioness_stand.stand_number as standNum, (select group_concat(ts_institution.name) from ts_institution where find_in_set(ts_institution.id,unit)) as unitName, (SELECT GROUP_CONCAT(UNAME) from ts_user WHERE find_in_set(USID,drafter) ) as drafterName, (SELECT GROUP_CONCAT(ts_dictype.DIC_TYPE_NAME) from ts_dictype WHERE find_in_set(ts_dictype.DIC_TYPE_CODE,area) ) as areaName, diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarInstitution/TsInstitutionMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarInstitution/TsInstitutionMapper.xml index 5e8f9d90..fdf3da7b 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarInstitution/TsInstitutionMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarInstitution/TsInstitutionMapper.xml @@ -35,6 +35,26 @@ WHERE parent_id=#{institutionId} + + + + From 6a4b807ecb742aec60d612e18cb62a0c90953cc7 Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Fri, 7 Jan 2022 16:21:58 +0800 Subject: [PATCH 054/116] =?UTF-8?q?=E6=97=A5=E6=9C=9F=E6=B3=A8=E8=A7=A3?= =?UTF-8?q?=E4=B8=8D=E7=94=9F=E6=95=88=E9=97=AE=E9=A2=98=20=E8=A7=92?= =?UTF-8?q?=E8=89=B2=E5=88=97=E8=A1=A8=20=E5=B7=AE=E5=85=AB=E5=B0=8F?= =?UTF-8?q?=E6=97=B6=20=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../da/slrs/sarRole/controller/TsRoleController.java | 12 ++++++++++-- .../java/com/adc/da/slrs/sarRole/dao/TsRoleDao.java | 3 +++ .../java/com/adc/da/slrs/sarRole/entity/TsRole.java | 6 +++--- .../adc/da/slrs/sarRole/service/ITsRoleService.java | 1 + 4 files changed, 17 insertions(+), 5 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarRole/controller/TsRoleController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarRole/controller/TsRoleController.java index afcda9b0..60d50527 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarRole/controller/TsRoleController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarRole/controller/TsRoleController.java @@ -8,6 +8,7 @@ import com.adc.da.login.util.UserUtils; import com.adc.da.slrs.sarMenu.entity.SarMenu; import com.adc.da.slrs.sarResource.entity.TsResource; import com.adc.da.slrs.sarResource.service.ITsResourceService; +import com.adc.da.slrs.sarRole.dao.TsRoleDao; import com.adc.da.slrs.sarRole.entity.TsRoleMenuVO; import com.adc.da.slrs.sarRole.entity.TsRoleResourceVO; import com.adc.da.slrs.sarRole.service.ITsRoleService; @@ -39,6 +40,8 @@ import java.util.List; public class TsRoleController extends BaseController { @Autowired private ITsRoleService tsRoleService; + @Autowired + private TsRoleDao tsRoleDao; @ApiOperation("查询所有角色") @GetMapping @@ -95,9 +98,14 @@ public class TsRoleController extends BaseController { @ApiOperation("查询角色详情") @GetMapping("/id") public ResponseMessage getRoleById(@RequestParam String roleId){ - TsRole tsRole=tsRoleService.getById(roleId); +// TsRole tsRole=tsRoleService.getById(roleId); +// if(tsRole.getParentId()!=null){ +// TsRole parent=tsRoleService.getById(tsRole.getParentId()); +// tsRole.setParent(parent.getName()); +// } + TsRole tsRole=tsRoleDao.getAllDatas(roleId); if(tsRole.getParentId()!=null){ - TsRole parent=tsRoleService.getById(tsRole.getParentId()); + TsRole parent=tsRoleDao.getAllDatas(tsRole.getParentId()); tsRole.setParent(parent.getName()); } return Result.success(tsRole); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarRole/dao/TsRoleDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarRole/dao/TsRoleDao.java index d709188b..a6edddff 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarRole/dao/TsRoleDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarRole/dao/TsRoleDao.java @@ -99,4 +99,7 @@ public interface TsRoleDao extends BaseMapper { * @return List */ List getRootMenuIdsByRoleIds(List roleIds); + + @Select("select *,DATE_ADD(ts_role.operate_time,INTERVAL 8 HOUR) as operateTime from ts_role where ts_role.ID = #{roleId}") + TsRole getAllDatas(@Param("roleId") String roleId); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarRole/entity/TsRole.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarRole/entity/TsRole.java index a2a705b2..cd72e305 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarRole/entity/TsRole.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarRole/entity/TsRole.java @@ -69,7 +69,7 @@ public class TsRole extends BaseEntity { private String remarks; @ApiModelProperty(value = "操作时间") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss",locale = "zh") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Timestamp operateTime; @@ -89,13 +89,13 @@ public class TsRole extends BaseEntity { @ApiModelProperty(value = "创建时间") @TableField("CREATION_TIME") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Timestamp creationTime; @ApiModelProperty(value = "修改时间") @TableField("MODIFY_TIME") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Timestamp modifyTime; diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarRole/service/ITsRoleService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarRole/service/ITsRoleService.java index 4f009999..3c9910bb 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarRole/service/ITsRoleService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarRole/service/ITsRoleService.java @@ -5,6 +5,7 @@ import com.adc.da.slrs.sarRole.entity.TsRole; import com.adc.da.slrs.sarRole.entity.TsRoleMenuVO; import com.adc.da.slrs.sarRole.entity.TsRoleResourceVO; import com.baomidou.mybatisplus.extension.service.IService; +import org.apache.ibatis.annotations.Param; import java.util.List; From 9791fd13e95839fe3d7910691e50cb301548ee00 Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Fri, 7 Jan 2022 17:10:21 +0800 Subject: [PATCH 055/116] =?UTF-8?q?=E4=BC=81=E6=A0=87=E9=AB=98=E7=BA=A7?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SarBussionessStandController.java | 28 +++++++++++++++++++ .../SarStandardsInfoController.java | 6 ++-- .../da/utils/util/SarAdvanceSearchUtil.java | 3 +- 3 files changed, 32 insertions(+), 5 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/controller/SarBussionessStandController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/controller/SarBussionessStandController.java index 3270c493..8cd3b549 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/controller/SarBussionessStandController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/controller/SarBussionessStandController.java @@ -281,5 +281,33 @@ public class SarBussionessStandController extends BaseController> getSarBussionStandPageQd(SarBussionessStandEOPage page) throws Exception { + if (StringUtils.isNotBlank(page.getAdvanceSearchVOStr())) { + List searchList = JSONObject.parseArray(page.getAdvanceSearchVOStr(),SarAdvanceSearchVO.class); + String advanceStr = SarAdvanceSearchUtil.createStandSql(searchList,"SAR_BUSS_STAND_ATTR_INFO"); + if (StringUtils.isNotBlank(advanceStr)) { + page.setAdvanceSearchStr(advanceStr); + } else { + page.setAdvanceSearchStr(null); + } + } + if(page.getUserId() == null || page.getUserId().equals("")){ + page.setUserId(LoginUserUtil.getUserId()); + } + + if (null != page.getNowOrderBy()) { + nowOrderFunc(page); + } + List rows = sarBussionessStandEOService.getSarBussionStandPage(page); + return Result.success(getPageInfo(page.getPager(), rows)); + } + } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java index b94c7bbf..c670d718 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java @@ -99,7 +99,7 @@ public class SarStandardsInfoController extends BaseController if (StringUtils.isNotBlank(page.getAdvanceSearchVOStr())) { List searchList = JSONObject.parseArray(page.getAdvanceSearchVOStr(),SarAdvanceSearchVO.class); - String advanceStr = SarAdvanceSearchUtil.createStandSql(searchList); + String advanceStr = SarAdvanceSearchUtil.createStandSql(searchList,"SAR_STAND_ATTR_INFO"); if (StringUtils.isNotBlank(advanceStr)) { page.setAdvanceSearchStr(advanceStr); } else { @@ -137,7 +137,7 @@ public class SarStandardsInfoController extends BaseController if (StringUtils.isNotBlank(page.getAdvanceSearchVOStr())) { List searchList = JSONObject.parseArray(page.getAdvanceSearchVOStr(),SarAdvanceSearchVO.class); - String advanceStr = SarAdvanceSearchUtil.createStandSql(searchList); + String advanceStr = SarAdvanceSearchUtil.createStandSql(searchList,"SAR_STAND_ATTR_INFO"); if (StringUtils.isNotBlank(advanceStr)) { page.setAdvanceSearchStr(advanceStr); } else { @@ -216,7 +216,7 @@ public class SarStandardsInfoController extends BaseController if (StringUtils.isNotBlank(page.getAdvanceSearchVOStr())) { List searchList = JSONObject.parseArray(page.getAdvanceSearchVOStr(),SarAdvanceSearchVO.class); - String advanceStr = SarAdvanceSearchUtil.createStandSql(searchList); + String advanceStr = SarAdvanceSearchUtil.createStandSql(searchList,"SAR_STAND_ATTR_INFO"); if (StringUtils.isNotBlank(advanceStr)) { page.setAdvanceSearchStr(advanceStr); } else { diff --git a/adc-da-slrs/src/main/java/com/adc/da/utils/util/SarAdvanceSearchUtil.java b/adc-da-slrs/src/main/java/com/adc/da/utils/util/SarAdvanceSearchUtil.java index 72b2f6bc..9a090ca9 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/utils/util/SarAdvanceSearchUtil.java +++ b/adc-da-slrs/src/main/java/com/adc/da/utils/util/SarAdvanceSearchUtil.java @@ -85,9 +85,8 @@ public class SarAdvanceSearchUtil { * @param searchVOList * @return */ - public static String createStandSql(List searchVOList) { + public static String createStandSql(List searchVOList,String tableName) { String sqlInfo = ""; - String tableName="SAR_STAND_ATTR_INFO."; StringBuilder sqlBuilder = new StringBuilder(); if (searchVOList != null && !searchVOList.isEmpty()) { From 5f67b22e7c26338d326addf5f9d104d6d62f6141 Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Fri, 7 Jan 2022 17:16:32 +0800 Subject: [PATCH 056/116] =?UTF-8?q?=E6=9D=A1=E6=AC=BE=E6=AF=94=E5=AF=B9?= =?UTF-8?q?=E5=87=BA=E7=8E=B0=E6=AF=94=E5=AF=B9=E5=AE=8C=E6=88=90=E7=8A=B6?= =?UTF-8?q?=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/SarStandCompareHisEOServiceImpl.java | 5 +++++ .../mapper/standardSplit/SarStandCompareHisEOMapper.xml | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) 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 937dd5e1..296adee2 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 @@ -243,6 +243,10 @@ public class SarStandCompareHisEOServiceImpl implements SarStandCompareHisEOServ sarItemsCompareHisEO.setCreateTime(new Date()); sarItemsCompareHisEOService.insertSelective(sarItemsCompareHisEO); } + SarStandCompareHisEO sarStandCompareHisEO =new SarStandCompareHisEO(); + sarStandCompareHisEO.setId(standHisId); + sarStandCompareHisEO.setCompareStatus("比对完成"); + sarStandCompareHisEODao.updateByPrimaryKeySelective(sarStandCompareHisEO); return resultMap; } @@ -377,6 +381,7 @@ public class SarStandCompareHisEOServiceImpl implements SarStandCompareHisEOServ sarItemsCompareHisEO.setCreateTime(new Date()); sarItemsCompareHisEOService.insertSelective(sarItemsCompareHisEO); } + return resultMap; } @Async diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/standardSplit/SarStandCompareHisEOMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/standardSplit/SarStandCompareHisEOMapper.xml index 430e0e6c..ae5b1047 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/standardSplit/SarStandCompareHisEOMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/standardSplit/SarStandCompareHisEOMapper.xml @@ -258,7 +258,7 @@ - select from (select tmp_tb.* from (select from SAR_STAND_COMPARE_HIS From 557a9f756c4fcaab43dee09d6fa302fdd50f29db Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Mon, 10 Jan 2022 12:49:56 +0800 Subject: [PATCH 057/116] =?UTF-8?q?=E9=A2=84=E8=AD=A6=E5=AD=98=E5=85=A5?= =?UTF-8?q?=E6=97=A5=E6=9C=9F=E8=A1=A8=E7=9A=84=E6=95=B0=E6=8D=AE=E5=BA=94?= =?UTF-8?q?=E8=AF=A5=E5=9C=A8=E9=A2=84=E8=AD=A6=E6=9C=9F=E9=99=90=E5=86=85?= =?UTF-8?q?,=E6=9F=A5=E8=AF=A2=E9=A2=84=E8=AD=A6=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E6=97=B6=E5=B7=B2=E9=80=BB=E8=BE=91=E5=88=A0=E9=99=A4=E7=9A=84?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E4=B8=8D=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/adc/da/scheduled/ScheduledJob.java | 2 +- .../mybatis/mapper/sarStandWarning/EarlyWraningEOMapper.xml | 2 ++ 2 files changed, 3 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 9424c392..d5e3f78d 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 @@ -130,7 +130,7 @@ public class ScheduledJob { for (String s : item.getSSRQ().split(",")) { - String pattern = "^\\d{4}-\\d{1,2}-\\d{1,2}$"; + String pattern = term.getTermStr(); Pattern r = Pattern.compile(pattern); Matcher m = r.matcher(s); diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandWarning/EarlyWraningEOMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandWarning/EarlyWraningEOMapper.xml index e8abcc3b..df21aa40 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandWarning/EarlyWraningEOMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandWarning/EarlyWraningEOMapper.xml @@ -205,6 +205,7 @@ POWER = '1' AND (MARK = 'stand') + AND sarInfo.VALID_FLAG='0' AND attr.CLLX LIKE CONCAT('%', #{waringEO.applyType},'%') @@ -249,6 +250,7 @@ POWER = '1' AND (MARK = 'item') + AND sarInfo.VALID_FLAG='0' AND items.APPLY_ARCTIC LIKE CONCAT('%', #{waringEO.applyType},'%') From fbde67fd7ff673209f5276a05e535cef1e01e98c Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Mon, 10 Jan 2022 17:27:09 +0800 Subject: [PATCH 058/116] =?UTF-8?q?=E5=BE=81=E6=B1=82=E6=84=8F=E8=A7=81?= =?UTF-8?q?=E6=B5=81=E7=A8=8B=E5=86=85=E9=83=A8=E5=AF=BC=E5=87=BA=20bug?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/adc/da/common/TableToExcel.java | 5 +++ .../SarItemsStandCompareHisEOController.java | 40 +++++++++++++++++++ .../SarBussionessStandMapper.xml | 2 +- 3 files changed, 46 insertions(+), 1 deletion(-) create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/controller/SarItemsStandCompareHisEOController.java diff --git a/adc-da-activiti/src/main/java/com/adc/da/common/TableToExcel.java b/adc-da-activiti/src/main/java/com/adc/da/common/TableToExcel.java index ff511b51..ad1dec71 100644 --- a/adc-da-activiti/src/main/java/com/adc/da/common/TableToExcel.java +++ b/adc-da-activiti/src/main/java/com/adc/da/common/TableToExcel.java @@ -39,6 +39,7 @@ public class TableToExcel { sheet.addMergedRegion(new CellRangeAddress(0,1,5,5)); sheet.addMergedRegion(new CellRangeAddress(0,1,6,6)); sheet.addMergedRegion(new CellRangeAddress(0,1,7,7)); + sheet.addMergedRegion(new CellRangeAddress(0,1,8,8)); //生成表头行 int j=0; @@ -75,6 +76,10 @@ public class TableToExcel { Cell nCell1 = neckRow.createCell(4); nCell1.setCellValue("修改理由"); } + if (null!=columnMap.get("cause")) { + Cell nCell1 = headRow.createCell(8); + nCell1.setCellValue("原因"); + } //从第三行开始填充数据 diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/controller/SarItemsStandCompareHisEOController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/controller/SarItemsStandCompareHisEOController.java new file mode 100644 index 00000000..cacf6ca4 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/controller/SarItemsStandCompareHisEOController.java @@ -0,0 +1,40 @@ +package com.adc.da.slrs.standardSplit.controller; + +import com.adc.da.base.web.BaseController; +import com.adc.da.http.PageInfo; +import com.adc.da.slrs.standardSplit.dao.SarItemsCompareHisEODao; +import com.adc.da.slrs.standardSplit.entity.SarItemsCompareHisEO; +import com.adc.da.slrs.standardSplit.entity.SarStandItemsCompareHisEO; +import com.adc.da.slrs.standardSplit.entity.SarStandItemsCompareHisEOPage; +import com.adc.da.slrs.standardSplit.service.SarItemsCompareHisEOService; +import com.adc.da.util.http.ResponseMessage; +import com.adc.da.util.http.Result; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import java.util.*; +@RestController +@RequestMapping("/${restPath}/lawss/sarItemsCompareHis") +@Api(description = "|SarStandItemsCompareHisEO|") +public class SarItemsStandCompareHisEOController extends BaseController { + + private static final Logger logger = LoggerFactory.getLogger(SarItemsStandCompareHisEOController.class); + + @Autowired + private SarItemsCompareHisEODao sarItemsCompareHisEOService; + + @ApiOperation(value = "|SarStandItemsCompareHisEO|分页查询") + @GetMapping("/page") + public ResponseMessage> page(SarStandItemsCompareHisEOPage page) throws Exception { + QueryWrapper queryWrapper=new QueryWrapper<>(); + queryWrapper.eq("STAND_HIS_ID",page.getStandHisId()); + List rows = sarItemsCompareHisEOService.selectList(queryWrapper); + return Result.success(getPageInfo(page.getPager(), rows)); + } + + +} diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStand/SarBussionessStandMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStand/SarBussionessStandMapper.xml index bc5ebed9..396482be 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStand/SarBussionessStandMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStand/SarBussionessStandMapper.xml @@ -55,7 +55,7 @@ stand_status, replaced_stand_num, replace_stand_num,put_time, - issue_time, stand_en_name, stand_name, stand_code,standStatusShow, + issue_time, stand_en_name, stand_name, stand_code,stand_status, SAR_BUSSIONESS_STAND.id From 7594824a7616f87d791b16dfcdbeb16db74c1866 Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Mon, 10 Jan 2022 17:54:37 +0800 Subject: [PATCH 059/116] =?UTF-8?q?=E4=BC=81=E6=A0=87=E6=97=A5=E6=9C=9F?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SarBussionessStandController.java | 2 +- .../entity/SarBussionessStandEOPage.java | 40 +++++++++++++++++++ .../da/utils/util/SarAdvanceSearchUtil.java | 3 +- .../SarBussionessStandMapper.xml | 20 +++++++++- 4 files changed, 62 insertions(+), 3 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/controller/SarBussionessStandController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/controller/SarBussionessStandController.java index 8cd3b549..89d52e3c 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/controller/SarBussionessStandController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/controller/SarBussionessStandController.java @@ -232,7 +232,7 @@ public class SarBussionessStandController extends BaseController> getSarBussionStandPage(SarBussionessStandEOPage page) throws Exception { if (StringUtils.isNotBlank(page.getAdvanceSearchVOStr())) { List searchList = JSONObject.parseArray(page.getAdvanceSearchVOStr(),SarAdvanceSearchVO.class); - String advanceStr = SarAdvanceSearchUtil.createSql(searchList,"SAR_BUSS_STAND_ATTR_INFO"); + String advanceStr = SarAdvanceSearchUtil.createStandSql(searchList,"SAR_BUSS_STAND_ATTR_INFO"); if (StringUtils.isNotBlank(advanceStr)) { page.setAdvanceSearchStr(advanceStr); } else { diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/entity/SarBussionessStandEOPage.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/entity/SarBussionessStandEOPage.java index 0fc3aec2..ba950ca9 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/entity/SarBussionessStandEOPage.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/entity/SarBussionessStandEOPage.java @@ -22,6 +22,13 @@ public class SarBussionessStandEOPage extends BasePage { this.textStatusBuss = textStatusBuss; } + private String startIssueTime; + private String endIssueTime; + private String startPutTime; + private String endPutTime; + + + private String modifyTime; private String modifyTime1; private String modifyTime2; @@ -1130,4 +1137,37 @@ public class SarBussionessStandEOPage extends BasePage { public void setSql(String sql) { this.sql = sql; } + + public String getStartIssueTime() { + return startIssueTime; + } + + public void setStartIssueTime(String startIssueTime) { + this.startIssueTime = startIssueTime; + } + + public String getEndIssueTime() { + return endIssueTime; + } + + public void setEndIssueTime(String endIssueTime) { + this.endIssueTime = endIssueTime; + } + + + public String getStartPutTime() { + return startPutTime; + } + + public void setStartPutTime(String startPutTime) { + this.startPutTime = startPutTime; + } + + public String getEndPutTime() { + return endPutTime; + } + + public void setEndPutTime(String endPutTime) { + this.endPutTime = endPutTime; + } } diff --git a/adc-da-slrs/src/main/java/com/adc/da/utils/util/SarAdvanceSearchUtil.java b/adc-da-slrs/src/main/java/com/adc/da/utils/util/SarAdvanceSearchUtil.java index 9a090ca9..1b872090 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/utils/util/SarAdvanceSearchUtil.java +++ b/adc-da-slrs/src/main/java/com/adc/da/utils/util/SarAdvanceSearchUtil.java @@ -81,11 +81,12 @@ public class SarAdvanceSearchUtil { /** - * 国内外标准高级查询 对SAR_STAND_ATTR_INFO表自定义字段生成条件语句 + * 国内外标准高级查询 对tableName表自定义字段生成条件语句 * @param searchVOList * @return */ public static String createStandSql(List searchVOList,String tableName) { + tableName=tableName+"."; String sqlInfo = ""; StringBuilder sqlBuilder = new StringBuilder(); if (searchVOList != null && !searchVOList.isEmpty()) { diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStand/SarBussionessStandMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStand/SarBussionessStandMapper.xml index 982af830..32e525f5 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStand/SarBussionessStandMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStand/SarBussionessStandMapper.xml @@ -465,9 +465,27 @@ and DATE_FORMAT(issue_time,'%Y-%m-%D') >= #{issueTime1} - -- and to_char(issue_time,'YYYY-MM-DD') <= #{issueTime2} and DATE_FORMAT(issue_time,'%Y-%m-%D') <= #{issueTime2} + + + + + and DATE_FORMAT(put_time,'%Y-%m-%d') >= #{startPutTime} + + + and DATE_FORMAT(put_time,'%Y-%m-%d') <= #{endPutTime} + + + and DATE_FORMAT(issue_time,'%Y-%m-%d') >= #{startIssueTime} + + + and DATE_FORMAT(issue_time,'%Y-%m-%d') <= #{endIssueTime} + + + + + and SAR_BUSS_STAND_MENU.MENU_ID in From 596528bcbf49aaa627fb092050f3373c0c3ddd95 Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Mon, 10 Jan 2022 18:10:09 +0800 Subject: [PATCH 060/116] =?UTF-8?q?=E5=85=AC=E5=BC=80=E5=BE=81=E6=B1=82?= =?UTF-8?q?=E6=84=8F=E8=A7=81=E6=A8=A1=E5=9D=97=E5=AF=BC=E5=87=BA=E4=B8=8A?= =?UTF-8?q?=E6=8A=A5=E6=84=8F=E8=A7=81=E5=8A=9F=E8=83=BD=20=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/SarPublicIdeaAllController.java | 11 +++++++++++ .../adc/da/slrs/sarStandIdea/entity/GetExcelDto2.java | 2 ++ .../da/slrs/sarStandIdea/entity/SarPublicIdeaAll.java | 3 +++ .../mapper/sarStandIdea/SarPublicIdeaAllMapper.xml | 9 +++++---- 4 files changed, 21 insertions(+), 4 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/controller/SarPublicIdeaAllController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/controller/SarPublicIdeaAllController.java index 82fb5ece..f1d5d28a 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/controller/SarPublicIdeaAllController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/controller/SarPublicIdeaAllController.java @@ -84,6 +84,15 @@ public class SarPublicIdeaAllController extends BaseController } + + @ApiOperation(value = "增加意见") + @PostMapping("/saveBatchByWk") + public ResponseMessage saveBatchByWk(@RequestBody List sar){ + boolean flag=sarPublicIdeaAllImpl.saveOrUpdateBatch(sar); + return Result.success("200",flag); + + } + @ApiOperation(value = "删除意见") @GetMapping("/deleteStand") public ResponseMessage deleteStand(DelStandDto delStandDto){ @@ -136,6 +145,7 @@ public class SarPublicIdeaAllController extends BaseController .userName(sarPublicIdeaAll.getUserName()) .deptName(sarPublicIdeaAll.getDeptName()) .state(map.get(sarPublicIdeaAll.getState())) + .cause(sarPublicIdeaAll.getCause()) .build(); standExcel2.add(getExcelDto); }else { @@ -160,6 +170,7 @@ public class SarPublicIdeaAllController extends BaseController headList.add(Lists.newArrayList("提出人")); if ("1".equals(type)){ headList.add(Lists.newArrayList("处理意见")); + headList.add(Lists.newArrayList("原因")); } if ("1".equals(type)) { EasyExcel.write(response.getOutputStream(), GetExcelDto2.class).head(headList).autoCloseStream(Boolean.FALSE).sheet("sheet1") diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/entity/GetExcelDto2.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/entity/GetExcelDto2.java index 6d2b104d..fc79bf30 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/entity/GetExcelDto2.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/entity/GetExcelDto2.java @@ -37,6 +37,8 @@ public class GetExcelDto2 { private String state; + private String cause; + } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/entity/SarPublicIdeaAll.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/entity/SarPublicIdeaAll.java index 72cfc5f8..589fb322 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/entity/SarPublicIdeaAll.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/entity/SarPublicIdeaAll.java @@ -75,4 +75,7 @@ public class SarPublicIdeaAll extends BaseEntity { @TableField("state") private String state; + @TableField("cause") + private String cause; + } diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandIdea/SarPublicIdeaAllMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandIdea/SarPublicIdeaAllMapper.xml index a9f5c8c2..a55a303a 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandIdea/SarPublicIdeaAllMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandIdea/SarPublicIdeaAllMapper.xml @@ -6,7 +6,7 @@ SELECT sar_public_idea_all.id,sar_public_idea_all.reason,ts_institution.name as dept_name,ts_institution.name as department,sar_public_idea_all.old_text, sar_public_idea_all.new_text,ts_user.INSTITUTION_ID as dept_id,sar_public_idea_all.part_code,sar_public_idea_all.user_name, sar_public_idea_all.user_id,sar_public_idea_all.content,sar_public_idea_all.idea_id,sar_public_idea_all.cid, - sar_public_idea_all.chapter_name as chapterName,sar_public_idea_all.wk_flag + sar_public_idea_all.chapter_name as chapterName,sar_public_idea_all.wk_flag,sar_public_idea_all.cause FROM sar_public_idea INNER JOIN sar_public_idea_all on sar_public_idea_all.idea_id = sar_public_idea.id left join ts_user on ts_user.USID = sar_public_idea_all.user_id @@ -17,7 +17,8 @@ From c4a40c59cb78977d8bad49a043b34980163d59e4 Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Tue, 11 Jan 2022 10:51:35 +0800 Subject: [PATCH 064/116] =?UTF-8?q?=E6=B8=85=E5=8D=95=E4=B8=AD=E7=9A=84?= =?UTF-8?q?=E4=BC=81=E6=A0=87=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/ISarBussionessStandService.java | 2 ++ .../impl/SarBussionessStandServiceImpl.java | 29 +++++++++++++++++++ 2 files changed, 31 insertions(+) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/ISarBussionessStandService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/ISarBussionessStandService.java index 39fa8d65..86b53c95 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/ISarBussionessStandService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/ISarBussionessStandService.java @@ -39,5 +39,7 @@ public interface ISarBussionessStandService extends IService List queryByList(SarBussionessStandEOPage sarBussionessStandEOPage); List getSarBussionStandPage(SarBussionessStandEOPage page) throws Exception; + + List getSarBussionStandPageQd(SarBussionessStandEOPage page) throws Exception; } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java index 880511a5..34a7be62 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java @@ -911,6 +911,35 @@ public class SarBussionessStandServiceImpl extends ServiceImpl getSarBussionStandPageQd(SarBussionessStandEOPage page) throws Exception { + //查询当前登录人角色拥有权限的菜单 + if(page.getMenuId() != null && page.getUserId() != null && StringUtils.isNotBlank(page.getUserId())){ + QueryWrapper qw = new QueryWrapper<>(); + qw.eq("ID",page.getMenuId()); + qw.isNull("PARENT_ID"); + List children = iTsResourceService.list(qw); + if(children.isEmpty() && !page.getMenuId().equals("nomenu")){ + List getMenuIdList = tsUserService.getResourceUserId(page.getUserId()); + if (getMenuIdList != null && !getMenuIdList.isEmpty()) { + page.setMenuRoleList(getMenuIdList); + } else { + page.setMenuRoleList(null); + } + List ids = iTsResourceService.getChildMenuList(page.getMenuId()); + if (ids != null && !ids.isEmpty()) { + page.setMenuAllChildrenIdList(ids); + } + } + } + + Integer rowCount = this.baseMapper.getBussionessStandInfoCount(page); + page.getPager().setRowCount(rowCount); + List sarlist = this.baseMapper.getBussionessStandInfoPage(page); + attrInfo(sarlist); + return sarlist; + } /*** * @Description: 处理属性表数据 * @Param: [sarlist] From 914d2c3d067daa52728e8dd963f1dc54868e07bd Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Tue, 11 Jan 2022 11:08:14 +0800 Subject: [PATCH 065/116] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E4=BC=9A=E5=90=8E?= =?UTF-8?q?=E6=B5=81=E7=A8=8B=20=E4=B8=80=E5=B0=8F=E6=97=B6=E5=8F=91?= =?UTF-8?q?=E8=B5=B7=E4=B8=80=E6=AC=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/adc/da/Timer/ProcessTimer.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/adc-da-activiti/src/main/java/com/adc/da/Timer/ProcessTimer.java b/adc-da-activiti/src/main/java/com/adc/da/Timer/ProcessTimer.java index f37f251e..b050bba0 100644 --- a/adc-da-activiti/src/main/java/com/adc/da/Timer/ProcessTimer.java +++ b/adc-da-activiti/src/main/java/com/adc/da/Timer/ProcessTimer.java @@ -186,7 +186,8 @@ public class ProcessTimer { } } - @Scheduled(cron = "0 0 10 * * ? ")//每天十点执行 +// @Scheduled(cron = "0 0 10 * * ? ")//每天十点执行 + @Scheduled(cron = "0 0 * * * ？ ")//每天十点执行 // @Scheduled(cron = "*/40 * * * * ? ")//20s public void everyDayTenOlockScanSAM() { List busProcessNews=new ArrayList<>(); From b4d36e8888d5232c9598f82d29887b595d827fa3 Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Tue, 11 Jan 2022 14:05:00 +0800 Subject: [PATCH 066/116] =?UTF-8?q?=E4=BC=9A=E8=AE=AE=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E4=BF=AE=E6=94=B9bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/adc/da/Timer/ProcessTimer.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/adc-da-activiti/src/main/java/com/adc/da/Timer/ProcessTimer.java b/adc-da-activiti/src/main/java/com/adc/da/Timer/ProcessTimer.java index b050bba0..f65560b7 100644 --- a/adc-da-activiti/src/main/java/com/adc/da/Timer/ProcessTimer.java +++ b/adc-da-activiti/src/main/java/com/adc/da/Timer/ProcessTimer.java @@ -187,7 +187,7 @@ public class ProcessTimer { } // @Scheduled(cron = "0 0 10 * * ? ")//每天十点执行 - @Scheduled(cron = "0 0 * * * ？ ")//每天十点执行 + @Scheduled(cron = "*/60 * * * *")//每天十点执行 // @Scheduled(cron = "*/40 * * * * ? ")//20s public void everyDayTenOlockScanSAM() { List busProcessNews=new ArrayList<>(); From b26de7b09b1f6f339c993449e3c5ca9a7fe632cd Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Tue, 11 Jan 2022 14:12:30 +0800 Subject: [PATCH 067/116] =?UTF-8?q?=E4=BC=9A=E8=AE=AE=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E4=BF=AE=E6=94=B9bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/adc/da/Timer/ProcessTimer.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/adc-da-activiti/src/main/java/com/adc/da/Timer/ProcessTimer.java b/adc-da-activiti/src/main/java/com/adc/da/Timer/ProcessTimer.java index f65560b7..428670ac 100644 --- a/adc-da-activiti/src/main/java/com/adc/da/Timer/ProcessTimer.java +++ b/adc-da-activiti/src/main/java/com/adc/da/Timer/ProcessTimer.java @@ -187,7 +187,7 @@ public class ProcessTimer { } // @Scheduled(cron = "0 0 10 * * ? ")//每天十点执行 - @Scheduled(cron = "*/60 * * * *")//每天十点执行 + @Scheduled(cron = "0 0 0/1 * * ? ")//每天十点执行 // @Scheduled(cron = "*/40 * * * * ? ")//20s public void everyDayTenOlockScanSAM() { List busProcessNews=new ArrayList<>(); From 654e7e8127ec0af3f5657afa998bd72c9e26254d Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Tue, 11 Jan 2022 15:35:59 +0800 Subject: [PATCH 068/116] =?UTF-8?q?=E5=BE=81=E6=B1=82=E6=84=8F=E8=A7=81?= =?UTF-8?q?=E6=B5=81=E7=A8=8B=E8=87=AA=E5=8A=A8=E5=8F=91=E8=B5=B7=E6=97=A5?= =?UTF-8?q?=E6=9C=9F=E5=8A=A0=E4=B8=80=E5=A4=A9=E9=97=AE=E9=A2=98=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/SarPublicIdeaController.java | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/controller/SarPublicIdeaController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/controller/SarPublicIdeaController.java index a56520f0..e447f216 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/controller/SarPublicIdeaController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/controller/SarPublicIdeaController.java @@ -69,15 +69,15 @@ public class SarPublicIdeaController extends BaseController { @PostMapping("/addSarPublicIdea") public ResponseMessage addSarPublicIdea(@RequestBody SarPublicIdea sarPublicIdea){ try{ - Calendar c = Calendar.getInstance(); - c.setTime(sarPublicIdea.getStartTime()); - c.add(Calendar.DAY_OF_MONTH, 1);// 今天+1天 - sarPublicIdea.setStartTime(c.getTime()); - - Calendar c2 = Calendar.getInstance(); - c2.setTime(sarPublicIdea.getEndTime()); - c2.add(Calendar.DAY_OF_MONTH, 2);// 今天+1天 - sarPublicIdea.setEndTime(c2.getTime()); +// Calendar c = Calendar.getInstance(); +// c.setTime(sarPublicIdea.getStartTime()); +// c.add(Calendar.DAY_OF_MONTH, 1);// 今天+1天 +// sarPublicIdea.setStartTime(c.getTime()); +// +// Calendar c2 = Calendar.getInstance(); +// c2.setTime(sarPublicIdea.getEndTime()); +// c2.add(Calendar.DAY_OF_MONTH, 2);// 今天+1天 +// sarPublicIdea.setEndTime(c2.getTime()); sarPublicIdeaService.save(sarPublicIdea); }catch(Exception e){ From 8a9971c046b44b31a50e8b2afeda04e65fa28754 Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Tue, 11 Jan 2022 22:27:36 +0800 Subject: [PATCH 069/116] =?UTF-8?q?=E9=A2=84=E8=AD=A6=20=E5=8F=91=E5=B8=83?= =?UTF-8?q?=E6=97=A5=E6=9C=9F=E6=9F=A5=E8=AF=A2=E4=B8=8E=E5=9B=9E=E6=98=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sarStandWarning/entity/StandWarningEO.java | 4 ++-- .../sarStandWarning/EarlyWraningEOMapper.xml | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/entity/StandWarningEO.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/entity/StandWarningEO.java index b1604d9a..26ebd22c 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/entity/StandWarningEO.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/entity/StandWarningEO.java @@ -83,10 +83,10 @@ public class StandWarningEO extends EarlyWarningEO { @ExcelIgnore @ApiModelProperty("范围查询发布日期开始") @DateTimeFormat(pattern = "YYYY-MM-dd") - private String startPutTime; + private String startIssueTime; @ExcelIgnore @ApiModelProperty("范围查询发布日期结束") @DateTimeFormat(pattern = "YYYY-MM-dd") - private String endPutTime; + private String endIssueTime; } diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandWarning/EarlyWraningEOMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandWarning/EarlyWraningEOMapper.xml index 494904e7..c84d8a60 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandWarning/EarlyWraningEOMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandWarning/EarlyWraningEOMapper.xml @@ -9,7 +9,7 @@ - + @@ -31,7 +31,7 @@ sarInfo.STAND_TYPE, CONCAT(sarInfo.STAND_SORT,' ',sarInfo.STAND_NUMBER,'-',sarInfo.STAND_YEAR) AS STAND_CODE, sarInfo.STAND_NAME, - sarInfo.PUT_TIME, + sarInfo.ISSUE_TIME, attr.SSRQ as SSRQ @@ -50,15 +50,15 @@ AND sarInfo.STAND_NAME like concat('%', #{waringEO.standName},'%') - + AND ( - DATE_FORMAT(sarInfo.PUT_TIME, '%Y-%m-%d') >= DATE_FORMAT( - #{waringEO.endPutTime}, + DATE_FORMAT(sarInfo.ISSUE_TIME, '%Y-%m-%d') >= DATE_FORMAT( + #{waringEO.startIssueTime}, '%Y-%m-%d' ) AND - DATE_FORMAT( sarInfo.PUT_TIME, '%Y-%m-%d') <= DATE_FORMAT( - #{waringEO.endPutTime}, + DATE_FORMAT( sarInfo.ISSUE_TIME, '%Y-%m-%d') <= DATE_FORMAT( + #{waringEO.endIssueTime}, '%Y-%m-%d' ) ) @@ -79,7 +79,7 @@ sarInfo.STAND_TYPE, CONCAT(sarInfo.STAND_SORT,' ',sarInfo.STAND_NUMBER,'-',sarInfo.STAND_YEAR) AS STAND_CODE, sarInfo.STAND_NAME, - sarInfo.PUT_TIME, + sarInfo.ISSUE_TIME, attr.SSRQ as SSRQ, case stand_type when 'INLAND' then '国内标准' From d4ef4e3477ba2625a9ad8aa542e5c11f9e4bcf14 Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Tue, 11 Jan 2022 22:33:28 +0800 Subject: [PATCH 070/116] =?UTF-8?q?=E9=A2=84=E8=AD=A6=20=E5=9C=A8=E4=BA=A7?= =?UTF-8?q?=E8=BD=A6=E5=AE=9E=E6=96=BD=E6=97=A5=E6=9C=9F=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=20=E4=BD=BF=E7=94=A8=E4=BA=86=E4=B8=A4=E4=B8=AAstartZCCSSRQ?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mybatis/mapper/sarStandWarning/EarlyWraningEOMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandWarning/EarlyWraningEOMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandWarning/EarlyWraningEOMapper.xml index c84d8a60..67b70a24 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandWarning/EarlyWraningEOMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandWarning/EarlyWraningEOMapper.xml @@ -223,7 +223,7 @@ AND ( sarInfo.ID IN (SELECT DISTINCT law_id FROM warning_date as t WHERE - DATE_FORMAT(t.SSRQ, '%Y-%m-%d') between DATE_FORMAT(#{waringEO.startZCCSSRQ}, '%Y-%m-%d') AND DATE_FORMAT(#{waringEO.startZCCSSRQ}, '%Y-%m-%d') + DATE_FORMAT(t.SSRQ, '%Y-%m-%d') between DATE_FORMAT(#{waringEO.startZCCSSRQ}, '%Y-%m-%d') AND DATE_FORMAT(#{waringEO.endZCCSSRQ}, '%Y-%m-%d') AND t.time_name = 'ZCCSSRQ' ) ) From d01ea4592dce2a2afc349dc42a858f97a97ac1f7 Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Tue, 11 Jan 2022 22:52:58 +0800 Subject: [PATCH 071/116] =?UTF-8?q?=E6=9A=82=E5=81=9C=E9=A2=84=E8=AD=A6?= =?UTF-8?q?=E5=AE=9A=E6=97=B6=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 | 2 +- 1 file changed, 1 insertion(+), 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 d5e3f78d..586a8736 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 @@ -71,7 +71,7 @@ public class ScheduledJob { private IWarningDateService iWarningDateService;// 预警日期 // @PostConstruct //程序启动时执行一次 - @Scheduled(cron = "0 0 0 * * ?") //每天的凌晨0点执行 +// @Scheduled(cron = "0 0 0 * * ?") //每天的凌晨0点执行 // @Scheduled(cron="*/5 * * * * ?") // @Scheduled(fixedDelay = 120000) @Async From fed0b3dc858cd0bdd9541d870bc83bf8af646228 Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Wed, 12 Jan 2022 10:20:28 +0800 Subject: [PATCH 072/116] =?UTF-8?q?=E5=85=AC=E5=BC=80=E5=BE=81=E6=B1=82?= =?UTF-8?q?=E6=84=8F=E8=A7=81=20=E5=AF=BC=E5=87=BA=20bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sarStandIdea/controller/SarPublicIdeaAllController.java | 6 +++--- .../com/adc/da/slrs/sarStandIdea/entity/GetExcelDto.java | 2 ++ 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/controller/SarPublicIdeaAllController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/controller/SarPublicIdeaAllController.java index fcd93676..33e28534 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/controller/SarPublicIdeaAllController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/controller/SarPublicIdeaAllController.java @@ -123,6 +123,7 @@ public class SarPublicIdeaAllController extends BaseController Map map=new HashMap<>(); map.put("1","上报"); map.put("2","处理后上报"); + map.put("3","不上报"); String fileName = URLEncoder.encode(textName, "UTF-8").replaceAll("\\+", "%20"); response.setHeader("Content-disposition", "attachment;filename*=utf-8''" + fileName + ".xlsx"); List data=new ArrayList<>(); @@ -156,6 +157,7 @@ public class SarPublicIdeaAllController extends BaseController .reason(sarPublicIdeaAll.getReason()) .userName(sarPublicIdeaAll.getUserName()) .deptName(sarPublicIdeaAll.getDeptName()) + .state(map.get(sarPublicIdeaAll.getState())) .cause(sarPublicIdeaAll.getCause()) .build(); standExcel.add(getExcelDto); @@ -169,9 +171,7 @@ public class SarPublicIdeaAllController extends BaseController headList.add(Lists.newArrayList("修改意见内容(包括理由或依据)","修改理由")); headList.add(Lists.newArrayList("提出部门")); headList.add(Lists.newArrayList("提出人")); - if ("1".equals(type)){ - headList.add(Lists.newArrayList("处理意见")); - } + headList.add(Lists.newArrayList("处理意见")); headList.add(Lists.newArrayList("原因")); if ("1".equals(type)) { EasyExcel.write(response.getOutputStream(), GetExcelDto2.class).head(headList).autoCloseStream(Boolean.FALSE).sheet("sheet1") diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/entity/GetExcelDto.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/entity/GetExcelDto.java index fc5a877b..505f964e 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/entity/GetExcelDto.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/entity/GetExcelDto.java @@ -38,6 +38,8 @@ public class GetExcelDto { // @ExcelProperty("提出人") private String userName; + private String state; + private String cause; From d93e9fb2ba3db1cfa2d00eddaac23124eca98b23 Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Wed, 12 Jan 2022 11:00:25 +0800 Subject: [PATCH 073/116] =?UTF-8?q?=E5=BE=81=E6=B1=82=E6=84=8F=E8=A7=81bug?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sarStandIdea/controller/SarPublicIdeaController.java | 8 ++++---- .../mapper/sarStandIdea/SarPublicIdeaAllMapper.xml | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/controller/SarPublicIdeaController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/controller/SarPublicIdeaController.java index e447f216..7b0341a6 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/controller/SarPublicIdeaController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/controller/SarPublicIdeaController.java @@ -74,10 +74,10 @@ public class SarPublicIdeaController extends BaseController { // c.add(Calendar.DAY_OF_MONTH, 1);// 今天+1天 // sarPublicIdea.setStartTime(c.getTime()); // -// Calendar c2 = Calendar.getInstance(); -// c2.setTime(sarPublicIdea.getEndTime()); -// c2.add(Calendar.DAY_OF_MONTH, 2);// 今天+1天 -// sarPublicIdea.setEndTime(c2.getTime()); + Calendar c2 = Calendar.getInstance(); + c2.setTime(sarPublicIdea.getEndTime()); + c2.add(Calendar.DAY_OF_MONTH, 2);// 今天+1天 + sarPublicIdea.setEndTime(c2.getTime()); sarPublicIdeaService.save(sarPublicIdea); }catch(Exception e){ diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandIdea/SarPublicIdeaAllMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandIdea/SarPublicIdeaAllMapper.xml index 3fe43621..94b5e2fa 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandIdea/SarPublicIdeaAllMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandIdea/SarPublicIdeaAllMapper.xml @@ -11,7 +11,7 @@ INNER JOIN sar_public_idea_all on sar_public_idea_all.idea_id = sar_public_idea.id left join ts_user on ts_user.USID = sar_public_idea_all.user_id left join ts_institution on ts_institution.id=ts_user.INSTITUTION_ID - WHERE sar_public_idea_all.idea_id IS NOT NULL and sar_public_idea.uniques = #{unique} and sar_public_idea_all.wk_flag is null + WHERE sar_public_idea_all.idea_id IS NOT NULL and sar_public_idea.uniques = #{unique} + + + From 2abdb7e2537a5e2ffd861e1e841b4656b2b2d838 Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Sat, 15 Jan 2022 17:05:11 +0800 Subject: [PATCH 088/116] =?UTF-8?q?=E5=8E=BB=E9=99=A4=E6=9C=AA=E8=A2=AB?= =?UTF-8?q?=E4=BD=BF=E7=94=A8=E7=9A=84=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/adc/da/scheduled/ScheduledJob.java | 4 ++-- 1 file changed, 2 insertions(+), 2 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 da7a421a..d837037a 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 @@ -193,9 +193,9 @@ public class ScheduledJob { logger.info("开始更新文本状态!!!"); logger.info("========================================================================================================="); logger.info("========================================================================================================="); - QueryWrapper wrapper = new QueryWrapper<>(); +// QueryWrapper wrapper = new QueryWrapper<>(); - TermDTO data = new TermDTO(LocalDate.now(), LocalDate.now()); +// TermDTO data = new TermDTO(LocalDate.now(), LocalDate.now()); /** *实施日期是当前系统时间的标准文本状态变为'现行有效' From 0136a396e072774d4f5f09b105a72cb0189e99ad Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Mon, 17 Jan 2022 15:49:31 +0800 Subject: [PATCH 089/116] =?UTF-8?q?=E9=AB=98=E7=BA=A7=E6=90=9C=E7=B4=A2adv?= =?UTF-8?q?anceVOStr=E6=97=A5=E6=9C=9F=E7=AD=89=E5=80=BC=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/adc/da/utils/util/SarAdvanceSearchUtil.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/adc-da-slrs/src/main/java/com/adc/da/utils/util/SarAdvanceSearchUtil.java b/adc-da-slrs/src/main/java/com/adc/da/utils/util/SarAdvanceSearchUtil.java index 1b872090..60a53752 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/utils/util/SarAdvanceSearchUtil.java +++ b/adc-da-slrs/src/main/java/com/adc/da/utils/util/SarAdvanceSearchUtil.java @@ -127,6 +127,14 @@ public class SarAdvanceSearchUtil { sql+=" AND "+" "+"DATE_FORMAT("+ tableName+searchVO.getField() + ",'%Y-%m-%d')"+" " + "BETWEEN" + " " +"DATE_FORMAT("+ "\'" + boundaryArray[0].replaceAll("\\s*","") + "\'" + ",'%Y-%m-%d')" +" AND "+ "DATE_FORMAT("+ "\'" + boundaryArray[1].replaceAll("\\s*","") + "\'" + ",'%Y-%m-%d')"; } break; + case "equals": + case "EQUALS": + if (i==0){ + sql+= "DATE_FORMAT("+ tableName+searchVO.getField() + ",'%Y-%m-%d')"+" " + "=" + " " +"DATE_FORMAT("+ "\'" + searchVO.getValue() + "\'" +",'%Y-%m-%d')" ; + }else { + sql+=" AND "+" "+"DATE_FORMAT("+ tableName+searchVO.getField() + ",'%Y-%m-%d')"+" " + "=" + " " +"DATE_FORMAT("+ "\'" + searchVO.getValue() + "\'" +",'%Y-%m-%d')" ; + } + break; default: } sqlBuilder.append(sql); From 70be635a9a999167ff3e6ca9e36e2d7c663d926c Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Mon, 17 Jan 2022 15:57:42 +0800 Subject: [PATCH 090/116] =?UTF-8?q?if()=E6=B2=A1=E6=9C=89=E5=A4=A7?= =?UTF-8?q?=E6=8B=AC=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../da/utils/util/SarAdvanceSearchUtil.java | 79 ++++++++++--------- 1 file changed, 40 insertions(+), 39 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/utils/util/SarAdvanceSearchUtil.java b/adc-da-slrs/src/main/java/com/adc/da/utils/util/SarAdvanceSearchUtil.java index 60a53752..b35dd3f9 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/utils/util/SarAdvanceSearchUtil.java +++ b/adc-da-slrs/src/main/java/com/adc/da/utils/util/SarAdvanceSearchUtil.java @@ -94,50 +94,51 @@ public class SarAdvanceSearchUtil { for (int i = 0; i < searchVOList.size(); i++) { String sql = ""; SarAdvanceSearchVO searchVO=searchVOList.get(i); - if (StringUtils.isNotBlank(searchVO.getValue())); + if (StringUtils.isNotBlank(searchVO.getValue())) { - - switch (searchVO.getType()){ - //多个正则查询 - case "regexp": - case "REGEXP": - if (i==0){ - sql+=tableName+searchVO.getField()+" " + "REGEXP" + " " + "\'" + searchVO.getValue().replaceAll(",","|").replaceAll("\\s*","") + "\'"; - }else { - sql+=" AND "+" "+tableName+searchVO.getField()+" " + "REGEXP" + " " +"\'"+ searchVO.getValue().replaceAll(",","|").replaceAll("\\s*","") + "\'" ; - } - break; + switch (searchVO.getType()) { + //多个正则查询 + case "regexp": + case "REGEXP": + if (i == 0) { + sql += tableName + searchVO.getField() + " " + "REGEXP" + " " + "\'" + searchVO.getValue().replaceAll(",", "|").replaceAll("\\s*", "") + "\'"; + } else { + sql += " AND " + " " + tableName + searchVO.getField() + " " + "REGEXP" + " " + "\'" + searchVO.getValue().replaceAll(",", "|").replaceAll("\\s*", "") + "\'"; + } + break; //模糊查询 - case "LIKE": - case "like": - if (i==0){ - sql+=tableName+searchVO.getField()+" " + "LIKE" + " " + "concat(concat('%','" +searchVO.getValue() + "'),'%') "; - }else { - sql+=" AND "+" "+tableName+searchVO.getField()+" " +"LIKE" + " " + "concat(concat('%','" +searchVO.getValue() + "'),'%') "; - } - break; + case "LIKE": + case "like": + if (i == 0) { + sql += tableName + searchVO.getField() + " " + "LIKE" + " " + "concat(concat('%','" + searchVO.getValue() + "'),'%') "; + } else { + sql += " AND " + " " + tableName + searchVO.getField() + " " + "LIKE" + " " + "concat(concat('%','" + searchVO.getValue() + "'),'%') "; + } + break; //日期范围查询 - case "between": - case "BETWEEN": - String[] boundaryArray = searchVO.getValue().split(","); - if (i==0){ - sql+= "DATE_FORMAT("+ tableName+searchVO.getField() + ",'%Y-%m-%d')"+" " + "BETWEEN" + " " +"DATE_FORMAT("+ "\'" + boundaryArray[0].replaceAll("\\s*","") + "\'" +",'%Y-%m-%d')" +" AND "+ "DATE_FORMAT("+ "\'" + boundaryArray[1].replaceAll("\\s*","") + "\'" + ",'%Y-%m-%d')"; - }else { - sql+=" AND "+" "+"DATE_FORMAT("+ tableName+searchVO.getField() + ",'%Y-%m-%d')"+" " + "BETWEEN" + " " +"DATE_FORMAT("+ "\'" + boundaryArray[0].replaceAll("\\s*","") + "\'" + ",'%Y-%m-%d')" +" AND "+ "DATE_FORMAT("+ "\'" + boundaryArray[1].replaceAll("\\s*","") + "\'" + ",'%Y-%m-%d')"; - } - break; - case "equals": - case "EQUALS": - if (i==0){ - sql+= "DATE_FORMAT("+ tableName+searchVO.getField() + ",'%Y-%m-%d')"+" " + "=" + " " +"DATE_FORMAT("+ "\'" + searchVO.getValue() + "\'" +",'%Y-%m-%d')" ; - }else { - sql+=" AND "+" "+"DATE_FORMAT("+ tableName+searchVO.getField() + ",'%Y-%m-%d')"+" " + "=" + " " +"DATE_FORMAT("+ "\'" + searchVO.getValue() + "\'" +",'%Y-%m-%d')" ; - } - break; - default: + case "between": + case "BETWEEN": + String[] boundaryArray = searchVO.getValue().split(","); + if (i == 0) { + sql += "DATE_FORMAT(" + tableName + searchVO.getField() + ",'%Y-%m-%d')" + " " + "BETWEEN" + " " + "DATE_FORMAT(" + "\'" + boundaryArray[0].replaceAll("\\s*", "") + "\'" + ",'%Y-%m-%d')" + " AND " + "DATE_FORMAT(" + "\'" + boundaryArray[1].replaceAll("\\s*", "") + "\'" + ",'%Y-%m-%d')"; + } else { + sql += " AND " + " " + "DATE_FORMAT(" + tableName + searchVO.getField() + ",'%Y-%m-%d')" + " " + "BETWEEN" + " " + "DATE_FORMAT(" + "\'" + boundaryArray[0].replaceAll("\\s*", "") + "\'" + ",'%Y-%m-%d')" + " AND " + "DATE_FORMAT(" + "\'" + boundaryArray[1].replaceAll("\\s*", "") + "\'" + ",'%Y-%m-%d')"; + } + break; + case "equals": + case "EQUALS": + if (i == 0) { + sql += "DATE_FORMAT(" + tableName + searchVO.getField() + ",'%Y-%m-%d')" + " " + "=" + " " + "DATE_FORMAT(" + "\'" + searchVO.getValue() + "\'" + ",'%Y-%m-%d')"; + } else { + sql += " AND " + " " + "DATE_FORMAT(" + tableName + searchVO.getField() + ",'%Y-%m-%d')" + " " + "=" + " " + "DATE_FORMAT(" + "\'" + searchVO.getValue() + "\'" + ",'%Y-%m-%d')"; + } + break; + default: + } + + sqlBuilder.append(sql); } - sqlBuilder.append(sql); } sqlInfo = sqlBuilder.toString(); } From c2ddb5a92b66dd7a4736b5246f1e00cc3ceb3faf Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Mon, 17 Jan 2022 16:37:35 +0800 Subject: [PATCH 091/116] =?UTF-8?q?=E6=B8=85=E5=8D=95=20=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E5=92=8C=E4=BF=AE=E6=94=B9=E9=83=A8=E5=88=86=20=E5=AF=B9?= =?UTF-8?q?=E6=A0=87=E5=87=86=E5=BA=93=E7=9A=84=E5=8F=8D=E6=89=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/SarLawsDetailedListServiceImpl.java | 33 ++++++++++++++++++- 1 file changed, 32 insertions(+), 1 deletion(-) 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 94dab8b3..d70c1321 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 @@ -12,9 +12,12 @@ import com.adc.da.slrs.sarLawsDetailedList.entity.DetailedUpDto; import com.adc.da.slrs.sarLawsDetailedList.entity.TimeDto; import com.adc.da.slrs.sarLawsDetailedList.service.ISarLawsDetailedListService; import com.adc.da.slrs.sarStandardsInfo.dao.SarStandardsInfoDao; +import com.adc.da.slrs.sarStandardsInfo.entity.SarStandardsInfo; +import com.adc.da.slrs.sarStandardsInfo.service.ISarStandardsInfoService; import com.adc.da.slrs.sarStandardsInfo.service.impl.SarStandardsInfoServiceImpl; import com.adc.da.slrs.sarUser.entity.UpDTO; import com.adc.da.slrs.sarUser.service.ITsUserService; +import com.adc.da.slrs.standardSplit.service.SarStandardsInfoEOService; import com.adc.da.sys.service.IDicTypeEOService; import com.adc.da.util.UUIDUtils; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -46,6 +49,9 @@ public class SarLawsDetailedListServiceImpl extends ServiceImpl sarStandardsInfos=new ArrayList<>(); + timeDto.forEach(timeDto1 -> { + SarStandardsInfo sarStandardsInfo=new SarStandardsInfo(); + sarStandardsInfo.setId(timeDto1.getStandId()); + sarStandardsInfo.setIsRelateAccess("1"); + sarStandardsInfos.add(sarStandardsInfo); + }); + sarStandardsInfoService.updateBatchById(sarStandardsInfos); + } } catch (Exception e) { e.printStackTrace(); @@ -604,7 +620,22 @@ public class SarLawsDetailedListServiceImpl extends ServiceImpl wrapper = new QueryWrapper<>(); + wrapper.eq("detailed_list_id",detailedUpDto.getId()); + List sarLawsAttrDetailedLists=sarLawsAttrDetailedListDao.selectList(wrapper); + List list1=new ArrayList<>(); + if (sarLawsAttrDetailedLists.size()>0){ + sarLawsAttrDetailedLists.forEach(sarLawsAttrDetailedList -> {list1.add(sarLawsAttrDetailedList.getStandId());}); + } + list1.removeAll(Arrays.asList(detailedUpDto.getInforlist().split(","))); + if (list1.size()>0){ + QueryWrapper wrapper1 = new QueryWrapper<>(); + wrapper1.in("stand_id",list1); + List res=sarLawsAttrDetailedListDao.selectList(wrapper); + if (null!=res && res.size()>0){ + sarStandardsInfoDao.updateISRELATEACCESSById("2", Arrays.asList(detailedUpDto.getInforlist().split(","))); + } + } //更新标准是否纳入认证清单 sarStandardsInfoDao.updateISRELATEACCESSById("1", Arrays.asList(detailedUpDto.getInforlist().split(","))); From 087f629216e8ae6ac77f881c793cde590e765224 Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Mon, 17 Jan 2022 17:00:26 +0800 Subject: [PATCH 092/116] =?UTF-8?q?=E6=B8=85=E5=8D=95=20=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/SarLawsDetailedListServiceImpl.java | 27 +++++++++++++++++-- 1 file changed, 25 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 d70c1321..20c004d0 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 @@ -69,8 +69,28 @@ public class SarLawsDetailedListServiceImpl extends ServiceImpl idList) { QueryWrapper wrapper = new QueryWrapper<>(); for (String id : idList) { + //把老的弄出来 + QueryWrapper wrapper2 = new QueryWrapper<>(); + wrapper2.eq("detailed_list_id",id); + List sarLawsAttrDetailedLists=sarLawsAttrDetailedListDao.selectList(wrapper2); + List list1=new ArrayList<>(); + if (sarLawsAttrDetailedLists.size()>0){ + sarLawsAttrDetailedLists.forEach(sarLawsAttrDetailedList -> {list1.add(sarLawsAttrDetailedList.getStandId());}); + } wrapper.eq("detailed_list_id", id); sarLawsAttrDetailedListDao.delete(wrapper); +// -- eeee + //移除之后 需要判定一下 还有没有其他地方引用 + QueryWrapper wrapper1 = new QueryWrapper<>(); + wrapper1.in("stand_id",list1); + List res=sarLawsAttrDetailedListDao.selectList(wrapper); + res.forEach(sarLawsAttrDetailedList -> { + list1.remove(sarLawsAttrDetailedList.getStandId()); + }); + if (null!=list1 && list1.size()>0){ + sarStandardsInfoDao.updateISRELATEACCESSById("2", list1); + } + } sarLawsDetailedListDao.deleteBatchIds(idList); return "删除成功"; @@ -632,8 +652,11 @@ public class SarLawsDetailedListServiceImpl extends ServiceImpl wrapper1 = new QueryWrapper<>(); wrapper1.in("stand_id",list1); List res=sarLawsAttrDetailedListDao.selectList(wrapper); - if (null!=res && res.size()>0){ - sarStandardsInfoDao.updateISRELATEACCESSById("2", Arrays.asList(detailedUpDto.getInforlist().split(","))); + res.forEach(sarLawsAttrDetailedList -> { + list1.remove(sarLawsAttrDetailedList.getStandId()); + }); + if (null!=list1 && list1.size()>0){ + sarStandardsInfoDao.updateISRELATEACCESSById("2", list1); } } //更新标准是否纳入认证清单 From dccdd471f0f3c43f56a3b6a09ed0ffaa512c9ba3 Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Mon, 17 Jan 2022 17:31:28 +0800 Subject: [PATCH 093/116] =?UTF-8?q?=E5=BD=93=E5=9C=A8=E7=BC=96=E8=BE=91?= =?UTF-8?q?=E6=A0=87=E5=87=86=E7=9A=84=E5=9B=BD=E5=AE=B6=E5=9C=B0=E5=8C=BA?= =?UTF-8?q?=E7=9A=84=E6=97=B6=E5=80=99,=E8=87=AA=E5=8A=A8=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E5=88=B0=E5=9B=BD=E5=AE=B6=E5=9C=B0=E5=8C=BA=E6=B8=85?= =?UTF-8?q?=E5=8D=95=E4=B8=AD,=E5=B9=B6=E4=B8=94=E6=8A=8A=E6=A0=87?= =?UTF-8?q?=E5=87=86=E7=9A=84=E6=98=AF=E5=90=A6=E7=BA=B3=E5=85=A5=E8=AE=A4?= =?UTF-8?q?=E8=AF=81=E6=B8=85=E5=8D=95=E6=94=B9=E4=B8=BA"=E6=98=AF"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/SarLawsDetailedListController.java | 2 +- .../service/impl/SarLawsDetailedListServiceImpl.java | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/controller/SarLawsDetailedListController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/controller/SarLawsDetailedListController.java index af745434..a55d325a 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/controller/SarLawsDetailedListController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/controller/SarLawsDetailedListController.java @@ -163,7 +163,7 @@ public class SarLawsDetailedListController extends BaseController Date: Tue, 18 Jan 2022 15:39:54 +0800 Subject: [PATCH 094/116] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=87=AA=E5=AE=9A?= =?UTF-8?q?=E4=B9=89=E5=B7=A5=E4=BD=9C=E7=BB=84=E6=A8=A1=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/WorkGroupController.java | 23 ++++++++++++ .../customWorkGroup/dao/WorkGroupDao.java | 16 +++++++++ .../customWorkGroup/entity/WorkGroup.java | 36 +++++++++++++++++++ .../service/IWorkGroupService.java | 16 +++++++++ .../service/impl/WorkGroupServiceImpl.java | 20 +++++++++++ .../mapper/workGroup/WorkGroupMapper.xml | 5 +++ 6 files changed, 116 insertions(+) create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/customWorkGroup/controller/WorkGroupController.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/customWorkGroup/dao/WorkGroupDao.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/customWorkGroup/entity/WorkGroup.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/customWorkGroup/service/IWorkGroupService.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/customWorkGroup/service/impl/WorkGroupServiceImpl.java create mode 100644 adc-da-slrs/src/main/resources/mybatis/mapper/workGroup/WorkGroupMapper.xml diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/customWorkGroup/controller/WorkGroupController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/customWorkGroup/controller/WorkGroupController.java new file mode 100644 index 00000000..88f3227f --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/customWorkGroup/controller/WorkGroupController.java @@ -0,0 +1,23 @@ +package com.adc.da.slrs.customWorkGroup.controller; + + +import org.springframework.web.bind.annotation.RequestMapping; +import com.adc.da.slrs.customWorkGroup.entity.WorkGroup; +import io.swagger.annotations.Api; +import org.springframework.web.bind.annotation.RestController; +import com.adc.da.base.web.BaseController; + +/** +*

+ * 前端控制器 + *

+* +* @author zhaokaiyao +* @since 2022-01-18 +*/ +@RestController +@Api(description = "|WorkGroup|") +@RequestMapping("/workGroup/work-group") +public class WorkGroupController extends BaseController { + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/customWorkGroup/dao/WorkGroupDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/customWorkGroup/dao/WorkGroupDao.java new file mode 100644 index 00000000..a60c6553 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/customWorkGroup/dao/WorkGroupDao.java @@ -0,0 +1,16 @@ +package com.adc.da.slrs.customWorkGroup.dao; + +import com.adc.da.slrs.customWorkGroup.entity.WorkGroup; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + *

+ * Mapper 接口 + *

+ * + * @author zhaokaiyao + * @since 2022-01-18 + */ +public interface WorkGroupDao extends BaseMapper { + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/customWorkGroup/entity/WorkGroup.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/customWorkGroup/entity/WorkGroup.java new file mode 100644 index 00000000..fd9ac7d9 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/customWorkGroup/entity/WorkGroup.java @@ -0,0 +1,36 @@ +package com.adc.da.slrs.customWorkGroup.entity; + +import com.adc.da.base.entity.BaseEntity; +import io.swagger.annotations.ApiModel; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +/** + *

+ * + *

+ * + * @author zhaokaiyao + * @since 2022-01-18 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@Accessors(chain = true) +@ApiModel(value="WorkGroup对象", description="") +public class WorkGroup extends BaseEntity { + + private static final long serialVersionUID = 1L; + + private String workGroupName; + + private String workLeader; + + private String workLeaderId; + + private String workPeople; + + private String workPeopleId; + + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/customWorkGroup/service/IWorkGroupService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/customWorkGroup/service/IWorkGroupService.java new file mode 100644 index 00000000..e35e2042 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/customWorkGroup/service/IWorkGroupService.java @@ -0,0 +1,16 @@ +package com.adc.da.slrs.customWorkGroup.service; + +import com.adc.da.slrs.customWorkGroup.entity.WorkGroup; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + *

+ * 服务类 + *

+ * + * @author zhaokaiyao + * @since 2022-01-18 + */ +public interface IWorkGroupService extends IService { + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/customWorkGroup/service/impl/WorkGroupServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/customWorkGroup/service/impl/WorkGroupServiceImpl.java new file mode 100644 index 00000000..86e5d080 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/customWorkGroup/service/impl/WorkGroupServiceImpl.java @@ -0,0 +1,20 @@ +package com.adc.da.slrs.customWorkGroup.service.impl; + +import com.adc.da.slrs.customWorkGroup.entity.WorkGroup; +import com.adc.da.slrs.customWorkGroup.dao.WorkGroupDao; +import com.adc.da.slrs.customWorkGroup.service.IWorkGroupService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; + +/** + *

+ * 服务实现类 + *

+ * + * @author zhaokaiyao + * @since 2022-01-18 + */ +@Service +public class WorkGroupServiceImpl extends ServiceImpl implements IWorkGroupService { + +} diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/workGroup/WorkGroupMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/workGroup/WorkGroupMapper.xml new file mode 100644 index 00000000..7ac3bc1d --- /dev/null +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/workGroup/WorkGroupMapper.xml @@ -0,0 +1,5 @@ + + + + + From 2f182924929cdce686743cadd206d00ceb28f7ed Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Tue, 18 Jan 2022 16:28:20 +0800 Subject: [PATCH 095/116] feat: There is no way the, plan lxd --- .../da/FeignClient/workFlowFeignClient.java | 8 +++ .../workFlowFeignClientImpl.java | 12 ++++ .../controller/WorkFlowController.java | 57 +++++++++++++++++++ .../adc/da/login/security/WebMvcConfig.java | 6 ++ .../esRevisePlan/entity/EsRevisePlan.java | 4 +- .../esRevisePlan/EsRevisePlanMapper.xml | 14 +++++ 6 files changed, 100 insertions(+), 1 deletion(-) 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 5413f86b..808a1999 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 @@ -12,6 +12,8 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RequestParam; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; import java.util.List; import java.util.Map; import java.util.Set; @@ -20,6 +22,12 @@ import java.util.Set; //@FeignClient(value = "shan6") public interface workFlowFeignClient { + @RequestMapping(value = "/bat-wkflow/busProcessModel/saveEditFile",method = RequestMethod.GET) + BusProcessModelHis saveEditFile(); + + @RequestMapping(value = "/bat-wkflow/busProcessModel/processEditFile",method = RequestMethod.GET) + BusProcessModelHis processEditFile(@RequestParam("id") String id); + @RequestMapping(value = "/bat-wkflow/busProcessModel/processModelHisOneUpdStatus",method = RequestMethod.GET) BusProcessModelHis processModelHisOneUpdStatus(@RequestParam("pid") String pid, @RequestParam("taskId") String taskId); diff --git a/adc-da-activiti/src/main/java/com/adc/da/FeignClientImpl/workFlowFeignClientImpl.java b/adc-da-activiti/src/main/java/com/adc/da/FeignClientImpl/workFlowFeignClientImpl.java index be3ef332..1552ca62 100644 --- a/adc-da-activiti/src/main/java/com/adc/da/FeignClientImpl/workFlowFeignClientImpl.java +++ b/adc-da-activiti/src/main/java/com/adc/da/FeignClientImpl/workFlowFeignClientImpl.java @@ -16,6 +16,8 @@ import org.springframework.stereotype.Component; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestParam; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; import java.util.List; import java.util.Map; @@ -28,6 +30,16 @@ public class workFlowFeignClientImpl { @Autowired private IUserEOService userEOService; + public BusProcessModelHis saveEditFile(){ + BusProcessModelHis stringWrapper = workFlowFeignClient.saveEditFile(); + return stringWrapper; + } + + public BusProcessModelHis processEditFile(@RequestParam("id") String id){ + BusProcessModelHis stringWrapper = workFlowFeignClient.processEditFile(id); + return stringWrapper; + } + public BusProcessModelHis processModelHisOneUpdStatus(@RequestParam("pid") String pid,@RequestParam("taskId") String taskId){ BusProcessModelHis stringWrapper = workFlowFeignClient.processModelHisOneUpdStatus(pid,taskId); return stringWrapper; diff --git a/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java b/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java index 944b20e2..9668cd53 100644 --- a/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java +++ b/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java @@ -66,7 +66,64 @@ public class WorkFlowController { // @Autowired // private ExportExcelMapper exportExcelMapper; + @ApiOperation(value = "|File|下载文件") + @GetMapping("/downloadFileForSar") + // @RequiresPermissions("sys:file:downloadFileForSar") + public void downloadFileForSar(String fileId, String oldFileName, HttpServletResponse response, HttpServletRequest request) throws Exception { + BusProcessModelHis modelHisOne = workFlowFeignClient.processEditFile(fileId); + InputStream is = null; + OutputStream os = null; + response.reset(); + try { + String fileOldName = fileNameEncoding(oldFileName,request); + response.setHeader("Content-Disposition", "attachment;filename=\""+fileOldName+"\""); + response.setContentType("application/octet-stream"); + File file = new File(standEditFilePath+modelHisOne.getEditFilePath()); + is = new FileInputStream(file); + os = response.getOutputStream(); + org.apache.commons.io.IOUtils.copy(is, os); + os.flush(); + } catch (IOException e) { + logger.error(e.getMessage(), e); + } finally { + org.apache.commons.io.IOUtils.closeQuietly(is); + org.apache.commons.io.IOUtils.closeQuietly(os); + } + } + /** + * @Author super_liu + * @Description 根据不同浏览器定义下载文件编码 + * Date 2018/10/11 10:40 + * @Param [fileName, request] + * @return java.lang.String + **/ + public String fileNameEncoding(String fileName, HttpServletRequest request) throws IOException { + String agent = request.getHeader("User-Agent"); + if (agent.contains("Firefox")) { + /*BASE64Encoder base64Encoder = new BASE64Encoder(); + fileName = "=?utf-8?B?" + + base64Encoder.encode(fileName.getBytes("utf-8")) + "?=";*/ + fileName = new String(fileName.getBytes("UTF-8"), "ISO8859-1"); // firefox浏览器 + } else { + fileName = URLEncoder.encode(fileName, "utf-8"); + //谷歌中空格变为+问题 + fileName = fileName.replaceAll("\\+","%20"); + } + return fileName; + } + + @ApiOperation(value = "存储在线编辑文件") + @GetMapping("/saveEditFile") + public BusProcessModelHis saveEditFile(){ + return workFlowFeignClient.saveEditFile(); + } + + @ApiOperation(value = "查询在线编辑流程汇总文件编辑对象") + @GetMapping("/processEditFile") + public BusProcessModelHis processEditFile(@RequestParam("id") String id){ + return workFlowFeignClient.processEditFile(id); + } @ApiOperation(value = "手机获取token") @PostMapping(value = "/loginMobile") diff --git a/adc-da-jwtLogin/src/main/java/com/adc/da/login/security/WebMvcConfig.java b/adc-da-jwtLogin/src/main/java/com/adc/da/login/security/WebMvcConfig.java index f5470943..a58c4653 100644 --- a/adc-da-jwtLogin/src/main/java/com/adc/da/login/security/WebMvcConfig.java +++ b/adc-da-jwtLogin/src/main/java/com/adc/da/login/security/WebMvcConfig.java @@ -72,6 +72,12 @@ public class WebMvcConfig implements WebMvcConfigurer { addInterceptor.excludePathPatterns("/api/lawss/activiti/processModelHisOne"); + addInterceptor.excludePathPatterns("/api/lawss/activiti/downloadFileForSar"); + + addInterceptor.excludePathPatterns("/api/lawss/activiti/saveEditFile"); + + addInterceptor.excludePathPatterns("/api/lawss/activiti/processEditFile"); + addInterceptor.excludePathPatterns("/api/lawss/activiti/processModelHisOneCount"); addInterceptor.excludePathPatterns("/api/att/attFile/getSyncPdfFileInfo"); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/entity/EsRevisePlan.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/entity/EsRevisePlan.java index e355d68a..0c38b17d 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/entity/EsRevisePlan.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/entity/EsRevisePlan.java @@ -122,5 +122,7 @@ public class EsRevisePlan extends BasePage { @TableField(exist = false) private List planStatusList; - + @ApiModelProperty(value = "立项单") + @TableField("LXD") + private String lxd; } diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/esRevisePlan/EsRevisePlanMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/esRevisePlan/EsRevisePlanMapper.xml index e438671e..fea29b3a 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/esRevisePlan/EsRevisePlanMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/esRevisePlan/EsRevisePlanMapper.xml @@ -75,6 +75,7 @@ + @@ -140,6 +141,7 @@ es_revise_plan.use_level, es_revise_plan.technologic, es_revise_plan.buss_sort, + es_revise_plan.LXD, sar_bussioness_stand.STAND_CODE as rqbName, sar_bussioness_stand.STAND_SORT as standType, (select group_concat(ts_institution.name) from ts_institution where find_in_set(ts_institution.id,unit)) as unitName, @@ -208,6 +210,7 @@ es_revise_plan.use_level, es_revise_plan.technologic, es_revise_plan.buss_sort, + es_revise_plan.LXD, sar_bussioness_stand.STAND_CODE as rqbName, sar_bussioness_stand.STAND_SORT as standType, sar_bussioness_stand.stand_number as standNum, @@ -280,6 +283,7 @@ es_revise_plan.use_level, es_revise_plan.technologic, es_revise_plan.buss_sort, + es_revise_plan.LXD, sar_bussioness_stand.STAND_CODE as rqbName, sar_bussioness_stand.STAND_SORT as standType, (select group_concat(ts_institution.name) from ts_institution where find_in_set(ts_institution.id,unit)) as unitName, @@ -354,6 +358,9 @@ buss_sort=#{bussSort}, + + LXD=#{lxd}, + where id = #{id} @@ -418,6 +425,9 @@ buss_sort, + + LXD, + values @@ -478,6 +488,9 @@ #{bussSort}, + + #{lxd}, + @@ -513,6 +526,7 @@ es_revise_plan.use_level, es_revise_plan.technologic, es_revise_plan.buss_sort, + es_revise_plan.LXD, sar_bussioness_stand.STAND_CODE as rqbName, sar_bussioness_stand.STAND_SORT as standType, (select group_concat(ts_institution.name) from ts_institution where find_in_set(ts_institution.id,unit)) as unitName, From 54ef64c8526ebdb61c7c399c8b7c4d61aac77de5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E5=90=9B?= <879913833@qq.com> Date: Tue, 18 Jan 2022 17:09:03 +0800 Subject: [PATCH 096/116] =?UTF-8?q?=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/adc/da/mq/SendStandMQService.java | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/adc-da-slrs/src/main/java/com/adc/da/mq/SendStandMQService.java b/adc-da-slrs/src/main/java/com/adc/da/mq/SendStandMQService.java index e439dc21..1bebf78d 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/mq/SendStandMQService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/mq/SendStandMQService.java @@ -211,6 +211,24 @@ public class SendStandMQService { context = context.replace(",,", ","); saveMap.put("content", context); } + +// 如果出现提示查询报错，而且提示 查询内容无法转换为 日期格式的 情况，原因可能是没有把日期转换为字符串，可以考虑放开下面的代码（目前，域内没有报错，但是，本地有问题） +// //部分字段没有转为汉字，在此处转为汉字 +// if(StringUtils.isNotBlank(String.valueOf(saveMap.get("XCXSSRQName")))) { +// saveMap.put("XCXSSRQName"," " + String.valueOf(saveMap.get("XCXSSRQName"))); +// } +// if(StringUtils.isNotBlank(String.valueOf(saveMap.get("ZCCSSRQName")))) { +// saveMap.put("ZCCSSRQName"," " + String.valueOf(saveMap.get("ZCCSSRQName"))); +// } +// if(StringUtils.isNotBlank(String.valueOf(saveMap.get("SSRQName")))) { +// saveMap.put("SSRQName"," " + String.valueOf(saveMap.get("SSRQName"))); +// } +// if(StringUtils.isNotBlank(String.valueOf(saveMap.get("issueTime")))) { +// saveMap.put("issueTime"," " + String.valueOf(saveMap.get("issueTime"))); +// } +// if(StringUtils.isNotBlank(String.valueOf(saveMap.get("ZCCSSRQ")))) { +// saveMap.put("ZCCSSRQ"," " + String.valueOf(saveMap.get("ZCCSSRQ"))); +// } if("add".equals(addOrUpdate)){ sarStandardsInfoService.insertIntoIndexForMap(saveMap); } else { From ca79108b71eb315321e47cf5ee6046efadcdac05 Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Tue, 18 Jan 2022 21:42:13 +0800 Subject: [PATCH 097/116] =?UTF-8?q?=E6=97=A5=E5=BF=97=E4=B8=8E=E6=89=8B?= =?UTF-8?q?=E5=8A=A8=E6=BF=80=E6=B4=BB=E5=AE=9A=E6=97=B6=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/scheduled/ScheduledJob.java | 5 ++++- .../com/adc/da/scheduled/controller/Controller.java | 12 ++++++++++-- 2 files changed, 14 insertions(+), 3 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 d837037a..8c776893 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 @@ -14,6 +14,7 @@ import com.adc.da.slrs.sarStandWarning.entity.WarningDate; import com.adc.da.slrs.sarStandWarning.service.IWarningDateService; import com.adc.da.slrs.sarStandardsInfo.dao.SarStandardsInfoDao; import com.adc.da.slrs.sarStandardsInfo.entity.SarStandardsInfo; +import com.adc.da.slrs.sarUpdLog.service.ISarUpdLogService; import com.adc.da.util.UUIDUtils; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import lombok.extern.slf4j.Slf4j; @@ -175,7 +176,8 @@ public class ScheduledJob { - + @Autowired + private ISarUpdLogService sarUpdLogEOService; /** @@ -299,6 +301,7 @@ public class ScheduledJob { try { +// sarUpdLogEOService.createUpdateLog(sarStandardsInfoEO.getStandType() + "_STAND", sarStandardsInfoEO.getId(), oldMap, newMap, content); sarStandardsInfoDao.updateById(sarStandardsInfo); }catch (Exception e){ System.out.println("代替标准状态更新:id为"+key+"文本状态更新失败"); diff --git a/adc-da-slrs/src/main/java/com/adc/da/scheduled/controller/Controller.java b/adc-da-slrs/src/main/java/com/adc/da/scheduled/controller/Controller.java index 582af319..b38dfaa3 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/scheduled/controller/Controller.java +++ b/adc-da-slrs/src/main/java/com/adc/da/scheduled/controller/Controller.java @@ -4,6 +4,7 @@ package com.adc.da.scheduled.controller; import com.adc.da.scheduled.ScheduledJob; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -16,8 +17,15 @@ public class Controller { @Autowired ScheduledJob scheduledJob; - @PostMapping - public void run(){ + @PutMapping("/warning") + public void warning(){ scheduledJob.warningSchedulingTasks(); } + + @PutMapping("textStatus") + public void textStatus(){ + scheduledJob.TextStatusSchedulingTasks(); + } + + } From d18185e0b7f84f5505755f747b329072f3e4f5c0 Mon Sep 17 00:00:00 2001 From: zyd Date: Tue, 18 Jan 2022 22:12:14 +0800 Subject: [PATCH 098/116] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8DVPPS=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E4=B8=AD=E5=B0=86=E5=85=B6=E4=BB=96=E9=9D=9E=E6=9C=AC?= =?UTF-8?q?=E8=8A=82=E7=82=B9=E4=B8=8B=E7=9A=84=E6=95=B0=E6=8D=AE=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E5=87=BA=E6=9D=A5=E7=9A=84BUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../slrs/sarVppsTree/service/impl/SarVppsTreeServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarVppsTree/service/impl/SarVppsTreeServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarVppsTree/service/impl/SarVppsTreeServiceImpl.java index c43411d3..fb1c648d 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarVppsTree/service/impl/SarVppsTreeServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarVppsTree/service/impl/SarVppsTreeServiceImpl.java @@ -56,7 +56,7 @@ public class SarVppsTreeServiceImpl extends ServiceImpl children=this.baseMapper.selectList(sarMenuQueryWrapper); From 06c14bd8cd54af524f44094de2a83e25fd7839f5 Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Tue, 18 Jan 2022 22:53:51 +0800 Subject: [PATCH 099/116] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E7=BB=84=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../adc/da/login/security/WebMvcConfig.java | 2 +- .../controller/WorkGroupController.java | 54 +++++++++++++++++-- .../customWorkGroup/dao/WorkGroupDao.java | 14 +++++ .../customWorkGroup/entity/WorkGroup.java | 3 +- .../entity/WorkGroupQueryPage.java | 32 +++++++++++ .../service/IWorkGroupService.java | 33 ++++++++++++ .../service/impl/WorkGroupServiceImpl.java | 48 +++++++++++++++++ .../mapper/workGroup/WorkGroupMapper.xml | 41 ++++++++++++++ 8 files changed, 222 insertions(+), 5 deletions(-) create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/customWorkGroup/entity/WorkGroupQueryPage.java diff --git a/adc-da-jwtLogin/src/main/java/com/adc/da/login/security/WebMvcConfig.java b/adc-da-jwtLogin/src/main/java/com/adc/da/login/security/WebMvcConfig.java index f5470943..ec2c0769 100644 --- a/adc-da-jwtLogin/src/main/java/com/adc/da/login/security/WebMvcConfig.java +++ b/adc-da-jwtLogin/src/main/java/com/adc/da/login/security/WebMvcConfig.java @@ -105,7 +105,7 @@ public class WebMvcConfig implements WebMvcConfigurer { // //测试接口使用 -// addInterceptor.excludePathPatterns("/api/**"); + addInterceptor.excludePathPatterns("/api/**"); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/customWorkGroup/controller/WorkGroupController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/customWorkGroup/controller/WorkGroupController.java index 88f3227f..ba18cc02 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/customWorkGroup/controller/WorkGroupController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/customWorkGroup/controller/WorkGroupController.java @@ -1,10 +1,17 @@ package com.adc.da.slrs.customWorkGroup.controller; -import org.springframework.web.bind.annotation.RequestMapping; +import com.adc.da.http.ResponseMessage; +import com.adc.da.http.Result; +import com.adc.da.slrs.customWorkGroup.entity.WorkGroupQueryPage; +import com.adc.da.slrs.customWorkGroup.service.IWorkGroupService; +import com.baomidou.mybatisplus.core.metadata.IPage; +import io.swagger.annotations.ApiModelProperty; +import org.apache.ibatis.annotations.Delete; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; import com.adc.da.slrs.customWorkGroup.entity.WorkGroup; import io.swagger.annotations.Api; -import org.springframework.web.bind.annotation.RestController; import com.adc.da.base.web.BaseController; /** @@ -17,7 +24,48 @@ import com.adc.da.base.web.BaseController; */ @RestController @Api(description = "|WorkGroup|") -@RequestMapping("/workGroup/work-group") +@RequestMapping("/${restPath}/workGroup/work-group") public class WorkGroupController extends BaseController { + + @Autowired + IWorkGroupService iWorkGroupService; + + @ApiModelProperty("新增工作组") + @PostMapping + public ResponseMessage addWorkGroup(WorkGroup workGroup) { + boolean add = iWorkGroupService.add(workGroup); + + return Result.success(add); + } + + + + @ApiModelProperty("删除工作组") + @DeleteMapping + public ResponseMessage deleteWorkGroup(String id){ + boolean delete = iWorkGroupService.delete(id); + + return Result.success(delete); + } + + @ApiModelProperty("根据组长民或者组名查询工作组") + @GetMapping + public ResponseMessage> getWorkGroupLists(WorkGroupQueryPage queryPage){ + IPage workGroup = iWorkGroupService.getWorkGroup(queryPage); + + return Result.success(workGroup); + } + + + @ApiModelProperty("修改工作组") + @PutMapping + public ResponseMessage updateWorkGroup(WorkGroup workGroup){ + boolean update = iWorkGroupService.update(workGroup); + + return Result.success(update); + } + + + } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/customWorkGroup/dao/WorkGroupDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/customWorkGroup/dao/WorkGroupDao.java index a60c6553..233fdb42 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/customWorkGroup/dao/WorkGroupDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/customWorkGroup/dao/WorkGroupDao.java @@ -1,7 +1,14 @@ package com.adc.da.slrs.customWorkGroup.dao; import com.adc.da.slrs.customWorkGroup.entity.WorkGroup; +import com.adc.da.slrs.customWorkGroup.entity.WorkGroupQueryPage; +import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Constants; +import org.apache.ibatis.annotations.Param; + +import java.util.List; /** *

@@ -13,4 +20,11 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; */ public interface WorkGroupDao extends BaseMapper { + + public IPage getWorkGroup( @Param("page")IPage page, + @Param(Constants.WRAPPER) Wrapper queryWrapper, + @Param("queryCondition")WorkGroupQueryPage queryCondition); + + + public List getUserName(String userId); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/customWorkGroup/entity/WorkGroup.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/customWorkGroup/entity/WorkGroup.java index fd9ac7d9..b01d4622 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/customWorkGroup/entity/WorkGroup.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/customWorkGroup/entity/WorkGroup.java @@ -22,7 +22,8 @@ public class WorkGroup extends BaseEntity { private static final long serialVersionUID = 1L; - private String workGroupName; + + private String workGroup; private String workLeader; diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/customWorkGroup/entity/WorkGroupQueryPage.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/customWorkGroup/entity/WorkGroupQueryPage.java new file mode 100644 index 00000000..5b09a2e5 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/customWorkGroup/entity/WorkGroupQueryPage.java @@ -0,0 +1,32 @@ +package com.adc.da.slrs.customWorkGroup.entity; + +import lombok.Data; + +import java.util.Optional; + +/** + * @author 22501 + */ +@Data +public class WorkGroupQueryPage { + + private Integer page; + + private Integer pageSize; + + private String leaderName; + + private String workGroupName; + + + public int getPage() { + return Optional.ofNullable(this.page) + .orElse(1); + + } + + public int getPageSize() { + return Optional.ofNullable(this.pageSize) + .orElse(20); + } +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/customWorkGroup/service/IWorkGroupService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/customWorkGroup/service/IWorkGroupService.java index e35e2042..214fdbc8 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/customWorkGroup/service/IWorkGroupService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/customWorkGroup/service/IWorkGroupService.java @@ -1,6 +1,8 @@ package com.adc.da.slrs.customWorkGroup.service; import com.adc.da.slrs.customWorkGroup.entity.WorkGroup; +import com.adc.da.slrs.customWorkGroup.entity.WorkGroupQueryPage; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; /** @@ -13,4 +15,35 @@ import com.baomidou.mybatisplus.extension.service.IService; */ public interface IWorkGroupService extends IService { + /** + * 新增 + * @param workGroup + * @return + */ + public boolean add(WorkGroup workGroup); + + + /** + * 删除 + * @param workGroupId + * @return + */ + public boolean delete(String workGroupId); + + /** + * 修改 + * @param queryPage + * @return + */ + public IPage getWorkGroup(WorkGroupQueryPage queryPage); + + + /** + * 更新 + * @param workGroup + * @return + */ + public boolean update(WorkGroup workGroup); + + } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/customWorkGroup/service/impl/WorkGroupServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/customWorkGroup/service/impl/WorkGroupServiceImpl.java index 86e5d080..d0c55149 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/customWorkGroup/service/impl/WorkGroupServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/customWorkGroup/service/impl/WorkGroupServiceImpl.java @@ -2,8 +2,13 @@ package com.adc.da.slrs.customWorkGroup.service.impl; import com.adc.da.slrs.customWorkGroup.entity.WorkGroup; import com.adc.da.slrs.customWorkGroup.dao.WorkGroupDao; +import com.adc.da.slrs.customWorkGroup.entity.WorkGroupQueryPage; import com.adc.da.slrs.customWorkGroup.service.IWorkGroupService; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; /** @@ -17,4 +22,47 @@ import org.springframework.stereotype.Service; @Service public class WorkGroupServiceImpl extends ServiceImpl implements IWorkGroupService { + @Autowired + WorkGroupDao workGroupDao; + + + + @Override + public boolean add(WorkGroup workGroup) { + return this.save(workGroup); + } + + @Override + public boolean delete(String workGroupId) { + return this.removeById(workGroupId); + } + + @Override + public IPage getWorkGroup(WorkGroupQueryPage queryPage) { + + + QueryWrapper wrapper = new QueryWrapper<>(); + if (queryPage.getWorkGroupName()!=null && !"".equals(queryPage.getWorkGroupName())){ + wrapper.eq("work_group_name",queryPage.getWorkGroupName()); + } + //可以通过组长名称模糊查询 + IPage workGroupList = workGroupDao.getWorkGroup(new Page<>(queryPage.getPage(), queryPage.getPageSize()), wrapper,queryPage); + //需要把组长的id和组员的id转换为其名称 + for (WorkGroup record : workGroupList.getRecords()) { + + record.setWorkLeader( String.join(",",workGroupDao.getUserName(record.getWorkLeaderId())) ); + record.setWorkPeople( String.join(",",workGroupDao.getUserName(record.getWorkPeopleId()))); + } + + return workGroupList; + + } + + + + + @Override + public boolean update(WorkGroup workGroup) { + return this.updateById(workGroup); + } } diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/workGroup/WorkGroupMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/workGroup/WorkGroupMapper.xml index 7ac3bc1d..e21fb1e3 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/workGroup/WorkGroupMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/workGroup/WorkGroupMapper.xml @@ -2,4 +2,45 @@ + + + + + + + From 87b843c398fe68954a456fa40d4b9a6b7629fc3f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E5=90=9B?= <879913833@qq.com> Date: Wed, 19 Jan 2022 10:19:16 +0800 Subject: [PATCH 100/116] =?UTF-8?q?es=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/StandLawsSearchServiceImpl.java | 20 ++++++++++++------- .../impl/SarStandardsInfoServiceImpl.java | 3 +++ 2 files changed, 16 insertions(+), 7 deletions(-) diff --git a/adc-da-search/src/main/java/com/adc/da/search/service/impl/StandLawsSearchServiceImpl.java b/adc-da-search/src/main/java/com/adc/da/search/service/impl/StandLawsSearchServiceImpl.java index e6593226..65e7bfc9 100644 --- a/adc-da-search/src/main/java/com/adc/da/search/service/impl/StandLawsSearchServiceImpl.java +++ b/adc-da-search/src/main/java/com/adc/da/search/service/impl/StandLawsSearchServiceImpl.java @@ -179,8 +179,10 @@ public class StandLawsSearchServiceImpl implements StandLawsSearchService { contentBuilder.append("体系类别:").append(attrInfoMap.get("TXLBName")).append(" "); }else { contentBuilder.append("归口管理部门:").append(attrInfoMap.get("GKDWName")).append(" "); - contentBuilder.append("起草单位:").append(attrInfoMap.get("FBJGName")).append(" "); - contentBuilder.append("我司署名人:").append(attrInfoMap.get("WSSMRName")).append(" "); +// contentBuilder.append("起草单位:").append(attrInfoMap.get("FBJGName")).append(" "); + contentBuilder.append("起草单位:").append(attrInfoMap.get("QCDW")).append(" "); +// contentBuilder.append("我司署名人:").append(attrInfoMap.get("WSSMRName")).append(" "); + contentBuilder.append("我司署名人:").append(attrInfoMap.get("WSSMR")).append(" "); contentBuilder.append("我司参与深度:").append(attrInfoMap.get("CYSDName")).append(" "); contentBuilder.append("我司参与制标排名:").append(attrInfoMap.get("CYZBPMName")).append(" "); } @@ -188,8 +190,10 @@ public class StandLawsSearchServiceImpl implements StandLawsSearchService { contentBuilder.append("能源类型:").append(attrInfoMap.get("NYLXName")).append(" "); contentBuilder.append("适用产品线:").append(attrInfoMap.get("SYCPXName")).append(" "); contentBuilder.append("适用认证:").append(attrInfoMap.get("SYRZName")).append(" "); - contentBuilder.append("责任部门:").append(attrInfoMap.get("ZRBMName")).append(" "); - contentBuilder.append("责任工程师:").append(attrInfoMap.get("ZRGCSName")).append(" "); +// contentBuilder.append("责任部门:").append(attrInfoMap.get("ZRBMName")).append(" "); + contentBuilder.append("责任部门:").append(attrInfoMap.get("ZRBM")).append(" "); +// contentBuilder.append("责任工程师:").append(attrInfoMap.get("ZRGCSName")).append(" "); + contentBuilder.append("责任工程师:").append(attrInfoMap.get("ZRGCS")).append(" "); contentBuilder.append("关联模块--乘用车VPPS编码:").append(attrInfoMap.get("CYCVPPSBMName")).append(" "); contentBuilder.append("关联模块--乘用车vpps中文名称:").append(attrInfoMap.get("CYCVPPSCNName")).append(" "); contentBuilder.append("关联模块--卡车VPPS编码:").append(attrInfoMap.get("KCCVPPSBMName")).append(" "); @@ -309,15 +313,17 @@ public class StandLawsSearchServiceImpl implements StandLawsSearchService { StringBuilder contentBuilder = new StringBuilder(); contentBuilder.append("企标类别:").append(attrInfoMap.get("standSort")).append(" "); contentBuilder.append("标准年份:").append(attrInfoMap.get("standYear")).append(" "); - contentBuilder.append("企标名称:").append(attrInfoMap.get("standName")).append(" "); + contentBuilder.append("企标名称:").append(attrInfoMap.get("stand_name")).append(" "); contentBuilder.append("企标英文名称:").append(attrInfoMap.get("stand_en_name")).append(" "); contentBuilder.append("文本状态:").append(attrInfoMap.get("textStatusBussName")).append(" "); contentBuilder.append("企标实施日期:").append(attrInfoMap.get("putTime")).append(" "); contentBuilder.append("企标发布日期:").append(attrInfoMap.get("issueTime")).append(" "); contentBuilder.append("废止日期:").append(attrInfoMap.get("FZRQBUSSName")).append(" "); contentBuilder.append("复审日期:").append(attrInfoMap.get("FSRQBUSSName")).append(" "); - contentBuilder.append("起草部门:").append(attrInfoMap.get("QCDWName")).append(" "); - contentBuilder.append("起草人:").append(attrInfoMap.get("QCRBUSSName")).append(" "); +// contentBuilder.append("起草部门:").append(attrInfoMap.get("QCDWName")).append(" "); + contentBuilder.append("起草部门:").append(attrInfoMap.get("QCDW")).append(" "); +// contentBuilder.append("起草人:").append(attrInfoMap.get("QCRBUSSName")).append(" "); + contentBuilder.append("起草人:").append(attrInfoMap.get("QCRBUSS")).append(" "); contentBuilder.append("文件上传人员:").append(attrInfoMap.get("WJSCRYBUSSName")).append(" "); contentBuilder.append("适用车型:").append(attrInfoMap.get("SYCXCLASSName")).append(" "); contentBuilder.append("能源类型:").append(attrInfoMap.get("NYLXCLASSName")).append(" "); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java index 16353926..244fa967 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java @@ -2605,6 +2605,9 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl Date: Wed, 19 Jan 2022 13:14:27 +0800 Subject: [PATCH 101/116] commit --- .../impl/StandLawsSearchServiceImpl.java | 20 ++++++++++++------- .../com/adc/da/mq/SendStandMQService.java | 18 +++++++++++++++++ .../impl/SarStandardsInfoServiceImpl.java | 3 +++ 3 files changed, 34 insertions(+), 7 deletions(-) diff --git a/adc-da-search/src/main/java/com/adc/da/search/service/impl/StandLawsSearchServiceImpl.java b/adc-da-search/src/main/java/com/adc/da/search/service/impl/StandLawsSearchServiceImpl.java index e6593226..65e7bfc9 100644 --- a/adc-da-search/src/main/java/com/adc/da/search/service/impl/StandLawsSearchServiceImpl.java +++ b/adc-da-search/src/main/java/com/adc/da/search/service/impl/StandLawsSearchServiceImpl.java @@ -179,8 +179,10 @@ public class StandLawsSearchServiceImpl implements StandLawsSearchService { contentBuilder.append("体系类别:").append(attrInfoMap.get("TXLBName")).append(" "); }else { contentBuilder.append("归口管理部门:").append(attrInfoMap.get("GKDWName")).append(" "); - contentBuilder.append("起草单位:").append(attrInfoMap.get("FBJGName")).append(" "); - contentBuilder.append("我司署名人:").append(attrInfoMap.get("WSSMRName")).append(" "); +// contentBuilder.append("起草单位:").append(attrInfoMap.get("FBJGName")).append(" "); + contentBuilder.append("起草单位:").append(attrInfoMap.get("QCDW")).append(" "); +// contentBuilder.append("我司署名人:").append(attrInfoMap.get("WSSMRName")).append(" "); + contentBuilder.append("我司署名人:").append(attrInfoMap.get("WSSMR")).append(" "); contentBuilder.append("我司参与深度:").append(attrInfoMap.get("CYSDName")).append(" "); contentBuilder.append("我司参与制标排名:").append(attrInfoMap.get("CYZBPMName")).append(" "); } @@ -188,8 +190,10 @@ public class StandLawsSearchServiceImpl implements StandLawsSearchService { contentBuilder.append("能源类型:").append(attrInfoMap.get("NYLXName")).append(" "); contentBuilder.append("适用产品线:").append(attrInfoMap.get("SYCPXName")).append(" "); contentBuilder.append("适用认证:").append(attrInfoMap.get("SYRZName")).append(" "); - contentBuilder.append("责任部门:").append(attrInfoMap.get("ZRBMName")).append(" "); - contentBuilder.append("责任工程师:").append(attrInfoMap.get("ZRGCSName")).append(" "); +// contentBuilder.append("责任部门:").append(attrInfoMap.get("ZRBMName")).append(" "); + contentBuilder.append("责任部门:").append(attrInfoMap.get("ZRBM")).append(" "); +// contentBuilder.append("责任工程师:").append(attrInfoMap.get("ZRGCSName")).append(" "); + contentBuilder.append("责任工程师:").append(attrInfoMap.get("ZRGCS")).append(" "); contentBuilder.append("关联模块--乘用车VPPS编码:").append(attrInfoMap.get("CYCVPPSBMName")).append(" "); contentBuilder.append("关联模块--乘用车vpps中文名称:").append(attrInfoMap.get("CYCVPPSCNName")).append(" "); contentBuilder.append("关联模块--卡车VPPS编码:").append(attrInfoMap.get("KCCVPPSBMName")).append(" "); @@ -309,15 +313,17 @@ public class StandLawsSearchServiceImpl implements StandLawsSearchService { StringBuilder contentBuilder = new StringBuilder(); contentBuilder.append("企标类别:").append(attrInfoMap.get("standSort")).append(" "); contentBuilder.append("标准年份:").append(attrInfoMap.get("standYear")).append(" "); - contentBuilder.append("企标名称:").append(attrInfoMap.get("standName")).append(" "); + contentBuilder.append("企标名称:").append(attrInfoMap.get("stand_name")).append(" "); contentBuilder.append("企标英文名称:").append(attrInfoMap.get("stand_en_name")).append(" "); contentBuilder.append("文本状态:").append(attrInfoMap.get("textStatusBussName")).append(" "); contentBuilder.append("企标实施日期:").append(attrInfoMap.get("putTime")).append(" "); contentBuilder.append("企标发布日期:").append(attrInfoMap.get("issueTime")).append(" "); contentBuilder.append("废止日期:").append(attrInfoMap.get("FZRQBUSSName")).append(" "); contentBuilder.append("复审日期:").append(attrInfoMap.get("FSRQBUSSName")).append(" "); - contentBuilder.append("起草部门:").append(attrInfoMap.get("QCDWName")).append(" "); - contentBuilder.append("起草人:").append(attrInfoMap.get("QCRBUSSName")).append(" "); +// contentBuilder.append("起草部门:").append(attrInfoMap.get("QCDWName")).append(" "); + contentBuilder.append("起草部门:").append(attrInfoMap.get("QCDW")).append(" "); +// contentBuilder.append("起草人:").append(attrInfoMap.get("QCRBUSSName")).append(" "); + contentBuilder.append("起草人:").append(attrInfoMap.get("QCRBUSS")).append(" "); contentBuilder.append("文件上传人员:").append(attrInfoMap.get("WJSCRYBUSSName")).append(" "); contentBuilder.append("适用车型:").append(attrInfoMap.get("SYCXCLASSName")).append(" "); contentBuilder.append("能源类型:").append(attrInfoMap.get("NYLXCLASSName")).append(" "); diff --git a/adc-da-slrs/src/main/java/com/adc/da/mq/SendStandMQService.java b/adc-da-slrs/src/main/java/com/adc/da/mq/SendStandMQService.java index e439dc21..1bebf78d 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/mq/SendStandMQService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/mq/SendStandMQService.java @@ -211,6 +211,24 @@ public class SendStandMQService { context = context.replace(",,", ","); saveMap.put("content", context); } + +// 如果出现提示查询报错，而且提示 查询内容无法转换为 日期格式的 情况，原因可能是没有把日期转换为字符串，可以考虑放开下面的代码（目前，域内没有报错，但是，本地有问题） +// //部分字段没有转为汉字，在此处转为汉字 +// if(StringUtils.isNotBlank(String.valueOf(saveMap.get("XCXSSRQName")))) { +// saveMap.put("XCXSSRQName"," " + String.valueOf(saveMap.get("XCXSSRQName"))); +// } +// if(StringUtils.isNotBlank(String.valueOf(saveMap.get("ZCCSSRQName")))) { +// saveMap.put("ZCCSSRQName"," " + String.valueOf(saveMap.get("ZCCSSRQName"))); +// } +// if(StringUtils.isNotBlank(String.valueOf(saveMap.get("SSRQName")))) { +// saveMap.put("SSRQName"," " + String.valueOf(saveMap.get("SSRQName"))); +// } +// if(StringUtils.isNotBlank(String.valueOf(saveMap.get("issueTime")))) { +// saveMap.put("issueTime"," " + String.valueOf(saveMap.get("issueTime"))); +// } +// if(StringUtils.isNotBlank(String.valueOf(saveMap.get("ZCCSSRQ")))) { +// saveMap.put("ZCCSSRQ"," " + String.valueOf(saveMap.get("ZCCSSRQ"))); +// } if("add".equals(addOrUpdate)){ sarStandardsInfoService.insertIntoIndexForMap(saveMap); } else { diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java index 16353926..244fa967 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java @@ -2605,6 +2605,9 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl Date: Wed, 19 Jan 2022 13:28:24 +0800 Subject: [PATCH 102/116] =?UTF-8?q?=E5=88=A4=E6=96=AD=E5=B7=A5=E4=BD=9C?= =?UTF-8?q?=E7=BB=84=E5=90=8D=E4=B8=8D=E8=83=BD=E9=87=8D=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/WorkGroupController.java | 44 ++++++++++++++++--- 1 file changed, 39 insertions(+), 5 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/customWorkGroup/controller/WorkGroupController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/customWorkGroup/controller/WorkGroupController.java index ba18cc02..40b54d6d 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/customWorkGroup/controller/WorkGroupController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/customWorkGroup/controller/WorkGroupController.java @@ -5,6 +5,7 @@ import com.adc.da.http.ResponseMessage; import com.adc.da.http.Result; import com.adc.da.slrs.customWorkGroup.entity.WorkGroupQueryPage; import com.adc.da.slrs.customWorkGroup.service.IWorkGroupService; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import io.swagger.annotations.ApiModelProperty; import org.apache.ibatis.annotations.Delete; @@ -14,6 +15,8 @@ import com.adc.da.slrs.customWorkGroup.entity.WorkGroup; import io.swagger.annotations.Api; import com.adc.da.base.web.BaseController; +import java.util.List; + /** *

* 前端控制器 @@ -34,9 +37,18 @@ public class WorkGroupController extends BaseController { @ApiModelProperty("新增工作组") @PostMapping public ResponseMessage addWorkGroup(WorkGroup workGroup) { - boolean add = iWorkGroupService.add(workGroup); + String meg=""; + if (isDistinct(workGroup.getWorkGroup())){ + if (iWorkGroupService.add(workGroup)){ + meg="新增成功!"; + }else { + meg="新增失败!"; + } + }else { + meg="组名已存在!"; + } - return Result.success(add); + return Result.success("200",meg); } @@ -53,7 +65,6 @@ public class WorkGroupController extends BaseController { @GetMapping public ResponseMessage> getWorkGroupLists(WorkGroupQueryPage queryPage){ IPage workGroup = iWorkGroupService.getWorkGroup(queryPage); - return Result.success(workGroup); } @@ -61,11 +72,34 @@ public class WorkGroupController extends BaseController { @ApiModelProperty("修改工作组") @PutMapping public ResponseMessage updateWorkGroup(WorkGroup workGroup){ - boolean update = iWorkGroupService.update(workGroup); + String meg=""; + if (isDistinct(workGroup.getWorkGroup())){ + if (iWorkGroupService.update(workGroup)){ + meg="修改成功!"; + }else { + meg="修改失败"; + } - return Result.success(update); + }else { + meg="组名已存在!"; + } + + return Result.success("200",meg); } + /** + * 判断提交的工作组名称是否重复 + * @param groupName + * @return true 没有重复 false 有重复 + */ + private boolean isDistinct(String groupName){ + QueryWrapper ew = new QueryWrapper<>(); + + ew.eq("work_group_name",groupName); + + List list = iWorkGroupService.list(ew); + return list.isEmpty(); + } } From cb2dde3bb2bcf42b98f59ad97c9be522c644aee6 Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Wed, 19 Jan 2022 13:43:58 +0800 Subject: [PATCH 103/116] VALID_FLAG = '0' --- .../mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml index 557e4d0b..4a7f892f 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml @@ -1723,6 +1723,8 @@ SELECT + id, work_group_name AS workGroup, work_leader_id AS workLeaderId, work_people_id AS workPeopleId From 0612cb210a0498d00cc505dfe91e3139fc1fca8f Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Wed, 19 Jan 2022 15:14:43 +0800 Subject: [PATCH 105/116] =?UTF-8?q?=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1=20?= =?UTF-8?q?VALID=5FFLAG=3D'0'?= 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 8c776893..f11f49ca 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 @@ -227,7 +227,8 @@ public class ScheduledJob { */ QueryWrapper columnForDTBJH = new QueryWrapper<>(); - columnForDTBJH.select("DTBJH"); + columnForDTBJH.select("DTBJH") + .eq("VALID_FLAG","0"); //查询代替标准字段得到一个 被代替了的标准的id的键值对列表 List> replaceStandIdMaps = sarStandAttrInfoDao.selectMaps(columnForDTBJH); HashMap replaceIdCountMap = new HashMap<>(); From 07ce4f1866bc62de7573edddba8ffb6e7e1d1bd5 Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Wed, 19 Jan 2022 16:27:39 +0800 Subject: [PATCH 106/116] =?UTF-8?q?=E6=B5=81=E7=A8=8B=E6=96=B0=E9=9C=80?= =?UTF-8?q?=E6=B1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../adc/da/slrs/sarUser/controller/TsUserController.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/controller/TsUserController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/controller/TsUserController.java index a60290a8..118e43d2 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/controller/TsUserController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/controller/TsUserController.java @@ -97,5 +97,13 @@ public class TsUserController extends BaseController { } + @ApiOperation("调研流程查询人 部门专用接口") + @GetMapping("/selectDeptByDY") + public ResponseMessage> selectDeptByDY(@Param("ids") String ids) throws Exception { + QueryWrapper queryWrapper=new QueryWrapper<>(); + queryWrapper.in("USID",ids.split(",")); + return Result.success(tsUserService.list(queryWrapper)); + } + } From 4821c6c34b2f820c881acd59a1e285e70d04b7ff Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Wed, 19 Jan 2022 16:47:43 +0800 Subject: [PATCH 107/116] =?UTF-8?q?=E5=AF=BC=E5=87=BA=E5=8E=BBhtml?= =?UTF-8?q?=E6=A0=87=E7=AD=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/adc/da/common/TableToExcel.java | 5 + .../SarPublicIdeaAllController.java | 9 +- .../adc/da/utils/removeHtml/RemoveHtml.java | 100 ++++++++++++++++++ 3 files changed, 110 insertions(+), 4 deletions(-) create mode 100644 adc-da-slrs/src/main/java/com/adc/da/utils/removeHtml/RemoveHtml.java diff --git a/adc-da-activiti/src/main/java/com/adc/da/common/TableToExcel.java b/adc-da-activiti/src/main/java/com/adc/da/common/TableToExcel.java index ad1dec71..df9d072e 100644 --- a/adc-da-activiti/src/main/java/com/adc/da/common/TableToExcel.java +++ b/adc-da-activiti/src/main/java/com/adc/da/common/TableToExcel.java @@ -1,5 +1,6 @@ package com.adc.da.common; +import com.adc.da.utils.removeHtml.RemoveHtml; import org.apache.commons.beanutils.BeanUtils; import org.apache.poi.hssf.usermodel.HSSFCellStyle; import org.apache.poi.ss.usermodel.*; @@ -93,6 +94,10 @@ public class TableToExcel { if (!"commentText".equals(key)) { try { Object val = BeanUtils.getProperty(t, key); + val= RemoveHtml.getResultsFromHtml(String.valueOf(val)); + if ("null".equals(val)){ + val=""; + } if (val instanceof Long) { dataRow.createCell(v++).setCellValue((Long) val); } else if (val instanceof Double) { diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/controller/SarPublicIdeaAllController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/controller/SarPublicIdeaAllController.java index 33e28534..84176653 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/controller/SarPublicIdeaAllController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/controller/SarPublicIdeaAllController.java @@ -6,6 +6,7 @@ import com.adc.da.http.Result; import com.adc.da.slrs.sarStandIdea.dao.SarPublicIdeaAllDao; import com.adc.da.slrs.sarStandIdea.entity.*; import com.adc.da.slrs.sarStandIdea.service.Impl.SarPublicIdeaAllServiceImpl; +import com.adc.da.utils.removeHtml.RemoveHtml; import com.alibaba.excel.EasyExcel; import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -140,8 +141,8 @@ public class SarPublicIdeaAllController extends BaseController if ("1".equals(type)) { GetExcelDto2 getExcelDto = GetExcelDto2.builder() .partCode(sarPublicIdeaAll.getPartCode()) - .oldText(sarPublicIdeaAll.getOldText()) - .newText(sarPublicIdeaAll.getNewText()) + .oldText(RemoveHtml.getResultsFromHtml(sarPublicIdeaAll.getOldText())) + .newText(RemoveHtml.getResultsFromHtml(sarPublicIdeaAll.getNewText())) .reason(sarPublicIdeaAll.getReason()) .userName(sarPublicIdeaAll.getUserName()) .deptName(sarPublicIdeaAll.getDeptName()) @@ -152,8 +153,8 @@ public class SarPublicIdeaAllController extends BaseController }else { GetExcelDto getExcelDto = GetExcelDto.builder() .partCode(sarPublicIdeaAll.getPartCode()) - .oldText(sarPublicIdeaAll.getOldText()) - .newText(sarPublicIdeaAll.getNewText()) + .oldText(RemoveHtml.getResultsFromHtml(sarPublicIdeaAll.getOldText())) + .newText(RemoveHtml.getResultsFromHtml(sarPublicIdeaAll.getNewText())) .reason(sarPublicIdeaAll.getReason()) .userName(sarPublicIdeaAll.getUserName()) .deptName(sarPublicIdeaAll.getDeptName()) diff --git a/adc-da-slrs/src/main/java/com/adc/da/utils/removeHtml/RemoveHtml.java b/adc-da-slrs/src/main/java/com/adc/da/utils/removeHtml/RemoveHtml.java new file mode 100644 index 00000000..8165d3ff --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/utils/removeHtml/RemoveHtml.java @@ -0,0 +1,100 @@ +package com.adc.da.utils.removeHtml; + +import java.util.regex.Matcher; +import java.util.regex.Pattern; + +public class RemoveHtml { + + + /** + * 匹配html标签，例如"

xxx

"这种格式 + */ + private static Pattern HTML_TAG_PATTERN = Pattern.compile("<[a-zA-Z]+.*?>([\\s\\S]*?)"); + + /** + * 替换掉html标签里面的style内容 + * + * @param content + * @return + */ + public static String replaceStyle(String content) { + if (content == null || content.length() == 0) { + return content; + } + String regEx = " style=\"(.*?)\""; + Pattern p = Pattern.compile(regEx); + Matcher m = p.matcher(content); + if (m.find()) { + content = m.replaceAll(""); + } + return content; + } + + + /** + * 移除掉
标签 + * + * @param src + * @return + */ + public static String removeBrTag(String src) { + if (src != null && !src.isEmpty()) { + src = src.replaceAll("
", ""); + } + return src; + } + + + /** + * 针对多个标签嵌套的情况进行处理 + * 比如

王者荣耀

+ * 预处理并且正则匹配完之后结果是 王者荣耀 + * 需要手工移除掉前面的起始标签 + * @param content + * @return + */ + public static String replaceStartTag(String content) { + if (content == null || content.length() == 0) { + return content; + } + String regEx = "<[a-zA-Z]*?>([\\s\\S]*?)"; + Pattern p = Pattern.compile(regEx); + Matcher m = p.matcher(content); + if (m.find()) { + content = m.replaceAll(""); + } + return content; + } + + + + /** + * 获取html中的数据 + * @param htmlStr + * @return + */ + public static String getResultsFromHtml(String htmlStr) { + //定义script的正则表达式，去除js可以防止注入 + String scriptRegex="]*?>[\\s\\S]*?<\\/script>"; + //定义style的正则表达式，去除style样式，防止css代码过多时只截取到css样式代码 + String styleRegex="]*?>[\\s\\S]*?<\\/style>"; + //定义HTML标签的正则表达式，去除标签，只提取文字内容 + String htmlRegex="<[^>]+>"; + //定义空格,回车,换行符,制表符 + String spaceRegex = "\\s*|\t|\r|\n"; + + // 过滤script标签 + htmlStr = htmlStr.replaceAll(scriptRegex, ""); + // 过滤style标签 + htmlStr = htmlStr.replaceAll(styleRegex, ""); + // 过滤html标签 + htmlStr = htmlStr.replaceAll(htmlRegex, ""); + // 过滤空格等 + htmlStr = htmlStr.replaceAll(spaceRegex, ""); + return htmlStr.trim(); // 返回文本字符串 + } + + + + +} From 3bd285aacdc0f82a7140851a93e7a2e9cd437708 Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Wed, 19 Jan 2022 17:17:24 +0800 Subject: [PATCH 108/116] feat: There is no way the, --- .../ActSarItemsBussEOController.java | 10 ++- .../service/ActSarItemsBussEOService.java | 70 +++++++++++++++++-- .../entity/QualityEvaluation.java | 3 + .../java/com/adc/da/utils/util/Utils.java | 6 ++ 4 files changed, 81 insertions(+), 8 deletions(-) diff --git a/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/ActSarItemsBussEOController.java b/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/ActSarItemsBussEOController.java index a15cbc75..956a30b3 100644 --- a/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/ActSarItemsBussEOController.java +++ b/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/ActSarItemsBussEOController.java @@ -11,9 +11,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; @RestController @RequestMapping("/${restPath}/lawss/actSarItemsBuss") @@ -35,4 +33,10 @@ public class ActSarItemsBussEOController extends BaseController { return Result.error("传入数据json不能为空"); } } + + @ApiOperation(value = "手动更新") + @GetMapping("/autoUpdIndex") + public void autoUpdIndex(@RequestParam("pid") String pid,@RequestParam("bussId") String bussId) { + actSarItemsEOService.autoUpdIndex(pid,bussId); + } } diff --git a/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsBussEOService.java b/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsBussEOService.java index badbd890..341e3159 100644 --- a/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsBussEOService.java +++ b/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsBussEOService.java @@ -29,6 +29,7 @@ import com.adc.da.slrs.sarUpdLog.service.ISarUpdLogService; import com.adc.da.slrs.sysInfo.service.SysInfoEOService; import com.adc.da.util.UUIDUtils; import com.adc.da.utils.util.InitStandAttrUtil; +import com.adc.da.utils.util.Utils; import com.adc.da.workFlow.dao.ActSarItemsEODao; import com.adc.da.workFlow.entity.BusProcessEvaluationHis; import com.alibaba.fastjson.JSON; @@ -44,8 +45,10 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; +import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.*; +import java.util.stream.Collectors; @Service("actSarItemsBussEOService") @Transactional(value = "transactionManager", readOnly = false, propagation = Propagation.REQUIRED, rollbackFor = Throwable.class) @@ -78,6 +81,49 @@ public class ActSarItemsBussEOService { @Value("${elas.flag}") private boolean elasflag; + public void autoUpdIndex(String pid,String bussId){ + List evaluationHisFilter = workFlowFeignClient.evaluationHisList(pid); + List evaluationHis = new ArrayList<>(); + Map> listMap = new TreeMap<>(); + + // 按 相同数据分组 + listMap = evaluationHisFilter.stream().collect( + Collectors.groupingBy(a -> Utils.format("{0}#{1}", a.getPId(),a.getTaskInfo()))); + + List evaluations = new ArrayList<>(); + if(!listMap.isEmpty()){ + SimpleDateFormat sdf=new SimpleDateFormat("yyy-MM-dd HH:mm:ss"); + listMap.forEach((key, value) -> { + if(!value.isEmpty()){ + evaluationHis.add(value.get(0)); + } + }); + String finalBussId = bussId; + Date date = new Date(); + evaluationHis.forEach(busProcessEvaluationHis -> { + List valueArr = JSONArray.parseArray(busProcessEvaluationHis.getMesg(),JSONObject.class); + if(!valueArr.isEmpty()){ + valueArr.forEach(object -> { + QualityEvaluation evaluation = new QualityEvaluation(); + evaluation.setId(UUIDUtils.randomUUID20()); + evaluation.setLawId(finalBussId); + evaluation.setUserId(object.getString("userId")); + evaluation.setScore(object.getString("score")); + evaluation.setReason(object.getString("reason")); + evaluation.setEvaluationIndex(object.getString("code")); + evaluation.setProcessNode(object.getString("processNode")); + evaluation.setEvaluationType(object.getString("indexType")); + evaluation.setCreateTime(date); + evaluation.setModifyTime(date); + evaluations.add(evaluation); + + }); + } + }); + qualityEvaluationService.saveBatch(evaluations); + } + } + /*** * @Description: 国内外标准流程入库" * @Date: 2020/12/7 13:48 @@ -238,10 +284,24 @@ public class ActSarItemsBussEOService { // saveCompStatusInfo(sarStandardsInfoEO,breakVal,allItems,prcNum); // } - List evaluationHis = workFlowFeignClient.evaluationHisList(pid); + List evaluationHisFilter = workFlowFeignClient.evaluationHisList(pid); + List evaluationHis = new ArrayList<>(); + Map> listMap = new TreeMap<>(); + + // 按 相同数据分组 + listMap = evaluationHisFilter.stream().collect( + Collectors.groupingBy(a -> Utils.format("{0}#{1}", a.getPId(),a.getTaskInfo()))); + List evaluations = new ArrayList<>(); - if(!evaluationHis.isEmpty()){ + if(!listMap.isEmpty()){ + SimpleDateFormat sdf=new SimpleDateFormat("yyy-MM-dd HH:mm:ss"); + listMap.forEach((key, value) -> { + if(!value.isEmpty()){ + evaluationHis.add(value.get(0)); + } + }); String finalBussId = bussId; + Date date = new Date(); evaluationHis.forEach(busProcessEvaluationHis -> { List valueArr = JSONArray.parseArray(busProcessEvaluationHis.getMesg(),JSONObject.class); if(!valueArr.isEmpty()){ @@ -255,15 +315,15 @@ public class ActSarItemsBussEOService { evaluation.setEvaluationIndex(object.getString("code")); evaluation.setProcessNode(object.getString("processNode")); evaluation.setEvaluationType(object.getString("indexType")); - evaluation.setCreateTime(new Date()); - evaluation.setModifyTime(new Date()); + evaluation.setCreateTime(date); + evaluation.setModifyTime(date); evaluations.add(evaluation); }); } }); + qualityEvaluationService.saveBatch(evaluations); } - qualityEvaluationService.saveBatch(evaluations); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/entity/QualityEvaluation.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/entity/QualityEvaluation.java index db50f52a..a6398a23 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/entity/QualityEvaluation.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/entity/QualityEvaluation.java @@ -3,6 +3,7 @@ package com.adc.da.slrs.sarEnterpriseStandardEvaluation.entity; import com.adc.da.base.entity.BaseEntity; import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.TableField; +import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonProperty; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -77,10 +78,12 @@ public class QualityEvaluation extends BaseEntity { @ApiModelProperty(value = "创建时间") @TableField(fill = FieldFill.INSERT) + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") private Date createTime; @ApiModelProperty(value = "更新时间") @TableField(fill = FieldFill.INSERT_UPDATE) + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") private Date modifyTime; diff --git a/adc-da-slrs/src/main/java/com/adc/da/utils/util/Utils.java b/adc-da-slrs/src/main/java/com/adc/da/utils/util/Utils.java index 27a7a463..f43dfae9 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/utils/util/Utils.java +++ b/adc-da-slrs/src/main/java/com/adc/da/utils/util/Utils.java @@ -5,6 +5,8 @@ import org.apache.poi.ss.usermodel.Cell; import org.apache.poi.ss.usermodel.CellType; import org.apache.poi.ss.usermodel.Row; +import java.text.MessageFormat; + /** * @Description: TODO * @author: super_liu @@ -12,6 +14,10 @@ import org.apache.poi.ss.usermodel.Row; */ public class Utils { + public static String format(String value, Object... paras) { + return MessageFormat.format(value, paras); + } + //判断row是否为空 空返回true public static boolean isRowEmpty(Row row) { if (null == row) { From d49893bdf101cce16c071c495040229be04ebd0e Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Wed, 19 Jan 2022 17:46:23 +0800 Subject: [PATCH 109/116] =?UTF-8?q?=E4=B8=BA=E5=AE=9A=E6=97=B6=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=E5=8A=A0=E4=B8=8A=E4=BA=86=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/adc/da/scheduled/ScheduledJob.java | 54 ++++++++++++++++--- .../service/impl/SarUpdLogServiceImpl.java | 2 + 2 files changed, 49 insertions(+), 7 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 f11f49ca..46aec11b 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 @@ -20,6 +20,8 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import lombok.extern.slf4j.Slf4j; +import net.sf.json.JSONObject; +import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.BeanUtils; @@ -228,10 +230,13 @@ public class ScheduledJob { QueryWrapper columnForDTBJH = new QueryWrapper<>(); columnForDTBJH.select("DTBJH") - .eq("VALID_FLAG","0"); + .eq("VALID_FLAG","0") + .ne("DTBJH",""); //查询代替标准字段得到一个 被代替了的标准的id的键值对列表 - List> replaceStandIdMaps = sarStandAttrInfoDao.selectMaps(columnForDTBJH); + List> replaceStandIdMaps = sarStandAttrInfoDao.selectMaps(columnForDTBJH).subList(0,100); HashMap replaceIdCountMap = new HashMap<>(); + + // 格式为 T/CSAE 175-2021 /** * 国内外表准号格式不统一 @@ -287,22 +292,37 @@ public class ScheduledJob { //一个被代替标准号时,文本状态更新为废止状态,两个及以上时更新为被代替状态 - SarStandardsInfo sarStandardsInfo = new SarStandardsInfo(); for (String key : replaceIdCountMap.keySet()) { + SarStandardsInfo sarStandardsInfo = new SarStandardsInfo(); + String reasonMsg=""; switch (replaceIdCountMap.get(key)){ case 1 : - sarStandardsInfo.setTextStatus("chblaarg77");//废止状态 + //废止状态 + sarStandardsInfo.setTextStatus("chblaarg77"); sarStandardsInfo.setId(key); + reasonMsg="该标准被一个标准代替"; break; - default : - sarStandardsInfo.setTextStatus("qke0ckro2p");//被代替状态 + case 2 : + //被代替状态 + sarStandardsInfo.setTextStatus("qke0ckro2p"); sarStandardsInfo.setId(key); + reasonMsg="该标准被一个以上标准代替"; + break; + default: break; } try { -// sarUpdLogEOService.createUpdateLog(sarStandardsInfoEO.getStandType() + "_STAND", sarStandardsInfoEO.getId(), oldMap, newMap, content); + //更新日志 + SarStandardsInfo beforeSarStandardsInfoEO = sarStandardsInfoDao.selectById(sarStandardsInfo.getId()); + sarStandardsInfo.setStandType(beforeSarStandardsInfoEO.getStandType()); + sarStandardsInfo.setStandSort(beforeSarStandardsInfoEO.getStandSort()); + sarStandardsInfo.setStandNumber(beforeSarStandardsInfoEO.getStandNumber()); + sarStandardsInfo.setStandYear(beforeSarStandardsInfoEO.getStandYear()); + sarStandardsInfo.setStandName(beforeSarStandardsInfoEO.getStandName()); + saveUpdateLog(sarStandardsInfo,beforeSarStandardsInfoEO,reasonMsg); + //更新日志 sarStandardsInfoDao.updateById(sarStandardsInfo); }catch (Exception e){ System.out.println("代替标准状态更新:id为"+key+"文本状态更新失败"); @@ -312,4 +332,24 @@ public class ScheduledJob { logger.info("==================================更新文本状态结束======================================"); } + + + + public void saveUpdateLog(SarStandardsInfo sarStandardsInfoEO, SarStandardsInfo beforeSarStandardsInfo,String reasonMsg) throws Exception { + Map newMap = new HashMap<>(); + Map oldMap = new HashMap<>(); + String attrStr = sarStandardsInfoEO.getSarStandAttrEOStr(); + if (StringUtils.isNotBlank(attrStr)) { + newMap = JSONObject.fromObject(attrStr); + } + newMap.put("textStatus",sarStandardsInfoEO.getTextStatus()); + oldMap.put("textStatus",beforeSarStandardsInfo.getTextStatus()); + // 增加关联事件 + String number = sarStandardsInfoEO.getStandSort() + " " + sarStandardsInfoEO.getStandNumber(); + if (StringUtils.isNotBlank(sarStandardsInfoEO.getStandYear())) { + number += "-" + sarStandardsInfoEO.getStandYear(); + } + String content ="==定时任务执行修改==:" + number + " 《" + sarStandardsInfoEO.getStandName() + "》"+reasonMsg; + sarUpdLogEOService.createUpdateLog(sarStandardsInfoEO.getStandType() + "_STAND", sarStandardsInfoEO.getId(), oldMap, newMap, content); + } } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUpdLog/service/impl/SarUpdLogServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUpdLog/service/impl/SarUpdLogServiceImpl.java index 2bf7bade..33a432fb 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUpdLog/service/impl/SarUpdLogServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUpdLog/service/impl/SarUpdLogServiceImpl.java @@ -135,6 +135,7 @@ public class SarUpdLogServiceImpl extends ServiceImpl i selectFieldMap.put("standSort","STANDCLASSIFY"); selectFieldMap.put("standState","STANDSTATE"); selectFieldMap.put("standNature","STANDNATURE"); + selectFieldMap.put("textStatus","TEXTSTATUS"); } else if (SarTypeEnum.INLAND_LAWS.getValue().equals(sarType) || SarTypeEnum.FOREIGN_LAWS.getValue().equals(sarType)) { selectFieldMap = InitStandAttrUtil.selectFieldMapLaws; selectFieldMap.put("isRelateAccess","SHIFOUGL"); @@ -199,6 +200,7 @@ public class SarUpdLogServiceImpl extends ServiceImpl i public String changeStandName (String field,String sarType) throws Exception{ switch (field) { + case "textStatus":return "文本状态"; case "country": return "适用区域"; case "isRelateAccess": return "重要度"; case "issueTime": return "发布日期"; From a2b38c85d37d2e6cc98472dca293af8c18edd1c1 Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Wed, 19 Jan 2022 18:23:10 +0800 Subject: [PATCH 110/116] =?UTF-8?q?=E8=B0=83=E7=A0=94=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../adc/da/slrs/sarUser/controller/TsUserController.java | 7 ++++--- .../main/java/com/adc/da/slrs/sarUser/dao/TsUserDao.java | 2 ++ .../resources/mybatis/mapper/sarUser/TsUserMapper.xml | 9 +++++++++ 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/controller/TsUserController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/controller/TsUserController.java index 118e43d2..09e8d111 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/controller/TsUserController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/controller/TsUserController.java @@ -24,6 +24,8 @@ import io.swagger.annotations.Api; import com.adc.da.base.web.BaseController; import javax.validation.Valid; +import java.util.ArrayList; +import java.util.Arrays; import java.util.List; /** @@ -100,9 +102,8 @@ public class TsUserController extends BaseController { @ApiOperation("调研流程查询人 部门专用接口") @GetMapping("/selectDeptByDY") public ResponseMessage> selectDeptByDY(@Param("ids") String ids) throws Exception { - QueryWrapper queryWrapper=new QueryWrapper<>(); - queryWrapper.in("USID",ids.split(",")); - return Result.success(tsUserService.list(queryWrapper)); + List strings=new ArrayList<>(Arrays.asList(ids.split(","))); + return Result.success(tsUserDao.selectDeptByDY(strings)); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/dao/TsUserDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/dao/TsUserDao.java index 9f231fe6..d3a8ad84 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/dao/TsUserDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/dao/TsUserDao.java @@ -56,4 +56,6 @@ public interface TsUserDao extends BaseMapper { * @return List */ List getUserIdsByPositionIds(List positionIds); + + List selectDeptByDY(@Param("list") List strings); } 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 b5e3c5f8..47413212 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 @@ -75,4 +75,13 @@ ) + + From ebe6cd5bf70d40841446303957705db213f314ed Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Wed, 19 Jan 2022 19:29:40 +0800 Subject: [PATCH 111/116] =?UTF-8?q?=E7=BC=96=E8=BE=91=E5=88=A4=E6=96=AD?= =?UTF-8?q?=E4=B8=8D=E8=83=BD=E9=87=8D=E5=A4=8D=E6=97=B6=E6=8E=92=E9=99=A4?= =?UTF-8?q?=E8=87=AA=E8=BA=AB=20=E8=A7=84=E8=8C=83=E4=BA=86=E8=BF=94?= =?UTF-8?q?=E5=9B=9E=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/WorkGroupController.java | 41 ++++++++++++------- 1 file changed, 26 insertions(+), 15 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/customWorkGroup/controller/WorkGroupController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/customWorkGroup/controller/WorkGroupController.java index dfeab7da..7685ce67 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/customWorkGroup/controller/WorkGroupController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/customWorkGroup/controller/WorkGroupController.java @@ -8,6 +8,7 @@ import com.adc.da.slrs.customWorkGroup.service.IWorkGroupService; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import io.swagger.annotations.ApiModelProperty; +import org.apache.commons.codec.language.Nysiis; import org.apache.ibatis.annotations.Delete; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -37,18 +38,21 @@ public class WorkGroupController extends BaseController { @ApiModelProperty("新增工作组") @PostMapping public ResponseMessage addWorkGroup(WorkGroup workGroup) { - String meg=""; - if (isDistinct(workGroup.getWorkGroup())){ + ResponseMessage result = Result.success(); + + if (isDistinct(workGroup.getWorkGroup(),null)){ if (iWorkGroupService.add(workGroup)){ - meg="新增成功!"; + result=Result.success("200","新增成功"); }else { - meg="新增失败!"; + result=Result.error("201","新增失败"); + } }else { - meg="组名已存在!"; + result=Result.error("202","组名已存在"); + } - return Result.success("200",meg); + return result; } @@ -72,32 +76,39 @@ public class WorkGroupController extends BaseController { @ApiModelProperty("修改工作组") @PutMapping public ResponseMessage updateWorkGroup(WorkGroup workGroup){ - String meg=""; - if (isDistinct(workGroup.getWorkGroup())){ + + ResponseMessage result = Result.success(); + + if (isDistinct(workGroup.getWorkGroup(),workGroup.getId())){ if (iWorkGroupService.update(workGroup)){ - meg="修改成功!"; + result=Result.success("200", "修改成功"); }else { - meg="修改失败"; + result=Result.error("201", "修改失败"); } }else { - meg="组名已存在!"; + result=Result.error("202", "组名已存在"); } - return Result.success("200",meg); + return result; } /** * 判断提交的工作组名称是否重复 - * @param groupName - * @return true 没有重复 false 有重复 + * @param groupName 条件 + * @param id 排除id + * @returntrue 没有重复 false 有重复 */ - private boolean isDistinct(String groupName){ + private boolean isDistinct(String groupName,String id){ QueryWrapper ew = new QueryWrapper<>(); ew.eq("work_group_name",groupName); + if (id!=null){ + ew.ne("id",id); + } + List list = iWorkGroupService.list(ew); return list.isEmpty(); } From 4826332deb2bc8ec3e5cd1d53fa38466c103225c Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Thu, 20 Jan 2022 15:05:23 +0800 Subject: [PATCH 112/116] =?UTF-8?q?=E6=A0=87=E5=87=86=E5=90=88=E8=A7=84?= =?UTF-8?q?=E8=AF=84=E4=BC=B0=20=E5=87=86=E5=A4=87=E7=9A=84=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SarStandProjectLibraryController.java | 15 +++++++++ .../dao/SarStandProjectLibraryDao.java | 3 ++ .../SarStandProjectLibraryService.java | 3 ++ .../SarStandProjectLibraryServiceImpl.java | 10 ++++++ .../SarStandProjectLibraryMapper.xml | 33 +++++++++++++++++++ 5 files changed, 64 insertions(+) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/controller/SarStandProjectLibraryController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/controller/SarStandProjectLibraryController.java index 02888d99..0cd08aa5 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/controller/SarStandProjectLibraryController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/controller/SarStandProjectLibraryController.java @@ -343,4 +343,19 @@ public class SarStandProjectLibraryController extends BaseController selectListByids(@Param("ids") List ids); + List queryProjectGroup(@Param("sarStandProjectLibrary") SarStandProjectLibrary sarStandProjectLibrary); + + List queryProjects(@Param("sarStandProjectLibrary") SarStandProjectLibrary sarStandProjectLibrary); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/SarStandProjectLibraryService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/SarStandProjectLibraryService.java index 85ed659b..72f916ab 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/SarStandProjectLibraryService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/SarStandProjectLibraryService.java @@ -29,5 +29,8 @@ public interface SarStandProjectLibraryService { void batchInsertAdd(@Param("ids") List list); List exportStandAttrInfoExcel(StandAttrInfoExcelDto standAttrInfoExcelDto,String standId); public Head AnalysisJsonAndStorage(String jsonStr); + public List queryProjectGroup(@Param("sarStandProjectLibrary") SarStandProjectLibrary sarStandProjectLibrary); + + public List queryProjects(@Param("sarStandProjectLibrary") SarStandProjectLibrary sarStandProjectLibrary); } 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 293ed9fd..a13297fb 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 @@ -128,6 +128,16 @@ public class SarStandProjectLibraryServiceImpl extends ServiceImpl queryProjectGroup(SarStandProjectLibrary sarStandProjectLibrary) { + return sarStandProjectLibraryDao.queryProjectGroup(sarStandProjectLibrary); + } + + @Override + public List queryProjects(SarStandProjectLibrary sarStandProjectLibrary) { + return sarStandProjectLibraryDao.queryProjects(sarStandProjectLibrary); + } + @Override public IPage queryMaintenanceProject(int current, int pageSize, SarStandProjectLibraryDto sarDto) { diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandProjectLibrary/SarStandProjectLibraryMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandProjectLibrary/SarStandProjectLibraryMapper.xml index 660d2263..0ce3a5e7 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandProjectLibrary/SarStandProjectLibraryMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandProjectLibrary/SarStandProjectLibraryMapper.xml @@ -368,4 +368,37 @@ #{item} + + From f3101d6e74b4904da5c2d335108adcd007c048f0 Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Thu, 20 Jan 2022 15:07:55 +0800 Subject: [PATCH 113/116] =?UTF-8?q?=E4=BC=81=E6=A0=87=E8=AF=A6=E6=83=85=20?= =?UTF-8?q?=E6=96=87=E6=9C=AC=E7=8A=B6=E6=80=81=E6=98=BE=E7=A4=BAtextStatu?= =?UTF-8?q?sBussShow?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../slrs/sarBussionessStand/entity/SarBussionessStand.java | 3 +++ .../mapper/sarBussionessStand/SarBussionessStandMapper.xml | 4 +++- .../com/adc/da/sys/controller/DicTypeEORestController.java | 6 ++++-- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/entity/SarBussionessStand.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/entity/SarBussionessStand.java index 7b663965..2d6502fe 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/entity/SarBussionessStand.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/entity/SarBussionessStand.java @@ -153,6 +153,9 @@ public class SarBussionessStand extends BaseEntity { @TableField(exist = false) private String menuParentId; + @TableField(exist = false) + private String textStatusBussShow; + @TableField(exist = false) private String standStatusShow; // 标准状态下拉框 --单选 diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStand/SarBussionessStandMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStand/SarBussionessStandMapper.xml index 38a70316..7abb5fd4 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStand/SarBussionessStandMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStand/SarBussionessStandMapper.xml @@ -21,6 +21,7 @@ + @@ -748,12 +749,13 @@ From d86f1c12cda279afa48fa916b8f677da697a8b5f Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Thu, 20 Jan 2022 16:21:09 +0800 Subject: [PATCH 115/116] =?UTF-8?q?=E6=A0=87=E5=87=86=E5=90=88=E8=A7=84?= =?UTF-8?q?=E8=AF=84=E4=BC=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sarStandProjectLibrary/SarStandProjectLibraryMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandProjectLibrary/SarStandProjectLibraryMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandProjectLibrary/SarStandProjectLibraryMapper.xml index 1fa348f5..7350546f 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandProjectLibrary/SarStandProjectLibraryMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandProjectLibrary/SarStandProjectLibraryMapper.xml @@ -370,7 +370,7 @@