Browse Source

2025-04-08

master
fengyuan_yang 9 months ago
parent
commit
3888675fa6
  1. 2
      src/main/java/com/spring/modules/request/service/impl/RequestManageServiceImpl.java
  2. 4
      src/main/java/com/spring/modules/sampleManagement/service/Impl/TechnicalSpecificationServiceImpl.java

2
src/main/java/com/spring/modules/request/service/impl/RequestManageServiceImpl.java

@ -367,7 +367,7 @@ public class RequestManageServiceImpl extends ServiceImpl<RequestManageMapper, P
throw new RuntimeException("不存在上一个节点的流程流转信息!"); throw new RuntimeException("不存在上一个节点的流程流转信息!");
} }
// 如果是节点更新则调用强制收回流程接口反之若为节点更新则跳过这一步
// 如果是节点更新则调用强制收回流程接口反之则跳过这一步
if ("update".equals(data.getProcessFlag())) { if ("update".equals(data.getProcessFlag())) {
// 强制收回流程 // 强制收回流程
DoForceDrawBackParam doForceDrawBackParam = new DoForceDrawBackParam(); DoForceDrawBackParam doForceDrawBackParam = new DoForceDrawBackParam();

4
src/main/java/com/spring/modules/sampleManagement/service/Impl/TechnicalSpecificationServiceImpl.java

@ -1439,7 +1439,7 @@ public class TechnicalSpecificationServiceImpl implements TechnicalSpecification
"plm_technical_specification_sheet", "code_no", "status", changeRequest.getStepId(), data.getBu() == null ? "" : data.getBu(), "plm_technical_specification_sheet", "code_no", "status", changeRequest.getStepId(), data.getBu() == null ? "" : data.getBu(),
baseData.get("domainControlAccount"), baseData.get("menuId"), baseData.get("menuName"), data.getNodeConclusion(), data.getRejectOpinion() == null ? "" : data.getRejectOpinion(), data.getNodeId()); baseData.get("domainControlAccount"), baseData.get("menuId"), baseData.get("menuName"), data.getNodeConclusion(), data.getRejectOpinion() == null ? "" : data.getRejectOpinion(), data.getNodeId());
// 如果是节点更新则调用提交流程接口反之若为节点更新则跳过这一步
// 如果是节点更新则调用提交流程接口反之则跳过这一步
if ("update".equals(data.getProcessFlag())) { 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);
paramData.setMainData(mainData); paramData.setMainData(mainData);
@ -1463,7 +1463,7 @@ public class TechnicalSpecificationServiceImpl implements TechnicalSpecification
String doForceDrawBackURL = apiUrlOa + "/oa/interface/doForceDrawBack"; String doForceDrawBackURL = apiUrlOa + "/oa/interface/doForceDrawBack";
ResponseData doForceDrawBackResponses = HttpClientUtil.doPostByRawWithOA(doForceDrawBackURL, doForceDrawBackParam); ResponseData doForceDrawBackResponses = HttpClientUtil.doPostByRawWithOA(doForceDrawBackURL, doForceDrawBackParam);
if (!"0".equals(doForceDrawBackResponses.getCode())) { if (!"0".equals(doForceDrawBackResponses.getCode())) {
throw new RuntimeException("OA撤回流程异常信息:" + doForceDrawBackResponses.getMsg());
throw new RuntimeException(e.getMessage() + "OA撤回流程异常信息:" + doForceDrawBackResponses.getMsg());
} }
throw new RuntimeException(e.getMessage()); throw new RuntimeException(e.getMessage());
} }

Loading…
Cancel
Save