From 50dffa0829dbbde0545d4c3313c318f693ea9c93 Mon Sep 17 00:00:00 2001
From: ye1023 <12588209+ye1023@user.noreply.gitee.com>
Date: Wed, 20 May 2026 10:14:51 +0800
Subject: [PATCH] =?UTF-8?q?yxk-20260520-=E5=85=9A=E5=A7=94=E4=BC=9A?=
 =?UTF-8?q?=EF=BC=9A=E6=96=B0=E5=A2=9E=E8=AE=AE=E9=A2=98=E5=BA=8F=E5=8F=B7?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=20=E5=BA=8F=E5=8F=B7=E8=87=AA=E5=8A=A8?=
 =?UTF-8?q?=E7=94=9F=E6=88=90=EF=BC=8C=E6=98=8E=E7=A1=AE=E7=94=9F=E6=88=90?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91=EF=BC=88=E5=85=88=E9=80=89=E6=97=A5=E6=9C=9F?=
 =?UTF-8?q?=E5=86=8D=E9=80=89=E8=AE=AE=E9=A2=98=EF=BC=89=EF=BC=8C20260520-?=
 =?UTF-8?q?1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/BgPartymatterController.java      | 16 ++++++++++++++++
 .../demo/bgpartymatter/entity/BgPartymatter.java |  5 +++++
 2 files changed, 21 insertions(+)

diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/bgpartymatter/controller/BgPartymatterController.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/bgpartymatter/controller/BgPartymatterController.java
index 3253192..6bbb384 100644
--- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/bgpartymatter/controller/BgPartymatterController.java
+++ b/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
diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/bgpartymatter/entity/BgPartymatter.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/bgpartymatter/entity/BgPartymatter.java
index 50db0f6..1b9d692 100644
--- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/bgpartymatter/entity/BgPartymatter.java
+++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/bgpartymatter/entity/BgPartymatter.java
@@ -66,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")