diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/StudyFormApplyController.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/StudyFormApplyController.java index 52c5daf..4484e2f 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/StudyFormApplyController.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/StudyFormApplyController.java @@ -141,17 +141,6 @@ public class StudyFormApplyController extends BaseController { /** - * 观察 - */ - @RequiresPermissions("business:drugFormApply:gc") - @PostMapping("/gc") - public AjaxResult gc(@RequestBody StudyFormApplyGcForm form) { - studyFormApplyService.gc(form); - return AjaxResult.success("操作成功"); - } - - - /** * 复核通过 */ @RequiresPermissions("business:drugFormApply:fh") @@ -161,7 +150,6 @@ public class StudyFormApplyController extends BaseController { return AjaxResult.success("操作成功"); } - /** * 复核拒绝 */ @@ -173,16 +161,6 @@ public class StudyFormApplyController extends BaseController { } /** - * 通过 - */ - @RequiresPermissions("business:drugFormApply:fh") - @PostMapping("/tg") - public AjaxResult tg(@RequestBody StudyFormApply studyFormApply) { - studyFormApplyService.tg(studyFormApply); - return AjaxResult.success("操作成功"); - } - - /** * 审阅 */ @RequiresPermissions("business:drugFormApply:sy") @@ -191,4 +169,24 @@ public class StudyFormApplyController extends BaseController { studyFormApplyService.sy(studyFormApply); return AjaxResult.success("操作成功"); } + + /** + * 审核通过 + */ + @RequiresPermissions("business:drugFormApply:sh") + @PostMapping("/shtg") + public AjaxResult shtg(@RequestBody StudyFormApply studyFormApply) { + studyFormApplyService.shtg(studyFormApply); + return AjaxResult.success("操作成功"); + } + + /** + * 审核拒绝 + */ + @RequiresPermissions("business:drugFormApply:sh") + @PostMapping("/shjj") + public AjaxResult shjj(@RequestBody StudyFormApply studyFormApply) { + studyFormApplyService.shjj(studyFormApply); + return AjaxResult.success("操作成功"); + } } diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/StudyFormApply.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/StudyFormApply.java index c2b0cb0..8cff786 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/StudyFormApply.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/StudyFormApply.java @@ -53,7 +53,7 @@ public class StudyFormApply extends MpBaseEntity @Compare(name = "是否补录") private Integer sfbl; - /** 表单状态：1：填报中；3：已提交；5：已完成（经复核）；7：已完成；9：待废止；11：已废止 */ + /** 表单状态：1：填报中；3：已提交；5：已复核；6：未通过；7：已完成；9：待废止；11：已废止 */ private Integer bdzt; /** 提交时间 */ 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 9ac8933..c69d178 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 @@ -50,7 +50,7 @@ public class StudyFormPre extends MpBaseEntity /** 表单归属人名称 */ private String userMc; - /** 表单状态：1：填报中；3：已提交；5：已通过 */ + /** 表单状态：1：填报中；3：已提交；5：已通过；7：未通过 */ private Integer bdzt; /** 是否需要负责人审核：1：否；10：是 */ diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/enums/study/StudyFormApplyBdztEnum.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/enums/study/StudyFormApplyBdztEnum.java index 1cc062a..ba900e7 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/enums/study/StudyFormApplyBdztEnum.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/enums/study/StudyFormApplyBdztEnum.java @@ -1,7 +1,7 @@ package com.hxhq.business.enums.study; /** - * 表单状态：1：填报中；3：已提交；5：已完成（经复核）；7：已完成；9：待废止；11：已废止 + * 表单状态：1：填报中；3：已提交；5：已复核；6：未通过；7：已完成；9：待废止；11：已废止 * @author tanfei */ public enum StudyFormApplyBdztEnum { @@ -17,9 +17,14 @@ public enum StudyFormApplyBdztEnum { ytj(3, "已提交"), /** - * 已完成（经复核） + * 已复核 */ - ywcfh(5, "已完成（经复核）"), + yfh(5, "已复核"), + + /** + * 未通过 + */ + wtg(6, "未通过"), /** * 已完成 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 f638e37..33c1c4c 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：已通过 + * 表单状态：1：填报中；3：已提交；5：已通过；7：未通过 * @author tanfei */ public enum StudyFormPreBdztEnum { @@ -19,7 +19,12 @@ public enum StudyFormPreBdztEnum { /** * 已通过 */ - ytg(5, "已通过"); + ytg(5, "已通过"), + + /** + * 未通过 + */ + wtg(7, "未通过"); private int value; private String text; diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IStudyFormApplyService.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IStudyFormApplyService.java index 550e34e..7a84c6a 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IStudyFormApplyService.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IStudyFormApplyService.java @@ -65,28 +65,18 @@ public interface IStudyFormApplyService extends IService */ public void bc(StudyFormApply studyFormApply); - /** * 提交 * @param studyFormApply */ public void tj(StudyFormApply studyFormApply); - - /** - * 观察 - * @param form - */ - public void gc(StudyFormApplyGcForm form); - - /** * 复核通过 * @param studyFormApply */ public void fhtg(StudyFormApply studyFormApply); - /** * 复核拒绝 * @param studyFormApply @@ -94,14 +84,21 @@ public interface IStudyFormApplyService extends IService public void fhjj(StudyFormApply studyFormApply); /** - * 通过 + * 审阅 * @param studyFormApply */ - public void tg(StudyFormApply studyFormApply); + public void sy(StudyFormApply studyFormApply); /** - * 审阅 + * 审核通过 * @param studyFormApply */ - public void sy(StudyFormApply studyFormApply); + public void shtg(StudyFormApply studyFormApply); + + /** + * 审核拒绝 + * @param studyFormApply + */ + public void shjj(StudyFormApply studyFormApply); + } 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 b7433ea..32452d5 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 @@ -291,11 +291,11 @@ public class StudyFormApplyServiceImpl extends ServiceImpl formData = new LinkedHashMap<>(); formData.put("备注",studyFormApply.getRemark()); - studyFormApplyJcgjService.saveJcgj(studyFormApply.getId(), JcgjlxEnum.bj.getValue(), "填写并保存", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getNickName()); + studyFormApplyJcgjService.saveJcgj(studyFormApply.getId(), JcgjlxEnum.bj.getValue(), "填写并保存记录", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getNickName()); } //签名信息 - studyFormApplyQmxxService.saveQmxx(studyFormApply.getId(),"填写并保存",SecurityUtils.getUserId(),SecurityUtils.getNickName(),studyFormApply.getRemark()); + studyFormApplyQmxxService.saveQmxx(studyFormApply.getId(),"填写并保存记录",SecurityUtils.getUserId(),SecurityUtils.getNickName(),studyFormApply.getRemark()); } @@ -307,39 +307,34 @@ public class StudyFormApplyServiceImpl extends ServiceImpl formData = new LinkedHashMap<>(); - formData.put("生长情况",form.getQmyy()); - formData.put("备注",form.getRemark()); - studyFormApplyJcgjService.saveJcgj(studyFormApplyOld.getId(), JcgjlxEnum.lc.getValue(), form.getQmyy(), JcmcysEnum.orange.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getNickName()); + formData.put("备注",studyFormApply.getRemark()); + studyFormApplyJcgjService.saveJcgj(studyFormApplyOld.getId(), JcgjlxEnum.lc.getValue(), "填写并提交记录", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getNickName()); //签名信息 - studyFormApplyQmxxService.saveQmxx(studyFormApplyOld.getId(),form.getQmyy(),SecurityUtils.getUserId(),SecurityUtils.getNickName(),form.getRemark()); + studyFormApplyQmxxService.saveQmxx(studyFormApplyOld.getId(),"填写并提交记录",SecurityUtils.getUserId(),SecurityUtils.getNickName(),studyFormApply.getRemark()); } + + /** * 复核通过 * @@ -358,7 +353,7 @@ public class StudyFormApplyServiceImpl extends ServiceImpl formData = new LinkedHashMap<>(); @@ -399,12 +394,12 @@ public class StudyFormApplyServiceImpl extends ServiceImpl formData = new LinkedHashMap<>(); - formData.put("原因",studyFormApply.getRemark()); - studyFormApplyJcgjService.saveJcgj(studyFormApplyOld.getId(), JcgjlxEnum.lc.getValue(), "免复核通过", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getNickName()); + formData.put("备注",studyFormApply.getRemark()); + studyFormApplyJcgjService.saveJcgj(studyFormApplyOld.getId(), JcgjlxEnum.lc.getValue(), "已审阅", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getNickName()); //签名信息 - studyFormApplyQmxxService.saveQmxx(studyFormApplyOld.getId(),"免复核通过",SecurityUtils.getUserId(),SecurityUtils.getNickName(),studyFormApply.getRemark()); + studyFormApplyQmxxService.saveQmxx(studyFormApplyOld.getId(),"已审阅",SecurityUtils.getUserId(),SecurityUtils.getNickName(),studyFormApply.getRemark()); } + /** - * 审阅 + * 审核通过 * * @param studyFormApply */ @Override - public void sy(StudyFormApply studyFormApply) { + public void shtg(StudyFormApply studyFormApply) { //验证签名人密码 todo if (studyFormApply.getId() == null || studyFormApply.getId().longValue() < 0) { throw new ServiceException("参数id不正确"); @@ -442,15 +436,46 @@ public class StudyFormApplyServiceImpl extends ServiceImpl formData = new LinkedHashMap<>(); formData.put("备注",studyFormApply.getRemark()); - studyFormApplyJcgjService.saveJcgj(studyFormApplyOld.getId(), JcgjlxEnum.lc.getValue(), "已审阅", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getNickName()); + studyFormApplyJcgjService.saveJcgj(studyFormApplyOld.getId(), JcgjlxEnum.lc.getValue(), "审核通过", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getNickName()); //签名信息 - studyFormApplyQmxxService.saveQmxx(studyFormApplyOld.getId(),"已审阅",SecurityUtils.getUserId(),SecurityUtils.getNickName(),studyFormApply.getRemark()); + studyFormApplyQmxxService.saveQmxx(studyFormApplyOld.getId(),"审核通过",SecurityUtils.getUserId(),SecurityUtils.getNickName(),studyFormApply.getRemark()); + } + + + /** + * 审核拒绝 + * + * @param studyFormApply + */ + @Override + public void shjj(StudyFormApply studyFormApply) { + //验证签名人密码 todo + if (studyFormApply.getId() == null || studyFormApply.getId().longValue() < 0) { + throw new ServiceException("参数id不正确"); + } + StudyFormApply studyFormApplyOld = this.getById(studyFormApply.getId()); + if (studyFormApplyOld == null) { + throw new ServiceException("表单不存在或已删除"); + } + if (!studyFormApplyOld.getBdzt().equals(StudyFormApplyBdztEnum.yfh.getValue()) ) { + throw new ServiceException("表单不是已复核状态，不能审核"); + } + studyFormApplyOld.setBdzt(StudyFormApplyBdztEnum.wtg.getValue()); + this.updateById(studyFormApplyOld); + //稽查轨迹 + Map formData = new LinkedHashMap<>(); + formData.put("原因",studyFormApply.getRemark()); + studyFormApplyJcgjService.saveJcgj(studyFormApplyOld.getId(), JcgjlxEnum.lc.getValue(), "审核拒绝", JcmcysEnum.red.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getNickName()); + //签名信息 + studyFormApplyQmxxService.saveQmxx(studyFormApplyOld.getId(),"审核拒绝",SecurityUtils.getUserId(),SecurityUtils.getNickName(),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 df0dc0a..f728b5c 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 @@ -292,11 +292,11 @@ public class StudyFormFillServiceImpl extends ServiceImpl formData = new LinkedHashMap<>(); formData.put("备注",studyFormFill.getRemark()); - studyFormFillJcgjService.saveJcgj(studyFormFill.getId(), JcgjlxEnum.bj.getValue(), "填写并保存", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getNickName()); + studyFormFillJcgjService.saveJcgj(studyFormFill.getId(), JcgjlxEnum.bj.getValue(), "填写并保存记录", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getNickName()); } //签名信息 - studyFormFillQmxxService.saveQmxx(studyFormFill.getId(),"填写并保存",SecurityUtils.getUserId(),SecurityUtils.getNickName(),studyFormFill.getRemark()); + 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/StudyFormPlanServiceImpl.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyFormPlanServiceImpl.java index 7f9953d..4c5ac66 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 @@ -168,11 +168,11 @@ public class StudyFormPlanServiceImpl extends ServiceImpl formData = new LinkedHashMap<>(); formData.put("备注",studyFormPlan.getRemark()); - studyFormPlanJcgjService.saveJcgj(studyFormPlan.getId(), JcgjlxEnum.bj.getValue(), "填写并保存", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getNickName()); + studyFormPlanJcgjService.saveJcgj(studyFormPlan.getId(), JcgjlxEnum.bj.getValue(), "填写并保存记录", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getNickName()); } //签名信息 - studyFormPlanQmxxService.saveQmxx(studyFormPlan.getId(),"填写并保存",SecurityUtils.getUserId(),SecurityUtils.getNickName(),studyFormPlan.getRemark()); + studyFormPlanQmxxService.saveQmxx(studyFormPlan.getId(),"填写并保存记录",SecurityUtils.getUserId(),SecurityUtils.getNickName(),studyFormPlan.getRemark()); } 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 878b370..867e37f 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 @@ -200,7 +200,7 @@ public class StudyFormPreServiceImpl extends ServiceImpl formData = new LinkedHashMap<>();