From 616805ab6b6aa0a893475dfd04634bedf0eefc3b Mon Sep 17 00:00:00 2001 From: "15881625488@163.com" <15881625488@163.com> Date: Mon, 5 Jan 2026 20:06:01 +0800 Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A[=E8=AF=95=E9=AA=8C=E7=AE=A1?= =?UTF-8?q?=E7=90=86][=E9=A2=84=E5=A1=AB=E8=A1=A8=E5=8D=95=EF=BC=8C?= =?UTF-8?q?=E5=A1=AB=E6=8A=A5=E8=A1=A8=E5=8D=95]=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/StudyFormPreController.java | 2 +- .../service/impl/StudyFormApplyServiceImpl.java | 3 ++ .../service/impl/StudyFormFillServiceImpl.java | 3 ++ .../service/impl/StudyFormPreServiceImpl.java | 49 ++++++++++++++-------- .../business/service/impl/TemplateServiceImpl.java | 3 ++ .../mapper/business/StudyFormApplyMapper.xml | 2 +- .../mapper/business/StudyFormFillMapper.xml | 2 +- .../mapper/business/StudyFormPlanMapper.xml | 2 +- .../mapper/business/StudyFormPreMapper.xml | 2 +- 9 files changed, 45 insertions(+), 23 deletions(-) diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/StudyFormPreController.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/StudyFormPreController.java index 60eb84a..32c6023 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/StudyFormPreController.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/StudyFormPreController.java @@ -85,7 +85,7 @@ public class StudyFormPreController extends BaseController * 保存 */ @PostMapping("/bc") - @RequiresPermissions("business:studyFormPre:bj,business:studyFormPre:xz") + @RequiresPermissions({"business:studyFormPre:bj","business:studyFormPre:xz"}) public AjaxResult bc(@RequestBody StudyFormPre studyFormPre) { studyFormPreService.bc(studyFormPre); 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 37f1746..7c16a12 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 @@ -67,6 +67,9 @@ public class StudyFormApplyServiceImpl extends ServiceImpl 0) { queryWrapper.eq("t.study_subject_id", form.getStudySubjectId()); } + if (form.getSfbl() != null && form.getSfbl().intValue() > 0) { + queryWrapper.eq("t.sfbl", form.getSfbl()); + } if (StringUtils.isNoneBlank(form.getBdbh())) { queryWrapper.and(p -> p.like("t.`bdbh`", form.getBdbh())); } 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 8f10b27..84e3cff 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 @@ -67,6 +67,9 @@ public class StudyFormFillServiceImpl extends ServiceImpl 0) { queryWrapper.eq("t.study_subject_id", form.getStudySubjectId()); } + if (form.getSfbl() != null && form.getSfbl().intValue() > 0) { + queryWrapper.eq("t.sfbl", form.getSfbl()); + } if (StringUtils.isNoneBlank(form.getBdbh())) { queryWrapper.and(p -> p.like("t.`bdbh`", form.getBdbh())); } 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 fd33b27..6167a07 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 @@ -16,9 +16,7 @@ import com.hxhq.business.enums.zykgl.JcgjlxEnum; import com.hxhq.business.enums.zykgl.JcmcysEnum; import com.hxhq.business.form.study.StudyFormPreAuditForm; import com.hxhq.business.form.study.StudyFormPreSearchForm; -import com.hxhq.business.service.IStudyFormFillService; -import com.hxhq.business.service.IStudyFormPreJcgjService; -import com.hxhq.business.service.IStudyFormPreQmxxService; +import com.hxhq.business.service.*; import com.hxhq.business.utils.JctUtil; import com.hxhq.common.core.exception.ServiceException; import com.hxhq.common.core.utils.StringUtils; @@ -27,7 +25,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.hxhq.business.mapper.StudyFormPreMapper; import com.hxhq.business.domain.StudyFormPre; -import com.hxhq.business.service.IStudyFormPreService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.web.bind.annotation.PostMapping; @@ -46,6 +43,10 @@ public class StudyFormPreServiceImpl extends ServiceImpl formData = new LinkedHashMap<>(); - studyFormPreJcgjService.saveJcgj(studyFormPre.getId(), JcgjlxEnum.bj.getValue(), "制作保存预制表单", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getNickName()); + studyFormPreJcgjService.saveJcgj(studyFormPre.getId(), JcgjlxEnum.xg.getValue(), "制作保存预制表单", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getNickName()); //签名信息 studyFormPreQmxxService.saveQmxx(studyFormPre.getId(),"制作保存预制表单",SecurityUtils.getUserId(),SecurityUtils.getNickName(),studyFormPre.getRemark()); @@ -165,18 +166,7 @@ public class StudyFormPreServiceImpl extends ServiceImpl formData1 = new LinkedHashMap<>(); + formData1.put("备注",studyFormFill.getRemark()); + studyFormFillJcgjService.saveJcgj(studyFormFill.getId(), JcgjlxEnum.bj.getValue(), "创建记录", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData1), SecurityUtils.getUserId(), SecurityUtils.getNickName()); + //签名信息 + studyFormFillQmxxService.saveQmxx(studyFormFill.getId(),"创建记录",SecurityUtils.getUserId(),SecurityUtils.getNickName(),studyFormFill.getRemark()); + } } diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/TemplateServiceImpl.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/TemplateServiceImpl.java index 4020041..5a9ad0c 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/TemplateServiceImpl.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/TemplateServiceImpl.java @@ -39,6 +39,9 @@ public class TemplateServiceImpl extends ServiceImpl i if(template.getDeptId()!=null && template.getDeptId().longValue()>0){ queryWrapper.eq("t.dept_id",template.getDeptId()); } + if(template.getNeedPre()!=null && template.getNeedPre().intValue()>0){ + queryWrapper.eq("t.need_pre",template.getNeedPre()); + } if(template.getStatus()!=null && template.getStatus().intValue()>0){ queryWrapper.eq("t.status",template.getStatus()); } diff --git a/hxhq-modules/hxhq-system/src/main/resources/mapper/business/StudyFormApplyMapper.xml b/hxhq-modules/hxhq-system/src/main/resources/mapper/business/StudyFormApplyMapper.xml index 8859a7d..0d874b2 100644 --- a/hxhq-modules/hxhq-system/src/main/resources/mapper/business/StudyFormApplyMapper.xml +++ b/hxhq-modules/hxhq-system/src/main/resources/mapper/business/StudyFormApplyMapper.xml @@ -4,7 +4,7 @@ "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - select t.id,t.bdbh,t.bdmc,t.create_time,t.user_mc,t.bdzt,t.bdzt,t.tjsj,tm.name as templateMc,tm.sn as templateSn,tm.dept_id as templateDeptId + select t.id,t.bdbh,t.bdmc,t.create_time,t.user_mc,t.user_id,t.bdzt,t.bdzt,t.tjsj,tm.name as templateMc,tm.sn as templateSn,tm.dept_id as templateDeptId FROM `t_study_form_fill` t left join t_template tm on tm.id=t.template_id diff --git a/hxhq-modules/hxhq-system/src/main/resources/mapper/business/StudyFormPlanMapper.xml b/hxhq-modules/hxhq-system/src/main/resources/mapper/business/StudyFormPlanMapper.xml index e4c422d..50051f2 100644 --- a/hxhq-modules/hxhq-system/src/main/resources/mapper/business/StudyFormPlanMapper.xml +++ b/hxhq-modules/hxhq-system/src/main/resources/mapper/business/StudyFormPlanMapper.xml @@ -4,7 +4,7 @@ "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - select t.id,t.bdbh,t.bdmc,t.create_time,t.user_mc,t.bdzt,t.bdzt,t.fzrsh,t.fzrshzt,tm.name as templateMc,tm.sn as templateSn,tm.dept_id as templateDeptId + select t.id,t.bdbh,t.bdmc,t.create_time,t.user_mc,t.user_id,t.bdzt,t.bdzt,t.fzrsh,t.fzrshzt,tm.name as templateMc,tm.sn as templateSn,tm.dept_id as templateDeptId FROM `t_study_form_pre` t left join t_template tm on tm.id=t.template_id