From 2ce3e1b03afab9f0ea00b0821b05d8ce5dcc604b Mon Sep 17 00:00:00 2001 From: bupengxiang Date: Thu, 18 May 2023 21:44:21 +0800 Subject: [PATCH] =?UTF-8?q?[=E4=BF=AE=E6=94=B9]=20prcType=20=E4=BB=A5?= =?UTF-8?q?=E5=89=8DprcType=E4=B8=8D=E8=83=BD=E7=BC=96=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- adc-da-main/src/main/resources/application-dev.properties | 5 ++++- .../da/wkflow/business_activiti/task/TodoTaskController.java | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/adc-da-main/src/main/resources/application-dev.properties b/adc-da-main/src/main/resources/application-dev.properties index 7a10004..df4ad6f 100644 --- a/adc-da-main/src/main/resources/application-dev.properties +++ b/adc-da-main/src/main/resources/application-dev.properties @@ -36,6 +36,9 @@ spring.datasource.driverClassName = com.mysql.cj.jdbc.Driver spring.datasource.url = jdbc:mysql://121.36.69.172:3307/report-library?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai +#spring.datasource.url = jdbc:mysql://121.36.69\ +# .172:3307/report-library_test?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false\ +# &allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai spring.datasource.username = root spring.datasource.password = hzwlsoft.com @@ -64,7 +67,7 @@ swaggerLevel=0 # \u672C\u5730\u5B58\u50A8\u6587\u4EF6\u7684\u78C1\u76D8\u5730\u5740 #uploadFile=D:\\work\\idea\\changan\\ #uploadFile=D:\\uploadfile\\tmp\\ -uploadFile=/data/DeploymentPackage/report_library/uploadfile/ +uploadFile=D:\\desktop\\dazhong\\uploadfile # \u672C\u5730\u6587\u4EF6\u8BBF\u95EE\u7684url\u5730\u5740 picPath=/api/home/pic/ diff --git a/report-activity/src/main/java/com/adc/da/wkflow/business_activiti/task/TodoTaskController.java b/report-activity/src/main/java/com/adc/da/wkflow/business_activiti/task/TodoTaskController.java index 5163d08..e2fd798 100644 --- a/report-activity/src/main/java/com/adc/da/wkflow/business_activiti/task/TodoTaskController.java +++ b/report-activity/src/main/java/com/adc/da/wkflow/business_activiti/task/TodoTaskController.java @@ -657,7 +657,7 @@ public class TodoTaskController { QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("CREAT_USER", approveDataVO.getCreateUser()); - queryWrapper.eq("PRC_TYPE", approveDataVO.getPrcType()); +// queryWrapper.eq("PRC_TYPE", approveDataVO.getPrcType()); queryWrapper.eq("ID", approveDataVO.getId()); queryWrapper.isNull("PRC_ID"); List list = iBusProcessNameService.list(queryWrapper); @@ -738,7 +738,7 @@ public class TodoTaskController { QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("CREAT_USER", approveDataVO.getCreateUser()); - queryWrapper.eq("PRC_TYPE", approveDataVO.getPrcType()); +// queryWrapper.eq("PRC_TYPE", approveDataVO.getPrcType()); queryWrapper.eq("ID", approveDataVO.getId()); queryWrapper.isNull("PRC_ID"); List list = iBusProcessNameService.list(queryWrapper);