style: 年度制修订-各部门主动上报代码整理

This commit is contained in:
2023-12-11 15:56:17 +08:00
parent fc2257a747
commit d9d4e3bf8f
@@ -252,29 +252,23 @@ public class ProcessEsAnnualReportServiceImpl extends ServiceImpl<ProcessEsAnnua
break; break;
case COLLECT_LEADER_APPROVAL: case COLLECT_LEADER_APPROVAL:
wrapper.eq(ProcessEsAnnualReport::getCollectUserLeader, userId); wrapper.eq(ProcessEsAnnualReport::getCollectUserLeader, userId);
wrapper.eq(ProcessEsAnnualReport::getDelFlag, YesOrNoEnum.NO.getInteger());
annualReportDataVO.setDataList(list(wrapper)); annualReportDataVO.setDataList(list(wrapper));
break; break;
case CONTACT_USER_COLLECT: case CONTACT_USER_COLLECT:
wrapper.eq(ProcessEsAnnualReport::getContactUser, userId); wrapper.eq(ProcessEsAnnualReport::getContactUser, userId);
wrapper.eq(ProcessEsAnnualReport::getProcessInstanceId, processInstanceId);
wrapper.in(ProcessEsAnnualReport::getExecutionId, executionIdList); wrapper.in(ProcessEsAnnualReport::getExecutionId, executionIdList);
wrapper.eq(ProcessEsAnnualReport::getDelFlag, YesOrNoEnum.NO.getInteger());
annualReportDataVO.setDataList(list(wrapper)); annualReportDataVO.setDataList(list(wrapper));
break; break;
case CONTACT_USER_LEADER_APPROVAL: case CONTACT_USER_LEADER_APPROVAL:
wrapper.eq(ProcessEsAnnualReport::getContactUserLeaderLeader, userId); wrapper.eq(ProcessEsAnnualReport::getContactUserLeaderLeader, userId);
wrapper.eq(ProcessEsAnnualReport::getProcessInstanceId, processInstanceId);
wrapper.in(ProcessEsAnnualReport::getExecutionId, executionIdList); wrapper.in(ProcessEsAnnualReport::getExecutionId, executionIdList);
wrapper.eq(ProcessEsAnnualReport::getDelFlag, YesOrNoEnum.NO.getInteger());
annualReportDataVO.setDataList(list(wrapper));
break; break;
case STANDARD_ENGINEER_COLLECT: case STANDARD_ENGINEER_COLLECT:
wrapper.eq(ProcessEsAnnualReport::getProcessInstanceId, processInstanceId);
wrapper.eq(ProcessEsAnnualReport::getDelFlag, YesOrNoEnum.NO.getInteger());
annualReportDataVO.setDataList(list(wrapper));
break; break;
} }
wrapper.eq(ProcessEsAnnualReport::getProcessInstanceId, processInstanceId);
wrapper.eq(ProcessEsAnnualReport::getDelFlag, YesOrNoEnum.NO.getInteger());
annualReportDataVO.setDataList(list(wrapper));
return annualReportDataVO; return annualReportDataVO;
} }