From ed14b8c1d40263afd66683ec5eedb4d9443fff0e Mon Sep 17 00:00:00 2001
From: "15881625488@163.com" <15881625488@163.com>
Date: Tue, 20 Jan 2026 10:11:42 +0800
Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9A[=E8=AF=95=E9=AA=8C=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86]=E7=BC=96=E5=8F=B7=E7=94=9F=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../hxhq/business/controller/PublicController.java |  7 ++-
 .../main/java/com/hxhq/business/domain/SnGen.java  | 10 ++++
 .../java/com/hxhq/business/enums/SnTypeEnum.java   | 56 ++++++++++++++++++++++
 .../com/hxhq/business/service/ISnGenService.java   |  2 +-
 .../business/service/impl/SnGenServiceImpl.java    |  5 +-
 5 files changed, 76 insertions(+), 4 deletions(-)
 create mode 100644 hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/enums/SnTypeEnum.java

diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/PublicController.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/PublicController.java
index a446afe..8f266b8 100644
--- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/PublicController.java
+++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/PublicController.java
@@ -6,6 +6,8 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.hxhq.business.domain.*;
 import com.hxhq.business.dto.sj.SjListDto;
 import com.hxhq.business.dto.study.StudyListDto;
+import com.hxhq.business.enums.NormalEnum;
+import com.hxhq.business.enums.SnTypeEnum;
 import com.hxhq.business.enums.study.StudyStatusEnum;
 import com.hxhq.business.form.common.SignForm;
 import com.hxhq.business.form.sj.SjSearchListForm;
@@ -74,11 +76,11 @@ public class PublicController extends BaseController {
     @GetMapping("/getSn")
     public AjaxResult getSn(Integer count) {
         if (count == null || count.intValue() <= 1) {
-            return AjaxResult.success("操作成功",snGenService.getNewSn());
+            return AjaxResult.success("操作成功",snGenService.getNewSn(SnTypeEnum.wz.getValue()));
         }else{
             List<String> list = new ArrayList<>();
             for (int i = 0; i < count;i++){
-                list.add(snGenService.getNewSn());
+                list.add(snGenService.getNewSn(SnTypeEnum.wz.getValue()));
             }
             return AjaxResult.success(list);
         }
@@ -127,6 +129,7 @@ public class PublicController extends BaseController {
     @GetMapping("/templateList")
     public TableDataInfo list(Template template) {
         startPage();
+        template.setStatus(NormalEnum.yes.getValue());
         List<Template> list = templateService.queryList(template);
         return getDataTable(list);
     }
diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/SnGen.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/SnGen.java
index 5e1a12c..cfd99e4 100644
--- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/SnGen.java
+++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/SnGen.java
@@ -21,6 +21,16 @@ public class SnGen extends MpBaseEntity
     /** 当前编号 */
     private Integer sn;
 
+    /** 类型：1：物资；3：一般表单；5：填报表单 */
+    private Integer type;
+
+    public Integer getType() {
+        return type;
+    }
+
+    public void setType(Integer type) {
+        this.type = type;
+    }
 
     public void setDate(String date)
     {
diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/enums/SnTypeEnum.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/enums/SnTypeEnum.java
new file mode 100644
index 0000000..4af12fd
--- /dev/null
+++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/enums/SnTypeEnum.java
@@ -0,0 +1,56 @@
+package com.hxhq.business.enums;
+
+/**
+ * 类型：1：物资；3：一般表单；5：填报表单
+ * @author tanfei
+ */
+public enum SnTypeEnum {
+
+    /**
+     * 物资
+     */
+    wz(1, "物资"),
+
+    /**
+     * 一般表单
+     */
+    ybbd(3, "一般表单"),
+
+    /**
+     * 填报表单
+     */
+    tbbd(5, "填报表单");
+
+    private int value;
+    private String text;
+
+    SnTypeEnum(int value, String text) {
+        this.value = value;
+        this.text = text;
+    }
+
+    public int getValue() {
+        return value;
+    }
+
+    public void setValue(int value) {
+        this.value = value;
+    }
+
+    public String getText() {
+        return text;
+    }
+
+    public void setText(String text) {
+        this.text = text;
+    }
+
+    public static SnTypeEnum getEnumByValue(int type) {
+        for (SnTypeEnum bt : values()) {
+            if (bt.value == type) {
+                return bt;
+            }
+        }
+        return null;
+    }
+}
diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/ISnGenService.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/ISnGenService.java
index 8509f87..a3082d1 100644
--- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/ISnGenService.java
+++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/ISnGenService.java
@@ -16,5 +16,5 @@ public interface ISnGenService extends IService<SnGen>
      * 获取新编号
      * @return
      */
-    String getNewSn();
+    String getNewSn(Integer type);
 }
diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/SnGenServiceImpl.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/SnGenServiceImpl.java
index 4747e6a..2753948 100644
--- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/SnGenServiceImpl.java
+++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/SnGenServiceImpl.java
@@ -31,17 +31,20 @@ public class SnGenServiceImpl extends ServiceImpl<SnGenMapper, SnGen> implements
     private final Lock lock = new ReentrantLock(true);
 
     @Override
-    public String getNewSn() {
+    public String getNewSn(Integer type) {
         lock.lock();
         try {
             Integer sort = 1;
             String date = DateUtils.dateTimeNow("yyMMdd");
             QueryWrapper<SnGen> queryWrapper = new QueryWrapper<>();
             queryWrapper.eq("date",date);
+            queryWrapper.eq("type",type);
             if(count(queryWrapper)==0){
                 SnGen snGen = new SnGen();
                 snGen.setDate(date);
                 snGen.setSn(sort);
+                snGen.setSn(sort);
+                snGen.setType(type);
                 save(snGen);
             }else{
                 baseMapper.addSn(date);