ZQ/laws-sinotruk-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update 标准预警多日期顺序排序

Browse Source
This commit is contained in:
liao
2023-11-10 09:29:23 +08:00
parent 026dcbc317
commit 87d871b629
3 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessHandleServiceImpl.java
+2 -2
View File
@@ -128,10 +128,10 @@ public class ProcessHandleServiceImpl implements IProcessHandleService {
processNodeLinkService.saveNodeUserLink(processDefinitionId, processInstanceId, userInfoMap); processNodeLinkService.saveNodeUserLink(processDefinitionId, processInstanceId, userInfoMap);
} }
if (pass) { // 通过 if (pass) { // 通过
runtimeService.setVariable(processInstanceId, "pass", true); runtimeService.setVariableLocal(processInstanceId, "pass", true);
basicTaskInfoDTO.setCommitFlag(CommitFlagEnum.PASS.getValue()); basicTaskInfoDTO.setCommitFlag(CommitFlagEnum.PASS.getValue());
} else { // 驳回 } else { // 驳回
runtimeService.setVariable(processInstanceId, "pass", false); runtimeService.setVariableLocal(processInstanceId, "pass", false);
basicTaskInfoDTO.setCommitFlag(CommitFlagEnum.REJECT.getValue()); basicTaskInfoDTO.setCommitFlag(CommitFlagEnum.REJECT.getValue());
} }
// 更新审批记录表 // 更新审批记录表
laws-modules/src/main/java/com/jero/modules/laws/localTool/mapper/xml/LawsStandardEarlyWarningMapper.xml
+7 -1
View File
@@ -108,6 +108,12 @@
</foreach> </foreach>
</if> </if>
ORDER BY ORDER BY
dataInfo.implementation_date DESC dataInfo.implementation_date DESC,
<if test="param.newModelImplementationDate != null and param.newModelImplementationDate != ''">
dataInfo.new_model_implementation_date ASC
</if>
<if test="param.onTheProductionDate != null and param.onTheProductionDate != ''">
dataInfo.on_the_production_date ASC
</if>
</select> </select>
</mapper> </mapper>
laws-single-startup/src/main/resources/application-dev.yml
+5 -5
View File
@@ -180,8 +180,8 @@ spring:
# shutdown-timeout: 100ms # shutdown-timeout: 100ms
redis: redis:
database: 11 database: 11
# host: 121.36.69.172 host: 121.36.69.172
host: localhost #host: localhost
lettuce: lettuce:
pool: pool:
max-active: 8 #最大连接数据库连接数,设 0 为没有限制 max-active: 8 #最大连接数据库连接数,设 0 为没有限制
@@ -189,9 +189,9 @@ spring:
max-wait: -1ms #最大建立连接等待时间。如果超过此时间将接到异常。设为-1表示无限制。 max-wait: -1ms #最大建立连接等待时间。如果超过此时间将接到异常。设为-1表示无限制。
min-idle: 0 #最小等待连接中的数量,设 0 为没有限制 min-idle: 0 #最小等待连接中的数量,设 0 为没有限制
shutdown-timeout: 100ms shutdown-timeout: 100ms
# password: hzwlsoft.com password: hzwlsoft.com
# port: 4780 port: 4780
port: 6379 # port: 6379
#rabbitmq 配置 #rabbitmq 配置
rabbitmq: rabbitmq: