2025-05-13

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

@@ -181,4 +181,8 @@ public interface ChangeManagementMapper extends BaseMapper<ChangeRequestEntity>{
     IPage<PlmProjectPartData> choosePartNoList(Page<PlmProjectPartData> plmProjectPartDataPage, @Param("query") PlmProjectPartData data);
 
     List<OaUserData> getOaUserIdByIsRemark(@Param("site") String site, @Param("docNo") String docNo, @Param("isRemark") String isRemark);
+
+    void updateProcessForm3(ParamData paramData);
+
+    PlmRequestDetailVo getRequestNodeByNodeId(@Param("site") String site, @Param("classificationNo") String classificationNo, @Param("nodeId") String nodeId);
 }

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

@@ -1466,8 +1466,17 @@ public class ChangeManagementServiceImpl extends ServiceImpl<ChangeManagementMap
         List<Map<String, Object>> isRemarks = res.stream().filter(a -> convertToInt(a.get("isremark")) == 0).collect(Collectors.toList());
         // 查 processForm 表 isRemark = 0 的信息
         List<ProcessFormVo> pfs = changeManagementMapper.getProcessFormByIsRemark(paramData.getSite(), paramData.getBu(), paramData.getDocNo(), "0");
+
         // 将记录表中 isRemark 为0的修改为1
-        changeManagementMapper.updateProcessForm2(paramData);
+        // 2025-05-12 查当前节点是否为非会签 是则不加username
+        PlmRequestDetailVo requestNode = changeManagementMapper.getRequestNodeByNodeId(paramData.getSite(), paramData.getClassificationNo(), paramData.getNodeId());
+        // 非会签
+        if (StringUtils.isNotBlank(requestNode.getCountersignatureItem()) && "1".equals(requestNode.getCountersignatureItem())) {
+            changeManagementMapper.updateProcessForm3(paramData);
+        } else {
+            changeManagementMapper.updateProcessForm2(paramData);
+        }
+
         // 修改单据的节点结论和驳回意见
         changeManagementMapper.updateProcessNode(paramData.getSite(), paramData.getBu() == null ? "" : paramData.getBu(), paramData.getRequestId(), paramData.getClassificationNo(), paramData.getNodeId(), paramData.getNodeConclusion(), paramData.getRejectOpinion(), paramData.getDomainControlAccount());
         // =========================
@@ -1733,8 +1742,17 @@ public class ChangeManagementServiceImpl extends ServiceImpl<ChangeManagementMap
         }
         // 得到 isRemark 为0的流转信息
         List<Map<String, Object>> isRemarks = res.stream().filter(a -> convertToInt(a.get("isremark")) == 0).collect(Collectors.toList());
+
         // 将记录表中 isRemark 为0的修改为1
-        changeManagementMapper.updateProcessForm2(paramData);
+        // 2025-05-12 查当前节点是否为非会签 是则不加username
+        PlmRequestDetailVo requestNode = changeManagementMapper.getRequestNodeByNodeId(paramData.getSite(), paramData.getClassificationNo(), paramData.getNodeId());
+        // 非会签
+        if (StringUtils.isNotBlank(requestNode.getCountersignatureItem()) && "1".equals(requestNode.getCountersignatureItem())) {
+            changeManagementMapper.updateProcessForm3(paramData);
+        } else {
+            changeManagementMapper.updateProcessForm2(paramData);
+        }
+
         // 修改单据的节点结论和驳回意见
         changeManagementMapper.updateProcessNode(paramData.getSite(), paramData.getBu() == null ? "" : paramData.getBu(), paramData.getRequestId(), paramData.getClassificationNo(), paramData.getNodeId(), paramData.getNodeConclusion(), paramData.getRejectOpinion(), paramData.getDomainControlAccount());
         if (isRemarks.isEmpty()) { // 已结束

src/main/java/com/spring/modules/request/vo/PlmRequestDetailVo.java

@@ -8,5 +8,6 @@ public class PlmRequestDetailVo extends PlmRequestDetailEntity {
 
     private String workflowname;
     private String isRejectDesc;
+    private String countersignatureItem;
 }
 

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

@@ -1072,6 +1072,15 @@
         where A.site = #{site} and document_no = #{docNo} and is_remark = 0 AND B.username = #{userName}
     </update>
 
+    <update id="updateProcessForm3" parameterType="ParamData">
+        update plm_process_form
+        set is_remark = 1,
+            update_date = getDate(),
+            update_by = #{userName}
+        where site = #{site} and document_no = #{docNo} and is_remark = 0
+    </update>
+
+
     <!-- 编辑变更单属性 -->
     <update id="updateChangeStatus2" parameterType="ParamData">
         update ${tableName}
@@ -1319,4 +1328,11 @@
         LEFT JOIN view_oa_HrmResource as b ON a.domain_control_account = b.loginid
         WHERE a.site = #{site} and a.document_no = #{docNo} and a.is_remark = #{isRemark}
     </select>
+
+    <select id="getRequestNodeByNodeId" resultType="com.spring.modules.request.vo.PlmRequestDetailVo">
+        SELECT
+            countersignature_item
+        FROM plm_request_node
+        where classification_no = #{classificationNo} and site = #{site} and node_id = #{nodeId}
+    </select>
 </mapper>

src/main/resources/mapper/request/RequestManageMapper.xml

@@ -178,9 +178,8 @@
         a.node_type,
         a.seq_no,
         a.is_reject,
-        case when a.is_reject = 'Y' then '是'
-        when a.is_reject = 'N' then '否'
-        else '' end as isRejectDesc
+        case when a.is_reject = 'Y' then '是' when a.is_reject = 'N' then '否' else '' end as isRejectDesc,
+        a.countersignature_item
         FROM plm_request_node a
         LEFT JOIN plm_request_header b ON a.site = b.site and a.classification_no = b.classification_no and a.workflow_id = b.workflow_id
         LEFT JOIN VIEW_Process_management_OA_PLM c ON a.workflow_id = c.workflowid
@@ -195,7 +194,7 @@
                 AND a.workflow_id like #{query.workflowId}
             </if>
         </where>
-        group by a.site, a.classification_no, a.workflow_id, c.workflowname, a.node_id, a.node_name, a.node_type, a.seq_no, a.is_reject
+        group by a.site, a.classification_no, a.workflow_id, c.workflowname, a.node_id, a.node_name, a.node_type, a.seq_no, a.is_reject, a.countersignature_item
         order by a.seq_no
     </select>
 
@@ -330,8 +329,9 @@
         update plm_request_node
         set is_reject = #{isReject},
             update_date = GETDATE(),
-            update_by = #{updateBy}
-        where classification_no = #{classificationNo} and node_id = #{nodeId}
+            update_by = #{updateBy},
+            countersignature_item = #{countersignatureItem}
+        where classification_no = #{classificationNo} and site = #{site} and node_id = #{nodeId}
     </update>
 
     <select id="getProcessControlList" resultType="PlmProcessControllBaseData">