!20 wsm-修改xispeak督办计划流程

Merge pull request !20 from new_new_new/feature/xispeak-first-process

jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/xispeak/entity/BgXiSpeak.java

@@ -3,10 +3,9 @@ package org.jeecg.modules.bg.xispeak.entity;
 import java.io.Serializable;
 import java.util.Date;
 import java.math.BigDecimal;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.TableLogic;
+
+import com.baomidou.mybatisplus.annotation.*;
+import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler;
 import org.jeecg.common.constant.ProvinceCityArea;
 import org.jeecg.common.util.SpringContextUtils;
 import lombok.Data;
@@ -17,6 +16,8 @@ import org.jeecg.common.aspect.annotation.Dict;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import java.io.UnsupportedEncodingException;
+import java.util.List;
+import java.util.Map;
 
 /**
  * @Description: 习总书记重要讲话指示批示情况
@@ -25,7 +26,7 @@ import java.io.UnsupportedEncodingException;
  * @Version: V1.0
  */
 @Data
-@TableName("bg_xi_speak")
+@TableName(value = "bg_xi_speak", autoResultMap = true)
 @Schema(description="习总书记重要讲话指示批示情况")
 public class BgXiSpeak implements Serializable {
     private static final long serialVersionUID = 1L;
@@ -165,4 +166,7 @@ public class BgXiSpeak implements Serializable {
     @Excel(name = "是否需要sdw审批", width = 15)
     @Schema(description = "是否需要sdw审批")
     private java.lang.Integer needSdwApproval;
+
+    @TableField(typeHandler = JacksonTypeHandler.class)
+    private Map<String, DeptApproveDetail> approveInfo;
 }

jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/xispeak/entity/DeptApproveDetail.java

@@ -0,0 +1,17 @@
+package org.jeecg.modules.bg.xispeak.entity;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+@Data
+@NoArgsConstructor // 必须确保有这个
+@AllArgsConstructor
+public class DeptApproveDetail {
+    private String deptId;       // 部门ID
+    private String approverId;   // 审批人ID（从监听器获取的）
+    private String approverName; // 审批人姓名（可选）
+    private List<String> implUserIdList; // 落实人Id
+    private List<String> implUserNameList; // 落实人姓名
+}

jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/xispeak/service/IBgXiSpeakService.java

@@ -71,4 +71,5 @@ public interface IBgXiSpeakService extends IService<BgXiSpeak> {
 	 */
 	List<SelectTreeModel> queryListByPid(String pid);
 
+	BgXiSpeak getByIdForUpdate(String id);
 }

jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/xispeak/service/impl/BgXiSpeakServiceImpl.java

@@ -216,4 +216,10 @@ public class BgXiSpeakServiceImpl extends ServiceImpl<BgXiSpeakMapper, BgXiSpeak
         return sb;
     }
 
+    @Override
+    public BgXiSpeak  getByIdForUpdate(String id) {
+        return this.getOne(new LambdaQueryWrapper<BgXiSpeak>()
+                .eq(BgXiSpeak::getId, id)
+                .last("for update"));
+    }
 }