From 00bb04f19199cc45ab1458dcfb2b1fb2714d3500 Mon Sep 17 00:00:00 2001 From: HanLong <404402223@qq.com> Date: Tue, 27 Jan 2026 20:49:39 +0800 Subject: [PATCH] =?UTF-8?q?fix:[=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]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/hxhq/business/controller/SjController.java | 1 - .../com/hxhq/business/controller/YqController.java | 9 ++++- .../main/java/com/hxhq/business/domain/Gsp.java | 41 +++++---------------- .../java/com/hxhq/business/domain/GspFfjl.java | 42 --------------------- .../java/com/hxhq/business/domain/GspRkjl.java | 43 ---------------------- .../src/main/java/com/hxhq/business/domain/Sj.java | 10 ++--- .../src/main/java/com/hxhq/business/domain/Yq.java | 2 + .../java/com/hxhq/business/form/yq/YqForm.java | 14 +++---- .../java/com/hxhq/business/mapper/YqMapper.java | 1 + .../java/com/hxhq/business/service/IYqService.java | 2 + .../business/service/impl/GspFfjlServiceImpl.java | 13 +++---- .../business/service/impl/GspRkjlServiceImpl.java | 7 ++-- .../hxhq/business/service/impl/GspServiceImpl.java | 40 +++++++++----------- .../hxhq/business/service/impl/SjServiceImpl.java | 25 ++++++------- .../hxhq/business/service/impl/YqServiceImpl.java | 8 +++- .../com/hxhq/business/utils/ObjectCompareUtil.java | 2 +- .../main/resources/mapper/business/YqMapper.xml | 6 ++- 17 files changed, 83 insertions(+), 183 deletions(-) diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/SjController.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/SjController.java index 634d144..b890fdd 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/SjController.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/SjController.java @@ -159,7 +159,6 @@ public class SjController extends BaseController public TableDataInfo list(SjSearchListForm form) { startPage(); - form.setArchive(DaztEnum.ygd.getValue()); List list = sjService.queryList(form); return getDataTable(list); } diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/YqController.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/YqController.java index 0d934de..0cb0a01 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/YqController.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/YqController.java @@ -10,6 +10,8 @@ import com.hxhq.business.form.yq.YqSearchForm; import com.hxhq.business.service.IYqJcgjService; import com.hxhq.common.security.annotation.RequiresPermissions; import com.hxhq.common.security.utils.SecurityUtils; +import com.hxhq.system.api.domain.SysDept; +import com.hxhq.system.service.ISysDeptService; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; @@ -34,6 +36,9 @@ public class YqController extends BaseController { private IYqService yqService; @Autowired + private ISysDeptService sysDeptService; + + @Autowired private IYqJcgjService yqJcgjService; /** @@ -69,7 +74,7 @@ public class YqController extends BaseController { @RequiresPermissions("business:resource:yq:xq") @GetMapping(value = "/info") public AjaxResult getInfo(Long id) { - return AjaxResult.success(yqService.getById(id)); + return AjaxResult.success(yqService.queryInfo(id)); } /** @@ -86,6 +91,8 @@ public class YqController extends BaseController { @PostMapping("/update") @RequiresPermissions("business:resource:yq:bj") public AjaxResult update(@RequestBody @Validated YqForm form) { + SysDept sysDept = sysDeptService.selectDeptById(form.getBmId()); + form.setBmMc(sysDept.getDeptName()); form.setQmrId(SecurityUtils.getUserId()); yqService.updateYq(form); return 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 d44ec55..089470b 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 @@ -199,32 +199,11 @@ public class Gsp extends MpBaseEntity private Date gdsqsj; /** 档案申请人名称 */ - private String dasqrMc; + private String gdsqrMc; /** 档案申请人ID*/ - private Long dasqrId; + private Long gdsqrId; - /** 档案申请人名称 */ - 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; @@ -234,20 +213,20 @@ public class Gsp extends MpBaseEntity this.gdsqsj = gdsqsj; } - public String getDasqrMc() { - return dasqrMc; + public String getGdsqrMc() { + return gdsqrMc; } - public void setDasqrMc(String dasqrMc) { - this.dasqrMc = dasqrMc; + public void setGdsqrMc(String gdsqrMc) { + this.gdsqrMc = gdsqrMc; } - public Long getDasqrId() { - return dasqrId; + public Long getGdsqrId() { + return gdsqrId; } - public void setDasqrId(Long dasqrId) { - this.dasqrId = dasqrId; + public void setGdsqrId(Long gdsqrId) { + this.gdsqrId = gdsqrId; } public Date getJyksrq() { 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 b950804..742d8a3 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 @@ -156,17 +156,6 @@ 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) { @@ -578,37 +567,6 @@ public class GspFfjl extends MpBaseEntity 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 String getMdOther() { return mdOther; 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 95dd8bf..1f7a9af 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 @@ -79,17 +79,6 @@ public class GspRkjl extends MpBaseEntity @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; @@ -99,38 +88,6 @@ public class GspRkjl extends MpBaseEntity 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/domain/Sj.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/Sj.java index 9b8f871..56f5cf6 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/Sj.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/Sj.java @@ -104,7 +104,7 @@ public class Sj extends MpBaseEntity private Date gdsqsj; /** 档案申请人id */ - private Long dasqrId; + private Long gdsqrId; /** 母液编号 */ private String parentBh; @@ -338,11 +338,11 @@ public class Sj extends MpBaseEntity this.deptId = deptId; } - public Long getDasqrId() { - return dasqrId; + public Long getGdsqrId() { + return gdsqrId; } - public void setDasqrId(Long dasqrId) { - this.dasqrId = dasqrId; + public void setGdsqrId(Long gdsqrId) { + this.gdsqrId = gdsqrId; } } diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/Yq.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/Yq.java index a780278..a97a92c 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/Yq.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/Yq.java @@ -2,6 +2,7 @@ package com.hxhq.business.domain; import java.util.Date; +import com.baomidou.mybatisplus.annotation.TableField; import com.fasterxml.jackson.annotation.JsonFormat; import com.baomidou.mybatisplus.annotation.TableName; import com.hxhq.common.core.annotation.Compare; @@ -72,6 +73,7 @@ public class Yq extends MpBaseEntity { /** 部门名称 */ @Compare(name = "所属部门") + @TableField(exist = false) private String bmMc; diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/yq/YqForm.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/yq/YqForm.java index 1d122f6..47f9fbd 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/yq/YqForm.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/yq/YqForm.java @@ -50,18 +50,14 @@ public class YqForm { */ @JsonFormat(pattern = "yyyy-MM-dd") @NotNull(message = "请选择校准日期") - @Excel(name = "下次校准日期") private Date jzrq; /** 部门名称 */ - @NotEmpty(message = "请选择所属部门") - @Excel(name = "所属部门") - @TableField(exist = false) private String bmMc; /** 部门id */ - private Long deptId; + private Long bmId; /** @@ -171,11 +167,11 @@ public class YqForm { this.wc = wc; } - public Long getDeptId() { - return deptId; + public Long getBmId() { + return bmId; } - public void setDeptId(Long deptId) { - this.deptId = deptId; + public void setBmId(Long bmId) { + this.bmId = bmId; } } diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/mapper/YqMapper.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/mapper/YqMapper.java index 09de728..b0c9cbd 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/mapper/YqMapper.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/mapper/YqMapper.java @@ -24,4 +24,5 @@ public interface YqMapper extends BaseMapper */ List queryList(@Param("ew") Wrapper queryWrapper); + Yq queryInfo(Long id); } diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IYqService.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IYqService.java index 0a8d6c1..2f3f9f7 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IYqService.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IYqService.java @@ -20,6 +20,8 @@ public interface IYqService extends IService */ public List queryList(YqSearchForm form); + Yq queryInfo(Long id); + /** 新增仪器信息 */ void addYq(YqForm yqForm); 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 d0f93ad..da7eaaf 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 @@ -281,10 +281,8 @@ 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.setGdsqrId(qmr.getUserId()); gspFfjl.setGdsqsj(new Date()); //region 稽查轨迹 @@ -335,10 +333,8 @@ 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.setGdsqrId(qmr.getUserId()); gspFfjl.setGdsqsj(new Date()); this.updateById(gspFfjl); //稽查轨迹 @@ -511,8 +507,9 @@ 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()); + gspFfjl.setGdsqrMc(qmr.getNickName()); + gspFfjl.setGdsqrId(qmr.getUserId()); + gspFfjl.setGdsqsj(new Date()); this.updateById(gspFfjl); //稽查轨迹 Map formData = new LinkedHashMap<>(); 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 c5164ee..91e0ef4 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 @@ -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; @@ -297,6 +294,7 @@ public class GspRkjlServiceImpl extends ServiceImpl impl gspRkjl.setJlzt(JlztEnum.dgd.getValue()); gspRkjl.setGdsqrId(qmr.getUserId()); gspRkjl.setGdsqrMc(qmr.getNickName()); + gspRkjl.setGdsqsj(new Date()); //region 稽查轨迹 GspRkjlJcgj gspRkjlJcgj = new GspRkjlJcgj(); @@ -343,6 +341,7 @@ public class GspRkjlServiceImpl extends ServiceImpl impl gspRkjl.setJlzt(JlztEnum.dgd.getValue()); gspRkjl.setGdsqrId(qmr.getUserId()); gspRkjl.setGdsqrMc(qmr.getNickName()); + gspRkjl.setGdsqsj(new Date()); this.updateById(gspRkjl); //稽查轨迹 Map formData = new LinkedHashMap<>(); 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 e9b5cb0..2334b24 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 @@ -2,10 +2,8 @@ package com.hxhq.business.service.impl; import java.math.BigDecimal; import java.util.*; -import java.util.function.Consumer; import java.util.stream.Collectors; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.hxhq.business.domain.*; @@ -882,15 +880,15 @@ public class GspServiceImpl extends ServiceImpl implements IGspS if (!gsp.getJyzt().equals(JyztEnum.wjy.getValue())) { throw new SecurityException("供试品【" + gsp.getMc() + "】不是未借阅状态，不能借阅"); } - if(!gsp.getDasqrId().equals(qmr.getUserId())){ + if(!gsp.getGdsqrId().equals(qmr.getUserId())){ throw new ServiceException("只有归档申请人才能操作"); } //申请借阅后，借阅状态更新为待借阅，等待档案员审核期间无法进行其他操作； gsp.setJyzt(JyztEnum.djy.getValue()); gsp.setJyksrq(form.getStartDate()); gsp.setJyjsrq(form.getEndDate()); - gsp.setDasqrId(qmr.getUserId()); - gsp.setDasqrMc(qmr.getNickName()); + gsp.setGdsqrId(qmr.getUserId()); + gsp.setGdsqrMc(qmr.getNickName()); this.updateById(gsp); //稽查轨迹 Map formData = new LinkedHashMap<>(); @@ -924,15 +922,13 @@ public class GspServiceImpl extends ServiceImpl implements IGspS if (!gsp.getZjzt().equals(ZjztEnum.gd.getValue())) { throw new SecurityException("供试品【" + gsp.getMc() + "】未归档，不能解档"); } - if(!gsp.getDasqrId().equals(qmr.getUserId())){ + if(!gsp.getGdsqrId().equals(qmr.getUserId())){ throw new ServiceException("只有归档申请人才能操作"); } //申请解档后，制剂状态更新为待解档，等待档案员审核期间无法进行其他操作； gsp.setZjzt(ZjztEnum.djd.getValue()); - gsp.setDasqrIdOld(gsp.getDasqrId()); - gsp.setDasqrMcOld(gsp.getDasqrMc()); - gsp.setDasqrId(qmr.getUserId()); - gsp.setDasqrMc(qmr.getNickName()); + gsp.setGdsqrId(qmr.getUserId()); + gsp.setGdsqrMc(qmr.getNickName()); this.updateById(gsp); //稽查轨迹 Map formData = new LinkedHashMap<>(); @@ -963,8 +959,8 @@ public class GspServiceImpl extends ServiceImpl implements IGspS } //申请归档，档案员可在档案管理中进行确认归档审核；申请后状态更新成待归档； gsp.setZjzt(ZjztEnum.dgd.getValue()); - gsp.setDasqrId(qmr.getUserId()); - gsp.setDasqrMc(qmr.getNickName()); + gsp.setGdsqrId(qmr.getUserId()); + gsp.setGdsqrMc(qmr.getNickName()); gsp.setGdsqsj(new Date()); this.updateById(gsp); //稽查轨迹 @@ -997,8 +993,8 @@ public class GspServiceImpl extends ServiceImpl implements IGspS } //申请归档，档案员可在档案管理中进行确认归档审核；申请后状态更新成待归档； gsp.setZjzt(ZjztEnum.dgd.getValue()); - gsp.setDasqrId(qmr.getUserId()); - gsp.setDasqrMc(qmr.getNickName()); + gsp.setGdsqrId(qmr.getUserId()); + gsp.setGdsqrMc(qmr.getNickName()); gsp.setGdsqsj(new Date()); gspList.add(gsp); } @@ -1146,7 +1142,7 @@ public class GspServiceImpl extends ServiceImpl implements IGspS archiveLogService.saveInfo(ArchiveLogTypeEnum.gsp, gsp.getId(), gsp.getMc(), gsp.getPh(), gsp.getGg() + gsp.getGgdw(), "同意归档"); - noticeService.save("供试品【"+gsp.getMc()+"】同意归档",gsp.getDasqrId(),getUrlQz("gspList")); + noticeService.save("供试品【"+gsp.getMc()+"】同意归档",gsp.getGdsqrId(),getUrlQz("gspList")); } @@ -1177,7 +1173,7 @@ public class GspServiceImpl extends ServiceImpl implements IGspS archiveLogService.saveInfo(ArchiveLogTypeEnum.gsp, gsp.getId(), gsp.getMc(), gsp.getPh(), gsp.getGg() + gsp.getGgdw(), "拒绝归档"); - noticeService.save("供试品【"+gsp.getMc()+"】拒绝归档",gsp.getDasqrId(),getUrlQz("gspList")); + noticeService.save("供试品【"+gsp.getMc()+"】拒绝归档",gsp.getGdsqrId(),getUrlQz("gspList")); } @@ -1208,7 +1204,7 @@ public class GspServiceImpl extends ServiceImpl implements IGspS archiveLogService.saveInfo(ArchiveLogTypeEnum.gsp, gsp.getId(), gsp.getMc(), gsp.getPh(), gsp.getGg() + gsp.getGgdw(), "同意解档"); - noticeService.save("供试品【"+gsp.getMc()+"】同意解档",gsp.getDasqrId(),getUrlQz("gspList")); + noticeService.save("供试品【"+gsp.getMc()+"】同意解档",gsp.getGdsqrId(),getUrlQz("gspList")); } @@ -1226,8 +1222,6 @@ public class GspServiceImpl extends ServiceImpl implements IGspS if (!gsp.getZjzt().equals(ZjztEnum.djd.getValue())) { throw new SecurityException("供试品【" + gsp.getMc() + "】不是待解档状态，不能操作"); } - gsp.setDasqrMc(gsp.getDasqrMcOld()); - gsp.setDasqrId(gsp.getDasqrIdOld()); gsp.setZjzt(ZjztEnum.gd.getValue()); this.updateById(gsp); //稽查轨迹 @@ -1241,7 +1235,7 @@ public class GspServiceImpl extends ServiceImpl implements IGspS archiveLogService.saveInfo(ArchiveLogTypeEnum.gsp, gsp.getId(), gsp.getMc(), gsp.getPh(), gsp.getGg() + gsp.getGgdw(), "拒绝解档"); - noticeService.save("供试品【"+gsp.getMc()+"】拒绝解档",gsp.getDasqrId(),getUrlQz("gspList")); + noticeService.save("供试品【"+gsp.getMc()+"】拒绝解档",gsp.getGdsqrId(),getUrlQz("gspList")); } @@ -1274,7 +1268,7 @@ public class GspServiceImpl extends ServiceImpl implements IGspS archiveLogService.saveInfo(ArchiveLogTypeEnum.gsp, gsp.getId(), gsp.getMc(), gsp.getPh(), gsp.getGg() + gsp.getGgdw(), "同意借阅"); - noticeService.save("供试品【"+gsp.getMc()+"】同意借阅",gsp.getDasqrId(),getUrlQz("gspList")); + noticeService.save("供试品【"+gsp.getMc()+"】同意借阅",gsp.getGdsqrId(),getUrlQz("gspList")); } @@ -1305,7 +1299,7 @@ public class GspServiceImpl extends ServiceImpl implements IGspS archiveLogService.saveInfo(ArchiveLogTypeEnum.gsp, gsp.getId(), gsp.getMc(), gsp.getPh(), gsp.getGg() + gsp.getGgdw(), "拒绝借阅"); - noticeService.save("供试品【"+gsp.getMc()+"】拒绝借阅",gsp.getDasqrId(),getUrlQz("gspList")); + noticeService.save("供试品【"+gsp.getMc()+"】拒绝借阅",gsp.getGdsqrId(),getUrlQz("gspList")); } @@ -1336,7 +1330,7 @@ public class GspServiceImpl extends ServiceImpl implements IGspS archiveLogService.saveInfo(ArchiveLogTypeEnum.gsp, gsp.getId(), gsp.getMc(), gsp.getPh(), gsp.getGg() + gsp.getGgdw(), "确认归还"); - noticeService.save("供试品【"+gsp.getMc()+"】确认归还",gsp.getDasqrId(),getUrlQz("gspList")); + noticeService.save("供试品【"+gsp.getMc()+"】确认归还",gsp.getGdsqrId(),getUrlQz("gspList")); } diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/SjServiceImpl.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/SjServiceImpl.java index 9682d2e..4cc814d 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/SjServiceImpl.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/SjServiceImpl.java @@ -2,7 +2,6 @@ package com.hxhq.business.service.impl; import java.math.BigDecimal; import java.util.*; -import java.util.function.Consumer; import java.util.stream.Collectors; import cn.hutool.json.JSONUtil; @@ -19,7 +18,6 @@ import com.hxhq.business.enums.zykgl.*; import com.hxhq.business.form.gsp.GspGdForm; import com.hxhq.business.form.gsp.GspJyForm; import com.hxhq.business.form.gsp.GspSearchListForm; -import com.hxhq.business.form.mjy.GdForm; import com.hxhq.business.form.sj.*; import com.hxhq.business.service.*; import com.hxhq.business.utils.JctUtil; @@ -31,7 +29,6 @@ import com.hxhq.system.api.domain.SysUser; import com.hxhq.system.service.ISysUserService; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.math.NumberUtils; -import org.omg.PortableInterceptor.SYSTEM_EXCEPTION; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -103,6 +100,8 @@ public class SjServiceImpl extends ServiceImpl implements ISjServi } if(form.getArchive() != null && form.getArchive() == DaztEnum.ygd.getValue()) { queryWrapper.in("s.zjzt", ZjztEnum.dgd.getValue(), ZjztEnum.gd.getValue(), ZjztEnum.djd.getValue()); + } else { + queryWrapper.isNotNull("s.zjzt"); } queryWrapper.orderByDesc("s.id"); return baseMapper.queryList(queryWrapper); @@ -430,7 +429,7 @@ public class SjServiceImpl extends ServiceImpl implements ISjServi if (!sjOld.getJyzt().equals(JyztEnum.wjy.getValue())) { throw new SecurityException("试剂【" + sjOld.getMc() + "】不是未借阅状态，不能借阅"); } - if(!sjOld.getDasqrId().equals(qmr.getUserId())){ + if(!sjOld.getGdsqrId().equals(qmr.getUserId())){ throw new ServiceException("只有归档申请人才能操作"); } //申请借阅后，借阅状态更新为待借阅，等待档案员审核期间无法进行其他操作； @@ -470,7 +469,7 @@ public class SjServiceImpl extends ServiceImpl implements ISjServi if (!sjOld.getZjzt().equals(ZjztEnum.gd.getValue())) { throw new SecurityException("试剂【" + sjOld.getMc() + "】未归档，不能解档"); } - if(!sjOld.getDasqrId().equals(qmr.getUserId())){ + if(!sjOld.getGdsqrId().equals(qmr.getUserId())){ throw new ServiceException("只有归档申请人才能操作"); } //申请解档后，制剂状态更新为待解档，等待档案员审核期间无法进行其他操作； @@ -507,7 +506,7 @@ public class SjServiceImpl extends ServiceImpl implements ISjServi //申请归档，档案员可在档案管理中进行确认归档审核；申请后状态更新成待归档； sjOld.setZjzt(ZjztEnum.dgd.getValue()); sjOld.setGdsqsj(new Date()); - sjOld.setDasqrId(qmr.getUserId()); + sjOld.setGdsqrId(qmr.getUserId()); this.updateById(sjOld); //稽查轨迹 Map formData = new LinkedHashMap<>(); @@ -543,7 +542,7 @@ public class SjServiceImpl extends ServiceImpl implements ISjServi //申请归档，档案员可在档案管理中进行确认归档审核；申请后状态更新成待归档； sjOld.setZjzt(ZjztEnum.dgd.getValue()); sjOld.setGdsqsj(new Date()); - sjOld.setDasqrId(qmr.getUserId()); + sjOld.setGdsqrId(qmr.getUserId()); sjList.add(sjOld); } this.updateBatchById(sjList); @@ -815,7 +814,7 @@ public class SjServiceImpl extends ServiceImpl implements ISjServi archiveLogService.saveInfo(ArchiveLogTypeEnum.sj, sj.getId(), sj.getMc(), sj.getBh(), sj.getNd() + sj.getNddw(), "同意归档"); - noticeService.save("试剂【"+sj.getMc()+"】同意归档",sj.getDasqrId(),getUrlQz()); + noticeService.save("试剂【"+sj.getMc()+"】同意归档",sj.getGdsqrId(),getUrlQz()); } @@ -846,7 +845,7 @@ public class SjServiceImpl extends ServiceImpl implements ISjServi archiveLogService.saveInfo(ArchiveLogTypeEnum.sj, sj.getId(), sj.getMc(), sj.getBh(), sj.getNd() + sj.getNddw(), "拒绝归档"); - noticeService.save("试剂【"+sj.getMc()+"】拒绝归档",sj.getDasqrId(),getUrlQz()); + noticeService.save("试剂【"+sj.getMc()+"】拒绝归档",sj.getGdsqrId(),getUrlQz()); } @@ -877,7 +876,7 @@ public class SjServiceImpl extends ServiceImpl implements ISjServi archiveLogService.saveInfo(ArchiveLogTypeEnum.sj, sj.getId(), sj.getMc(), sj.getBh(), sj.getNd() + sj.getNddw(), "同意解档"); - noticeService.save("试剂【"+sj.getMc()+"】同意解档",sj.getDasqrId(),getUrlQz()); + noticeService.save("试剂【"+sj.getMc()+"】同意解档",sj.getGdsqrId(),getUrlQz()); } @@ -908,7 +907,7 @@ public class SjServiceImpl extends ServiceImpl implements ISjServi archiveLogService.saveInfo(ArchiveLogTypeEnum.sj, sj.getId(), sj.getMc(), sj.getBh(), sj.getNd() + sj.getNddw(), "拒绝解档"); - noticeService.save("试剂【"+sj.getMc()+"】拒绝解档",sj.getDasqrId(),getUrlQz()); + noticeService.save("试剂【"+sj.getMc()+"】拒绝解档",sj.getGdsqrId(),getUrlQz()); } @@ -941,7 +940,7 @@ public class SjServiceImpl extends ServiceImpl implements ISjServi archiveLogService.saveInfo(ArchiveLogTypeEnum.sj, sj.getId(), sj.getMc(), sj.getBh(), sj.getNd() + sj.getNddw(), "同意借阅"); - noticeService.save("试剂【"+sj.getMc()+"】同意借阅",sj.getDasqrId(),getUrlQz()); + noticeService.save("试剂【"+sj.getMc()+"】同意借阅",sj.getGdsqrId(),getUrlQz()); } @@ -972,7 +971,7 @@ public class SjServiceImpl extends ServiceImpl implements ISjServi archiveLogService.saveInfo(ArchiveLogTypeEnum.sj, sj.getId(), sj.getMc(), sj.getBh(), sj.getNd() + sj.getNddw(), "拒绝借阅"); - noticeService.save("试剂【"+sj.getMc()+"】拒绝借阅",sj.getDasqrId(),getUrlQz()); + noticeService.save("试剂【"+sj.getMc()+"】拒绝借阅",sj.getGdsqrId(),getUrlQz()); } diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/YqServiceImpl.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/YqServiceImpl.java index a311e67..55e5bc8 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/YqServiceImpl.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/YqServiceImpl.java @@ -55,6 +55,7 @@ public class YqServiceImpl extends ServiceImpl implements IYqServi public List queryList(YqSearchForm form) { QueryWrapper queryWrapper = Wrappers.query(); + queryWrapper.eq("y.del_flag", 0); if(StringUtils.isNotEmpty(form.getMc())) { queryWrapper.like("y.`mc`", form.getBh()); } @@ -78,6 +79,11 @@ public class YqServiceImpl extends ServiceImpl implements IYqServi } @Override + public Yq queryInfo(Long id) { + return baseMapper.queryInfo(id); + } + + @Override public void addYq(YqForm yqForm) { SysUser qmr = sysUserService.selectUserById(yqForm.getQmrId()); sysUserService.checkPassword(qmr, yqForm.getQmrmm(), false); @@ -93,7 +99,7 @@ public class YqServiceImpl extends ServiceImpl implements IYqServi SysUser qmr = sysUserService.selectUserById(yqForm.getQmrId()); sysUserService.checkPassword(qmr, yqForm.getQmrmm(), false); - Yq yq = getById(yqForm.getId()); + Yq yq = this.queryInfo(yqForm.getId()); if(yq == null) { throw new ServiceException("仪器不存在或已删除"); } diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/utils/ObjectCompareUtil.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/utils/ObjectCompareUtil.java index e573a5d..1d3be66 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/utils/ObjectCompareUtil.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/utils/ObjectCompareUtil.java @@ -84,7 +84,7 @@ public class ObjectCompareUtil { // if (StringUtils.isNoneBlank(oldValueStr) && StringUtils.isNoneBlank(newValueStr)) { // 对比字段值 - if (!Objects.equals(oldValue, newValue)) { + if (!Objects.equals(oldValue, newValue) && !StringUtils.equals(oldValueStr, newValueStr)) { FieldChange change = new FieldChange(); change.setFieldName(field.getName()); change.setFieldLabel(getFieldLabel(field)); diff --git a/hxhq-modules/hxhq-system/src/main/resources/mapper/business/YqMapper.xml b/hxhq-modules/hxhq-system/src/main/resources/mapper/business/YqMapper.xml index bf834a9..b51f0d3 100644 --- a/hxhq-modules/hxhq-system/src/main/resources/mapper/business/YqMapper.xml +++ b/hxhq-modules/hxhq-system/src/main/resources/mapper/business/YqMapper.xml @@ -4,11 +4,15 @@ "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> + \ No newline at end of file