项目库-任务清单-批量设置认证进度和状态-校验修改

This commit is contained in:
liyawei
2022-08-23 09:49:44 +08:00
parent e9a74c4025
commit abd77b852e
@@ -495,20 +495,20 @@ public class ProjectTaskInventoryEOServiceImpl extends ServiceImpl<ProjectTaskIn
Map<String, String> msgMap = new HashMap<>(); Map<String, String> msgMap = new HashMap<>();
if ("1".equals(operation)) { if ("1".equals(operation)) {
if (! ProjectRoleEnum.HOMOLOGATION_ENGINEER.getValue().equals(roleCode)) { if (! (ProjectRoleEnum.HOMOLOGATION_ENGINEER.getValue().equals(roleCode)
|| ProjectRoleEnum.REGULATI_AND_HOMOLOGATION_ENGINEER.getValue().equals(roleCode))) {
msgMap.put("serialNumber", projectLawsInventoryEO.getSerialNumber()); msgMap.put("serialNumber", projectLawsInventoryEO.getSerialNumber());
msgMapList.add(msgMap);
} }
} else if ("2".equals(operation)) { } else if ("2".equals(operation)) {
if (!(ProjectRoleEnum.HOMOLOGATION_ENGINEER.getValue().equals(roleCode) if (!(ProjectRoleEnum.REGULATI_ENGINEER.getValue().equals(roleCode)
|| ProjectRoleEnum.HOMOLOGATION_ENGINEER.getValue().equals(roleCode) || ProjectRoleEnum.HOMOLOGATION_ENGINEER.getValue().equals(roleCode)
|| ProjectRoleEnum.REGULATI_AND_HOMOLOGATION_ENGINEER.getValue().equals(roleCode))) { || ProjectRoleEnum.REGULATI_AND_HOMOLOGATION_ENGINEER.getValue().equals(roleCode))) {
msgMap.put("serialNumber", projectLawsInventoryEO.getSerialNumber()); msgMap.put("serialNumber", projectLawsInventoryEO.getSerialNumber());
msgMapList.add(msgMap);
} }
} }
msgMapList.add(msgMap);
} }
return getMsg(msgMapList, cut, operation); return getMsg(msgMapList, cut, operation);