diff --git a/src/main/java/com/spring/modules/change/service/impl/ChangeManagementServiceImpl.java b/src/main/java/com/spring/modules/change/service/impl/ChangeManagementServiceImpl.java index 599604d6..1a22b763 100644 --- a/src/main/java/com/spring/modules/change/service/impl/ChangeManagementServiceImpl.java +++ b/src/main/java/com/spring/modules/change/service/impl/ChangeManagementServiceImpl.java @@ -1541,6 +1541,17 @@ public class ChangeManagementServiceImpl extends ServiceImpl engineers = operatorList.stream().filter(a -> "engineer".equals(a.getType())).collect(Collectors.toList()); List technicians = operatorList.stream().filter(a -> "technician".equals(a.getType())).collect(Collectors.toList()); List dccs = operatorList.stream().filter(a -> "dcc".equals(a.getType())).collect(Collectors.toList()); + List cqcs = operatorList.stream().filter(a -> "cqc".equals(a.getType())).collect(Collectors.toList()); + List fais = operatorList.stream().filter(a -> "fai".equals(a.getType())).collect(Collectors.toList()); ParamData paramData = new ParamData(data.getSite(), baseData.get("nodeId"), baseData.get("nodeName"), data.getCodeNo(), data.getUserName(), baseData.get("classificationNo"), baseData.get("userId"), baseData.get("workflowId"), baseData.get("workflowname"), baseData.get("requestName"), baseData.get("path"), baseData.get("requestId"), @@ -1381,7 +1383,7 @@ public class TechnicalSpecificationServiceImpl implements TechnicalSpecification requestManageService.doProcessControl(controlList.get(i).getRoleId(),data.getSite(),data.getCodeNo()); } } - List mainData = getMainData(data.getSite(), baseData, changeRequest, engineers, technicians, dccs); + List mainData = getMainData(data.getSite(), baseData, changeRequest, engineers, technicians, dccs, cqcs, fais); paramData.setMainData(mainData); SubmitRequestParam submitRequestParam = new SubmitRequestParam(); submitRequestParam.setUserId(paramData.getUserId()); @@ -1493,6 +1495,9 @@ public class TechnicalSpecificationServiceImpl implements TechnicalSpecification List engineers = operatorList.stream().filter(a -> "engineer".equals(a.getType())).collect(Collectors.toList()); List technicians = operatorList.stream().filter(a -> "technician".equals(a.getType())).collect(Collectors.toList()); List dccs = operatorList.stream().filter(a -> "dcc".equals(a.getType())).collect(Collectors.toList()); + List cqcs = operatorList.stream().filter(a -> "cqc".equals(a.getType())).collect(Collectors.toList()); + List fais = operatorList.stream().filter(a -> "fai".equals(a.getType())).collect(Collectors.toList()); + ParamData paramData = new ParamData(data.getSite(), baseData.get("nodeId"), baseData.get("nodeName"), data.getDocumentNo(), data.getUserName(), baseData.get("classificationNo"), baseData.get("userId"), baseData.get("workflowId"), baseData.get("workflowname"), baseData.get("requestName"), baseData.get("path"), baseData.get("requestId"), "plm_technical_specification_sheet", "code_no", "status", changeRequest.getStepId(), data.getBu() == null ? "" : data.getBu(), @@ -1500,7 +1505,7 @@ public class TechnicalSpecificationServiceImpl implements TechnicalSpecification // 如果是节点更新则调用提交流程接口,反之则跳过这一步 if ("update".equals(data.getProcessFlag())) { - List mainData = getMainData(data.getSite(), baseData, changeRequest, engineers, technicians, dccs); + List mainData = getMainData(data.getSite(), baseData, changeRequest, engineers, technicians, dccs, cqcs, fais); paramData.setMainData(mainData); SubmitRequestParam submitRequestParam = new SubmitRequestParam(); submitRequestParam.setUserId(paramData.getUserId()); @@ -1529,7 +1534,8 @@ public class TechnicalSpecificationServiceImpl implements TechnicalSpecification } public List getMainData(String site, Map baseData, PlmTechnicalSpecificationSheet changeRequest, List engineers, - List technicians, List dccs) { + List technicians, List dccs, List cqcs, + List fais) { // 创建 mainData List mainData = new ArrayList<>(); List nodeDetails = changeManagementMapper.queryNodeDetails(site, baseData.get("workflowId"), baseData.get("nodeId"), baseData.get("classificationNo")); @@ -1593,6 +1599,24 @@ public class TechnicalSpecificationServiceImpl implements TechnicalSpecification } fieldValues.append(oaIds.get(0).getId()).append(","); } + } else if ("cqc".equals(nodeDetail.getPlmField().split("#")[1])) { + for (PlmTechnicalSpecificationTeamData cqc : cqcs) { + // 根据域控账号获取oa人员id + List oaIds = sysUserDao.selectOaIdByAccount(cqc.getDomainControlAccount()); + if (oaIds.isEmpty()) { + throw new RuntimeException("未获取到域控账号对应的OA人员!"); + } + fieldValues.append(oaIds.get(0).getId()).append(","); + } + } else if ("fai".equals(nodeDetail.getPlmField().split("#")[1])) { + for (PlmTechnicalSpecificationTeamData fai : fais) { + // 根据域控账号获取oa人员id + List oaIds = sysUserDao.selectOaIdByAccount(fai.getDomainControlAccount()); + if (oaIds.isEmpty()) { + throw new RuntimeException("未获取到域控账号对应的OA人员!"); + } + fieldValues.append(oaIds.get(0).getId()).append(","); + } } fieldValue = fieldValues.length() > 0 ? fieldValues.substring(0, fieldValues.length() - 1) : ""; } diff --git a/src/main/resources/mapper/change/ChangeManagementMapper.xml b/src/main/resources/mapper/change/ChangeManagementMapper.xml index 6cdec932..318ca71e 100644 --- a/src/main/resources/mapper/change/ChangeManagementMapper.xml +++ b/src/main/resources/mapper/change/ChangeManagementMapper.xml @@ -839,7 +839,7 @@ where site = #{site} and change_no = #{changeNo} - SELECT a.id, a.site,