Browse Source

2024-10-21

优化
master
fengyuan_yang 1 year ago
parent
commit
af55c87e04
  1. 2
      src/main/java/com/spring/modules/change/mapper/ChangeManagementMapper.java
  2. 8
      src/main/java/com/spring/modules/change/service/impl/ChangeManagementServiceImpl.java
  3. 11
      src/main/resources/mapper/change/ChangeManagementMapper.xml

2
src/main/java/com/spring/modules/change/mapper/ChangeManagementMapper.java

@ -167,4 +167,6 @@ public interface ChangeManagementMapper extends BaseMapper<ChangeRequestEntity>{
List<PlmRequestDetailVo> getReviewByNodeId(@Param("site") String site, @Param("classificationNo") String classificationNo, @Param("workflowId") String workflowId, @Param("reviewNodeId") String reviewNodeId);
List<TechnicalSpecificationData> technicalSpecificationSearch2(TechnicalSpecificationData data);
void updateProcessFormToAgree(ParamData paramData);
}

8
src/main/java/com/spring/modules/change/service/impl/ChangeManagementServiceImpl.java

@ -1257,6 +1257,10 @@ public class ChangeManagementServiceImpl extends ServiceImpl<ChangeManagementMap
throw new RuntimeException("统一待办异常信息:" + receiveRequestInfoResponse.getMsg());
}
}
// 将第一个节点记录修改为同意
paramData.setStepId(10);
changeManagementMapper.updateProcessFormToAgree(paramData);
}
/**
@ -1638,6 +1642,10 @@ public class ChangeManagementServiceImpl extends ServiceImpl<ChangeManagementMap
List<PlmRequestDetailVo> nodeDetailLast = changeManagementMapper.queryNodeDetailLast(paramData.getSite(), paramData.getClassificationNo(), paramData.getWorkflowId());
paramData.setStepId(nodeDetailLast.get(0).getStepId());
changeManagementMapper.updateChangeStatus2(paramData);
// 修改最后一个节点为同意
changeManagementMapper.updateProcessFormToAgree(paramData);
// 如果是ECN则执行升版操作
if ("ECN".equals(type)) {
ChangeRequestEntity changeRequestEntity = new ChangeRequestEntity();

11
src/main/resources/mapper/change/ChangeManagementMapper.xml

@ -1070,7 +1070,9 @@
case when c.node_conclusion = 'Y' then '同意' when c.node_conclusion = 'N' then '驳回' else '' end as nodeConclusionDesc,
c.create_date,
c.create_by,
c.reject_opinion
c.reject_opinion,
c.update_date,
c.update_by
from plm_request_header a
LEFT JOIN plm_request_node b ON a.SITE = b.SITE AND a.classification_no = b.classification_no AND a.workflow_id = b.workflow_id
LEFT JOIN plm_process_form c ON b.SITE = b.SITE AND b.classification_no = c.classification_no AND b.workflow_id = c.workflow_id AND b.node_id = c.node_id and c.document_no = #{documentNo}
@ -1138,4 +1140,11 @@
AND workflow_id = #{workflowId}
AND node_id = #{reviewNodeId}
</select>
<!-- 编辑变更单属性 -->
<update id="updateProcessFormToAgree">
update plm_process_form
set node_conclusion = 'Y'
where site = #{site} and bu = #{bu} and menu_id = #{menuId} and document_no = #{docNo} and step_id = #{stepId}
</update>
</mapper>
Loading…
Cancel
Save