From 2d794382d411918801445485644290b3ee1afeae Mon Sep 17 00:00:00 2001 From: "15881625488@163.com" <15881625488@163.com> Date: Fri, 16 Jan 2026 12:04:21 +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]=E9=A2=84=E5=A1=AB=E8=A1=A8=E5=8D=95=E5=85=B3?= =?UTF-8?q?=E9=97=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/StudyFormPreController.java | 31 +++++++ .../com/hxhq/business/domain/StudyFormPre.java | 35 +++++++- .../business/enums/study/StudyFormPreBdztEnum.java | 14 +++- .../business/service/IStudyFormPreService.java | 19 +++++ .../service/impl/StudyFormPreServiceImpl.java | 98 ++++++++++++++++++++++ .../com/hxhq/business/utils/StudyFormUtil.java | 3 + .../mapper/business/StudyFormPreMapper.xml | 3 +- 7 files changed, 199 insertions(+), 4 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 da107d3..cdd4002 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 @@ -138,6 +138,37 @@ public class StudyFormPreController extends BaseController studyFormPreService.jj(form); return AjaxResult.success("操作成功"); } + + /** + * 申请关闭 + */ + @PostMapping("/sqgb") + public AjaxResult sqgb(@RequestBody StudyFormPre studyFormPre) + { + studyFormPreService.sqgb(studyFormPre); + return AjaxResult.success("操作成功"); + } + + /** + * 关闭同意 + */ + @PostMapping("/tygb") + public AjaxResult tygb(@RequestBody StudyFormPreAuditForm form) + { + studyFormPreService.tygb(form); + return AjaxResult.success("操作成功"); + } + + /** + * 关闭拒绝 + */ + @PostMapping("/jjgb") + public AjaxResult jjgb(@RequestBody StudyFormPreAuditForm form) + { + studyFormPreService.jjgb(form); + return AjaxResult.success("操作成功"); + } + /** * 保存复核意见 */ diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/StudyFormPre.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/StudyFormPre.java index 38b517a..93ba331 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/StudyFormPre.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/StudyFormPre.java @@ -53,7 +53,7 @@ public class StudyFormPre extends MpBaseEntity /** 表单归属人名称-英文 */ private String userMcEn; - /** 表单状态：1：填报中；3：已提交；5：已通过；7：未通过 */ + /** 表单状态：1：填报中；3：已提交；5：已通过；7：未通过 ；9：待关闭；11：已关闭*/ private Integer bdzt; /** 是否需要负责人审核 */ @@ -72,6 +72,15 @@ public class StudyFormPre extends MpBaseEntity /** 审核人员名称-英文(通知用) */ private String shryMcEn; + /** 实际审核人员id */ + private Long sjshryId; + + /** 实际审核人员名称 */ + private String sjshryMc; + + /** 实际审核人员名称-英文 */ + private String sjshryMcEn; + /** 提交时间 */ @Excel(name = "提交时间") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @@ -111,6 +120,30 @@ public class StudyFormPre extends MpBaseEntity @TableField(exist = false) private String studyMc; + public String getSjshryMc() { + return sjshryMc; + } + + public void setSjshryMc(String sjshryMc) { + this.sjshryMc = sjshryMc; + } + + public String getSjshryMcEn() { + return sjshryMcEn; + } + + public void setSjshryMcEn(String sjshryMcEn) { + this.sjshryMcEn = sjshryMcEn; + } + + public Long getSjshryId() { + return sjshryId; + } + + public void setSjshryId(Long sjshryId) { + this.sjshryId = sjshryId; + } + public String getUserMcEn() { return userMcEn; } diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/enums/study/StudyFormPreBdztEnum.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/enums/study/StudyFormPreBdztEnum.java index 33c1c4c..9b10b1c 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/enums/study/StudyFormPreBdztEnum.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/enums/study/StudyFormPreBdztEnum.java @@ -1,7 +1,7 @@ package com.hxhq.business.enums.study; /** - * 表单状态：1：填报中；3：已提交；5：已通过；7：未通过 + * 表单状态：1：填报中；3：已提交；5：已通过；7：未通过 ；9：待关闭；11：已关闭 * @author tanfei */ public enum StudyFormPreBdztEnum { @@ -24,7 +24,17 @@ public enum StudyFormPreBdztEnum { /** * 未通过 */ - wtg(7, "未通过"); + wtg(7, "未通过"), + + /** + * 待关闭 + */ + dgb(9, "待关闭"), + + /** + * 已关闭 + */ + ygb(11, "已关闭"); private int value; private String text; diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IStudyFormPreService.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IStudyFormPreService.java index 5d64e9d..219d5ee 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IStudyFormPreService.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IStudyFormPreService.java @@ -68,6 +68,25 @@ public interface IStudyFormPreService extends IService public StudyFormFill tb(StudyFormPre studyFormPre); /** + * 申请关闭 + * @param studyFormPre + */ + public void sqgb(StudyFormPre studyFormPre); + + + /** + * 关闭同意 + * @param form + */ + public void tygb(StudyFormPreAuditForm form); + + /** + * 关闭拒绝 + * @param form + */ + public void jjgb(StudyFormPreAuditForm form); + + /** * 更新表单内容 */ public void updateBdnr(StudyFormUpdateForm form); 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 0705c41..10a2c9b 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 @@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.hxhq.business.domain.*; import com.hxhq.business.dto.study.StudyFormPreListDto; import com.hxhq.business.enums.NormalEnum; +import com.hxhq.business.enums.study.StudyFormPlanBdztEnum; import com.hxhq.business.enums.study.StudyFormPreBdztEnum; import com.hxhq.business.enums.study.StudyFormPreFzrshztEnum; import com.hxhq.business.enums.zykgl.JcgjlxEnum; @@ -221,6 +222,9 @@ public class StudyFormPreServiceImpl extends ServiceImpl formData = new LinkedHashMap<>(); + formData.put("原因", studyFormPre.getRemark()); + studyFormPreJcgjService.saveJcgj(studyFormPreOld.getId(), JcgjlxEnum.lc.getValue(), "申请关闭", JcmcysEnum.green.getValue(), formData, qmr, null, null); + //签名信息 + studyFormFillQmxxService.saveQmxx(studyFormPreOld.getId(), "申请关闭", qmr, studyFormPre.getRemark()); + } + + + /** + * 关闭拒绝 + * + * @param form + */ + @Override + public void jjgb(StudyFormPreAuditForm form) { + SysUser qmr = SecurityUtils.getLoginUser().getSysUser(); + //验证密码 + checkPassword(qmr, form.getQmrmm()); + StudyFormPre studyFormPreOld = this.getById(form.getId()); + if (studyFormPreOld == null) { + throw new ServiceException("信息不存在或已删除"); + } + if (!studyFormPreOld.getSjshryId().equals(qmr.getUserId())) { + throw new ServiceException("只能操作自己审核的表单"); + } + if (!studyFormPreOld.getBdzt().equals(StudyFormPreBdztEnum.dgb.getValue())) { + throw new ServiceException("不是待关闭状态，不能审核"); + } + studyFormPreOld.setBdzt(StudyFormPreBdztEnum.ytg.getValue()); + this.updateById(studyFormPreOld); + //稽查轨迹 + Map formData = new LinkedHashMap<>(); + formData.put("原因", form.getRemark()); + studyFormPreJcgjService.saveJcgj(studyFormPreOld.getId(), JcgjlxEnum.lc.getValue(), "关闭拒绝", JcmcysEnum.red.getValue(), formData, qmr, null, null); + //签名信息 + studyFormPreQmxxService.saveQmxx(studyFormPreOld.getId(), "关闭拒绝", qmr, form.getRemark()); + } + + /** + * 关闭同意 + * + * @param form + */ + @Override + public void tygb(StudyFormPreAuditForm form) { + SysUser qmr = SecurityUtils.getLoginUser().getSysUser(); + //验证密码 + checkPassword(qmr, form.getQmrmm()); + StudyFormPre studyFormPreOld = this.getById(form.getId()); + if (studyFormPreOld == null) { + throw new ServiceException("信息不存在或已删除"); + } + if (!studyFormPreOld.getSjshryId().equals(qmr.getUserId())) { + throw new ServiceException("只能操作自己审核的表单"); + } + if (!studyFormPreOld.getBdzt().equals(StudyFormPreBdztEnum.dgb.getValue())) { + throw new ServiceException("不是待关闭状态，不能审核"); + } + studyFormPreOld.setBdzt(StudyFormPreBdztEnum.ygb.getValue()); + this.updateById(studyFormPreOld); + //稽查轨迹 + Map formData = new LinkedHashMap<>(); + formData.put("原因", form.getRemark()); + studyFormPreJcgjService.saveJcgj(studyFormPreOld.getId(), JcgjlxEnum.lc.getValue(), "关闭同意", JcmcysEnum.green.getValue(), formData, qmr, null, null); + //签名信息 + studyFormPreQmxxService.saveQmxx(studyFormPreOld.getId(), "关闭同意", qmr, form.getRemark()); + } + + /** * 验证密码 * * @param user diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/utils/StudyFormUtil.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/utils/StudyFormUtil.java index 2dda67c..c945a5e 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/utils/StudyFormUtil.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/utils/StudyFormUtil.java @@ -58,6 +58,9 @@ public class StudyFormUtil { mapQmyy.put("制作提交预制表单","Submit Record Preset"); mapQmyy.put("创建记录","Create Record"); mapQmyy.put("填写并保存记录","Create and Save Record"); + mapQmyy.put("申请关闭","申请关闭"); + mapQmyy.put("关闭拒绝","关闭拒绝"); + mapQmyy.put("关闭同意","关闭同意"); //endregion diff --git a/hxhq-modules/hxhq-system/src/main/resources/mapper/business/StudyFormPreMapper.xml b/hxhq-modules/hxhq-system/src/main/resources/mapper/business/StudyFormPreMapper.xml index 447d992..c4c78e2 100644 --- a/hxhq-modules/hxhq-system/src/main/resources/mapper/business/StudyFormPreMapper.xml +++ b/hxhq-modules/hxhq-system/src/main/resources/mapper/business/StudyFormPreMapper.xml @@ -4,7 +4,8 @@ "http://mybatis.org/dtd/mybatis-3-mapper.dtd">