From 765396824f2a038ca9527947ed46e6cf82db4a20 Mon Sep 17 00:00:00 2001
From: "15881625488@163.com" <15881625488@163.com>
Date: Tue, 20 Jan 2026 13:04:44 +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]=E8=A1=A8=E5=8D=95=E7=BC=96=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/StudyFormApplyServiceImpl.java    | 39 +++++++++++++++++++---
 .../service/impl/StudyFormFillServiceImpl.java     | 32 ++++++++++++++++++
 .../service/impl/StudyFormPlanServiceImpl.java     | 38 +++++++++++++++++++--
 .../service/impl/StudyFormPreServiceImpl.java      | 36 +++++++++++++++++++-
 4 files changed, 137 insertions(+), 8 deletions(-)

diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyFormApplyServiceImpl.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyFormApplyServiceImpl.java
index 591a831..4238279 100644
--- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyFormApplyServiceImpl.java
+++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyFormApplyServiceImpl.java
@@ -8,26 +8,27 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.hxhq.business.domain.*;
 import com.hxhq.business.dto.study.StudyFormApplyListDto;
 import com.hxhq.business.enums.NormalEnum;
+import com.hxhq.business.enums.SnTypeEnum;
 import com.hxhq.business.enums.study.StudyFormApplyBdztEnum;
 import com.hxhq.business.enums.zykgl.JcgjlxEnum;
 import com.hxhq.business.enums.zykgl.JcmcysEnum;
 import com.hxhq.business.form.study.*;
 import com.hxhq.business.form.study.StudyFormApplySearchForm;
-import com.hxhq.business.service.IStudyFormApplyJcgjService;
-import com.hxhq.business.service.IStudyFormApplyQmxxService;
+import com.hxhq.business.service.*;
 import com.hxhq.business.utils.JctUtil;
 import com.hxhq.business.utils.ObjectCompareUtil;
 import com.hxhq.business.utils.lang.StudyFormUtil;
 import com.hxhq.common.core.exception.ServiceException;
 import com.hxhq.common.core.utils.StringUtils;
 import com.hxhq.common.security.utils.SecurityUtils;
+import com.hxhq.system.api.domain.SysDept;
 import com.hxhq.system.api.domain.SysUser;
+import com.hxhq.system.service.ISysDeptService;
 import com.hxhq.system.service.ISysUserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.hxhq.business.mapper.StudyFormApplyMapper;
 import com.hxhq.business.domain.StudyFormApply;
-import com.hxhq.business.service.IStudyFormApplyService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 
 /**
@@ -45,6 +46,14 @@ public class StudyFormApplyServiceImpl extends ServiceImpl<StudyFormApplyMapper,
     private IStudyFormApplyQmxxService studyFormApplyQmxxService;
     @Autowired
     private ISysUserService sysUserService;
+    @Autowired
+    private ISnGenService snGenService;
+    @Autowired
+    private ITemplateService templateService;
+    @Autowired
+    private IStudyService studyService;
+    @Autowired
+    private ISysDeptService sysDeptService;
 
     /**
      * 查询试验-申请单列表
@@ -275,6 +284,7 @@ public class StudyFormApplyServiceImpl extends ServiceImpl<StudyFormApplyMapper,
         } else {
             studyFormApply.setBdzt(StudyFormApplyBdztEnum.tbz.getValue());
             studyFormApply.setUserId(qmr.getUserId());
+            studyFormApply.setBdbh(getSn(studyFormApply));
             studyFormApply.setUserMc(qmr.getNickName());
             studyFormApply.setUserMcEn(qmr.getUserName());
             this.save(studyFormApply);
@@ -303,6 +313,7 @@ public class StudyFormApplyServiceImpl extends ServiceImpl<StudyFormApplyMapper,
         if (studyFormApply.getId() == null) {
             studyFormApply.setUserId(qmr.getUserId());
             studyFormApply.setUserMc(SecurityUtils.getNickName());
+            studyFormApply.setBdbh(getSn(studyFormApply));
         }
         studyFormApply.setBdzt(StudyFormApplyBdztEnum.ytj.getValue());
         studyFormApply.setTjsj(new Date());
@@ -575,5 +586,25 @@ public class StudyFormApplyServiceImpl extends ServiceImpl<StudyFormApplyMapper,
 //        baseMapper.updateZdgxjl(form.getId(), form.getZdgxjl());
     }
 
-
+    /**
+     * 生成编号
+     * @param studyFormApply
+     * @return
+     */
+    public String getSn(StudyFormApply studyFormApply){
+        Study study=studyService.getById(studyFormApply.getStudyId());
+        if(study==null){
+            throw new ServiceException("试验不存在或已删除");
+        }
+        Template template=templateService.getById(studyFormApply.getTemplateId());
+        if(template==null){
+            throw new ServiceException("模板不存在或已删除");
+        }
+        SysDept dep=sysDeptService.selectDeptById(template.getDeptId());
+        if(dep==null){
+            throw new ServiceException("学科不存在或已删除");
+        }
+        // MB+表单名缩写(底层模板名称)+版本号+试验编号+学科缩写+流水号
+        return "MB"+template.getShowSn()+study.getSn()+dep.getAbbr()+snGenService.getNewSn(SnTypeEnum.ybbd.getValue());
+    }
 }
diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyFormFillServiceImpl.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyFormFillServiceImpl.java
index 0766aff..c50ab2f 100644
--- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyFormFillServiceImpl.java
+++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyFormFillServiceImpl.java
@@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.hxhq.business.domain.*;
 import com.hxhq.business.dto.study.StudyFormFillListDto;
 import com.hxhq.business.enums.NormalEnum;
+import com.hxhq.business.enums.SnTypeEnum;
 import com.hxhq.business.enums.study.StudyFormFillBdztEnum;
 import com.hxhq.business.enums.template.ProductEnum;
 import com.hxhq.business.enums.zykgl.JcgjlxEnum;
@@ -21,7 +22,9 @@ import com.hxhq.business.utils.lang.StudyFormUtil;
 import com.hxhq.common.core.exception.ServiceException;
 import com.hxhq.common.core.utils.StringUtils;
 import com.hxhq.common.security.utils.SecurityUtils;
+import com.hxhq.system.api.domain.SysDept;
 import com.hxhq.system.api.domain.SysUser;
+import com.hxhq.system.service.ISysDeptService;
 import com.hxhq.system.service.ISysUserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -48,6 +51,12 @@ public class StudyFormFillServiceImpl extends ServiceImpl<StudyFormFillMapper, S
     private ITemplateService templateService;
     @Autowired
     private ISjService sjService;
+    @Autowired
+    private ISnGenService snGenService;
+    @Autowired
+    private IStudyService studyService;
+    @Autowired
+    private ISysDeptService sysDeptService;
 
     /**
      * 查询试验-填报单列表
@@ -285,6 +294,7 @@ public class StudyFormFillServiceImpl extends ServiceImpl<StudyFormFillMapper, S
         } else {
             studyFormFill.setBdzt(StudyFormFillBdztEnum.tbz.getValue());
             studyFormFill.setUserId(SecurityUtils.getUserId());
+            studyFormFill.setBdbh(getSn(studyFormFill));
             studyFormFill.setStartDate(new Date());
             studyFormFill.setUserMc(SecurityUtils.getNickName());
             this.save(studyFormFill);
@@ -340,6 +350,7 @@ public class StudyFormFillServiceImpl extends ServiceImpl<StudyFormFillMapper, S
             studyFormFill.setUserId(SecurityUtils.getUserId());
             studyFormFill.setUserMc(SecurityUtils.getNickName());
             studyFormFill.setSftb(NormalEnum.yes.getValue());
+            studyFormFill.setBdbh(getSn(studyFormFill));
             this.save(studyFormFill);
             //生成物资
             genResource(studyFormFill);
@@ -638,5 +649,26 @@ public class StudyFormFillServiceImpl extends ServiceImpl<StudyFormFillMapper, S
 //        baseMapper.updateZdgxjl(form.getId(), form.getZdgxjl());
     }
 
+    /**
+     * 生成编号
+     * @param studyFormFill
+     * @return
+     */
+    public String getSn(StudyFormFill studyFormFill){
+        Study study=studyService.getById(studyFormFill.getStudyId());
+        if(study==null){
+            throw new ServiceException("试验不存在或已删除");
+        }
+        Template template=templateService.getById(studyFormFill.getTemplateId());
+        if(template==null){
+            throw new ServiceException("模板不存在或已删除");
+        }
+        SysDept dep=sysDeptService.selectDeptById(template.getDeptId());
+        if(dep==null){
+            throw new ServiceException("学科不存在或已删除");
+        }
+        // MB+表单名缩写(底层模板名称)+版本号+试验编号+学科缩写+流水号+流水号
+        return "MB"+template.getShowSn()+study.getSn()+dep.getAbbr()+snGenService.getNewSn(SnTypeEnum.ybbd.getValue())+snGenService.getNewSn(SnTypeEnum.ybbd.getValue());
+    }
 
 }
diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyFormPlanServiceImpl.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyFormPlanServiceImpl.java
index cc14cca..dc37ad7 100644
--- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyFormPlanServiceImpl.java
+++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyFormPlanServiceImpl.java
@@ -8,25 +8,26 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.hxhq.business.domain.*;
 import com.hxhq.business.domain.StudyFormPlan;
 import com.hxhq.business.dto.study.StudyFormPlanListDto;
+import com.hxhq.business.enums.SnTypeEnum;
 import com.hxhq.business.enums.study.StudyFormPlanBdztEnum;
 import com.hxhq.business.enums.zykgl.JcgjlxEnum;
 import com.hxhq.business.enums.zykgl.JcmcysEnum;
 import com.hxhq.business.form.study.StudyFormPlanSearchForm;
 import com.hxhq.business.form.study.StudyFormUpdateForm;
-import com.hxhq.business.service.IStudyFormPlanJcgjService;
-import com.hxhq.business.service.IStudyFormPlanQmxxService;
+import com.hxhq.business.service.*;
 import com.hxhq.business.utils.JctUtil;
 import com.hxhq.business.utils.ObjectCompareUtil;
 import com.hxhq.business.utils.lang.StudyFormUtil;
 import com.hxhq.common.core.exception.ServiceException;
 import com.hxhq.common.core.utils.StringUtils;
 import com.hxhq.common.security.utils.SecurityUtils;
+import com.hxhq.system.api.domain.SysDept;
 import com.hxhq.system.api.domain.SysUser;
+import com.hxhq.system.service.ISysDeptService;
 import com.hxhq.system.service.ISysUserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.hxhq.business.mapper.StudyFormPlanMapper;
-import com.hxhq.business.service.IStudyFormPlanService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 
 /**
@@ -43,6 +44,14 @@ public class StudyFormPlanServiceImpl extends ServiceImpl<StudyFormPlanMapper, S
     private IStudyFormPlanQmxxService studyFormPlanQmxxService;
     @Autowired
     private ISysUserService sysUserService;
+    @Autowired
+    private ISnGenService snGenService;
+    @Autowired
+    private ITemplateService templateService;
+    @Autowired
+    private IStudyService studyService;
+    @Autowired
+    private ISysDeptService sysDeptService;
 
     /**
      * 查询试验-填报单列表
@@ -161,6 +170,7 @@ public class StudyFormPlanServiceImpl extends ServiceImpl<StudyFormPlanMapper, S
             studyFormPlan.setBdzt(StudyFormPlanBdztEnum.tbz.getValue());
             studyFormPlan.setUserId(qmr.getUserId());
             studyFormPlan.setUserMc(qmr.getNickName());
+            studyFormPlan.setBdbh(getSn(studyFormPlan));
             studyFormPlan.setUserMcEn(qmr.getUserName());
             this.save(studyFormPlan);
             //稽查轨迹
@@ -188,6 +198,7 @@ public class StudyFormPlanServiceImpl extends ServiceImpl<StudyFormPlanMapper, S
         if (studyFormPlan.getId() == null) {
             studyFormPlan.setUserId(SecurityUtils.getUserId());
             studyFormPlan.setUserMc(SecurityUtils.getNickName());
+            studyFormPlan.setBdbh(getSn(studyFormPlan));
         }
         studyFormPlan.setBdzt(StudyFormPlanBdztEnum.ytj.getValue());
         studyFormPlan.setTjsj(new Date());
@@ -405,5 +416,26 @@ public class StudyFormPlanServiceImpl extends ServiceImpl<StudyFormPlanMapper, S
 //        baseMapper.updateZdgxjl(form.getId(), form.getZdgxjl());
     }
 
+    /**
+     * 生成编号
+     * @param studyFormPlan
+     * @return
+     */
+    public String getSn(StudyFormPlan studyFormPlan){
+        Study study=studyService.getById(studyFormPlan.getStudyId());
+        if(study==null){
+            throw new ServiceException("试验不存在或已删除");
+        }
+        Template template=templateService.getById(studyFormPlan.getTemplateId());
+        if(template==null){
+            throw new ServiceException("模板不存在或已删除");
+        }
+        SysDept dep=sysDeptService.selectDeptById(template.getDeptId());
+        if(dep==null){
+            throw new ServiceException("学科不存在或已删除");
+        }
+        // MB+表单名缩写(底层模板名称)+版本号+试验编号+学科缩写+流水号
+        return "MB"+template.getShowSn()+study.getSn()+dep.getAbbr()+snGenService.getNewSn(SnTypeEnum.ybbd.getValue());
+    }
 
 }
\ No newline at end of file
diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyFormPreServiceImpl.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyFormPreServiceImpl.java
index d3b3618..e8ac70e 100644
--- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyFormPreServiceImpl.java
+++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyFormPreServiceImpl.java
@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.hxhq.business.domain.*;
 import com.hxhq.business.dto.study.StudyFormPreListDto;
+import com.hxhq.business.enums.SnTypeEnum;
 import com.hxhq.business.enums.study.StudyFormPreBdztEnum;
 import com.hxhq.business.enums.study.StudyFormPreFzrshztEnum;
 import com.hxhq.business.enums.zykgl.JcgjlxEnum;
@@ -21,7 +22,9 @@ import com.hxhq.business.utils.lang.StudyFormUtil;
 import com.hxhq.common.core.exception.ServiceException;
 import com.hxhq.common.core.utils.StringUtils;
 import com.hxhq.common.security.utils.SecurityUtils;
+import com.hxhq.system.api.domain.SysDept;
 import com.hxhq.system.api.domain.SysUser;
+import com.hxhq.system.service.ISysDeptService;
 import com.hxhq.system.service.ISysUserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -48,6 +51,14 @@ public class StudyFormPreServiceImpl extends ServiceImpl<StudyFormPreMapper, Stu
     private IStudyFormFillQmxxService studyFormFillQmxxService;
     @Autowired
     private ISysUserService sysUserService;
+    @Autowired
+    private ISnGenService snGenService;
+    @Autowired
+    private ITemplateService templateService;
+    @Autowired
+    private IStudyService studyService;
+    @Autowired
+    private ISysDeptService sysDeptService;
 
     /**
      * 查询试验-预填单列表
@@ -133,7 +144,7 @@ public class StudyFormPreServiceImpl extends ServiceImpl<StudyFormPreMapper, Stu
             }
             result = studyFormPreOld;
         } else {
-            studyFormPre.setBdbh("todo");
+            studyFormPre.setBdbh(getSn(studyFormPre));
             studyFormPre.setUserId(qmr.getUserId());
             studyFormPre.setUserMc(qmr.getNickName());
             studyFormPre.setUserMcEn(qmr.getNickName());
@@ -170,6 +181,7 @@ public class StudyFormPreServiceImpl extends ServiceImpl<StudyFormPreMapper, Stu
             studyFormPre.setTjsj(new Date());
             this.updateById(studyFormPre);
         } else {
+            studyFormPre.setBdbh(getSn(studyFormPre));
             studyFormPre.setUserId(qmr.getUserId());
             studyFormPre.setUserMc(qmr.getNickName());
             studyFormPre.setUserMcEn(qmr.getUserName());
@@ -500,4 +512,26 @@ public class StudyFormPreServiceImpl extends ServiceImpl<StudyFormPreMapper, Stu
         this.updateById(studyFormPreOld);
 //        baseMapper.updateZdgxjl(form.getId(), form.getZdgxjl());
     }
+
+    /**
+     * 生成编号
+     * @param studyFormPre
+     * @return
+     */
+    public String getSn(StudyFormPre studyFormPre){
+        Study study=studyService.getById(studyFormPre.getStudyId());
+        if(study==null){
+            throw new ServiceException("试验不存在或已删除");
+        }
+        Template template=templateService.getById(studyFormPre.getTemplateId());
+        if(template==null){
+            throw new ServiceException("模板不存在或已删除");
+        }
+        SysDept dep=sysDeptService.selectDeptById(template.getDeptId());
+        if(dep==null){
+            throw new ServiceException("学科不存在或已删除");
+        }
+        // MB+表单名缩写(底层模板名称)+版本号+试验编号+学科缩写+流水号
+        return "MB"+template.getShowSn()+study.getSn()+dep.getAbbr()+snGenService.getNewSn(SnTypeEnum.ybbd.getValue());
+    }
 }