Merge remote-tracking branch 'origin/main'

srs-flowable/src/main/java/com/srs/flowable/listener/enlistmentReserve/ApprovalAssigneeListener.java

@@ -66,8 +66,14 @@ public class ApprovalAssigneeListener implements ExecutionListener {
         // 获取审核意见
         String approvalOpinion = (String) execution.getVariable("approvalOpinion");
 
-        // 获取审核状态
+        // 获取审核状态（兼容Integer/Long类型）
-        Long approvalResult = (Long) execution.getVariable("approvalResult");
+        Object approvalResultObj = execution.getVariable("approvalResult");
+        Long approvalResult = null;
+        if (approvalResultObj != null) {
+            // 先转为数字，再获取long值
+            Number num = (Number) approvalResultObj;
+            approvalResult = num.longValue();
+        }
 
         // 4. 后续逻辑不变：查询下一个节点负责人并更新变量
         Long nextAssigneeId = getNextAssignee(currentNodeName, processInstanceId, enlistmentId, currentActivityId, approvalOpinion, approvalResult);

srs-routine/src/main/java/com/srs/routine/domain/RtEnlistmentReserve.java

@@ -208,6 +208,14 @@ private static final long serialVersionUID=1L;
     @Excel(name = "附件id")
     private String affixId;
 
+    /**
+     * 流程部署编号
+     */
+    @ApiModelProperty("流程部署编号")
+    @TableField("deploy_id")
+    @Excel(name = "流程部署编号")
+    private String deployId;
+
     /**
      * 入伍保留学籍申请表-审核记录
      */

srs-routine/src/main/java/com/srs/routine/service/impl/RtEnlistmentReserveServiceImpl.java

@@ -109,6 +109,7 @@ public class RtEnlistmentReserveServiceImpl extends ServiceImpl<RtEnlistmentRese
                 RtEnlistmentReserve updateEntity = new RtEnlistmentReserve();
                 updateEntity.setId(applyId);
                 updateEntity.setProcessInstanceId(processResultDto.getProcessInstanceId());
+                updateEntity.setDeployId(processResultDto.getDeploymentId());
                 updateEntity.setApplyStatus(1L); // 审批中状态（根据实际枚举调整）
                 rtEnlistmentReserveMapper.updateRtEnlistmentReserve(updateEntity);
                 System.out.println("申请表[" + applyId + "]已启动流程，实例ID：" + processResultDto.getProcessInstanceId() + "，状态更新为审批中");
@@ -165,6 +166,7 @@ public class RtEnlistmentReserveServiceImpl extends ServiceImpl<RtEnlistmentRese
 
                 // 关联流程实例ID，更新为“审批中”状态
                 rtEnlistmentReserve.setProcessInstanceId(processResultDto.getProcessInstanceId());
+                rtEnlistmentReserve.setDeployId(processResultDto.getDeploymentId());
                 rtEnlistmentReserve.setApplyStatus(1L); // 审批中
                 System.out.println("申请表[" + rtEnlistmentReserve.getId() + "]启动流程成功，实例ID：" + processResultDto.getProcessInstanceId());
             } else {

srs-routine/src/main/resources/mapper/routine/RtEnlistmentReserveMapper.xml

@@ -28,6 +28,7 @@
         <result property="createTime" column="create_time"/>
         <result property="updateTime" column="update_time"/>
         <result property="affixId" column="affix_id"/>
+        <result property="deployId"    column="deploy_id"    />
         <!--入伍保留学籍申请表-审核记录 （多条件查询column里传入了多条件【{studentName = student_name, studentNo = student_no}】javaType里面写了list表明你有多条件 studentName student_name字段）-->
         <collection property="enlistmentReserveApprovalList"
                     column="{studentName = student_name, studentNo = student_no}"
@@ -122,7 +123,8 @@
                approval_no,
                create_time,
                update_time,
-               affix_id
+               affix_id,
+               deploy_id
         from rt_enlistment_reserve
     </sql>
 
@@ -156,6 +158,7 @@
             <if test="reserveEndDate != null ">and reserve_end_date = #{reserveEndDate}</if>
             <if test="approvalNo != null  and approvalNo != ''">and approval_no = #{approvalNo}</if>
             <if test="affixId != null  and affixId != ''">and affix_id = #{affixId}</if>
+            <if test="deployId != null  and deployId != ''"> and deploy_id = #{deployId}</if>
         </where>
     </select>
 
@@ -206,6 +209,7 @@
             <if test="createTime != null">create_time,</if>
             <if test="updateTime != null">update_time,</if>
             <if test="affixId != null">affix_id,</if>
+            <if test="deployId != null">deploy_id,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="applyNo != null and applyNo != ''">#{applyNo},</if>
@@ -230,6 +234,7 @@
             <if test="createTime != null">#{createTime},</if>
             <if test="updateTime != null">#{updateTime},</if>
             <if test="affixId != null">#{affixId},</if>
+            <if test="deployId != null">#{deployId},</if>
         </trim>
     </insert>
 
@@ -258,6 +263,7 @@
             <if test="createTime != null">create_time = #{createTime},</if>
             <if test="updateTime != null">update_time = #{updateTime},</if>
             <if test="affixId != null">affix_id = #{affixId},</if>
+            <if test="deployId != null">deploy_id = #{deployId},</if>
         </trim>
         where id = #{id}
     </update>