From e365f06520afcaccd9af09a56064d21f8088c888 Mon Sep 17 00:00:00 2001 From: "15881625488@163.com" <15881625488@163.com> Date: Thu, 8 Jan 2026 14:18:53 +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][=E8=AE=A1=E5=88=92=E8=A1=A8=E5=8D=95]=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/StudyFormPlanController.java | 9 --- .../com/hxhq/business/domain/StudyFormPlan.java | 2 +- .../enums/study/StudyFormPlanBdztEnum.java | 9 +-- .../business/service/IStudyFormPlanService.java | 6 -- .../service/impl/StudyFormApplyServiceImpl.java | 15 ++--- .../service/impl/StudyFormFillServiceImpl.java | 4 +- .../service/impl/StudyFormPlanServiceImpl.java | 65 ++++++++++------------ .../mapper/business/StudyFormApplyMapper.xml | 3 +- 8 files changed, 41 insertions(+), 72 deletions(-) diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/StudyFormPlanController.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/StudyFormPlanController.java index fc2c612..50a5972 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/StudyFormPlanController.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/StudyFormPlanController.java @@ -129,15 +129,6 @@ public class StudyFormPlanController extends BaseController return AjaxResult.success("操作成功"); } - /** - * 通过 - */ - @RequiresPermissions("business:studyFormPlan:fh") - @PostMapping("/tg") - public AjaxResult tg(@RequestBody StudyFormPlan studyFormPlan) { - studyFormPlanService.tg(studyFormPlan); - return AjaxResult.success("操作成功"); - } /** * 审阅 diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/StudyFormPlan.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/StudyFormPlan.java index 772db37..27a2573 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/StudyFormPlan.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/StudyFormPlan.java @@ -47,7 +47,7 @@ public class StudyFormPlan extends MpBaseEntity /** 表单归属人名称 */ private String userMc; - /** 表单状态：1：填报中；3：已提交；5：已完成（经复核）；7：已完成 */ + /** 表单状态：1：填报中；3：已提交；5：已完成（经复核）*/ private Integer bdzt; /** 提交时间 */ diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/enums/study/StudyFormPlanBdztEnum.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/enums/study/StudyFormPlanBdztEnum.java index 2daeaee..4d33e7d 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/enums/study/StudyFormPlanBdztEnum.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/enums/study/StudyFormPlanBdztEnum.java @@ -1,7 +1,7 @@ package com.hxhq.business.enums.study; /** - * 表单状态：1：填报中；3：已提交；5：已完成（经复核）；7：已完成 + * 表单状态：1：填报中；3：已提交；5：已完成（经复核） * @author tanfei */ public enum StudyFormPlanBdztEnum { @@ -19,12 +19,7 @@ public enum StudyFormPlanBdztEnum { /** * 已完成（经复核） */ - ywcfh(5, "已完成（经复核）"), - - /** - * 已完成 - */ - ywc(7, "已完成"); + ywcfh(5, "已完成（经复核）"); private int value; private String text; diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IStudyFormPlanService.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IStudyFormPlanService.java index 23101d4..480fad6 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IStudyFormPlanService.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IStudyFormPlanService.java @@ -64,12 +64,6 @@ public interface IStudyFormPlanService extends IService public void fhjj(StudyFormPlan studyFormPlan); /** - * 通过 - * @param studyFormPlan - */ - public void tg(StudyFormPlan studyFormPlan); - - /** * 审阅 * @param studyFormPlan */ 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 32452d5..7b9bda1 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 @@ -1,9 +1,6 @@ package com.hxhq.business.service.impl; -import java.util.ArrayList; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; +import java.util.*; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; @@ -230,8 +227,8 @@ public class StudyFormApplyServiceImpl extends ServiceImpl formData = new LinkedHashMap<>(); - formData.put("新归属人",studyFormApply.getRemark()); - formData.put("原归属人",studyFormApplyOld.getRemark()); + formData.put("新归属人",studyFormApply.getUserMc()); + formData.put("原归属人",studyFormApplyOld.getUserMc()); formData.put("原因",studyFormApply.getRemark()); //是否验证新的归属人，是否属于该实验？ todo @@ -315,13 +312,11 @@ public class StudyFormApplyServiceImpl extends ServiceImpl formData = new LinkedHashMap<>(); @@ -411,6 +406,8 @@ public class StudyFormApplyServiceImpl extends ServiceImpl formData = new LinkedHashMap<>(); formData.put("备注",studyFormApply.getRemark()); 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 f728b5c..a51426d 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 @@ -230,8 +230,8 @@ public class StudyFormFillServiceImpl extends ServiceImpl formData = new LinkedHashMap<>(); - formData.put("新归属人",studyFormFill.getRemark()); - formData.put("原归属人",studyFormFillOld.getRemark()); + formData.put("新归属人",studyFormFill.getUserMc()); + formData.put("原归属人",studyFormFillOld.getUserMc()); formData.put("原因",studyFormFill.getRemark()); //是否验证新的归属人，是否属于该实验？ todo 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 4c5ac66..1d36293 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 @@ -1,17 +1,16 @@ package com.hxhq.business.service.impl; -import java.util.ArrayList; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; +import java.util.*; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.hxhq.business.domain.StudyFormPlan; import com.hxhq.business.domain.StudyFormFillJcgj; import com.hxhq.business.domain.StudyFormPlan; import com.hxhq.business.domain.StudyFormPlanJcgj; import com.hxhq.business.dto.study.StudyFormPlanListDto; import com.hxhq.business.enums.study.StudyFormPlanBdztEnum; +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; @@ -107,8 +106,8 @@ public class StudyFormPlanServiceImpl extends ServiceImpl formData = new LinkedHashMap<>(); - formData.put("新归属人",studyFormPlan.getRemark()); - formData.put("原归属人",studyFormPlanOld.getRemark()); + formData.put("新归属人",studyFormPlan.getUserMc()); + formData.put("原归属人",studyFormPlanOld.getUserMc()); formData.put("原因",studyFormPlan.getRemark()); //是否验证新的归属人，是否属于该实验？ todo @@ -184,17 +183,6 @@ public class StudyFormPlanServiceImpl extends ServiceImpl formData = new LinkedHashMap<>(); formData.put("备注",studyFormPlan.getRemark()); - studyFormPlanJcgjService.saveJcgj(studyFormPlanOld.getId(), JcgjlxEnum.lc.getValue(), "复核通过", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getNickName()); + studyFormPlanJcgjService.saveJcgj(studyFormPlanOld.getId(), JcgjlxEnum.lc.getValue(), "填写并提交记录", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getNickName()); //签名信息 - studyFormPlanQmxxService.saveQmxx(studyFormPlanOld.getId(),"复核通过",SecurityUtils.getUserId(),SecurityUtils.getNickName(),studyFormPlan.getRemark()); + studyFormPlanQmxxService.saveQmxx(studyFormPlanOld.getId(),"填写并提交记录",SecurityUtils.getUserId(),SecurityUtils.getNickName(),studyFormPlan.getRemark()); + } /** - * 复核拒绝 + * 复核通过 * * @param studyFormPlan */ @Override - public void fhjj(StudyFormPlan studyFormPlan) { + public void fhtg(StudyFormPlan studyFormPlan) { //验证签名人密码 todo if (studyFormPlan.getId() == null || studyFormPlan.getId().longValue() < 0) { throw new ServiceException("参数id不正确"); @@ -235,24 +225,24 @@ public class StudyFormPlanServiceImpl extends ServiceImpl formData = new LinkedHashMap<>(); - formData.put("原因",studyFormPlan.getRemark()); - studyFormPlanJcgjService.saveJcgj(studyFormPlanOld.getId(), JcgjlxEnum.lc.getValue(), "复核拒绝", JcmcysEnum.red.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getNickName()); + formData.put("备注",studyFormPlan.getRemark()); + studyFormPlanJcgjService.saveJcgj(studyFormPlanOld.getId(), JcgjlxEnum.lc.getValue(), "复核通过", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getNickName()); //签名信息 - studyFormPlanQmxxService.saveQmxx(studyFormPlanOld.getId(),"复核拒绝",SecurityUtils.getUserId(),SecurityUtils.getNickName(),studyFormPlan.getRemark()); - + studyFormPlanQmxxService.saveQmxx(studyFormPlanOld.getId(),"复核通过",SecurityUtils.getUserId(),SecurityUtils.getNickName(),studyFormPlan.getRemark()); } + /** - * 通过 + * 复核拒绝 * * @param studyFormPlan */ @Override - public void tg(StudyFormPlan studyFormPlan) { + public void fhjj(StudyFormPlan studyFormPlan) { //验证签名人密码 todo if (studyFormPlan.getId() == null || studyFormPlan.getId().longValue() < 0) { throw new ServiceException("参数id不正确"); @@ -264,17 +254,18 @@ public class StudyFormPlanServiceImpl extends ServiceImpl formData = new LinkedHashMap<>(); formData.put("原因",studyFormPlan.getRemark()); - studyFormPlanJcgjService.saveJcgj(studyFormPlanOld.getId(), JcgjlxEnum.lc.getValue(), "免复核通过", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getNickName()); + studyFormPlanJcgjService.saveJcgj(studyFormPlanOld.getId(), JcgjlxEnum.lc.getValue(), "复核拒绝", JcmcysEnum.red.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getNickName()); //签名信息 - studyFormPlanQmxxService.saveQmxx(studyFormPlanOld.getId(),"免复核通过",SecurityUtils.getUserId(),SecurityUtils.getNickName(),studyFormPlan.getRemark()); + studyFormPlanQmxxService.saveQmxx(studyFormPlanOld.getId(),"复核拒绝",SecurityUtils.getUserId(),SecurityUtils.getNickName(),studyFormPlan.getRemark()); } + /** * 审阅 * @@ -290,8 +281,8 @@ public class StudyFormPlanServiceImpl extends ServiceImpl formData = new LinkedHashMap<>(); 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 4bde912..d3b210b 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,8 @@ "http://mybatis.org/dtd/mybatis-3-mapper.dtd">