From 1d1a4867ace2b208b145e291e353772b87fe0ca2 Mon Sep 17 00:00:00 2001 From: HanLong <404402223@qq.com> Date: Thu, 22 Jan 2026 15:09:30 +0800 Subject: [PATCH] =?UTF-8?q?feat:[=E6=A1=A3=E6=A1=88=E7=AE=A1=E7=90=86][?= =?UTF-8?q?=E4=BE=9B=E8=AF=95=E5=93=81=E6=A1=A3=E6=A1=88=E7=AE=A1=E7=90=86?= =?UTF-8?q?]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../hxhq/business/controller/GspController.java | 84 +++++++++ .../business/controller/GspFfjlController.java | 87 +++++++++ .../business/controller/GspRkjlController.java | 85 +++++++++ .../main/java/com/hxhq/business/domain/Gsp.java | 56 ++++++ .../java/com/hxhq/business/domain/GspFfjl.java | 56 ++++++ .../java/com/hxhq/business/domain/GspRkjl.java | 56 ++++++ .../com/hxhq/business/service/IGspFfjlService.java | 22 +++ .../com/hxhq/business/service/IGspRkjlService.java | 21 +++ .../com/hxhq/business/service/IGspService.java | 21 +++ .../business/service/impl/GspFfjlServiceImpl.java | 202 ++++++++++++++++++++- .../business/service/impl/GspRkjlServiceImpl.java | 184 +++++++++++++++++++ .../hxhq/business/service/impl/GspServiceImpl.java | 199 ++++++++++++++++++++ 12 files changed, 1068 insertions(+), 5 deletions(-) diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/GspController.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/GspController.java index 821c4b4..382fcc6 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/GspController.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/GspController.java @@ -297,4 +297,88 @@ public class GspController extends BaseController { gspService.gd(form); return AjaxResult.success("操作成功"); } + + /** + * 同意归档 + */ + @PostMapping("/gd/agree") + @RequiresPermissions("business:resource:gsp:gd") + public AjaxResult agreeGd(@RequestBody @Validated GspGdForm form) + { + form.setQmrId(SecurityUtils.getUserId()); + gspService.agreeGd(form); + return AjaxResult.success("操作成功"); + } + + /** + * 拒绝归档 + */ + @PostMapping("/gd/refuse") + @RequiresPermissions("business:resource:gsp:gd") + public AjaxResult refuseGd(@RequestBody @Validated GspGdForm form) + { + form.setQmrId(SecurityUtils.getUserId()); + gspService.refuseGd(form); + return AjaxResult.success("操作成功"); + } + + /** + * 同意解档 + */ + @PostMapping("/jd/agree") + @RequiresPermissions("business:resource:gsp:gd") + public AjaxResult agreeJd(@RequestBody @Validated GspGdForm form) + { + form.setQmrId(SecurityUtils.getUserId()); + gspService.agreeJd(form); + return AjaxResult.success("操作成功"); + } + + /** + * 拒绝解档 + */ + @PostMapping("/jd/refuse") + @RequiresPermissions("business:resource:gsp:gd") + public AjaxResult refuseJd(@RequestBody @Validated GspGdForm form) + { + form.setQmrId(SecurityUtils.getUserId()); + gspService.refuseJd(form); + return AjaxResult.success("操作成功"); + } + + /** + * 同意借阅 + */ + @PostMapping("/jy/agree") + @RequiresPermissions("business:resource:gsp:gd") + public AjaxResult agreeJy(@RequestBody @Validated GspJyForm form) + { + form.setQmrId(SecurityUtils.getUserId()); + gspService.agreeJy(form); + return AjaxResult.success("操作成功"); + } + + /** + * 拒绝借阅 + */ + @PostMapping("/jy/refuse") + @RequiresPermissions("business:resource:gsp:gd") + public AjaxResult refuseJy(@RequestBody @Validated GspJyForm form) + { + form.setQmrId(SecurityUtils.getUserId()); + gspService.refuseJy(form); + return AjaxResult.success("操作成功"); + } + + /** + * 档案确认归还 + */ + @PostMapping("/gh/archive") + @RequiresPermissions("business:resource:gsp:gd") + public AjaxResult archiveGh(@RequestBody @Validated GspGdForm form) + { + form.setQmrId(SecurityUtils.getUserId()); + gspService.archiveGh(form); + return AjaxResult.success("操作成功"); + } } diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/GspFfjlController.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/GspFfjlController.java index f1c3107..163dd93 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/GspFfjlController.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/GspFfjlController.java @@ -5,11 +5,14 @@ import java.util.List; import com.hxhq.business.domain.GspFfjlJcgj; import com.hxhq.business.domain.MjyFfjlJcgj; +import com.hxhq.business.form.gsp.GspGdForm; +import com.hxhq.business.form.gsp.GspJyForm; import com.hxhq.business.form.mjy.*; import com.hxhq.business.service.IGspFfjlJcgjService; import com.hxhq.common.security.annotation.RequiresPermissions; import com.hxhq.common.security.utils.SecurityUtils; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import com.hxhq.business.domain.GspFfjl; import com.hxhq.business.service.IGspFfjlService; @@ -163,4 +166,88 @@ public class GspFfjlController extends BaseController gspFfjlService.jq(form); return AjaxResult.success("操作成功"); } + + /** + * 同意归档 + */ + @PostMapping("/gd/agree") + @RequiresPermissions("business:resource:gsp:gd") + public AjaxResult agreeGd(@RequestBody @Validated GspGdForm form) + { + form.setQmrId(SecurityUtils.getUserId()); + gspFfjlService.agreeGd(form); + return AjaxResult.success("操作成功"); + } + + /** + * 拒绝归档 + */ + @PostMapping("/gd/refuse") + @RequiresPermissions("business:resource:gsp:gd") + public AjaxResult refuseGd(@RequestBody @Validated GspGdForm form) + { + form.setQmrId(SecurityUtils.getUserId()); + gspFfjlService.refuseGd(form); + return AjaxResult.success("操作成功"); + } + + /** + * 同意解档 + */ + @PostMapping("/jd/agree") + @RequiresPermissions("business:resource:gsp:gd") + public AjaxResult agreeJd(@RequestBody @Validated GspGdForm form) + { + form.setQmrId(SecurityUtils.getUserId()); + gspFfjlService.agreeJd(form); + return AjaxResult.success("操作成功"); + } + + /** + * 拒绝解档 + */ + @PostMapping("/jd/refuse") + @RequiresPermissions("business:resource:gsp:gd") + public AjaxResult refuseJd(@RequestBody @Validated GspGdForm form) + { + form.setQmrId(SecurityUtils.getUserId()); + gspFfjlService.refuseJd(form); + return AjaxResult.success("操作成功"); + } + + /** + * 同意借阅 + */ + @PostMapping("/jy/agree") + @RequiresPermissions("business:resource:gsp:gd") + public AjaxResult agreeJy(@RequestBody @Validated GspJyForm form) + { + form.setQmrId(SecurityUtils.getUserId()); + gspFfjlService.agreeJy(form); + return AjaxResult.success("操作成功"); + } + + /** + * 拒绝借阅 + */ + @PostMapping("/jy/refuse") + @RequiresPermissions("business:resource:gsp:gd") + public AjaxResult refuseJy(@RequestBody @Validated GspJyForm form) + { + form.setQmrId(SecurityUtils.getUserId()); + gspFfjlService.refuseJy(form); + return AjaxResult.success("操作成功"); + } + + /** + * 档案确认归还 + */ + @PostMapping("/gh/archive") + @RequiresPermissions("business:resource:gsp:gd") + public AjaxResult archiveGh(@RequestBody @Validated GspGdForm form) + { + form.setQmrId(SecurityUtils.getUserId()); + gspFfjlService.archiveGh(form); + return AjaxResult.success("操作成功"); + } } diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/GspRkjlController.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/GspRkjlController.java index a26efde..a6284f2 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/GspRkjlController.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/GspRkjlController.java @@ -11,6 +11,7 @@ import com.hxhq.business.service.IGspRkjlJcgjService; import com.hxhq.common.security.annotation.RequiresPermissions; import com.hxhq.common.security.utils.SecurityUtils; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import com.hxhq.business.domain.GspRkjl; import com.hxhq.business.service.IGspRkjlService; @@ -175,4 +176,88 @@ public class GspRkjlController extends BaseController gspRkjlService.jy(form); return AjaxResult.success("操作成功"); } + + /** + * 同意归档 + */ + @PostMapping("/gd/agree") + @RequiresPermissions("business:resource:gsp:gd") + public AjaxResult agreeGd(@RequestBody @Validated GspGdForm form) + { + form.setQmrId(SecurityUtils.getUserId()); + gspRkjlService.agreeGd(form); + return AjaxResult.success("操作成功"); + } + + /** + * 拒绝归档 + */ + @PostMapping("/gd/refuse") + @RequiresPermissions("business:resource:gsp:gd") + public AjaxResult refuseGd(@RequestBody @Validated GspGdForm form) + { + form.setQmrId(SecurityUtils.getUserId()); + gspRkjlService.refuseGd(form); + return AjaxResult.success("操作成功"); + } + + /** + * 同意解档 + */ + @PostMapping("/jd/agree") + @RequiresPermissions("business:resource:gsp:gd") + public AjaxResult agreeJd(@RequestBody @Validated GspGdForm form) + { + form.setQmrId(SecurityUtils.getUserId()); + gspRkjlService.agreeJd(form); + return AjaxResult.success("操作成功"); + } + + /** + * 拒绝解档 + */ + @PostMapping("/jd/refuse") + @RequiresPermissions("business:resource:gsp:gd") + public AjaxResult refuseJd(@RequestBody @Validated GspGdForm form) + { + form.setQmrId(SecurityUtils.getUserId()); + gspRkjlService.refuseJd(form); + return AjaxResult.success("操作成功"); + } + + /** + * 同意借阅 + */ + @PostMapping("/jy/agree") + @RequiresPermissions("business:resource:gsp:gd") + public AjaxResult agreeJy(@RequestBody @Validated GspJyForm form) + { + form.setQmrId(SecurityUtils.getUserId()); + gspRkjlService.agreeJy(form); + return AjaxResult.success("操作成功"); + } + + /** + * 拒绝借阅 + */ + @PostMapping("/jy/refuse") + @RequiresPermissions("business:resource:gsp:gd") + public AjaxResult refuseJy(@RequestBody @Validated GspJyForm form) + { + form.setQmrId(SecurityUtils.getUserId()); + gspRkjlService.refuseJy(form); + return AjaxResult.success("操作成功"); + } + + /** + * 档案确认归还 + */ + @PostMapping("/gh/archive") + @RequiresPermissions("business:resource:gsp:gd") + public AjaxResult archiveGh(@RequestBody @Validated GspGdForm form) + { + form.setQmrId(SecurityUtils.getUserId()); + gspRkjlService.archiveGh(form); + return AjaxResult.success("操作成功"); + } } diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/Gsp.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/Gsp.java index f81cfd6..1209ee2 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/Gsp.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/Gsp.java @@ -191,6 +191,62 @@ public class Gsp extends MpBaseEntity @JsonFormat(pattern = "yyyy-MM-dd") private Date jyjsrq; + /** 归档申请时间 */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date gdsqsj; + + /** 档案申请人名称 */ + private String dasqrMc; + + /** 档案申请人ID*/ + private Long dasqrId; + + /** 档案申请人名称 */ + private String dasqrMcOld; + + /** 档案申请人ID*/ + private Long dasqrIdOld; + + public String getDasqrMcOld() { + return dasqrMcOld; + } + + public void setDasqrMcOld(String dasqrMcOld) { + this.dasqrMcOld = dasqrMcOld; + } + + public Long getDasqrIdOld() { + return dasqrIdOld; + } + + public void setDasqrIdOld(Long dasqrIdOld) { + this.dasqrIdOld = dasqrIdOld; + } + + public Date getGdsqsj() { + return gdsqsj; + } + + public void setGdsqsj(Date gdsqsj) { + this.gdsqsj = gdsqsj; + } + + public String getDasqrMc() { + return dasqrMc; + } + + public void setDasqrMc(String dasqrMc) { + this.dasqrMc = dasqrMc; + } + + public Long getDasqrId() { + return dasqrId; + } + + public void setDasqrId(Long dasqrId) { + this.dasqrId = dasqrId; + } + public Date getJyksrq() { return jyksrq; } diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/GspFfjl.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/GspFfjl.java index b080c01..f6db299 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/GspFfjl.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/GspFfjl.java @@ -141,6 +141,10 @@ public class GspFfjl extends MpBaseEntity /** 归档申请人名称 */ private String gdsqrMc; + /** 归档申请时间 */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date gdsqsj; + /** 借阅开始日期 */ @JsonFormat(pattern = "yyyy-MM-dd") private Date jyksrq; @@ -149,6 +153,18 @@ public class GspFfjl extends MpBaseEntity @JsonFormat(pattern = "yyyy-MM-dd") private Date jyjsrq; + /** 档案申请人名称 */ + private String dasqrMc; + + /** 档案申请人ID*/ + private Long dasqrId; + + /** 档案申请人名称 */ + private String dasqrMcOld; + + /** 档案申请人ID*/ + private Long dasqrIdOld; + public void setJlzt(Integer jlzt) { this.jlzt = jlzt; @@ -550,4 +566,44 @@ public class GspFfjl extends MpBaseEntity public void setGdsqrMc(String gdsqrMc) { this.gdsqrMc = gdsqrMc; } + + public Date getGdsqsj() { + return gdsqsj; + } + + public void setGdsqsj(Date gdsqsj) { + this.gdsqsj = gdsqsj; + } + + public String getDasqrMc() { + return dasqrMc; + } + + public void setDasqrMc(String dasqrMc) { + this.dasqrMc = dasqrMc; + } + + public Long getDasqrId() { + return dasqrId; + } + + public void setDasqrId(Long dasqrId) { + this.dasqrId = dasqrId; + } + + public String getDasqrMcOld() { + return dasqrMcOld; + } + + public void setDasqrMcOld(String dasqrMcOld) { + this.dasqrMcOld = dasqrMcOld; + } + + public Long getDasqrIdOld() { + return dasqrIdOld; + } + + public void setDasqrIdOld(Long dasqrIdOld) { + this.dasqrIdOld = dasqrIdOld; + } } diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/GspRkjl.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/GspRkjl.java index 0a167e4..95dd8bf 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/GspRkjl.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/GspRkjl.java @@ -75,6 +75,62 @@ public class GspRkjl extends MpBaseEntity @JsonFormat(pattern = "yyyy-MM-dd") private Date jyjsrq; + /** 归档申请时间 */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date gdsqsj; + + /** 档案申请人名称 */ + private String dasqrMc; + + /** 档案申请人ID*/ + private Long dasqrId; + + /** 档案申请人名称 */ + private String dasqrMcOld; + + /** 档案申请人ID*/ + private Long dasqrIdOld; + + public Date getGdsqsj() { + return gdsqsj; + } + + public void setGdsqsj(Date gdsqsj) { + this.gdsqsj = gdsqsj; + } + + public String getDasqrMc() { + return dasqrMc; + } + + public void setDasqrMc(String dasqrMc) { + this.dasqrMc = dasqrMc; + } + + public Long getDasqrId() { + return dasqrId; + } + + public void setDasqrId(Long dasqrId) { + this.dasqrId = dasqrId; + } + + public String getDasqrMcOld() { + return dasqrMcOld; + } + + public void setDasqrMcOld(String dasqrMcOld) { + this.dasqrMcOld = dasqrMcOld; + } + + public Long getDasqrIdOld() { + return dasqrIdOld; + } + + public void setDasqrIdOld(Long dasqrIdOld) { + this.dasqrIdOld = dasqrIdOld; + } + public Date getJyksrq() { return jyksrq; } diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IGspFfjlService.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IGspFfjlService.java index 49580e4..69f886f 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IGspFfjlService.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IGspFfjlService.java @@ -9,7 +9,9 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.hxhq.business.domain.Mjy; import com.hxhq.business.domain.MjyFfjl; import com.hxhq.business.dto.mjy.FfjlDetailDto; +import com.hxhq.business.form.gsp.GspGdForm; import com.hxhq.business.form.gsp.GspGhForm; +import com.hxhq.business.form.gsp.GspJyForm; import com.hxhq.business.form.mjy.*; import com.hxhq.system.api.domain.SysUser; @@ -110,4 +112,24 @@ public interface IGspFfjlService extends IService */ public void jq(FfjlJqForm form); + /** 同意归档 */ + void agreeGd(GspGdForm form); + + /** 拒绝归档 */ + void refuseGd(GspGdForm form); + + /** 同意解档 */ + void agreeJd(GspGdForm form); + + /** 拒绝解档 */ + void refuseJd(GspGdForm form); + + /** 同意借阅 */ + void agreeJy(GspJyForm form); + + /** 拒绝借阅 */ + void refuseJy(GspJyForm form); + + /** 档案确认归还 */ + void archiveGh(GspGdForm form); } diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IGspRkjlService.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IGspRkjlService.java index 490eb85..b5ed69a 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IGspRkjlService.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IGspRkjlService.java @@ -54,4 +54,25 @@ public interface IGspRkjlService extends IService /** 借阅 */ void jy(GspJyForm form); + + /** 同意归档 */ + void agreeGd(GspGdForm form); + + /** 拒绝归档 */ + void refuseGd(GspGdForm form); + + /** 同意解档 */ + void agreeJd(GspGdForm form); + + /** 拒绝解档 */ + void refuseJd(GspGdForm form); + + /** 同意借阅 */ + void agreeJy(GspJyForm form); + + /** 拒绝借阅 */ + void refuseJy(GspJyForm form); + + /** 档案确认归还 */ + void archiveGh(GspGdForm form); } diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IGspService.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IGspService.java index b0f9672..c8247a5 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IGspService.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IGspService.java @@ -85,4 +85,25 @@ public interface IGspService extends IService /** 试验关联的供试品列表 */ List queryStudyList(GspSearchListForm form); + + /** 同意归档 */ + void agreeGd(GspGdForm form); + + /** 拒绝归档 */ + void refuseGd(GspGdForm form); + + /** 同意解档 */ + void agreeJd(GspGdForm form); + + /** 拒绝解档 */ + void refuseJd(GspGdForm form); + + /** 同意借阅 */ + void agreeJy(GspJyForm form); + + /** 拒绝借阅 */ + void refuseJy(GspJyForm form); + + /** 档案确认归还 */ + void archiveGh(GspGdForm form); } diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GspFfjlServiceImpl.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GspFfjlServiceImpl.java index 823533b..47a43e7 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GspFfjlServiceImpl.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GspFfjlServiceImpl.java @@ -7,11 +7,10 @@ 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.mjy.FfjlDetailDto; -import com.hxhq.business.enums.zykgl.JcgjlxEnum; -import com.hxhq.business.enums.zykgl.JcmcysEnum; -import com.hxhq.business.enums.zykgl.JlztEnum; -import com.hxhq.business.enums.zykgl.JyztEnum; +import com.hxhq.business.enums.zykgl.*; +import com.hxhq.business.form.gsp.GspGdForm; import com.hxhq.business.form.gsp.GspGhForm; +import com.hxhq.business.form.gsp.GspJyForm; import com.hxhq.business.form.mjy.*; import com.hxhq.business.service.IGspFfjlJcgjService; import com.hxhq.business.utils.JctUtil; @@ -236,6 +235,11 @@ public class GspFfjlServiceImpl extends ServiceImpl impl for (GspFfjl gspFfjl : gspFfjlList) { //申请归档，档案员可在档案管理中进行确认归档审核；申请后状态更新成待归档； gspFfjl.setJlzt(JlztEnum.dgd.getValue()); + gspFfjl.setGdsqrId(qmr.getUserId()); + gspFfjl.setGdsqrMc(qmr.getNickName()); + gspFfjl.setDasqrMc(qmr.getNickName()); + gspFfjl.setDasqrId(qmr.getUserId()); + gspFfjl.setGdsqsj(new Date()); //region 稽查轨迹 GspFfjlJcgj gspFfjlJcgj = new GspFfjlJcgj(); @@ -267,7 +271,6 @@ public class GspFfjlServiceImpl extends ServiceImpl impl public void gd(FfjlGdForm form) { SysUser qmr = sysUserService.selectUserById(form.getQmrId()); sysUserService.checkPassword(qmr, form.getQmrmm(), false); - //验证签名人密码 todo if (form.getId() == null || form.getId().longValue() < 0) { throw new ServiceException("参数id不正确"); } @@ -282,6 +285,9 @@ public class GspFfjlServiceImpl extends ServiceImpl impl gspFfjl.setJlzt(JlztEnum.dgd.getValue()); gspFfjl.setGdsqrId(qmr.getUserId()); gspFfjl.setGdsqrMc(qmr.getNickName()); + gspFfjl.setDasqrMc(qmr.getNickName()); + gspFfjl.setDasqrId(qmr.getUserId()); + gspFfjl.setGdsqsj(new Date()); this.updateById(gspFfjl); //稽查轨迹 Map formData = new LinkedHashMap<>(); @@ -443,6 +449,8 @@ public class GspFfjlServiceImpl extends ServiceImpl impl gspFfjl.setJyzt(JyztEnum.djy.getValue()); gspFfjl.setJyksrq(form.getStartDate()); gspFfjl.setJyjsrq(form.getEndDate()); + gspFfjl.setDasqrMc(qmr.getNickName()); + gspFfjl.setDasqrId(qmr.getUserId()); this.updateById(gspFfjl); //稽查轨迹 Map formData = new LinkedHashMap<>(); @@ -489,4 +497,188 @@ public class GspFfjlServiceImpl extends ServiceImpl impl JcmcysEnum.orange.getValue(), JctUtil.formatStr(formData), JctUtil.formatStr(formDataEn), qmr); } + @Override + public void agreeGd(GspGdForm form) { + SysUser qmr = sysUserService.selectUserById(form.getQmrId()); + sysUserService.checkPassword(qmr, form.getQmrmm(), false); + if (form.getId() == null || form.getId().longValue() < 0) { + throw new SecurityException("参数id不正确"); + } + GspFfjl gspFfjl = this.getById(form.getId()); + if (gspFfjl == null) { + throw new SecurityException("发放记录不存在或已删除"); + } + if (!gspFfjl.getJlzt().equals(JlztEnum.dgd.getValue())) { + throw new SecurityException("发放记录【" + gspFfjl.getMc() + "】不是待归档状态，不能操作"); + } + gspFfjl.setJlzt(JlztEnum.gd.getValue()); + this.updateById(gspFfjl); + //稽查轨迹 + Map formData = new LinkedHashMap<>(); + formData.put("备注", form.getRemark()); + + Map formDataEn = new LinkedHashMap<>(); + formDataEn.put("Comment", form.getRemark()); + gspFfjlJcgjService.saveJcgj(gspFfjl.getId(), JcgjlxEnum.lc.getValue(), "同意归档", "Approve Archiving", + JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), JctUtil.formatStr(formDataEn), qmr); + } + + @Override + public void refuseGd(GspGdForm form) { + SysUser qmr = sysUserService.selectUserById(form.getQmrId()); + sysUserService.checkPassword(qmr, form.getQmrmm(), false); + if (form.getId() == null || form.getId().longValue() < 0) { + throw new SecurityException("参数id不正确"); + } + GspFfjl gspFfjl = this.getById(form.getId()); + if (gspFfjl == null) { + throw new SecurityException("发放记录不存在或已删除"); + } + if (!gspFfjl.getJlzt().equals(JlztEnum.dgd.getValue())) { + throw new SecurityException("发放记录【" + gspFfjl.getMc() + "】不是待归档状态，不能操作"); + } + gspFfjl.setJlzt(JlztEnum.ysd.getValue()); + this.updateById(gspFfjl); + //稽查轨迹 + Map formData = new LinkedHashMap<>(); + formData.put("备注", form.getRemark()); + + Map formDataEn = new LinkedHashMap<>(); + formDataEn.put("Comment", form.getRemark()); + gspFfjlJcgjService.saveJcgj(gspFfjl.getId(), JcgjlxEnum.lc.getValue(), "拒绝归档", "Reject Archiving", + JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), JctUtil.formatStr(formDataEn), qmr); + } + + @Override + public void agreeJd(GspGdForm form) { + SysUser qmr = sysUserService.selectUserById(form.getQmrId()); + sysUserService.checkPassword(qmr, form.getQmrmm(), false); + if (form.getId() == null || form.getId().longValue() < 0) { + throw new SecurityException("参数id不正确"); + } + GspFfjl gspFfjl = this.getById(form.getId()); + if (gspFfjl == null) { + throw new SecurityException("发放记录不存在或已删除"); + } + if (!gspFfjl.getJlzt().equals(JlztEnum.djd.getValue())) { + throw new SecurityException("发放记录【" + gspFfjl.getMc() + "】不是待解档状态，不能操作"); + } + gspFfjl.setJlzt(JlztEnum.ysd.getValue()); + this.updateById(gspFfjl); + //稽查轨迹 + Map formData = new LinkedHashMap<>(); + formData.put("备注", form.getRemark()); + + Map formDataEn = new LinkedHashMap<>(); + formDataEn.put("Comment", form.getRemark()); + gspFfjlJcgjService.saveJcgj(gspFfjl.getId(), JcgjlxEnum.lc.getValue(), "同意解档", "Approve De-archiving", + JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), JctUtil.formatStr(formDataEn), qmr); + } + + @Override + public void refuseJd(GspGdForm form) { + SysUser qmr = sysUserService.selectUserById(form.getQmrId()); + sysUserService.checkPassword(qmr, form.getQmrmm(), false); + if (form.getId() == null || form.getId().longValue() < 0) { + throw new SecurityException("参数id不正确"); + } + GspFfjl gspFfjl = this.getById(form.getId()); + if (gspFfjl == null) { + throw new SecurityException("发放记录不存在或已删除"); + } + if (!gspFfjl.getJlzt().equals(JlztEnum.djd.getValue())) { + throw new SecurityException("发放记录【" + gspFfjl.getMc() + "】不是待解档状态，不能操作"); + } + gspFfjl.setJlzt(JlztEnum.gd.getValue()); + this.updateById(gspFfjl); + //稽查轨迹 + Map formData = new LinkedHashMap<>(); + formData.put("备注", form.getRemark()); + + Map formDataEn = new LinkedHashMap<>(); + formDataEn.put("Comment", form.getRemark()); + gspFfjlJcgjService.saveJcgj(gspFfjl.getId(), JcgjlxEnum.lc.getValue(), "拒绝解档", "Reject De-archiving", + JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), JctUtil.formatStr(formDataEn), qmr); + } + + @Override + public void agreeJy(GspJyForm form) { + SysUser qmr = sysUserService.selectUserById(form.getQmrId()); + sysUserService.checkPassword(qmr, form.getQmrmm(), false); + if (form.getId() == null || form.getId().longValue() < 0) { + throw new SecurityException("参数id不正确"); + } + GspFfjl gspFfjl = this.getById(form.getId()); + if (gspFfjl == null) { + throw new SecurityException("发放记录不存在或已删除"); + } + if (!gspFfjl.getJyzt().equals(JyztEnum.djy.getValue())) { + throw new SecurityException("发放记录【" + gspFfjl.getMc() + "】不是待借阅状态，不能操作"); + } + gspFfjl.setJyzt(JyztEnum.jyz.getValue()); + gspFfjl.setJyksrq(form.getStartDate()); + gspFfjl.setJyjsrq(form.getEndDate()); + this.updateById(gspFfjl); + //稽查轨迹 + Map formData = new LinkedHashMap<>(); + formData.put("备注", form.getRemark()); + + Map formDataEn = new LinkedHashMap<>(); + formDataEn.put("Comment", form.getRemark()); + gspFfjlJcgjService.saveJcgj(gspFfjl.getId(), JcgjlxEnum.lc.getValue(), "同意借阅", "Approve Check-out", + JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), JctUtil.formatStr(formDataEn), qmr); + } + + @Override + public void refuseJy(GspJyForm form) { + SysUser qmr = sysUserService.selectUserById(form.getQmrId()); + sysUserService.checkPassword(qmr, form.getQmrmm(), false); + if (form.getId() == null || form.getId().longValue() < 0) { + throw new SecurityException("参数id不正确"); + } + GspFfjl gspFfjl = this.getById(form.getId()); + if (gspFfjl == null) { + throw new SecurityException("发放记录不存在或已删除"); + } + if (!gspFfjl.getJyzt().equals(JyztEnum.djy.getValue())) { + throw new SecurityException("发放记录【" + gspFfjl.getMc() + "】不是待借阅状态，不能操作"); + } + gspFfjl.setJyzt(JyztEnum.wjy.getValue()); + this.updateById(gspFfjl); + //稽查轨迹 + Map formData = new LinkedHashMap<>(); + formData.put("备注", form.getRemark()); + + Map formDataEn = new LinkedHashMap<>(); + formDataEn.put("Comment", form.getRemark()); + gspFfjlJcgjService.saveJcgj(gspFfjl.getId(), JcgjlxEnum.lc.getValue(), "拒绝借阅", "Reject Check-out", + JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), JctUtil.formatStr(formDataEn), qmr); + } + + @Override + public void archiveGh(GspGdForm form) { + SysUser qmr = sysUserService.selectUserById(form.getQmrId()); + sysUserService.checkPassword(qmr, form.getQmrmm(), false); + if (form.getId() == null || form.getId().longValue() < 0) { + throw new SecurityException("参数id不正确"); + } + GspFfjl gspFfjl = this.getById(form.getId()); + if (gspFfjl == null) { + throw new SecurityException("发放记录不存在或已删除"); + } + if (!gspFfjl.getJyzt().equals(JyztEnum.jyz.getValue())) { + throw new SecurityException("发放记录【" + gspFfjl.getMc() + "】不是借阅中状态，不能操作"); + } + gspFfjl.setJyzt(JyztEnum.wjy.getValue()); + this.updateById(gspFfjl); + //稽查轨迹 + Map formData = new LinkedHashMap<>(); + formData.put("备注", form.getRemark()); + + Map formDataEn = new LinkedHashMap<>(); + formDataEn.put("Comment", form.getRemark()); + gspFfjlJcgjService.saveJcgj(gspFfjl.getId(), JcgjlxEnum.lc.getValue(), "确认归还", "Check-out End Confirmation", + JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), JctUtil.formatStr(formDataEn), qmr); + } + } diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GspRkjlServiceImpl.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GspRkjlServiceImpl.java index 411bad4..5713b3b 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GspRkjlServiceImpl.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GspRkjlServiceImpl.java @@ -362,4 +362,188 @@ public class GspRkjlServiceImpl extends ServiceImpl impl } + @Override + public void agreeGd(GspGdForm form) { + SysUser qmr = sysUserService.selectUserById(form.getQmrId()); + sysUserService.checkPassword(qmr, form.getQmrmm(), false); + if (form.getId() == null || form.getId().longValue() < 0) { + throw new SecurityException("参数id不正确"); + } + GspRkjl gspRkjl = this.getById(form.getId()); + if (gspRkjl == null) { + throw new SecurityException("供试品入库记录不存在或已删除"); + } + if (!gspRkjl.getJlzt().equals(JlztEnum.dgd.getValue())) { + throw new SecurityException("供试品入库记录【" + gspRkjl.getMc() + "】不是待归档状态，不能操作"); + } + gspRkjl.setJlzt(ZjztEnum.gd.getValue()); + this.updateById(gspRkjl); + //稽查轨迹 + Map formData = new LinkedHashMap<>(); + formData.put("备注", form.getRemark()); + + Map formDataEn = new LinkedHashMap<>(); + formDataEn.put("Comment", form.getRemark()); + gspRkjlJcgjService.saveJcgj(gspRkjl.getId(), JcgjlxEnum.lc.getValue(), "同意归档", "Approve Archiving", + JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), JctUtil.formatStr(formDataEn), qmr); + } + + @Override + public void refuseGd(GspGdForm form) { + SysUser qmr = sysUserService.selectUserById(form.getQmrId()); + sysUserService.checkPassword(qmr, form.getQmrmm(), false); + if (form.getId() == null || form.getId().longValue() < 0) { + throw new SecurityException("参数id不正确"); + } + GspRkjl gspRkjl = this.getById(form.getId()); + if (gspRkjl == null) { + throw new SecurityException("供试品入库记录不存在或已删除"); + } + if (!gspRkjl.getJlzt().equals(JlztEnum.dgd.getValue())) { + throw new SecurityException("供试品入库记录【" + gspRkjl.getMc() + "】不是待归档状态，不能操作"); + } + gspRkjl.setJlzt(ZjztEnum.ysd.getValue()); + this.updateById(gspRkjl); + //稽查轨迹 + Map formData = new LinkedHashMap<>(); + formData.put("备注", form.getRemark()); + + Map formDataEn = new LinkedHashMap<>(); + formDataEn.put("Comment", form.getRemark()); + gspRkjlJcgjService.saveJcgj(gspRkjl.getId(), JcgjlxEnum.lc.getValue(), "拒绝归档", "Reject Archiving", + JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), JctUtil.formatStr(formDataEn), qmr); + } + + @Override + public void agreeJd(GspGdForm form) { + SysUser qmr = sysUserService.selectUserById(form.getQmrId()); + sysUserService.checkPassword(qmr, form.getQmrmm(), false); + if (form.getId() == null || form.getId().longValue() < 0) { + throw new SecurityException("参数id不正确"); + } + GspRkjl gspRkjl = this.getById(form.getId()); + if (gspRkjl == null) { + throw new SecurityException("供试品入库记录不存在或已删除"); + } + if (!gspRkjl.getJlzt().equals(JlztEnum.djd.getValue())) { + throw new SecurityException("供试品入库记录【" + gspRkjl.getMc() + "】不是待解档状态，不能操作"); + } + gspRkjl.setJlzt(ZjztEnum.ysd.getValue()); + this.updateById(gspRkjl); + //稽查轨迹 + Map formData = new LinkedHashMap<>(); + formData.put("备注", form.getRemark()); + + Map formDataEn = new LinkedHashMap<>(); + formDataEn.put("Comment", form.getRemark()); + gspRkjlJcgjService.saveJcgj(gspRkjl.getId(), JcgjlxEnum.lc.getValue(), "同意解档", "Approve De-archiving", + JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), JctUtil.formatStr(formDataEn), qmr); + } + + @Override + public void refuseJd(GspGdForm form) { + SysUser qmr = sysUserService.selectUserById(form.getQmrId()); + sysUserService.checkPassword(qmr, form.getQmrmm(), false); + if (form.getId() == null || form.getId().longValue() < 0) { + throw new SecurityException("参数id不正确"); + } + GspRkjl gspRkjl = this.getById(form.getId()); + if (gspRkjl == null) { + throw new SecurityException("供试品入库记录不存在或已删除"); + } + if (!gspRkjl.getJlzt().equals(JlztEnum.djd.getValue())) { + throw new SecurityException("供试品入库记录【" + gspRkjl.getMc() + "】不是待解档状态，不能操作"); + } + gspRkjl.setJlzt(ZjztEnum.gd.getValue()); + this.updateById(gspRkjl); + //稽查轨迹 + Map formData = new LinkedHashMap<>(); + formData.put("备注", form.getRemark()); + + Map formDataEn = new LinkedHashMap<>(); + formDataEn.put("Comment", form.getRemark()); + gspRkjlJcgjService.saveJcgj(gspRkjl.getId(), JcgjlxEnum.lc.getValue(), "拒绝解档", "Reject De-archiving", + JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), JctUtil.formatStr(formDataEn), qmr); + } + + @Override + public void agreeJy(GspJyForm form) { + SysUser qmr = sysUserService.selectUserById(form.getQmrId()); + sysUserService.checkPassword(qmr, form.getQmrmm(), false); + if (form.getId() == null || form.getId().longValue() < 0) { + throw new SecurityException("参数id不正确"); + } + GspRkjl gspRkjl = this.getById(form.getId()); + if (gspRkjl == null) { + throw new SecurityException("供试品入库记录不存在或已删除"); + } + if (!gspRkjl.getJyzt().equals(JyztEnum.djy.getValue())) { + throw new SecurityException("供试品入库记录【" + gspRkjl.getMc() + "】不是待借阅状态，不能操作"); + } + gspRkjl.setJyzt(JyztEnum.jyz.getValue()); + gspRkjl.setJyksrq(form.getStartDate()); + gspRkjl.setJyjsrq(form.getEndDate()); + this.updateById(gspRkjl); + //稽查轨迹 + Map formData = new LinkedHashMap<>(); + formData.put("备注", form.getRemark()); + + Map formDataEn = new LinkedHashMap<>(); + formDataEn.put("Comment", form.getRemark()); + gspRkjlJcgjService.saveJcgj(gspRkjl.getId(), JcgjlxEnum.lc.getValue(), "同意借阅", "Approve Check-out", + JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), JctUtil.formatStr(formDataEn), qmr); + } + + @Override + public void refuseJy(GspJyForm form) { + SysUser qmr = sysUserService.selectUserById(form.getQmrId()); + sysUserService.checkPassword(qmr, form.getQmrmm(), false); + if (form.getId() == null || form.getId().longValue() < 0) { + throw new SecurityException("参数id不正确"); + } + GspRkjl gspRkjl = this.getById(form.getId()); + if (gspRkjl == null) { + throw new SecurityException("供试品入库记录不存在或已删除"); + } + if (!gspRkjl.getJyzt().equals(JyztEnum.djy.getValue())) { + throw new SecurityException("供试品入库记录【" + gspRkjl.getMc() + "】不是待借阅状态，不能操作"); + } + gspRkjl.setJyzt(JyztEnum.wjy.getValue()); + this.updateById(gspRkjl); + //稽查轨迹 + Map formData = new LinkedHashMap<>(); + formData.put("备注", form.getRemark()); + + Map formDataEn = new LinkedHashMap<>(); + formDataEn.put("Comment", form.getRemark()); + gspRkjlJcgjService.saveJcgj(gspRkjl.getId(), JcgjlxEnum.lc.getValue(), "拒绝借阅", "Reject Check-out", + JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), JctUtil.formatStr(formDataEn), qmr); + } + + @Override + public void archiveGh(GspGdForm form) { + SysUser qmr = sysUserService.selectUserById(form.getQmrId()); + sysUserService.checkPassword(qmr, form.getQmrmm(), false); + if (form.getId() == null || form.getId().longValue() < 0) { + throw new SecurityException("参数id不正确"); + } + GspRkjl gspRkjl = this.getById(form.getId()); + if (gspRkjl == null) { + throw new SecurityException("供试品入库记录不存在或已删除"); + } + if (!gspRkjl.getJyzt().equals(JyztEnum.jyz.getValue())) { + throw new SecurityException("供试品入库记录【" + gspRkjl.getMc() + "】不是借阅中状态，不能操作"); + } + gspRkjl.setJyzt(JyztEnum.wjy.getValue()); + this.updateById(gspRkjl); + //稽查轨迹 + Map formData = new LinkedHashMap<>(); + formData.put("备注", form.getRemark()); + + Map formDataEn = new LinkedHashMap<>(); + formDataEn.put("Comment", form.getRemark()); + gspRkjlJcgjService.saveJcgj(gspRkjl.getId(), JcgjlxEnum.lc.getValue(), "确认归还", "Check-out End Confirmation", + JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), JctUtil.formatStr(formDataEn), qmr); + } + } diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GspServiceImpl.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GspServiceImpl.java index d4c6f1a..5b7c961 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GspServiceImpl.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GspServiceImpl.java @@ -855,6 +855,8 @@ public class GspServiceImpl extends ServiceImpl implements IGspS gsp.setJyzt(JyztEnum.djy.getValue()); gsp.setJyksrq(form.getStartDate()); gsp.setJyjsrq(form.getEndDate()); + gsp.setDasqrId(qmr.getUserId()); + gsp.setDasqrMc(qmr.getNickName()); this.updateById(gsp); //稽查轨迹 Map formData = new LinkedHashMap<>(); @@ -888,6 +890,10 @@ public class GspServiceImpl extends ServiceImpl implements IGspS } //申请解档后，制剂状态更新为待解档，等待档案员审核期间无法进行其他操作； gsp.setZjzt(ZjztEnum.djd.getValue()); + gsp.setDasqrIdOld(gsp.getDasqrId()); + gsp.setDasqrMcOld(gsp.getDasqrMc()); + gsp.setDasqrId(qmr.getUserId()); + gsp.setDasqrMc(qmr.getNickName()); this.updateById(gsp); //稽查轨迹 Map formData = new LinkedHashMap<>(); @@ -915,6 +921,9 @@ public class GspServiceImpl extends ServiceImpl implements IGspS } //申请归档，档案员可在档案管理中进行确认归档审核；申请后状态更新成待归档； gsp.setZjzt(ZjztEnum.dgd.getValue()); + gsp.setDasqrId(qmr.getUserId()); + gsp.setDasqrMc(qmr.getNickName()); + gsp.setGdsqsj(new Date()); this.updateById(gsp); //稽查轨迹 Map formData = new LinkedHashMap<>(); @@ -945,6 +954,9 @@ public class GspServiceImpl extends ServiceImpl implements IGspS } //申请归档，档案员可在档案管理中进行确认归档审核；申请后状态更新成待归档； gsp.setZjzt(ZjztEnum.dgd.getValue()); + gsp.setDasqrId(qmr.getUserId()); + gsp.setDasqrMc(qmr.getNickName()); + gsp.setGdsqsj(new Date()); gspList.add(gsp); } this.updateBatchById(gspList); @@ -1057,4 +1069,191 @@ public class GspServiceImpl extends ServiceImpl implements IGspS return baseMapper.queryStudyList(queryWrapper); } + @Override + public void agreeGd(GspGdForm form) { + SysUser qmr = sysUserService.selectUserById(form.getQmrId()); + sysUserService.checkPassword(qmr, form.getQmrmm(), false); + if (form.getId() == null || form.getId().longValue() < 0) { + throw new SecurityException("参数id不正确"); + } + Gsp gsp = this.getById(form.getId()); + if (gsp == null) { + throw new SecurityException("供试品不存在或已删除"); + } + if (!gsp.getZjzt().equals(ZjztEnum.dgd.getValue())) { + throw new SecurityException("供试品【" + gsp.getMc() + "】不是待归档状态，不能操作"); + } + gsp.setZjzt(ZjztEnum.gd.getValue()); + this.updateById(gsp); + //稽查轨迹 + Map formData = new LinkedHashMap<>(); + formData.put("备注", form.getRemark()); + + Map formDataEn = new LinkedHashMap<>(); + formDataEn.put("Comment", form.getRemark()); + gspJcgjService.saveJcgj(gsp.getId(), JcgjlxEnum.lc.getValue(), "同意归档", "Approve Archiving", + JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), JctUtil.formatStr(formDataEn), qmr); + + } + + @Override + public void refuseGd(GspGdForm form) { + SysUser qmr = sysUserService.selectUserById(form.getQmrId()); + sysUserService.checkPassword(qmr, form.getQmrmm(), false); + if (form.getId() == null || form.getId().longValue() < 0) { + throw new SecurityException("参数id不正确"); + } + Gsp gsp = this.getById(form.getId()); + if (gsp == null) { + throw new SecurityException("供试品不存在或已删除"); + } + if (!gsp.getZjzt().equals(ZjztEnum.dgd.getValue())) { + throw new SecurityException("供试品【" + gsp.getMc() + "】不是待归档状态，不能操作"); + } + gsp.setZjzt(ZjztEnum.ysd.getValue()); + this.updateById(gsp); + //稽查轨迹 + Map formData = new LinkedHashMap<>(); + formData.put("备注", form.getRemark()); + + Map formDataEn = new LinkedHashMap<>(); + formDataEn.put("Comment", form.getRemark()); + gspJcgjService.saveJcgj(gsp.getId(), JcgjlxEnum.lc.getValue(), "拒绝归档", "Reject Archiving", + JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), JctUtil.formatStr(formDataEn), qmr); + } + + @Override + public void agreeJd(GspGdForm form) { + SysUser qmr = sysUserService.selectUserById(form.getQmrId()); + sysUserService.checkPassword(qmr, form.getQmrmm(), false); + if (form.getId() == null || form.getId().longValue() < 0) { + throw new SecurityException("参数id不正确"); + } + Gsp gsp = this.getById(form.getId()); + if (gsp == null) { + throw new SecurityException("供试品不存在或已删除"); + } + if (!gsp.getZjzt().equals(ZjztEnum.djd.getValue())) { + throw new SecurityException("供试品【" + gsp.getMc() + "】不是待解档状态，不能操作"); + } + gsp.setZjzt(ZjztEnum.ysd.getValue()); + this.updateById(gsp); + //稽查轨迹 + Map formData = new LinkedHashMap<>(); + formData.put("备注", form.getRemark()); + + Map formDataEn = new LinkedHashMap<>(); + formDataEn.put("Comment", form.getRemark()); + gspJcgjService.saveJcgj(gsp.getId(), JcgjlxEnum.lc.getValue(), "同意解档", "Approve De-archiving", + JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), JctUtil.formatStr(formDataEn), qmr); + } + + @Override + public void refuseJd(GspGdForm form) { + SysUser qmr = sysUserService.selectUserById(form.getQmrId()); + sysUserService.checkPassword(qmr, form.getQmrmm(), false); + if (form.getId() == null || form.getId().longValue() < 0) { + throw new SecurityException("参数id不正确"); + } + Gsp gsp = this.getById(form.getId()); + if (gsp == null) { + throw new SecurityException("供试品不存在或已删除"); + } + if (!gsp.getZjzt().equals(ZjztEnum.gd.getValue())) { + throw new SecurityException("供试品【" + gsp.getMc() + "】不是待解档状态，不能操作"); + } + gsp.setDasqrMc(gsp.getDasqrMcOld()); + gsp.setDasqrId(gsp.getDasqrIdOld()); + gsp.setZjzt(ZjztEnum.gd.getValue()); + this.updateById(gsp); + //稽查轨迹 + Map formData = new LinkedHashMap<>(); + formData.put("备注", form.getRemark()); + + Map formDataEn = new LinkedHashMap<>(); + formDataEn.put("Comment", form.getRemark()); + gspJcgjService.saveJcgj(gsp.getId(), JcgjlxEnum.lc.getValue(), "拒绝解档", "Reject De-archiving", + JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), JctUtil.formatStr(formDataEn), qmr); + } + + @Override + public void agreeJy(GspJyForm form) { + SysUser qmr = sysUserService.selectUserById(form.getQmrId()); + sysUserService.checkPassword(qmr, form.getQmrmm(), false); + if (form.getId() == null || form.getId().longValue() < 0) { + throw new SecurityException("参数id不正确"); + } + Gsp gsp = this.getById(form.getId()); + if (gsp == null) { + throw new SecurityException("供试品不存在或已删除"); + } + if (!gsp.getJyzt().equals(JyztEnum.djy.getValue())) { + throw new SecurityException("供试品【" + gsp.getMc() + "】不是待借阅状态，不能操作"); + } + gsp.setJyzt(JyztEnum.jyz.getValue()); + gsp.setJyksrq(form.getStartDate()); + gsp.setJyjsrq(form.getEndDate()); + this.updateById(gsp); + //稽查轨迹 + Map formData = new LinkedHashMap<>(); + formData.put("备注", form.getRemark()); + + Map formDataEn = new LinkedHashMap<>(); + formDataEn.put("Comment", form.getRemark()); + gspJcgjService.saveJcgj(gsp.getId(), JcgjlxEnum.lc.getValue(), "同意借阅", "Approve Check-out", + JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), JctUtil.formatStr(formDataEn), qmr); + } + + @Override + public void refuseJy(GspJyForm form) { + SysUser qmr = sysUserService.selectUserById(form.getQmrId()); + sysUserService.checkPassword(qmr, form.getQmrmm(), false); + if (form.getId() == null || form.getId().longValue() < 0) { + throw new SecurityException("参数id不正确"); + } + Gsp gsp = this.getById(form.getId()); + if (gsp == null) { + throw new SecurityException("供试品不存在或已删除"); + } + if (!gsp.getJyzt().equals(JyztEnum.djy.getValue())) { + throw new SecurityException("供试品【" + gsp.getMc() + "】不是待借阅状态，不能操作"); + } + gsp.setJyzt(JyztEnum.wjy.getValue()); + this.updateById(gsp); + //稽查轨迹 + Map formData = new LinkedHashMap<>(); + formData.put("备注", form.getRemark()); + + Map formDataEn = new LinkedHashMap<>(); + formDataEn.put("Comment", form.getRemark()); + gspJcgjService.saveJcgj(gsp.getId(), JcgjlxEnum.lc.getValue(), "拒绝借阅", "Reject Check-out", + JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), JctUtil.formatStr(formDataEn), qmr); + } + + @Override + public void archiveGh(GspGdForm form) { + SysUser qmr = sysUserService.selectUserById(form.getQmrId()); + sysUserService.checkPassword(qmr, form.getQmrmm(), false); + if (form.getId() == null || form.getId().longValue() < 0) { + throw new SecurityException("参数id不正确"); + } + Gsp gsp = this.getById(form.getId()); + if (gsp == null) { + throw new SecurityException("供试品不存在或已删除"); + } + if (!gsp.getJyzt().equals(JyztEnum.jyz.getValue())) { + throw new SecurityException("供试品【" + gsp.getMc() + "】不是借阅中状态，不能操作"); + } + gsp.setJyzt(JyztEnum.wjy.getValue()); + this.updateById(gsp); + //稽查轨迹 + Map formData = new LinkedHashMap<>(); + formData.put("备注", form.getRemark()); + + Map formDataEn = new LinkedHashMap<>(); + formDataEn.put("Comment", form.getRemark()); + gspJcgjService.saveJcgj(gsp.getId(), JcgjlxEnum.lc.getValue(), "确认归还", "Check-out End Confirmation", + JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), JctUtil.formatStr(formDataEn), qmr); + } + }