wilson
/
ccl-plm-java
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

2025-05-09

master
fengyuan_yang 8 months ago
parent
45fed200af
commit
f0d1cba142
3 changed files with 61 additions and 4 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 33
      src/main/java/com/spring/modules/change/service/impl/ChangeManagementServiceImpl.java
  2. 30
      src/main/java/com/spring/modules/sampleManagement/service/Impl/TechnicalSpecificationServiceImpl.java
  3. 2
      src/main/resources/mapper/change/ChangeManagementMapper.xml

33
src/main/java/com/spring/modules/change/service/impl/ChangeManagementServiceImpl.java
View File

@ -1541,6 +1541,17 @@ public class ChangeManagementServiceImpl extends ServiceImpl<ChangeManagementMap
// 如果 isRemarks 中的节点ID = 最新节点ID
if (isRemarks.get(0).get("nodeid").toString().equals(newNodeId) && !pfs.isEmpty()) {
// 2025-05-09 发送统一待办前先调用[删除异构系统指定人员待办流程]接口
DeleteUserRequestInfoParam deleteUserRequestInfoParam = new DeleteUserRequestInfoParam();
deleteUserRequestInfoParam.setUserId(paramData.getUserId());
deleteUserRequestInfoParam.setRequestId(paramData.getRequestId());
deleteUserRequestInfoParam.setSyscode("PLM");
String deleteUserRequestInfoURL = apiUrlOa + "/oa/interface/deleteUserRequestInfo";
ResponseData deleteUserRequestInfoResponses = HttpClientUtil.doPostByRawWithOA(deleteUserRequestInfoURL, deleteUserRequestInfoParam);
if (!"0".equals(deleteUserRequestInfoResponses.getCode())) {
throw new RuntimeException("删除异构系统指定人员待办流程异常信息：" + deleteUserRequestInfoResponses.getMsg());
}
// 发送代办
// 创建单点登录地址
String url = loginTokenUrl + "?dca=" + pfs.get(0).getDomainControlAccount() + "&token=" + " " + "&site=" + paramData.getSite() + "&path=" + paramData.getPath() + "&docNo=" + paramData.getDocNo();
@ -1638,6 +1649,17 @@ public class ChangeManagementServiceImpl extends ServiceImpl<ChangeManagementMap
// 修改该变更单的 stepId
changeManagementMapper.updateStepId2(paramData);
// 2025-05-09 发送统一待办前先调用[删除异构系统指定人员待办流程]接口
DeleteUserRequestInfoParam deleteUserRequestInfoParam = new DeleteUserRequestInfoParam();
deleteUserRequestInfoParam.setUserId(paramData.getUserId());
deleteUserRequestInfoParam.setRequestId(paramData.getRequestId());
deleteUserRequestInfoParam.setSyscode("PLM");
String deleteUserRequestInfoURL = apiUrlOa + "/oa/interface/deleteUserRequestInfo";
ResponseData deleteUserRequestInfoResponses = HttpClientUtil.doPostByRawWithOA(deleteUserRequestInfoURL, deleteUserRequestInfoParam);
if (!"0".equals(deleteUserRequestInfoResponses.getCode())) {
throw new RuntimeException("删除异构系统指定人员待办流程异常信息：" + deleteUserRequestInfoResponses.getMsg());
}
// 9、统一待办接口
for (String key : dcas.keySet()) {
// 创建单点登录地址
@ -1767,6 +1789,17 @@ public class ChangeManagementServiceImpl extends ServiceImpl<ChangeManagementMap
// 通过函数获取流程标题 2024-12-25
String requestName = changeManagementMapper.getRequestNameByFunction(paramData.getClassificationNo(), paramData.getWorkflowId(), paramData.getWorkflowName(), paramData.getNodeId(), paramData.getNodeName(), paramData.getDocNo(), "N", paramData.getUserName(), DateUtils.getStringNow(), paramData.getRejectOpinion(), paramData.getMenuName(), "提交");
// 2025-05-09 发送统一待办前先调用[删除异构系统指定人员待办流程]接口
DeleteUserRequestInfoParam deleteUserRequestInfoParam = new DeleteUserRequestInfoParam();
deleteUserRequestInfoParam.setUserId(paramData.getUserId());
deleteUserRequestInfoParam.setRequestId(paramData.getRequestId());
deleteUserRequestInfoParam.setSyscode("PLM");
String deleteUserRequestInfoURL = apiUrlOa + "/oa/interface/deleteUserRequestInfo";
ResponseData deleteUserRequestInfoResponses = HttpClientUtil.doPostByRawWithOA(deleteUserRequestInfoURL, deleteUserRequestInfoParam);
if (!"0".equals(deleteUserRequestInfoResponses.getCode())) {
throw new RuntimeException("删除异构系统指定人员待办流程异常信息：" + deleteUserRequestInfoResponses.getMsg());
}
// 9、统一待办接口
for (String key : dcas.keySet()) {
// 创建单点登录地址

30
src/main/java/com/spring/modules/sampleManagement/service/Impl/TechnicalSpecificationServiceImpl.java
View File

@ -1363,6 +1363,8 @@ public class TechnicalSpecificationServiceImpl implements TechnicalSpecification
List<PlmTechnicalSpecificationTeamData> engineers = operatorList.stream().filter(a -> "engineer".equals(a.getType())).collect(Collectors.toList());
List<PlmTechnicalSpecificationTeamData> technicians = operatorList.stream().filter(a -> "technician".equals(a.getType())).collect(Collectors.toList());
List<PlmTechnicalSpecificationTeamData> dccs = operatorList.stream().filter(a -> "dcc".equals(a.getType())).collect(Collectors.toList());
List<PlmTechnicalSpecificationTeamData> cqcs = operatorList.stream().filter(a -> "cqc".equals(a.getType())).collect(Collectors.toList());
List<PlmTechnicalSpecificationTeamData> 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> mainData = getMainData(data.getSite(), baseData, changeRequest, engineers, technicians, dccs);
List<MainData> 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<PlmTechnicalSpecificationTeamData> engineers = operatorList.stream().filter(a -> "engineer".equals(a.getType())).collect(Collectors.toList());
List<PlmTechnicalSpecificationTeamData> technicians = operatorList.stream().filter(a -> "technician".equals(a.getType())).collect(Collectors.toList());
List<PlmTechnicalSpecificationTeamData> dccs = operatorList.stream().filter(a -> "dcc".equals(a.getType())).collect(Collectors.toList());
List<PlmTechnicalSpecificationTeamData> cqcs = operatorList.stream().filter(a -> "cqc".equals(a.getType())).collect(Collectors.toList());
List<PlmTechnicalSpecificationTeamData> 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> mainData = getMainData(data.getSite(), baseData, changeRequest, engineers, technicians, dccs);
List<MainData> 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<MainData> getMainData(String site, Map<String, String> baseData, PlmTechnicalSpecificationSheet changeRequest, List<PlmTechnicalSpecificationTeamData> engineers,
List<PlmTechnicalSpecificationTeamData> technicians, List<PlmTechnicalSpecificationTeamData> dccs) {
List<PlmTechnicalSpecificationTeamData> technicians, List<PlmTechnicalSpecificationTeamData> dccs, List<PlmTechnicalSpecificationTeamData> cqcs,
List<PlmTechnicalSpecificationTeamData> fais) {
// 创建 mainData
List<MainData> mainData = new ArrayList<>();
List<PlmRequestDetailVo> 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<OaUserData> 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<OaUserData> 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) : "";
}

2
src/main/resources/mapper/change/ChangeManagementMapper.xml
View File

@ -839,7 +839,7 @@
where site = #{site} and change_no = #{changeNo}
</update>
<select id="queryRequestId" parameterType="string" resultType="ProcessFormEntity">
<select id="''queryRequestId''" parameterType="string" resultType="ProcessFormEntity">
SELECT
a.id,
a.site,

Write Preview
Loading…
Cancel
Save