Merge branch 'master' into feature/20260519

jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/bgpartymatter/controller/BgPartymatterController.java

@@ -36,6 +36,7 @@ import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
 import org.springframework.web.multipart.MultipartFile;
 import org.springframework.web.multipart.MultipartHttpServletRequest;
 import java.io.IOException;
+import java.text.SimpleDateFormat;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -106,6 +107,7 @@ public class BgPartymatterController extends JeecgController<BgPartymatter, IBgP
         if (oConvertUtils.isEmpty(bgPartymatter.getDelFlag())) {
             bgPartymatter.setDelFlag("0");
         }
+        fillGeneratedNumber(bgPartymatter);
         bgPartymatterService.save(bgPartymatter);
         return Result.OK("添加成功！");
     }
@@ -120,6 +122,7 @@ public class BgPartymatterController extends JeecgController<BgPartymatter, IBgP
     @RequiresPermissions("bgpartymatter:bg_partymatter:edit")
     @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
     public Result<String> edit(@RequestBody BgPartymatter bgPartymatter) {
+        fillGeneratedNumber(bgPartymatter);
         bgPartymatterService.updateById(bgPartymatter);
         return Result.OK("编辑成功!");
     }
@@ -139,11 +142,24 @@ public class BgPartymatterController extends JeecgController<BgPartymatter, IBgP
             return Result.error("流程实例ID不能为空");
         }
         String varField = oConvertUtils.isEmpty(dto.getVarField()) ? "json_data" : dto.getVarField();
+        fillGeneratedNumber(dto.getFormData());
         bgPartymatterService.updateById(dto.getFormData());
         runtimeService.setVariable(dto.getProcessInstanceId(), varField, JSONObject.toJSONString(dto.getFormData()));
         return Result.OK("保存成功");
     }
 
+    /**
+     * 根据会议时间和议题序号生成业务序号，规则：yyyyMMdd-议题序号。
+     * 前端会即时回显，后端保存前再次生成，保证接口调用和流程保存数据一致。
+     */
+    private void fillGeneratedNumber(BgPartymatter bgPartymatter) {
+        if (bgPartymatter == null || bgPartymatter.getMatterTime() == null || bgPartymatter.getItemNumber() == null) {
+            return;
+        }
+        String dateText = new SimpleDateFormat("yyyyMMdd").format(bgPartymatter.getMatterTime());
+        bgPartymatter.setNumber(dateText + "-" + bgPartymatter.getItemNumber());
+    }
+
     /**
      * 通过id删除
      * @param id

jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/bgpartymatter/entity/BgPartymatter.java

@@ -4,6 +4,7 @@ import java.io.Serializable;
 import java.io.UnsupportedEncodingException;
 import java.util.Date;
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.TableLogic;
@@ -65,6 +66,11 @@ public class BgPartymatter implements Serializable {
     @Excel(name = "序号", width = 15)
     @Schema(description = "序号")
     private java.lang.String number;
+    /**议题序号*/
+    @Excel(name = "议题序号", width = 15)
+    @Schema(description = "议题序号")
+    @TableField("item_number")
+    private java.lang.Integer itemNumber;
 	/**会议时间*/
     @Excel(name = "会议时间", width = 15, format = "yyyy-MM-dd")
 	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
@@ -83,11 +89,25 @@ public class BgPartymatter implements Serializable {
     @Excel(name = "事项目录编码", width = 15)
     @Schema(description = "事项目录编码")
     private java.lang.String matterCode;
-	/**责任部门*/
-    @Excel(name = "责任部门", width = 15, dictTable = "sys_depart", dicText = "depart_name", dicCode = "id")
+	/**抄告单编号*/
+    @Excel(name = "抄告单编号", width = 15)
+    @Schema(description = "抄告单编号")
+    private java.lang.String noticeNumber;
+	/**是否为三重一大决策*/
+    @Excel(name = "是否为三重一大决策", width = 15, dicCode = "yn")
+    @Dict(dicCode = "yn")
+    @Schema(description = "是否为三重一大决策")
+    private java.lang.String isImportant;
+	/**主办部门*/
+    @Excel(name = "主办部门", width = 15, dictTable = "sys_depart", dicText = "depart_name", dicCode = "id")
     @Dict(dictTable = "sys_depart", dicText = "depart_name", dicCode = "id")
-    @Schema(description = "责任部门")
+    @Schema(description = "主办部门")
     private java.lang.String responDeptid;
+    /**协办部门*/
+    @Excel(name = "协办部门", width = 15, dictTable = "sys_depart", dicText = "depart_name", dicCode = "id")
+    @Dict(dictTable = "sys_depart", dicText = "depart_name", dicCode = "id")
+    @Schema(description = "协办部门")
+    private java.lang.String assistDeptid;
 	/**实际执行情况*/
     @Excel(name = "实际执行情况", width = 15)
     @Schema(description = "实际执行情况")
@@ -107,10 +127,10 @@ public class BgPartymatter implements Serializable {
     @DateTimeFormat(pattern="yyyy-MM-dd")
     @Schema(description = "要求完成日期")
     private java.util.Date deadline;
-	/**紧急程度*/
-    @Excel(name = "紧急程度", width = 15)
-    @Dict(dicCode = "urgency_level")
-    @Schema(description = "紧急程度")
+	/**是否急件*/
+    @Excel(name = "是否急件", width = 15, dicCode = "yn")
+    @Dict(dicCode = "yn")
+    @Schema(description = "是否急件")
     private java.lang.String urgencyLevel;
 	/**是否需要所办领导审批*/
     @Excel(name = "是否需要所办领导审批", width = 15,replace = {"是_1","否_0"} )

jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/bgpartymatter/entity/BgPartymatterFeedback.java

@@ -80,6 +80,7 @@ public class BgPartymatterFeedback implements Serializable {
     private java.util.Date actualTime;
 	/**完成状态*/
 	@Excel(name = "完成状态", width = 15)
+    @Dict(dicCode = "feedback_status")
     @Schema(description = "完成状态")
     private java.lang.String bpmStatus;
     /**流程实例id*/