bug修复

bonus-common-biz/src/main/java/com/bonus/common/biz/domain/lease/WorkPeopleInfo.java

@@ -3,11 +3,11 @@ package com.bonus.common.biz.domain.lease;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
 
+
+import java.io.Serializable;
 import java.util.Date;
-import java.util.UUID;
+
 
 /**
  *
@@ -15,10 +15,8 @@ import java.util.UUID;
  * @date 2024-10-16
  */
 
-@EqualsAndHashCode(callSuper = false)
 @Data
-@ToString
-public class WorkPeopleInfo {
+public class WorkPeopleInfo implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
@@ -62,4 +60,6 @@ public class WorkPeopleInfo {
 
     @ApiModelProperty(value = "角色数组")
     private String[] roleIdArray;
+
+    private int nextNodeId;
 }

bonus-common-biz/src/main/java/com/bonus/common/biz/domain/lease/WorkPeopleInfoTwo.java

@@ -0,0 +1,63 @@
+package com.bonus.common.biz.domain.lease;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ *
+ * @author xsheng
+ * @date 2024-10-16
+ */
+
+@Data
+
+public class WorkPeopleInfoTwo {
+
+    private static final long serialVersionUID = 1L;
+
+    /** ID */
+    private String id;
+
+    @ApiModelProperty(value = "创建时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date createTime;
+
+    @ApiModelProperty(value = "更新时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date updateTime;
+
+    @ApiModelProperty(value = "消息主表id")
+    private String informationId;
+
+    @ApiModelProperty(value = "阅读状态")
+    private int readState;
+
+    @ApiModelProperty(value = "处理状态")
+    private int handleState;
+
+    @ApiModelProperty(value = "接收人账号")
+    private String receiverUsername;
+
+    @ApiModelProperty(value = "更新人账号")
+    private String updateUser;
+
+    @ApiModelProperty(value = "是否当前人审核")
+    private int isExamine;
+
+    @ApiModelProperty(value = "部门")
+    private long deptId;
+
+    @ApiModelProperty(value = "流程id")
+    private int flowId;
+
+    @ApiModelProperty(value = "角色")
+    private String roleIds;
+
+    @ApiModelProperty(value = "角色数组")
+    private String[] roleIdArray;
+
+    private int nextNodeId;
+}

bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/mapper/LeaseTaskMapper.java

@@ -167,7 +167,7 @@ public interface LeaseTaskMapper {
      */
     int insertWorkPeople(WorkPeopleInfo workPeopleInfo);
 
-    List<WorkPeopleInfo> selectWorkPeopleInfoList(WorkPeopleInfo info);
+    List<WorkPeopleInfo> selectWorkPeopleInfoList(@Param("flowId") int flowId);
 
     List<WorkPeopleInfo> selectUserListByRoleAndDept(WorkPeopleInfo param);
 

bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/impl/LeaseTaskServiceImpl.java

@@ -252,7 +252,7 @@ public class LeaseTaskServiceImpl implements ILeaseTaskService {
             WorkPeopleInfo info = new WorkPeopleInfo();
             info.setFlowId(newId);
 
-            List<WorkPeopleInfo> workPeopleInfoList = mapper.selectWorkPeopleInfoList(info);
+            List<WorkPeopleInfo> workPeopleInfoList = mapper.selectWorkPeopleInfoList(info.getFlowId());
 
             if(workPeopleInfoList != null && workPeopleInfoList.size() > 0){
                 WorkPeopleInfo person = workPeopleInfoList.get(0);

bonus-modules/bonus-material/src/main/java/com/bonus/material/work/service/impl/SysWorkflowRecordHistoryServiceImpl.java

@@ -464,8 +464,8 @@ public class SysWorkflowRecordHistoryServiceImpl implements SysWorkflowRecordHis
             WorkPeopleInfo info = new WorkPeopleInfo();
             info.setFlowId(newId);
 
-            List<WorkPeopleInfo> workPeopleInfoList = lMapper.selectWorkPeopleInfoList(info);
-
+            List<WorkPeopleInfo> workPeopleInfoList = new ArrayList<>();
+            workPeopleInfoList = lMapper.selectWorkPeopleInfoList(info.getFlowId());
             if(workPeopleInfoList != null && workPeopleInfoList.size() > 0){
                 WorkPeopleInfo person = workPeopleInfoList.get(0);
                 String roleIds = person.getRoleIds();

bonus-modules/bonus-material/src/main/resources/mapper/material/lease/LeaseTaskMapper.xml

@@ -142,7 +142,11 @@
         <result property="applyCode" column="apply_code"/>
     </resultMap>
 
-
+    <resultMap type="com.bonus.common.biz.domain.lease.WorkPeopleInfo" id="WorkPeopleInfoResult">
+        <result property="id" column="id"/>
+        <result property="nextNodeId" column="next_node_id"/>
+        <result property="roleIds" column="roleIds"/>
+    </resultMap>
 
     <sql id="selectLeaseApplyInfoVo">
         select
@@ -948,11 +952,11 @@
         </trim>
     </insert>
 
-    <select id="selectWorkPeopleInfoList" resultType="com.bonus.common.biz.domain.lease.WorkPeopleInfo">
+    <select id="selectWorkPeopleInfoList" resultMap="WorkPeopleInfoResult">
         SELECT
-            wh.id,
-            wh.next_node_id,
-            wc.roleIds
+            wh.id as id,
+            wh.next_node_id as nextNodeId,
+            wc.roleIds as roleIds
         FROM
             sys_workflow_record_history wh
                 LEFT JOIN sys_workflow_config wc on wh.next_node_id = wc.node_id