From 87d871b629ae682bd1248096a3f6e2e09ad8fa64 Mon Sep 17 00:00:00 2001 From: liao Date: Fri, 10 Nov 2023 09:29:23 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E6=A0=87=E5=87=86=E9=A2=84=E8=AD=A6?= =?UTF-8?q?=E5=A4=9A=E6=97=A5=E6=9C=9F=E9=A1=BA=E5=BA=8F=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fb/service/impl/ProcessHandleServiceImpl.java | 4 ++-- .../mapper/xml/LawsStandardEarlyWarningMapper.xml | 8 +++++++- .../src/main/resources/application-dev.yml | 10 +++++----- 3 files changed, 14 insertions(+), 8 deletions(-) diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessHandleServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessHandleServiceImpl.java index b3158ece..df6b63ca 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessHandleServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessHandleServiceImpl.java @@ -128,10 +128,10 @@ public class ProcessHandleServiceImpl implements IProcessHandleService { processNodeLinkService.saveNodeUserLink(processDefinitionId, processInstanceId, userInfoMap); } if (pass) { // 通过 - runtimeService.setVariable(processInstanceId, "pass", true); + runtimeService.setVariableLocal(processInstanceId, "pass", true); basicTaskInfoDTO.setCommitFlag(CommitFlagEnum.PASS.getValue()); } else { // 驳回 - runtimeService.setVariable(processInstanceId, "pass", false); + runtimeService.setVariableLocal(processInstanceId, "pass", false); basicTaskInfoDTO.setCommitFlag(CommitFlagEnum.REJECT.getValue()); } // 更新审批记录表 diff --git a/laws-modules/src/main/java/com/jero/modules/laws/localTool/mapper/xml/LawsStandardEarlyWarningMapper.xml b/laws-modules/src/main/java/com/jero/modules/laws/localTool/mapper/xml/LawsStandardEarlyWarningMapper.xml index 79b85c57..069722d4 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/localTool/mapper/xml/LawsStandardEarlyWarningMapper.xml +++ b/laws-modules/src/main/java/com/jero/modules/laws/localTool/mapper/xml/LawsStandardEarlyWarningMapper.xml @@ -108,6 +108,12 @@ ORDER BY - dataInfo.implementation_date DESC + dataInfo.implementation_date DESC, + + dataInfo.new_model_implementation_date ASC + + + dataInfo.on_the_production_date ASC + \ No newline at end of file diff --git a/laws-single-startup/src/main/resources/application-dev.yml b/laws-single-startup/src/main/resources/application-dev.yml index c8b2063d..d8edce9a 100644 --- a/laws-single-startup/src/main/resources/application-dev.yml +++ b/laws-single-startup/src/main/resources/application-dev.yml @@ -180,8 +180,8 @@ spring: # shutdown-timeout: 100ms redis: database: 11 -# host: 121.36.69.172 - host: localhost + host: 121.36.69.172 + #host: localhost lettuce: pool: max-active: 8 #最大连接数据库连接数,设 0 为没有限制 @@ -189,9 +189,9 @@ spring: max-wait: -1ms #最大建立连接等待时间。如果超过此时间将接到异常。设为-1表示无限制。 min-idle: 0 #最小等待连接中的数量,设 0 为没有限制 shutdown-timeout: 100ms -# password: hzwlsoft.com -# port: 4780 - port: 6379 + password: hzwlsoft.com + port: 4780 +# port: 6379 #rabbitmq 配置 rabbitmq: