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);
}
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());
}
// 更新审批记录表
laws-modules/src/main/java/com/jero/modules/laws/localTool/mapper/xml/LawsStandardEarlyWarningMapper.xml
+7 -1
View File
@@ -108,6 +108,12 @@
</foreach>
</if>
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>
</mapper>