sxyanzhu
/
jhprjv2
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

提交代码

dev_xds
姜玉琦 2024-04-22 22:59:38 +08:00
parent 9a2890f78e
commit 68b30653a4
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectAuditinfoServiceImpl.java
View File

@ -174,11 +174,14 @@ public class SurProjectAuditinfoServiceImpl implements ISurProjectAuditinfoServi
} }
SmzSspProblemmodifyWhere smzSspProblemmodifyWhere = new SmzSspProblemmodifyWhere(); SmzSspProblemmodifyWhere smzSspProblemmodifyWhere = new SmzSspProblemmodifyWhere();
smzSspProblemmodifyWhere.setProjectId(Convert.toLong(flowTaskEntity.getBusinessKey())); if(StringUtils.isNotEmpty(flowTaskEntity.getBusinessKey())){
smzSspProblemmodifyWhere.setProjectId(Convert.toLong(flowTaskEntity.getBusinessKey()));
}
smzSspProblemmodifyWhere.setInfoType(1L); smzSspProblemmodifyWhere.setInfoType(1L);
Long minRole = flowTaskEntity.getRoleIds().stream().mapToLong(Long::longValue).min().getAsLong(); Long minRole = flowTaskEntity.getRoleIds().stream().mapToLong(Long::longValue).min().getAsLong();
smzSspProblemmodifyWhere.setNowRole(Convert.toStr(minRole)); smzSspProblemmodifyWhere.setNowRole(Convert.toStr(minRole));
smzSspProblemmodifyWhere.setNowUser(flowTaskEntity.getNowUserName()); smzSspProblemmodifyWhere.setNowUser(flowTaskEntity.getNowUserName());
smzSspProblemmodifyWhere.setNowDept(flowTaskEntity.getNowDept());
int zlCount = 0; int zlCount = 0;
List<Map<String, Object>> zlDataList = smzSspProblemmodifyMapper.findProblemmodifyGroupByCheckState(smzSspProblemmodifyWhere); List<Map<String, Object>> zlDataList = smzSspProblemmodifyMapper.findProblemmodifyGroupByCheckState(smzSspProblemmodifyWhere);
if(StringUtils.isNotEmpty(zlDataList)){ if(StringUtils.isNotEmpty(zlDataList)){
@ -208,6 +211,9 @@ public class SurProjectAuditinfoServiceImpl implements ISurProjectAuditinfoServi
dataMap.put("approveCLFY",d); dataMap.put("approveCLFY",d);
//查询劳资预警审批信息 //查询劳资预警审批信息
FlowLabourInfo flowLabourInfo=new FlowLabourInfo(); FlowLabourInfo flowLabourInfo=new FlowLabourInfo();
if(StringUtils.isNotEmpty(flowTaskEntity.getBusinessKey())){
flowLabourInfo.setProjectId(Convert.toLong(flowTaskEntity.getBusinessKey()));
}
flowLabourInfo.setNowRole(flowTaskEntity.getNowRole()); flowLabourInfo.setNowRole(flowTaskEntity.getNowRole());
flowLabourInfo.setNowDept(flowTaskEntity.getNowDept()); flowLabourInfo.setNowDept(flowTaskEntity.getNowDept());
flowLabourInfo.setNowUser(flowTaskEntity.getNowUser()); flowLabourInfo.setNowUser(flowTaskEntity.getNowUser());