diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GyzjServiceImpl.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GyzjServiceImpl.java index d1b9e49..ac09407 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GyzjServiceImpl.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GyzjServiceImpl.java @@ -15,6 +15,7 @@ import com.hxhq.business.dto.study.StudyFormFillCc; import com.hxhq.business.dto.study.StudyFormFillCz; import com.hxhq.business.dto.study.StudyFormFillResource; import com.hxhq.business.enums.archive.ArchiveLogTypeEnum; +import com.hxhq.business.enums.study.StudyFormFillResourceTypeEnum; import com.hxhq.business.enums.zykgl.*; import com.hxhq.business.form.gyzj.*; import com.hxhq.business.service.*; @@ -1318,7 +1319,7 @@ public class GyzjServiceImpl extends ServiceImpl implements IG */ @Override public void genResource(StudyFormFill studyFormFill, Template template, String remark) { - System.out.println(System.currentTimeMillis()); + Boolean mark = template.getProduct().equals(StudyFormFillResourceTypeEnum.gyzj.getValue()) ? true : false; SysUser qmr = sysUserService.selectUserById(SecurityUtils.getUserId()); Long studyId = studyFormFill.getStudyId(); @@ -1331,106 +1332,125 @@ public class GyzjServiceImpl extends ServiceImpl implements IG LinkedList tzList = new LinkedList<>(); if (StringUtils.isNotEmpty(resource) && !StringUtils.equals("[]", resource)) { List studyFormFillResourceList = JSONUtil.toList(resource, StudyFormFillResource.class); - List bhList = studyFormFillResourceList.stream().filter(p->p.getType()==null).map(StudyFormFillResource::getBh).collect(Collectors.toList()); + List bhList = studyFormFillResourceList.stream().filter(p -> (p.getType() == null && mark) || p.getType().equals(StudyFormFillResourceTypeEnum.gyzj.getValue())).map(StudyFormFillResource::getBh).collect(Collectors.toList()); // 根据编号获取需要处置的列表 - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.in(Gyzj::getBh, bhList); - gyzjList = this.list(queryWrapper); - for (Gyzj gyzj : gyzjList) { - gyzjMap.put(gyzj.getBh(), gyzj); - } - - for (StudyFormFillResource studyFormFillResource : studyFormFillResourceList) { - Gyzj gyzj = gyzjMap.get(studyFormFillResource.getBh()); - if (gyzj == null) { - gyzj = new Gyzj(); - gyzj.setStudyId(studyId); - gyzj.setBdId(studyFormId); - gyzj.setZjzt(ZjztEnum.wrk.getValue()); - gyzj.setJyzt(JyztEnum.wjy.getValue()); - } - gyzj.setMc(studyFormFillResource.getMc()); - gyzj.setBh(studyFormFillResource.getBh()); - gyzj.setNd(String.valueOf(studyFormFillResource.getNdz())); - gyzj.setNddw(studyFormFillResource.getNddw()); - gyzj.setKc(String.valueOf(studyFormFillResource.getKc())); - gyzj.setKcdw(studyFormFillResource.getKcdw()); - gyzj.setSxrq(DateUtils.parseDate(studyFormFillResource.getSxrq())); - if (gyzj.getId() == null) { - this.save(gyzj); - gyzjList.add(gyzj); + if (bhList.size() > 0) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.in(Gyzj::getBh, bhList); + gyzjList = this.list(queryWrapper); + for (Gyzj gyzj : gyzjList) { gyzjMap.put(gyzj.getBh(), gyzj); - // 稽查轨迹 - jcgjList.add(gyzjJcgjService.getJcgj(gyzj.getId(), JcgjlxEnum.lc.getValue(), "配制完成", JcmcysEnum.green.getValue(), null, null, qmr, remark)); - // 台账 - tzList.add(gyzjTzService.getTzGen(gyzj.getId(), null, null, null, null, null, null, null, null, qmr, "配制完成", gyzj.getKc(), gyzj.getKcdw(), remark, studyFormFill.getId())); - } else { - this.updateById(gyzj); - } - // 使用 - String syl = studyFormFillResource.getSyl(); - if (StringUtils.isNotEmpty(syl) && NumberUtils.isParsable(syl)) { - BigDecimal kc = new BigDecimal(gyzj.getKc()); - kc = kc.subtract(new BigDecimal(syl)); - gyzj.setKc(kc.toString()); - baseMapper.updateKc(gyzj.getId(), kc.toString()); - // 使用稽查轨迹 - HashMap formData = new LinkedHashMap<>(); - formData.put("使用量", syl + studyFormFillResource.getSyldw()); - // 稽查轨迹 - jcgjList.add(gyzjJcgjService.getJcgj(gyzj.getId(), JcgjlxEnum.lc.getValue(), "使用", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), JctUtil.formatStr(GyzjJcnrUtil.getMapEn(formData)), qmr, remark)); - // 台账 - tzList.add(gyzjTzService.getTzGen(gyzj.getId(), null, null, null, null, null, null, null, null, qmr, "使用", syl, studyFormFillResource.getSyldw(), remark, studyFormFill.getId())); } - gyzjMap.put(gyzj.getBh(), gyzj); - } - } - - // 存储 - String cclist = studyFormFill.getCclist(); - if (StringUtils.isNotEmpty(cclist) && !StringUtils.equals("[]", cclist)) { - List studyFormFillCcList = JSONUtil.toList(cclist, StudyFormFillCc.class); - for (StudyFormFillCc studyFormFillCc : studyFormFillCcList) { - baseMapper.updateCc(studyFormFillCc.getList(), studyFormFillCc.getCctj(), studyFormFillCc.getCcwz()); - for (String bh : studyFormFillCc.getList()) { - Gyzj gyzj = gyzjMap.get(bh); - if (gyzj != null) { + for (StudyFormFillResource studyFormFillResource : studyFormFillResourceList) { + Gyzj gyzj = gyzjMap.get(studyFormFillResource.getBh()); + //配置的才保存，或更新 + if (studyFormFillResource.getType() == null) { + if (gyzj == null) { + gyzj = new Gyzj(); + gyzj.setStudyId(studyId); + gyzj.setBdId(studyFormId); + gyzj.setZjzt(ZjztEnum.wrk.getValue()); + gyzj.setJyzt(JyztEnum.wjy.getValue()); + } + gyzj.setMc(studyFormFillResource.getMc()); + gyzj.setBh(studyFormFillResource.getBh()); + gyzj.setNd(String.valueOf(studyFormFillResource.getNdz())); + gyzj.setNddw(studyFormFillResource.getNddw()); + gyzj.setKc(String.valueOf(studyFormFillResource.getKc())); + gyzj.setKcdw(studyFormFillResource.getKcdw()); + gyzj.setSxrq(DateUtils.parseDate(studyFormFillResource.getSxrq())); + if (gyzj.getId() == null) { + this.save(gyzj); + gyzjList.add(gyzj); + gyzjMap.put(gyzj.getBh(), gyzj); + // 稽查轨迹 + jcgjList.add(gyzjJcgjService.getJcgj(gyzj.getId(), JcgjlxEnum.lc.getValue(), "配制完成", JcmcysEnum.green.getValue(), null, null, qmr, remark)); + // 台账 + tzList.add(gyzjTzService.getTzGen(gyzj.getId(), null, null, null, null, null, null, null, null, qmr, "配制完成", gyzj.getKc(), gyzj.getKcdw(), remark, studyFormFill.getId())); + } else { + this.updateById(gyzj); + } + } + // 使用 + String syl = studyFormFillResource.getSyl(); + if (StringUtils.isNotEmpty(syl) && NumberUtils.isParsable(syl)) { + BigDecimal kc = new BigDecimal(gyzj.getKc()); + kc = kc.subtract(new BigDecimal(syl)); + gyzj.setKc(kc.toString()); + baseMapper.updateKc(gyzj.getId(), kc.toString()); + // 使用稽查轨迹 + HashMap formData = new LinkedHashMap<>(); + formData.put("使用量", syl + studyFormFillResource.getSyldw()); // 稽查轨迹 - HashMap formData = new HashMap<>(); - formData.put("存储位置", studyFormFillCc.getCcwz()); - formData.put("存储条件", studyFormFillCc.getCctj()); - jcgjList.add(gyzjJcgjService.getJcgj(gyzj.getId(), JcgjlxEnum.lc.getValue(), "存储", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), JctUtil.formatStr(GyzjJcnrUtil.getMapEn(formData)), qmr, remark)); + jcgjList.add(gyzjJcgjService.getJcgj(gyzj.getId(), JcgjlxEnum.lc.getValue(), "使用", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), JctUtil.formatStr(GyzjJcnrUtil.getMapEn(formData)), qmr, remark)); // 台账 - tzList.add(gyzjTzService.getTzGen(gyzj.getId(), null, null, null, null, null, null, null, null, qmr, "存储", gyzj.getKc(), gyzj.getKcdw(), remark, studyFormFill.getId())); + tzList.add(gyzjTzService.getTzGen(gyzj.getId(), null, null, null, null, null, null, null, null, qmr, "使用", syl, studyFormFillResource.getSyldw(), remark, studyFormFill.getId())); } + gyzjMap.put(gyzj.getBh(), gyzj); } } } + if (gyzjMap.size() > 0) { + // 存储 + String cclist = studyFormFill.getCclist(); + if (StringUtils.isNotEmpty(cclist) && !StringUtils.equals("[]", cclist)) { + List studyFormFillCcList = JSONUtil.toList(cclist, StudyFormFillCc.class); + for (StudyFormFillCc studyFormFillCc : studyFormFillCcList) { + List list=new ArrayList<>(); + for (String bh : studyFormFillCc.getList()) { + Gyzj gyzj = gyzjMap.get(bh); + if (gyzj != null) { + list.add(bh); + // 稽查轨迹 + HashMap formData = new HashMap<>(); + formData.put("存储位置", studyFormFillCc.getCcwz()); + formData.put("存储条件", studyFormFillCc.getCctj()); + jcgjList.add(gyzjJcgjService.getJcgj(gyzj.getId(), JcgjlxEnum.lc.getValue(), "存储", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), JctUtil.formatStr(GyzjJcnrUtil.getMapEn(formData)), qmr, remark)); + // 台账 + tzList.add(gyzjTzService.getTzGen(gyzj.getId(), null, null, null, null, null, null, null, null, qmr, "存储", gyzj.getKc(), gyzj.getKcdw(), remark, studyFormFill.getId())); + } + } + if(list.size()>0){ + baseMapper.updateCc(list, studyFormFillCc.getCctj(), studyFormFillCc.getCcwz()); + } + } + } - // 处置，库存全变为0 - String czlist = studyFormFill.getCzlist(); - if (StringUtils.isNotEmpty(czlist) && !StringUtils.equals("[]", czlist)) { - List studyFormFillCzList = JSONUtil.toList(czlist, StudyFormFillCz.class); - for (StudyFormFillCz studyFormFillCz : studyFormFillCzList) { - for (String bh : studyFormFillCz.getList()) { - Gyzj gyzj = gyzjMap.get(bh); - if (gyzj != null) { - // 稽查轨迹 - HashMap formData = new HashMap<>(); - formData.put("处置方式", studyFormFillCz.getCzfs()); - formData.put("处置量", gyzj.getKc() + gyzj.getKcdw()); - jcgjList.add(gyzjJcgjService.getJcgj(gyzj.getId(), JcgjlxEnum.lc.getValue(), "处置", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), JctUtil.formatStr(GyzjJcnrUtil.getMapEn(formData)), qmr, remark)); - - // 台账 - tzList.add(gyzjTzService.getTzGen(gyzj.getId(), null, null, null, null, null, null, null, null, qmr, "处置", gyzj.getKc(), gyzj.getKcdw(), remark, studyFormFill.getId())); + // 处置，库存全变为0 + String czlist = studyFormFill.getCzlist(); + if (StringUtils.isNotEmpty(czlist) && !StringUtils.equals("[]", czlist)) { + List studyFormFillCzList = JSONUtil.toList(czlist, StudyFormFillCz.class); + for (StudyFormFillCz studyFormFillCz : studyFormFillCzList) { + List list=new ArrayList<>(); + for (String bh : studyFormFillCz.getList()) { + Gyzj gyzj = gyzjMap.get(bh); + if (gyzj != null) { + list.add(bh); + // 稽查轨迹 + HashMap formData = new HashMap<>(); + formData.put("处置方式", studyFormFillCz.getCzfs()); + formData.put("处置量", gyzj.getKc() + gyzj.getKcdw()); + jcgjList.add(gyzjJcgjService.getJcgj(gyzj.getId(), JcgjlxEnum.lc.getValue(), "处置", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), JctUtil.formatStr(GyzjJcnrUtil.getMapEn(formData)), qmr, remark)); + + // 台账 + tzList.add(gyzjTzService.getTzGen(gyzj.getId(), null, null, null, null, null, null, null, null, qmr, "处置", gyzj.getKc(), gyzj.getKcdw(), remark, studyFormFill.getId())); + } + } + if(list.size()>0) { + baseMapper.updateKcBatch(list, "0"); } } - baseMapper.updateKcBatch(studyFormFillCz.getList(), "0"); } } - gyzjJcgjService.saveBatch(jcgjList); - gyzjTzService.saveBatch(tzList); - studyGyzjService.saveBatch(studyId, gyzjList); + if(jcgjList.size()>0){ + gyzjJcgjService.saveBatch(jcgjList); + } + if(tzList.size()>0){ + gyzjTzService.saveBatch(tzList); + } + if(gyzjList.size()>0){ + studyGyzjService.saveBatch(studyId, gyzjList); + } } //endregion diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/MjyServiceImpl.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/MjyServiceImpl.java index c348ebb..3b8fbc6 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/MjyServiceImpl.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/MjyServiceImpl.java @@ -15,6 +15,7 @@ import com.hxhq.business.dto.study.StudyFormFillCc; import com.hxhq.business.dto.study.StudyFormFillCz; import com.hxhq.business.dto.study.StudyFormFillResource; import com.hxhq.business.enums.archive.ArchiveLogTypeEnum; +import com.hxhq.business.enums.study.StudyFormFillResourceTypeEnum; import com.hxhq.business.enums.study.StudyTypeEnum; import com.hxhq.business.enums.zykgl.*; import com.hxhq.business.form.mjy.*; @@ -156,7 +157,7 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS public void jd(JdForm form) { SysUser qmr = SecurityUtils.getLoginUser().getSysUser(); //验证签名人密码 - checkPassword(qmr, form.getQmrmm(),false); + checkPassword(qmr, form.getQmrmm(), false); if (form.getId() == null || form.getId().longValue() < 0) { throw new ServiceException("参数id不正确"); } @@ -164,7 +165,7 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS if (mjyOld == null) { throw new ServiceException("麻精药不存在或已删除"); } - if(!mjyOld.getGdsqrId().equals(qmr.getUserId())){ + if (!mjyOld.getGdsqrId().equals(qmr.getUserId())) { throw new ServiceException("只有归档申请人才能操作"); } if (!mjyOld.getZjzt().equals(ZjztEnum.gd.getValue())) { @@ -176,7 +177,7 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS //稽查轨迹 mjyJcgjService.saveJcgj(mjyOld.getId(), JcgjlxEnum.lc.getValue(), "申请解档", JcmcysEnum.green.getValue(), null, qmr, form.getRemark()); //保存日志 - archiveLogService.saveInfo(ArchiveLogTypeEnum.mjy, mjyOld.getId(), mjyOld.getMc(), mjyOld.getBh(), mjyOld.getNd()+mjyOld.getNddw(), "申请解档"); + archiveLogService.saveInfo(ArchiveLogTypeEnum.mjy, mjyOld.getId(), mjyOld.getMc(), mjyOld.getBh(), mjyOld.getNd() + mjyOld.getNddw(), "申请解档"); } /** @@ -189,7 +190,7 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS public void jy(JyForm form) { SysUser qmr = SecurityUtils.getLoginUser().getSysUser(); //验证签名人密码 - checkPassword(qmr, form.getQmrmm(),false); + checkPassword(qmr, form.getQmrmm(), false); if (form.getId() == null || form.getId().longValue() < 0) { throw new ServiceException("参数id不正确"); } @@ -197,7 +198,7 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS if (mjyOld == null) { throw new ServiceException("麻精药不存在或已删除"); } - if(!mjyOld.getGdsqrId().equals(qmr.getUserId())){ + if (!mjyOld.getGdsqrId().equals(qmr.getUserId())) { throw new ServiceException("只有归档申请人才能操作"); } if (!mjyOld.getZjzt().equals(ZjztEnum.gd.getValue())) { @@ -215,9 +216,9 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS Map formData = new LinkedHashMap<>(); formData.put("借阅开始时间", DateUtils.dateTime(form.getStartDate())); formData.put("借阅结束时间", DateUtils.dateTime(form.getEndDate())); - mjyJcgjService.saveJcgj(mjyOld.getId(), JcgjlxEnum.lc.getValue(), "申请借阅", JcmcysEnum.orange.getValue(),formData, qmr, form.getRemark()); + mjyJcgjService.saveJcgj(mjyOld.getId(), JcgjlxEnum.lc.getValue(), "申请借阅", JcmcysEnum.orange.getValue(), formData, qmr, form.getRemark()); //保存日志 - archiveLogService.saveInfo(ArchiveLogTypeEnum.mjy, mjyOld.getId(), mjyOld.getMc(), mjyOld.getBh(), mjyOld.getNd()+mjyOld.getNddw(), "申请借阅"); + archiveLogService.saveInfo(ArchiveLogTypeEnum.mjy, mjyOld.getId(), mjyOld.getMc(), mjyOld.getBh(), mjyOld.getNd() + mjyOld.getNddw(), "申请借阅"); } /** @@ -230,7 +231,7 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS public void plgd(GdForm form) { SysUser qmr = SecurityUtils.getLoginUser().getSysUser(); //验证签名人密码 - checkPassword(qmr, form.getQmrmm(),false); + checkPassword(qmr, form.getQmrmm(), false); if (form.getIds().length < 0) { throw new ServiceException("参数ids不正确"); } @@ -251,9 +252,9 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS mjy.setGdsqrId(qmr.getUserId()); mjy.setGdsqrMc(qmr.getNickName()); //稽查轨迹 - mjyJcgjList.add(mjyJcgjService.getJcgj(mjy.getId(), JcgjlxEnum.lc.getValue(), "申请归档", JcmcysEnum.orange.getValue(),null, qmr, form.getRemark())); + mjyJcgjList.add(mjyJcgjService.getJcgj(mjy.getId(), JcgjlxEnum.lc.getValue(), "申请归档", JcmcysEnum.orange.getValue(), null, qmr, form.getRemark())); //保存日志 - archiveLogService.saveInfo(ArchiveLogTypeEnum.mjy, mjy.getId(), mjy.getMc(), mjy.getBh(), mjy.getNd()+mjy.getNddw(), "申请归档"); + archiveLogService.saveInfo(ArchiveLogTypeEnum.mjy, mjy.getId(), mjy.getMc(), mjy.getBh(), mjy.getNd() + mjy.getNddw(), "申请归档"); } this.updateBatchById(mjyList); mjyJcgjService.saveBatch(mjyJcgjList); @@ -270,7 +271,7 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS public void gd(GdForm form) { SysUser qmr = SecurityUtils.getLoginUser().getSysUser(); //验证签名人密码 - checkPassword(qmr, form.getQmrmm(),false); + checkPassword(qmr, form.getQmrmm(), false); if (form.getId() == null || form.getId().longValue() < 0) { throw new ServiceException("参数id不正确"); } @@ -288,9 +289,9 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS mjyOld.setGdsqrMc(qmr.getNickName()); this.updateById(mjyOld); //稽查轨迹 - mjyJcgjService.saveJcgj(mjyOld.getId(), JcgjlxEnum.lc.getValue(), "申请归档", JcmcysEnum.orange.getValue(),null, qmr, form.getRemark()); + mjyJcgjService.saveJcgj(mjyOld.getId(), JcgjlxEnum.lc.getValue(), "申请归档", JcmcysEnum.orange.getValue(), null, qmr, form.getRemark()); //保存日志 - archiveLogService.saveInfo(ArchiveLogTypeEnum.mjy, mjyOld.getId(), mjyOld.getMc(), mjyOld.getBh(), mjyOld.getNd()+mjyOld.getNddw(), "申请归档"); + archiveLogService.saveInfo(ArchiveLogTypeEnum.mjy, mjyOld.getId(), mjyOld.getMc(), mjyOld.getBh(), mjyOld.getNd() + mjyOld.getNddw(), "申请归档"); } @@ -304,7 +305,7 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS public void plsd(SdForm form) { SysUser qmr = SecurityUtils.getLoginUser().getSysUser(); //验证签名人密码 - checkPassword(qmr, form.getQmrmm(),false); + checkPassword(qmr, form.getQmrmm(), false); if (form.getIds().length < 0) { throw new ServiceException("参数ids不正确"); } @@ -320,7 +321,7 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS //锁定 mjy.setZjzt(ZjztEnum.ysd.getValue()); //稽查轨迹 - mjyJcgjList.add(mjyJcgjService.getJcgj(mjy.getId(), JcgjlxEnum.lc.getValue(), "锁定麻精药", JcmcysEnum.orange.getValue(),null, qmr, form.getRemark())); + mjyJcgjList.add(mjyJcgjService.getJcgj(mjy.getId(), JcgjlxEnum.lc.getValue(), "锁定麻精药", JcmcysEnum.orange.getValue(), null, qmr, form.getRemark())); } this.updateBatchById(mjyList); mjyJcgjService.saveBatch(mjyJcgjList); @@ -337,7 +338,7 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS public void sd(SdForm form) { SysUser qmr = SecurityUtils.getLoginUser().getSysUser(); //验证签名人密码 - checkPassword(qmr, form.getQmrmm(),false); + checkPassword(qmr, form.getQmrmm(), false); if (form.getId() == null || form.getId().longValue() < 0) { throw new ServiceException("参数id不正确"); } @@ -351,7 +352,7 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS mjyOld.setZjzt(ZjztEnum.ysd.getValue()); this.updateById(mjyOld); //稽查轨迹 - mjyJcgjService.saveJcgj(mjyOld.getId(), JcgjlxEnum.lc.getValue(), "锁定麻精药", JcmcysEnum.orange.getValue(),null, qmr, form.getRemark()); + mjyJcgjService.saveJcgj(mjyOld.getId(), JcgjlxEnum.lc.getValue(), "锁定麻精药", JcmcysEnum.orange.getValue(), null, qmr, form.getRemark()); } @@ -365,7 +366,7 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS public void js(JsForm form) { SysUser qmr = SecurityUtils.getLoginUser().getSysUser(); //验证签名人密码 - checkPassword(qmr, form.getQmrmm(),false); + checkPassword(qmr, form.getQmrmm(), false); if (form.getId() == null || form.getId().longValue() < 0) { throw new ServiceException("参数id不正确"); } @@ -380,7 +381,7 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS mjyOld.setZjzt(ZjztEnum.rk.getValue()); this.updateById(mjyOld); //稽查轨迹 - mjyJcgjService.saveJcgj(mjyOld.getId(), JcgjlxEnum.lc.getValue(), "解锁麻精药", JcmcysEnum.orange.getValue(),null,qmr, form.getRemark()); + mjyJcgjService.saveJcgj(mjyOld.getId(), JcgjlxEnum.lc.getValue(), "解锁麻精药", JcmcysEnum.orange.getValue(), null, qmr, form.getRemark()); } /** @@ -395,11 +396,11 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS SysUser fhr = sysUserService.selectUserById(form.getFhrId()); SysUser jdr = sysUserService.selectUserById(form.getJdrId()); //验证处理人密码 - checkPassword(clr, form.getClrmm(),true); + checkPassword(clr, form.getClrmm(), true); //验证复核人密码 - checkPassword(fhr, form.getFhrmm(),true); + checkPassword(fhr, form.getFhrmm(), true); //验证监督人密码 - checkPassword(jdr, form.getJdrmm(),true); + checkPassword(jdr, form.getJdrmm(), true); QueryWrapper queryWrapper = Wrappers.query(); queryWrapper.in("id", form.getIds()); @@ -434,9 +435,9 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS formData.put("处置人", clr.getNickName()); formData.put("复核人", fhr.getNickName()); formData.put("监督人", jdr.getNickName()); - mjyJcgjList.add(mjyJcgjService.getJcgj(mjy.getId(), JcgjlxEnum.lc.getValue(), "处置药剂", JcmcysEnum.orange.getValue(),formData,null, null)); + mjyJcgjList.add(mjyJcgjService.getJcgj(mjy.getId(), JcgjlxEnum.lc.getValue(), "处置药剂", JcmcysEnum.orange.getValue(), formData, null, null)); //台账 - mjyTzList.add(mjyTzService.getTz(mjy.getId(),null,null,null,null,null,null,null,null,clr,"处置药剂",mjyPlffItemFilter.get(0).getCzl(),mjy.getKcdw(),mjyPlffItemFilter.get(0).getCzyy())); + mjyTzList.add(mjyTzService.getTz(mjy.getId(), null, null, null, null, null, null, null, null, clr, "处置药剂", mjyPlffItemFilter.get(0).getCzl(), mjy.getKcdw(), mjyPlffItemFilter.get(0).getCzyy())); } else { throw new ServiceException("麻精药【" + mjy.getMc() + "】不存在或已删除"); } @@ -461,11 +462,11 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS SysUser jdr = sysUserService.selectUserById(form.getJdrId()); //验证处理人密码 - checkPassword(clr, form.getClrmm(),true); + checkPassword(clr, form.getClrmm(), true); //验证复核人密码 - checkPassword(fhr, form.getFhrmm(),true); + checkPassword(fhr, form.getFhrmm(), true); //验证监督人密码 - checkPassword(jdr, form.getJdrmm(),true); + checkPassword(jdr, form.getJdrmm(), true); if (form.getId() == null || form.getId().longValue() < 0) { throw new ServiceException("参数id不正确"); } @@ -493,7 +494,7 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS mjyJcgjService.saveJcgj(mjyOld.getId(), JcgjlxEnum.lc.getValue(), "处置药剂", JcmcysEnum.green.getValue(), formData, null, null); //台账 - mjyTzService.saveTz(mjyOld.getId(),null,null,null,null,null,null,null,null,clr,"处置药剂",form.getCzl(),mjyOld.getKcdw(),form.getCzyy()); + mjyTzService.saveTz(mjyOld.getId(), null, null, null, null, null, null, null, null, clr, "处置药剂", form.getCzl(), mjyOld.getKcdw(), form.getCzyy()); this.updateById(mjyOld); } @@ -510,11 +511,11 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS SysUser fhr = sysUserService.selectUserById(form.getFhrId()); SysUser jdr = sysUserService.selectUserById(form.getJdrId()); //验证处理人密码 - checkPassword(clr, form.getClrmm(),true); + checkPassword(clr, form.getClrmm(), true); //验证复核人密码 - checkPassword(fhr, form.getFhrmm(),true); + checkPassword(fhr, form.getFhrmm(), true); //验证监督人密码 - checkPassword(jdr, form.getJdrmm(),true); + checkPassword(jdr, form.getJdrmm(), true); if (form.getIds().length < 0) { throw new ServiceException("参数ids不正确"); @@ -541,9 +542,9 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS formData.put("处置人", clr.getNickName()); formData.put("复核人", fhr.getNickName()); formData.put("监督人", jdr.getNickName()); - mjyJcgjList.add(mjyJcgjService.getJcgj(mjy.getId(), JcgjlxEnum.lc.getValue(), "处置容器", JcmcysEnum.green.getValue(), formData,null , null)); + mjyJcgjList.add(mjyJcgjService.getJcgj(mjy.getId(), JcgjlxEnum.lc.getValue(), "处置容器", JcmcysEnum.green.getValue(), formData, null, null)); //台账 - mjyTzList.add(mjyTzService.getTz(mjy.getId(),null,null,null,null,null,null,null,null,clr,"处置容器",null,null,mjyPlffItemFilter.get(0).getCzyy())); + mjyTzList.add(mjyTzService.getTz(mjy.getId(), null, null, null, null, null, null, null, null, clr, "处置容器", null, null, mjyPlffItemFilter.get(0).getCzyy())); mjy.setRqzt(RqztEnum.ycz.getValue()); } else { @@ -567,11 +568,11 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS SysUser fhr = sysUserService.selectUserById(form.getFhrId()); SysUser jdr = sysUserService.selectUserById(form.getJdrId()); //验证处理人密码 - checkPassword(clr, form.getClrmm(),true); + checkPassword(clr, form.getClrmm(), true); //验证复核人密码 - checkPassword(fhr, form.getFhrmm(),true); + checkPassword(fhr, form.getFhrmm(), true); //验证监督人密码 - checkPassword(jdr, form.getJdrmm(),true); + checkPassword(jdr, form.getJdrmm(), true); if (form.getId() == null || form.getId().longValue() < 0) { throw new ServiceException("参数id不正确"); @@ -595,10 +596,10 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS formData.put("处置人", clr.getNickName()); formData.put("复核人", fhr.getNickName()); formData.put("监督人", jdr.getNickName()); - mjyJcgjService.saveJcgj(mjyOld.getId(), JcgjlxEnum.lc.getValue(), "处置容器", JcmcysEnum.green.getValue(), formData, null,null); + mjyJcgjService.saveJcgj(mjyOld.getId(), JcgjlxEnum.lc.getValue(), "处置容器", JcmcysEnum.green.getValue(), formData, null, null); //台账 - mjyTzService.saveTz(mjyOld.getId(),null,null,null,null,null,null,null,null,clr,"处置容器",null,null,form.getCzyy()); + mjyTzService.saveTz(mjyOld.getId(), null, null, null, null, null, null, null, null, clr, "处置容器", null, null, form.getCzyy()); } @@ -614,11 +615,11 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS SysUser lqr2 = sysUserService.selectUserById(form.getLqr2Id()); SysUser ffr1 = SecurityUtils.getLoginUser().getSysUser(); //验证领取人1密码 - checkPassword(lqr1, form.getLqr1mm(),true); + checkPassword(lqr1, form.getLqr1mm(), true); //验证领取人2密码 - checkPassword(lqr2, form.getLqr2mm(),true); + checkPassword(lqr2, form.getLqr2mm(), true); //验证发放人密码 - checkPassword(ffr1, form.getFfrmm(),true); + checkPassword(ffr1, form.getFfrmm(), true); Zcg zcg = zcgService.getById(form.getZcgId()); if (zcg == null) { @@ -652,7 +653,7 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS formData.put("钥匙1领取人", lqr1.getNickName()); formData.put("钥匙2领取人", lqr2.getNickName()); formData.put("发放人", ffr1.getNickName()); - mjyJcgjList.add(mjyJcgjService.getJcgj(mjy.getId(), JcgjlxEnum.lc.getValue(), "钥匙发放", JcmcysEnum.green.getValue(), formData, null,null)); + mjyJcgjList.add(mjyJcgjService.getJcgj(mjy.getId(), JcgjlxEnum.lc.getValue(), "钥匙发放", JcmcysEnum.green.getValue(), formData, null, null)); } if (StringUtils.isBlank(zcg.getGlyj())) { zcg.setGlyj(glyj); @@ -667,7 +668,7 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS zcgService.updateById(zcg); this.updateBatchById(mjyList); mjyJcgjService.saveBatch(mjyJcgjList); - if(mjyFfjlList.size()>0){ + if (mjyFfjlList.size() > 0) { mjyFfjlService.updateBatchById(mjyFfjlList); } } @@ -686,13 +687,13 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS SysUser ffr1 = SecurityUtils.getLoginUser().getSysUser(); SysUser ffr2 = sysUserService.selectUserById(form.getFfr2Id()); //验证领取人1密码 - checkPassword(lqr1, form.getLqr1mm(),true); + checkPassword(lqr1, form.getLqr1mm(), true); //验证领取人2密码 - checkPassword(lqr2, form.getLqr2mm(),true); + checkPassword(lqr2, form.getLqr2mm(), true); //验证发放人1密码 - checkPassword(ffr1, form.getFfr1mm(),true); + checkPassword(ffr1, form.getFfr1mm(), true); //验证发放人2密码 - checkPassword(ffr2, form.getFfr2mm(),true); + checkPassword(ffr2, form.getFfr2mm(), true); if (form.getId() == null || form.getId().longValue() < 0) { throw new ServiceException("参数id不正确"); @@ -720,9 +721,9 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS formData.put("领取人2", lqr2.getNickName()); formData.put("发放人", ffr1.getNickName()); formData.put("发放人2", ffr2.getNickName()); - mjyJcgjService.saveJcgj(mjyOld.getId(), JcgjlxEnum.lc.getValue(), "领取发放", JcmcysEnum.green.getValue(), formData, ffr1,form.getRemark()); + mjyJcgjService.saveJcgj(mjyOld.getId(), JcgjlxEnum.lc.getValue(), "领取发放", JcmcysEnum.green.getValue(), formData, ffr1, form.getRemark()); //台账 - mjyTzService.saveTz(mjyOld.getId(),lqr1,lqr2,null,null,ffr1,ffr2,null,null,null,"领取发放",mjyOld.getKc(),mjyOld.getKcdw(),form.getRemark()); + mjyTzService.saveTz(mjyOld.getId(), lqr1, lqr2, null, null, ffr1, ffr2, null, null, null, "领取发放", mjyOld.getKc(), mjyOld.getKcdw(), form.getRemark()); //更新发放信息 mjyOld.setCkl(mjyOld.getKc()); @@ -759,13 +760,13 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS SysUser ffr1 = SecurityUtils.getLoginUser().getSysUser(); SysUser ffr2 = sysUserService.selectUserById(form.getFfr2Id()); //验证领取人1密码 - checkPassword(lqr1, form.getLqr1mm(),true); + checkPassword(lqr1, form.getLqr1mm(), true); //验证领取人2密码 - checkPassword(lqr2, form.getLqr2mm(),true); + checkPassword(lqr2, form.getLqr2mm(), true); //验证发放人1密码 - checkPassword(ffr1, form.getFfr1mm(),true); + checkPassword(ffr1, form.getFfr1mm(), true); //验证发放人2密码 - checkPassword(ffr2, form.getFfr2mm(),true); + checkPassword(ffr2, form.getFfr2mm(), true); QueryWrapper queryWrapper = Wrappers.query(); queryWrapper.in("id", form.getIds()); @@ -799,9 +800,9 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS formData.put("领取人2", lqr2.getNickName()); formData.put("发放人", ffr1.getNickName()); formData.put("发放人2", ffr2.getNickName()); - mjyJcgjList.add(mjyJcgjService.getJcgj(mjy.getId(), JcgjlxEnum.lc.getValue(), "领取发放", JcmcysEnum.green.getValue(), formData, ffr1,plffItemFilter.get(0).getRemark())); + mjyJcgjList.add(mjyJcgjService.getJcgj(mjy.getId(), JcgjlxEnum.lc.getValue(), "领取发放", JcmcysEnum.green.getValue(), formData, ffr1, plffItemFilter.get(0).getRemark())); //台账 - mjyTzList.add(mjyTzService.getTz(mjy.getId(),lqr1,lqr2,null,null,ffr1,ffr2,null,null,null,"领取发放",mjy.getKc(),mjy.getKcdw(),plffItemFilter.get(0).getRemark())); + mjyTzList.add(mjyTzService.getTz(mjy.getId(), lqr1, lqr2, null, null, ffr1, ffr2, null, null, null, "领取发放", mjy.getKc(), mjy.getKcdw(), plffItemFilter.get(0).getRemark())); //更新发放信息 mjy.setCkl(mjy.getKc()); mjy.setCkldw(mjy.getKcdw()); @@ -838,9 +839,9 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS @Override @Transactional(rollbackFor = Exception.class) public void bj(BjForm form) { - SysUser qmr=SecurityUtils.getLoginUser().getSysUser(); + SysUser qmr = SecurityUtils.getLoginUser().getSysUser(); //验证签名人密码 - checkPassword(qmr, form.getQmrmm(),false); + checkPassword(qmr, form.getQmrmm(), false); if (form.getId() == null || form.getId().longValue() < 0) { throw new ServiceException("参数id不正确"); } @@ -861,7 +862,7 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS throw new ServiceException("你没有修改任何内容"); } for (ObjectCompareUtil.FieldChange fieldChange : fieldChanges) { - mjyJcgjList.add(mjyJcgjService.getJcgj(mjyOld.getId(), JcgjlxEnum.lc.getValue(), "申请编辑", JcmcysEnum.green.getValue(), fieldChange.toString(), fieldChange.toEnString(), qmr,null)); + mjyJcgjList.add(mjyJcgjService.getJcgj(mjyOld.getId(), JcgjlxEnum.lc.getValue(), "申请编辑", JcmcysEnum.green.getValue(), fieldChange.toString(), fieldChange.toEnString(), qmr, null)); } mjyOld.setMcbj(form.getMc()); mjyOld.setNdbj(form.getNd()); @@ -885,9 +886,9 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS @Override @Transactional(rollbackFor = Exception.class) public void shbj(ShbjForm form) { - SysUser qmr=SecurityUtils.getLoginUser().getSysUser(); + SysUser qmr = SecurityUtils.getLoginUser().getSysUser(); //验证签名人密码 - checkPassword(qmr, form.getQmrmm(),false); + checkPassword(qmr, form.getQmrmm(), false); if (form.getId() == null || form.getId().longValue() < 0) { throw new ServiceException("参数id不正确"); } @@ -912,13 +913,13 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS mjyOld.setNddw(mjyOld.getNddwbj()); mjyOld.setNd(mjyOld.getNdbj()); mjyOld.setMc(mjyOld.getMcbj()); - mjyJcgjService.saveJcgj(mjyOld.getId(), JcgjlxEnum.lc.getValue(), "同意编辑", JcmcysEnum.green.getValue(), formData, qmr,null); + mjyJcgjService.saveJcgj(mjyOld.getId(), JcgjlxEnum.lc.getValue(), "同意编辑", JcmcysEnum.green.getValue(), formData, qmr, null); //通知 - noticeService.save("麻精药【"+mjyOld.getMc()+"】同意编辑",mjyOld.getBjrId(),getUrlQz("mjyList")); + noticeService.save("麻精药【" + mjyOld.getMc() + "】同意编辑", mjyOld.getBjrId(), getUrlQz("mjyList")); } else { - mjyJcgjService.saveJcgj(mjyOld.getId(), JcgjlxEnum.lc.getValue(), "拒绝编辑", JcmcysEnum.red.getValue(), formData, qmr,null); + mjyJcgjService.saveJcgj(mjyOld.getId(), JcgjlxEnum.lc.getValue(), "拒绝编辑", JcmcysEnum.red.getValue(), formData, qmr, null); //通知 - noticeService.save("麻精药【"+mjyOld.getMc()+"】拒绝编辑",mjyOld.getBjrId(),getUrlQz("mjyList")); + noticeService.save("麻精药【" + mjyOld.getMc() + "】拒绝编辑", mjyOld.getBjrId(), getUrlQz("mjyList")); } //清空编辑信息 mjyOld.setMcbj(null); @@ -943,9 +944,9 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS @Override @Transactional(rollbackFor = Exception.class) public void xgkc(XgkcForm form) { - SysUser qmr=SecurityUtils.getLoginUser().getSysUser(); + SysUser qmr = SecurityUtils.getLoginUser().getSysUser(); //验证签名人密码 - checkPassword(qmr, form.getQmrmm(),false); + checkPassword(qmr, form.getQmrmm(), false); if (form.getId() == null || form.getId().longValue() < 0) { throw new ServiceException("参数id不正确"); } @@ -966,7 +967,7 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS List mjyJcgjList = new ArrayList<>(); //region 稽查轨迹 for (ObjectCompareUtil.FieldChange fieldChange : fieldChanges) { - mjyJcgjList.add(mjyJcgjService.getJcgj(mjyOld.getId(), JcgjlxEnum.lc.getValue(), "修改库存申请", JcmcysEnum.green.getValue(), fieldChange.toString(), fieldChange.toEnString(), qmr,null)); + mjyJcgjList.add(mjyJcgjService.getJcgj(mjyOld.getId(), JcgjlxEnum.lc.getValue(), "修改库存申请", JcmcysEnum.green.getValue(), fieldChange.toString(), fieldChange.toEnString(), qmr, null)); } //endregion @@ -990,9 +991,9 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS @Override @Transactional(rollbackFor = Exception.class) public void shxgkc(ShxgkcForm form) { - SysUser qmr=SecurityUtils.getLoginUser().getSysUser(); + SysUser qmr = SecurityUtils.getLoginUser().getSysUser(); //验证签名人密码 - checkPassword(qmr, form.getQmrmm(),false); + checkPassword(qmr, form.getQmrmm(), false); if (form.getId() == null || form.getId().longValue() < 0) { throw new ServiceException("参数id不正确"); } @@ -1011,18 +1012,18 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS formData.put("申请备注", mjyOld.getKcbjbz()); formData.put("审核备注", form.getRemark()); if (form.getQmyy().equals(ShXgkcEnum.ty.getValue())) { - mjyJcgjService.saveJcgj(mjyOld.getId(), JcgjlxEnum.lc.getValue(), "同意修改库存", JcmcysEnum.green.getValue(), formData, qmr,null); + mjyJcgjService.saveJcgj(mjyOld.getId(), JcgjlxEnum.lc.getValue(), "同意修改库存", JcmcysEnum.green.getValue(), formData, qmr, null); mjyOld.setKcdw(mjyOld.getKcdwbj()); mjyOld.setKc(mjyOld.getKcbj()); //通知 - noticeService.save("麻精药【"+mjyOld.getMc()+"】拒绝修改库存",mjyOld.getKcbjrId(),getUrlQz("mjyList")); + noticeService.save("麻精药【" + mjyOld.getMc() + "】拒绝修改库存", mjyOld.getKcbjrId(), getUrlQz("mjyList")); } else { - mjyJcgjService.saveJcgj(mjyOld.getId(), JcgjlxEnum.lc.getValue(), "拒绝修改库存", JcmcysEnum.red.getValue(), formData, qmr,null); + mjyJcgjService.saveJcgj(mjyOld.getId(), JcgjlxEnum.lc.getValue(), "拒绝修改库存", JcmcysEnum.red.getValue(), formData, qmr, null); //通知 - noticeService.save("麻精药【"+mjyOld.getMc()+"】拒绝编辑",mjyOld.getKcbjrId(),getUrlQz("mjyList")); + noticeService.save("麻精药【" + mjyOld.getMc() + "】拒绝编辑", mjyOld.getKcbjrId(), getUrlQz("mjyList")); } //台账 - mjyTzService.saveTz(mjyOld.getId(),null,null,null,null,null,null,null,null,qmr,"修改库存",mjyOld.getKcbj(),mjyOld.getKcdw(),mjyOld.getKcbjbz()); + mjyTzService.saveTz(mjyOld.getId(), null, null, null, null, null, null, null, null, qmr, "修改库存", mjyOld.getKcbj(), mjyOld.getKcdw(), mjyOld.getKcbjbz()); mjyOld.setKcbj(null); mjyOld.setKcdwbj(null); @@ -1044,13 +1045,13 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS SysUser jsr1 = SecurityUtils.getLoginUser().getSysUser(); SysUser jsr2 = sysUserService.selectUserById(form.getJsr2Id()); //验证归还人1密码 - checkPassword(ghr1, form.getGhr1mm(),true); + checkPassword(ghr1, form.getGhr1mm(), true); //验证归还人2密码 - checkPassword(ghr2, form.getGhr2mm(),true); + checkPassword(ghr2, form.getGhr2mm(), true); //验证接收人1密码 - checkPassword(jsr1, form.getJsr1mm(),true); + checkPassword(jsr1, form.getJsr1mm(), true); //验证接收人2密码 - checkPassword(jsr2, form.getJsr2mm(),true); + checkPassword(jsr2, form.getJsr2mm(), true); if (form.getId() == null || form.getId().longValue() < 0) { throw new ServiceException("参数id不正确"); @@ -1068,7 +1069,7 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS BigDecimal leftKc = new BigDecimal(mjyOld.getKc()).subtract(new BigDecimal(form.getSyl())); mjyFfjlService.gh(form, mjyOld, ghr1, ghr2, jsr1, jsr2); // 台账 - mjyTzService.saveTz(mjyOld.getId(),null,null,ghr1,ghr2,null,null,jsr1,jsr2,null,"归还",form.getRkmz(),mjyOld.getKcdw(),form.getRemark()); + mjyTzService.saveTz(mjyOld.getId(), null, null, ghr1, ghr2, null, null, jsr1, jsr2, null, "归还", form.getRkmz(), mjyOld.getKcdw(), form.getRemark()); // 稽查轨迹 Map formData = new LinkedHashMap<>(); formData.put("入库位置", form.getRkwz()); @@ -1081,10 +1082,10 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS formData.put("归还人2", ghr2.getNickName()); formData.put("库管员1", jsr1.getNickName()); formData.put("库管员2", jsr2.getNickName()); - mjyJcgjService.saveJcgj(mjyOld.getId(), JcgjlxEnum.lc.getValue(), "归还", JcmcysEnum.green.getValue(), formData, null,null); + mjyJcgjService.saveJcgj(mjyOld.getId(), JcgjlxEnum.lc.getValue(), "归还", JcmcysEnum.green.getValue(), formData, null, null); //通知 - noticeService.save("麻精药【"+mjyOld.getMc()+"】归还",mjyOld.getKcbjrId(),getUrlQz("mjyList")); - noticeService.save("麻精药【"+mjyOld.getMc()+"】归还",mjyOld.getKcbjrId(),getUrlQz("mjyList")); + noticeService.save("麻精药【" + mjyOld.getMc() + "】归还", mjyOld.getKcbjrId(), getUrlQz("mjyList")); + noticeService.save("麻精药【" + mjyOld.getMc() + "】归还", mjyOld.getKcbjrId(), getUrlQz("mjyList")); // 更新 mjyOld.setKc(leftKc.toString()); mjyOld.setZjzt(ZjztEnum.rk.getValue()); @@ -1092,7 +1093,6 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS } - /** * 入库 ok * @@ -1106,13 +1106,13 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS SysUser jsr1 = SecurityUtils.getLoginUser().getSysUser(); SysUser jsr2 = sysUserService.selectUserById(form.getJsr2Id()); //验证签名人1密码 - checkPassword(qmr1, form.getQmr1mm(),true); + checkPassword(qmr1, form.getQmr1mm(), true); //验证签名人2密码 - checkPassword(qmr2, form.getQmr2mm(),true); + checkPassword(qmr2, form.getQmr2mm(), true); //验证接收人1密码 - checkPassword(jsr1, form.getJsr1mm(),true); + checkPassword(jsr1, form.getJsr1mm(), true); //验证接收人2密码 - checkPassword(jsr2, form.getJsr2mm(),true); + checkPassword(jsr2, form.getJsr2mm(), true); if (form.getId() == null || form.getId().longValue() < 0) { throw new ServiceException("参数id不正确"); @@ -1125,7 +1125,7 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS throw new ServiceException("麻精药【" + mjyOld.getMc() + "】不是未入库状态，不能入库"); } // 台账 - mjyTzService.saveTz(mjyOld.getId(),null,null,qmr1,qmr2,null,null,jsr1,jsr2,null,"麻精药入库",form.getRkl(),mjyOld.getKcdw(),form.getRemark()); + mjyTzService.saveTz(mjyOld.getId(), null, null, qmr1, qmr2, null, null, jsr1, jsr2, null, "麻精药入库", form.getRkl(), mjyOld.getKcdw(), form.getRemark()); // 稽查轨迹 Map formData = new LinkedHashMap<>(); formData.put("入库位置", form.getRkwz()); @@ -1136,7 +1136,7 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS formData.put("签名人2", qmr2.getNickName()); formData.put("库管员1", jsr1.getNickName()); formData.put("库管员2", jsr2.getNickName()); - mjyJcgjService.saveJcgj(mjyOld.getId(), JcgjlxEnum.lc.getValue(), "麻精药入库", JcmcysEnum.green.getValue(), formData, null,null); + mjyJcgjService.saveJcgj(mjyOld.getId(), JcgjlxEnum.lc.getValue(), "麻精药入库", JcmcysEnum.green.getValue(), formData, null, null); // 更新 mjyOld.setKc(form.getRkl()); mjyOld.setZjzt(ZjztEnum.rk.getValue()); @@ -1151,11 +1151,11 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS */ @Override public void cc(com.hxhq.business.form.mjy.CcForm form) { - SysUser qmr=SecurityUtils.getLoginUser().getSysUser(); - SysUser qmr2=sysUserService.selectUserById(form.getQmr2Id()); + SysUser qmr = SecurityUtils.getLoginUser().getSysUser(); + SysUser qmr2 = sysUserService.selectUserById(form.getQmr2Id()); //验证签名人密码 - checkPassword(qmr,form.getQmr1mm(),true); - checkPassword(qmr2,form.getQmr2mm(),true); + checkPassword(qmr, form.getQmr1mm(), true); + checkPassword(qmr2, form.getQmr2mm(), true); if (form.getId() == null || form.getId().longValue() < 0) { throw new ServiceException("参数id不正确"); } @@ -1178,7 +1178,7 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS formData.put("签名人2", qmr.getNickName()); mjyJcgjService.saveJcgj(mjyOld.getId(), JcgjlxEnum.lc.getValue(), "存储", JcmcysEnum.green.getValue(), formData, null, form.getRemark()); //台账 - mjyTzService.saveTz(mjyOld.getId(),null,null,qmr,qmr2,null,null,null,null,null,"存储",mjyOld.getKc(),mjyOld.getKcdw(),form.getRemark()); + mjyTzService.saveTz(mjyOld.getId(), null, null, qmr, qmr2, null, null, null, null, null, "存储", mjyOld.getKc(), mjyOld.getKcdw(), form.getRemark()); } /** @@ -1188,11 +1188,11 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS */ @Override public void qc(com.hxhq.business.form.mjy.CcForm form) { - SysUser qmr=SecurityUtils.getLoginUser().getSysUser(); - SysUser qmr2=sysUserService.selectUserById(form.getQmr2Id()); + SysUser qmr = SecurityUtils.getLoginUser().getSysUser(); + SysUser qmr2 = sysUserService.selectUserById(form.getQmr2Id()); //验证签名人密码 - checkPassword(qmr,form.getQmr1mm(),true); - checkPassword(qmr2,form.getQmr2mm(),true); + checkPassword(qmr, form.getQmr1mm(), true); + checkPassword(qmr2, form.getQmr2mm(), true); if (form.getId() == null || form.getId().longValue() < 0) { throw new ServiceException("参数id不正确"); } @@ -1211,18 +1211,19 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS formData.put("签名人2", qmr.getNickName()); mjyJcgjService.saveJcgj(mjyOld.getId(), JcgjlxEnum.lc.getValue(), "取出", JcmcysEnum.green.getValue(), formData, null, form.getRemark()); //台账 - mjyTzService.saveTz(mjyOld.getId(),null,null,qmr,qmr2,null,null,null,null,null,"取出",mjyOld.getKc(),mjyOld.getKcdw(),form.getRemark()); + mjyTzService.saveTz(mjyOld.getId(), null, null, qmr, qmr2, null, null, null, null, null, "取出", mjyOld.getKc(), mjyOld.getKcdw(), form.getRemark()); } /** * 表单生成 + * * @param studyFormFill * @param template * @param remark */ @Override - public void genResource(StudyFormFill studyFormFill, Template template,String remark) { - System.out.println(System.currentTimeMillis()); + public void genResource(StudyFormFill studyFormFill, Template template, String remark) { + Boolean mark = template.getProduct().equals(StudyFormFillResourceTypeEnum.mjy.getValue()) ? true : false; SysUser qmr = sysUserService.selectUserById(SecurityUtils.getUserId()); Long studyId = studyFormFill.getStudyId(); @@ -1233,107 +1234,128 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS List mjyList = new ArrayList<>(); LinkedList jcgjList = new LinkedList<>(); LinkedList tzList = new LinkedList<>(); - if(StringUtils.isNotEmpty(resource) && !StringUtils.equals("[]", resource)) { + if (StringUtils.isNotEmpty(resource) && !StringUtils.equals("[]", resource)) { List studyFormFillResourceList = JSONUtil.toList(resource, StudyFormFillResource.class); - List bhList = studyFormFillResourceList.stream().filter(p->p.getType()==null).map(StudyFormFillResource::getBh).collect(Collectors.toList()); + List bhList = studyFormFillResourceList.stream().filter(p -> (p.getType() == null && mark) || p.getType().equals(StudyFormFillResourceTypeEnum.mjy.getValue())).map(StudyFormFillResource::getBh).collect(Collectors.toList()); // 根据编号获取需要处置的列表 - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.in(Mjy::getBh, bhList); - mjyList = this.list(queryWrapper); - for (Mjy mjy : mjyList) { - mjyMap.put(mjy.getBh(), mjy); - } - - for (StudyFormFillResource studyFormFillResource : studyFormFillResourceList) { - Mjy mjy = mjyMap.get(studyFormFillResource.getBh()); - if(mjy == null) { - mjy = new Mjy(); - mjy.setStudyId(studyId); - mjy.setBdId(studyFormId); - mjy.setZjzt(ZjztEnum.wrk.getValue()); - mjy.setJyzt(JyztEnum.wjy.getValue()); - } - mjy.setMc(studyFormFillResource.getMc()); - mjy.setBh(studyFormFillResource.getBh()); - mjy.setNd(String.valueOf(studyFormFillResource.getNdz())); - mjy.setNddw(studyFormFillResource.getNddw()); - mjy.setKc(String.valueOf(studyFormFillResource.getKc())); - mjy.setKcdw(studyFormFillResource.getKcdw()); - mjy.setSxrq(DateUtils.parseDate(studyFormFillResource.getSxrq())); - if(mjy.getId() == null) { - this.save(mjy); - mjyList.add(mjy); + if (bhList.size() > 0) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.in(Mjy::getBh, bhList); + mjyList = this.list(queryWrapper); + for (Mjy mjy : mjyList) { mjyMap.put(mjy.getBh(), mjy); - // 稽查轨迹 - jcgjList.add(mjyJcgjService.getJcgj(mjy.getId(), JcgjlxEnum.lc.getValue(), "配制完成",JcmcysEnum.green.getValue(), null, null, qmr,remark)); - // 台账 - tzList.add(mjyTzService.getTzGen(mjy.getId(), null,null, null,null, null,null, null,null, qmr,"配制完成" ,mjy.getKc(),mjy.getKcdw(), remark,studyFormFill.getId())); - } else { - this.updateById(mjy); } - // 使用 - String syl = studyFormFillResource.getSyl(); - if(StringUtils.isNotEmpty(syl) && NumberUtils.isParsable(syl)) { - BigDecimal kc = new BigDecimal(mjy.getKc()); - kc = kc.subtract(new BigDecimal(syl)); - mjy.setKc(kc.toString()); - baseMapper.updateKc(mjy.getId(), kc.toString()); - // 使用稽查轨迹 - HashMap formData = new LinkedHashMap<>(); - formData.put("使用量", syl + studyFormFillResource.getSyldw()); - // 稽查轨迹 - jcgjList.add(mjyJcgjService.getJcgj(mjy.getId(), JcgjlxEnum.lc.getValue(), "使用",JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), JctUtil.formatStr(MjyJcnrUtil.getMapEn(formData)), qmr,remark)); - // 台账 - tzList.add(mjyTzService.getTzGen(mjy.getId(), null,null, null,null, null,null, null,null, qmr,"使用" ,syl,studyFormFillResource.getSyldw(), remark,studyFormFill.getId())); + + for (StudyFormFillResource studyFormFillResource : studyFormFillResourceList) { + Mjy mjy = mjyMap.get(studyFormFillResource.getBh()); + //配置的才保存，或更新 + if (studyFormFillResource.getType() == null) { + if (mjy == null) { + mjy = new Mjy(); + mjy.setStudyId(studyId); + mjy.setBdId(studyFormId); + mjy.setZjzt(ZjztEnum.wrk.getValue()); + mjy.setJyzt(JyztEnum.wjy.getValue()); + } + mjy.setMc(studyFormFillResource.getMc()); + mjy.setBh(studyFormFillResource.getBh()); + mjy.setNd(String.valueOf(studyFormFillResource.getNdz())); + mjy.setNddw(studyFormFillResource.getNddw()); + mjy.setKc(String.valueOf(studyFormFillResource.getKc())); + mjy.setKcdw(studyFormFillResource.getKcdw()); + mjy.setSxrq(DateUtils.parseDate(studyFormFillResource.getSxrq())); + if (mjy.getId() == null) { + this.save(mjy); + mjyList.add(mjy); + mjyMap.put(mjy.getBh(), mjy); + // 稽查轨迹 + jcgjList.add(mjyJcgjService.getJcgj(mjy.getId(), JcgjlxEnum.lc.getValue(), "配制完成", JcmcysEnum.green.getValue(), null, null, qmr, remark)); + // 台账 + tzList.add(mjyTzService.getTzGen(mjy.getId(), null, null, null, null, null, null, null, null, qmr, "配制完成", mjy.getKc(), mjy.getKcdw(), remark, studyFormFill.getId())); + } else { + this.updateById(mjy); + } + } + // 使用 + String syl = studyFormFillResource.getSyl(); + if (StringUtils.isNotEmpty(syl) && NumberUtils.isParsable(syl)) { + BigDecimal kc = new BigDecimal(mjy.getKc()); + kc = kc.subtract(new BigDecimal(syl)); + mjy.setKc(kc.toString()); + baseMapper.updateKc(mjy.getId(), kc.toString()); + // 使用稽查轨迹 + HashMap formData = new LinkedHashMap<>(); + formData.put("使用量", syl + studyFormFillResource.getSyldw()); + // 稽查轨迹 + jcgjList.add(mjyJcgjService.getJcgj(mjy.getId(), JcgjlxEnum.lc.getValue(), "使用", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), JctUtil.formatStr(MjyJcnrUtil.getMapEn(formData)), qmr, remark)); + // 台账 + tzList.add(mjyTzService.getTzGen(mjy.getId(), null, null, null, null, null, null, null, null, qmr, "使用", syl, studyFormFillResource.getSyldw(), remark, studyFormFill.getId())); + } + mjyMap.put(mjy.getBh(), mjy); } - mjyMap.put(mjy.getBh(), mjy); } } - - // 存储 - String cclist = studyFormFill.getCclist(); - if(StringUtils.isNotEmpty(cclist) && !StringUtils.equals("[]", cclist)) { - List studyFormFillCcList = JSONUtil.toList(cclist, StudyFormFillCc.class); - for (StudyFormFillCc studyFormFillCc : studyFormFillCcList) { - baseMapper.updateCc(studyFormFillCc.getList(), studyFormFillCc.getCctj(), studyFormFillCc.getCcwz()); - for (String bh : studyFormFillCc.getList()) { - Mjy mjy = mjyMap.get(bh); - - // 稽查轨迹 - HashMap formData = new HashMap<>(); - formData.put("存储位置", studyFormFillCc.getCcwz()); - formData.put("存储条件", studyFormFillCc.getCctj()); - jcgjList.add(mjyJcgjService.getJcgj(mjy.getId(), JcgjlxEnum.lc.getValue(), "存储",JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), JctUtil.formatStr(MjyJcnrUtil.getMapEn(formData)), qmr,remark)); - // 台账 - tzList.add(mjyTzService.getTzGen(mjy.getId(), null,null, null,null, null,null, null,null, qmr,"存储" ,mjy.getKc(),mjy.getKcdw(), remark,studyFormFill.getId())); + if (mjyMap.size() > 0) { + // 存储 + String cclist = studyFormFill.getCclist(); + if (StringUtils.isNotEmpty(cclist) && !StringUtils.equals("[]", cclist)) { + List studyFormFillCcList = JSONUtil.toList(cclist, StudyFormFillCc.class); + for (StudyFormFillCc studyFormFillCc : studyFormFillCcList) { + List list=new ArrayList<>(); + for (String bh : studyFormFillCc.getList()) { + Mjy mjy = mjyMap.get(bh); + if(mjy!=null){ + list.add(bh); + // 稽查轨迹 + HashMap formData = new HashMap<>(); + formData.put("存储位置", studyFormFillCc.getCcwz()); + formData.put("存储条件", studyFormFillCc.getCctj()); + jcgjList.add(mjyJcgjService.getJcgj(mjy.getId(), JcgjlxEnum.lc.getValue(), "存储", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), JctUtil.formatStr(MjyJcnrUtil.getMapEn(formData)), qmr, remark)); + // 台账 + tzList.add(mjyTzService.getTzGen(mjy.getId(), null, null, null, null, null, null, null, null, qmr, "存储", mjy.getKc(), mjy.getKcdw(), remark, studyFormFill.getId())); + } + } + if(list.size()>0){ + baseMapper.updateCc(list, studyFormFillCc.getCctj(), studyFormFillCc.getCcwz()); + } } } - } - - // 处置，库存全变为0 - String czlist = studyFormFill.getCzlist(); - if(StringUtils.isNotEmpty(czlist) && !StringUtils.equals("[]", czlist)) { - List studyFormFillCzList = JSONUtil.toList(czlist, StudyFormFillCz.class); - for (StudyFormFillCz studyFormFillCz : studyFormFillCzList) { - for (String bh : studyFormFillCz.getList()) { - Mjy mjy = mjyMap.get(bh); - // 稽查轨迹 - HashMap formData = new HashMap<>(); - formData.put("处置方式", studyFormFillCz.getCzfs()); - formData.put("处置量", mjy.getKc() + mjy.getKcdw()); - jcgjList.add(mjyJcgjService.getJcgj(mjy.getId(), JcgjlxEnum.lc.getValue(), "处置",JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), JctUtil.formatStr(MjyJcnrUtil.getMapEn(formData)), qmr,remark)); - - // 台账 - tzList.add(mjyTzService.getTzGen(mjy.getId(), null,null, null,null, null,null, null,null, qmr,"处置" ,mjy.getKc(),mjy.getKcdw(), remark,studyFormFill.getId())); + // 处置，库存全变为0 + String czlist = studyFormFill.getCzlist(); + if (StringUtils.isNotEmpty(czlist) && !StringUtils.equals("[]", czlist)) { + List studyFormFillCzList = JSONUtil.toList(czlist, StudyFormFillCz.class); + for (StudyFormFillCz studyFormFillCz : studyFormFillCzList) { + List list=new ArrayList<>(); + for (String bh : studyFormFillCz.getList()) { + Mjy mjy = mjyMap.get(bh); + if(mjy!=null){ + list.add(bh); + // 稽查轨迹 + HashMap formData = new HashMap<>(); + formData.put("处置方式", studyFormFillCz.getCzfs()); + formData.put("处置量", mjy.getKc() + mjy.getKcdw()); + jcgjList.add(mjyJcgjService.getJcgj(mjy.getId(), JcgjlxEnum.lc.getValue(), "处置", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), JctUtil.formatStr(MjyJcnrUtil.getMapEn(formData)), qmr, remark)); + + // 台账 + tzList.add(mjyTzService.getTzGen(mjy.getId(), null, null, null, null, null, null, null, null, qmr, "处置", mjy.getKc(), mjy.getKcdw(), remark, studyFormFill.getId())); + } + } + if(list.size()>0) { + baseMapper.updateKcBatch(list, "0"); + } } - baseMapper.updateKcBatch(studyFormFillCz.getList(), "0"); } } - mjyJcgjService.saveBatch(jcgjList); - mjyTzService.saveBatch(tzList); - studyMjyService.saveBatch(studyId, mjyList); - + if(jcgjList.size()>0){ + mjyJcgjService.saveBatch(jcgjList); + } + if(tzList.size()>0){ + mjyTzService.saveBatch(tzList); + } + if(mjyList.size()>0){ + studyMjyService.saveBatch(studyId, mjyList); + } } //endregion @@ -1347,7 +1369,7 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS * @return 麻精药集合 */ @Override - public List queryArchiveList(SearchForm form){ + public List queryArchiveList(SearchForm form) { QueryWrapper queryWrapper = Wrappers.query(); queryWrapper.eq("t.del_flag", "0"); queryWrapper.eq("t.`dazt`", DaztEnum.ygd.getValue()); @@ -1377,10 +1399,10 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS * 同意归档 */ @Override - public void tygd(ArchiveForm form){ - SysUser qmr=SecurityUtils.getLoginUser().getSysUser(); + public void tygd(ArchiveForm form) { + SysUser qmr = SecurityUtils.getLoginUser().getSysUser(); //验证签名人密码 - checkPassword(qmr,form.getQmrmm(),false); + checkPassword(qmr, form.getQmrmm(), false); if (form.getId() == null || form.getId().longValue() < 0) { throw new ServiceException("参数id不正确"); } @@ -1396,19 +1418,19 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS //稽查轨迹 mjyJcgjService.saveJcgj(mjyOld.getId(), JcgjlxEnum.lc.getValue(), "同意归档", JcmcysEnum.green.getValue(), null, qmr, form.getRemark()); //保存日志 - archiveLogService.saveInfo(ArchiveLogTypeEnum.mjy, mjyOld.getId(), mjyOld.getMc(), mjyOld.getBh(), mjyOld.getNd()+mjyOld.getNddw(), "同意归档"); + archiveLogService.saveInfo(ArchiveLogTypeEnum.mjy, mjyOld.getId(), mjyOld.getMc(), mjyOld.getBh(), mjyOld.getNd() + mjyOld.getNddw(), "同意归档"); //通知 - noticeService.save("麻精药【"+mjyOld.getMc()+"】同意归档",mjyOld.getGdsqrId(),getUrlQz("mjyList")); + noticeService.save("麻精药【" + mjyOld.getMc() + "】同意归档", mjyOld.getGdsqrId(), getUrlQz("mjyList")); } /** * 拒绝归档 */ @Override - public void jjgd(ArchiveForm form){ - SysUser qmr=SecurityUtils.getLoginUser().getSysUser(); + public void jjgd(ArchiveForm form) { + SysUser qmr = SecurityUtils.getLoginUser().getSysUser(); //验证签名人密码 - checkPassword(qmr,form.getQmrmm(),false); + checkPassword(qmr, form.getQmrmm(), false); if (form.getId() == null || form.getId().longValue() < 0) { throw new ServiceException("参数id不正确"); } @@ -1427,19 +1449,19 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS formData.put("原因", form.getRemark()); mjyJcgjService.saveJcgj(mjyOld.getId(), JcgjlxEnum.lc.getValue(), "拒绝归档", JcmcysEnum.green.getValue(), formData, qmr, null); //保存日志 - archiveLogService.saveInfo(ArchiveLogTypeEnum.mjy, mjyOld.getId(), mjyOld.getMc(), mjyOld.getBh(), mjyOld.getNd()+mjyOld.getNddw(), "拒绝归档"); + archiveLogService.saveInfo(ArchiveLogTypeEnum.mjy, mjyOld.getId(), mjyOld.getMc(), mjyOld.getBh(), mjyOld.getNd() + mjyOld.getNddw(), "拒绝归档"); //通知 - noticeService.save("麻精药【"+mjyOld.getMc()+"】拒绝归档",mjyOld.getGdsqrId(),getUrlQz("mjyList")); + noticeService.save("麻精药【" + mjyOld.getMc() + "】拒绝归档", mjyOld.getGdsqrId(), getUrlQz("mjyList")); } /** * 同意解档 */ @Override - public void tyjd(ArchiveForm form){ - SysUser qmr=SecurityUtils.getLoginUser().getSysUser(); + public void tyjd(ArchiveForm form) { + SysUser qmr = SecurityUtils.getLoginUser().getSysUser(); //验证签名人密码 - checkPassword(qmr,form.getQmrmm(),false); + checkPassword(qmr, form.getQmrmm(), false); if (form.getId() == null || form.getId().longValue() < 0) { throw new ServiceException("参数id不正确"); } @@ -1456,19 +1478,19 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS //稽查轨迹 mjyJcgjService.saveJcgj(mjyOld.getId(), JcgjlxEnum.lc.getValue(), "同意解档", JcmcysEnum.green.getValue(), null, qmr, form.getRemark()); //保存日志 - archiveLogService.saveInfo(ArchiveLogTypeEnum.mjy, mjyOld.getId(), mjyOld.getMc(), mjyOld.getBh(), mjyOld.getNd()+mjyOld.getNddw(), "同意解档"); + archiveLogService.saveInfo(ArchiveLogTypeEnum.mjy, mjyOld.getId(), mjyOld.getMc(), mjyOld.getBh(), mjyOld.getNd() + mjyOld.getNddw(), "同意解档"); //通知 - noticeService.save("麻精药【"+mjyOld.getMc()+"】同意解档",mjyOld.getGdsqrId(),getUrlQz("mjyList")); + noticeService.save("麻精药【" + mjyOld.getMc() + "】同意解档", mjyOld.getGdsqrId(), getUrlQz("mjyList")); } /** * 拒绝解档 */ @Override - public void jjjd(ArchiveForm form){ - SysUser qmr=SecurityUtils.getLoginUser().getSysUser(); + public void jjjd(ArchiveForm form) { + SysUser qmr = SecurityUtils.getLoginUser().getSysUser(); //验证签名人密码 - checkPassword(qmr,form.getQmrmm(),false); + checkPassword(qmr, form.getQmrmm(), false); if (form.getId() == null || form.getId().longValue() < 0) { throw new ServiceException("参数id不正确"); } @@ -1486,19 +1508,19 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS formData.put("原因", form.getRemark()); mjyJcgjService.saveJcgj(mjyOld.getId(), JcgjlxEnum.lc.getValue(), "拒绝解档", JcmcysEnum.green.getValue(), formData, qmr, null); //保存日志 - archiveLogService.saveInfo(ArchiveLogTypeEnum.mjy, mjyOld.getId(), mjyOld.getMc(), mjyOld.getBh(), mjyOld.getNd()+mjyOld.getNddw(), "拒绝解档"); + archiveLogService.saveInfo(ArchiveLogTypeEnum.mjy, mjyOld.getId(), mjyOld.getMc(), mjyOld.getBh(), mjyOld.getNd() + mjyOld.getNddw(), "拒绝解档"); //通知 - noticeService.save("麻精药【"+mjyOld.getMc()+"】拒绝解档",mjyOld.getGdsqrId(),getUrlQz("mjyList")); + noticeService.save("麻精药【" + mjyOld.getMc() + "】拒绝解档", mjyOld.getGdsqrId(), getUrlQz("mjyList")); } /** * 同意借阅 */ @Override - public void tyjy(ArchiveForm form){ - SysUser qmr=SecurityUtils.getLoginUser().getSysUser(); + public void tyjy(ArchiveForm form) { + SysUser qmr = SecurityUtils.getLoginUser().getSysUser(); //验证签名人密码 - checkPassword(qmr,form.getQmrmm(),false); + checkPassword(qmr, form.getQmrmm(), false); if (form.getId() == null || form.getId().longValue() < 0) { throw new ServiceException("参数id不正确"); } @@ -1519,19 +1541,19 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS formData.put("借阅结束时间", DateUtils.dateTime(form.getJyjsrq())); mjyJcgjService.saveJcgj(mjyOld.getId(), JcgjlxEnum.lc.getValue(), "同意借阅", JcmcysEnum.green.getValue(), formData, qmr, form.getRemark()); //保存日志 - archiveLogService.saveInfo(ArchiveLogTypeEnum.mjy, mjyOld.getId(), mjyOld.getMc(), mjyOld.getBh(), mjyOld.getNd()+mjyOld.getNddw(), "同意借阅"); + archiveLogService.saveInfo(ArchiveLogTypeEnum.mjy, mjyOld.getId(), mjyOld.getMc(), mjyOld.getBh(), mjyOld.getNd() + mjyOld.getNddw(), "同意借阅"); //通知 - noticeService.save("麻精药【"+mjyOld.getMc()+"】同意借阅",mjyOld.getGdsqrId(),getUrlQz("mjyList")); + noticeService.save("麻精药【" + mjyOld.getMc() + "】同意借阅", mjyOld.getGdsqrId(), getUrlQz("mjyList")); } /** * 拒绝借阅 */ @Override - public void jjjy(ArchiveForm form){ - SysUser qmr=SecurityUtils.getLoginUser().getSysUser(); + public void jjjy(ArchiveForm form) { + SysUser qmr = SecurityUtils.getLoginUser().getSysUser(); //验证签名人密码 - checkPassword(qmr,form.getQmrmm(),false); + checkPassword(qmr, form.getQmrmm(), false); if (form.getId() == null || form.getId().longValue() < 0) { throw new ServiceException("参数id不正确"); } @@ -1553,19 +1575,19 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS formData.put("原因", form.getRemark()); mjyJcgjService.saveJcgj(mjyOld.getId(), JcgjlxEnum.lc.getValue(), "拒绝借阅", JcmcysEnum.green.getValue(), formData, qmr, null); //保存日志 - archiveLogService.saveInfo(ArchiveLogTypeEnum.mjy, mjyOld.getId(), mjyOld.getMc(), mjyOld.getBh(), mjyOld.getNd()+mjyOld.getNddw(), "拒绝借阅"); + archiveLogService.saveInfo(ArchiveLogTypeEnum.mjy, mjyOld.getId(), mjyOld.getMc(), mjyOld.getBh(), mjyOld.getNd() + mjyOld.getNddw(), "拒绝借阅"); //通知 - noticeService.save("麻精药【"+mjyOld.getMc()+"】拒绝借阅",mjyOld.getGdsqrId(),getUrlQz("mjyList")); + noticeService.save("麻精药【" + mjyOld.getMc() + "】拒绝借阅", mjyOld.getGdsqrId(), getUrlQz("mjyList")); } /** * 确认归还 */ @Override - public void qrgh(ArchiveForm form){ - SysUser qmr=SecurityUtils.getLoginUser().getSysUser(); + public void qrgh(ArchiveForm form) { + SysUser qmr = SecurityUtils.getLoginUser().getSysUser(); //验证签名人密码 - checkPassword(qmr,form.getQmrmm(),false); + checkPassword(qmr, form.getQmrmm(), false); if (form.getId() == null || form.getId().longValue() < 0) { throw new ServiceException("参数id不正确"); } @@ -1581,9 +1603,9 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS //稽查轨迹 mjyJcgjService.saveJcgj(mjyOld.getId(), JcgjlxEnum.lc.getValue(), "确认归还", JcmcysEnum.green.getValue(), null, qmr, form.getRemark()); //保存日志 - archiveLogService.saveInfo(ArchiveLogTypeEnum.mjy, mjyOld.getId(), mjyOld.getMc(), mjyOld.getBh(), mjyOld.getNd()+mjyOld.getNddw(), "确认归还"); + archiveLogService.saveInfo(ArchiveLogTypeEnum.mjy, mjyOld.getId(), mjyOld.getMc(), mjyOld.getBh(), mjyOld.getNd() + mjyOld.getNddw(), "确认归还"); //通知 - noticeService.save("麻精药【"+mjyOld.getMc()+"】确认归还",mjyOld.getGdsqrId(),getUrlQz("mjyList")); + noticeService.save("麻精药【" + mjyOld.getMc() + "】确认归还", mjyOld.getGdsqrId(), getUrlQz("mjyList")); } @@ -1591,19 +1613,19 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS * 借阅到期自动归还 */ @Override - public void autoJyExpireReturn(){ + public void autoJyExpireReturn() { QueryWrapper queryWrapper = Wrappers.query(); - queryWrapper.eq("jyzt",JyztEnum.jyz.getValue()); + queryWrapper.eq("jyzt", JyztEnum.jyz.getValue()); queryWrapper.apply("jyjsrq<{0}", DateUtils.getTime()); - List mjyList=this.list(queryWrapper); - List mjyFfjlJcgjList=new ArrayList<>(); - for(Mjy mjy:mjyList){ + List mjyList = this.list(queryWrapper); + List mjyFfjlJcgjList = new ArrayList<>(); + for (Mjy mjy : mjyList) { mjy.setJyzt(JyztEnum.wjy.getValue()); //稽查轨迹 mjyFfjlJcgjList.add(mjyJcgjService.getJcgj(mjy.getId(), JcgjlxEnum.lc.getValue(), "到期自动归还", JcmcysEnum.green.getValue(), null, null, null)); } this.updateBatchById(mjyList); - if(mjyFfjlJcgjList.size()>0){ + if (mjyFfjlJcgjList.size() > 0) { mjyJcgjService.saveBatch(mjyFfjlJcgjList); } } @@ -1616,7 +1638,7 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS * @param user * @param qmrmm */ - public void checkPassword(SysUser user, String qmrmm,Boolean needName) { + public void checkPassword(SysUser user, String qmrmm, Boolean needName) { if (StringUtils.isBlank(qmrmm)) { throw new ServiceException("签名密码不能为空"); } @@ -1626,11 +1648,12 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS /** * 获取通知的跳转url + * * @param tab * @return */ - private String getUrlQz(String tab){ - return "/resource/mjy/"+tab; + private String getUrlQz(String tab) { + return "/resource/mjy/" + tab; } } 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 5cc9294..91a9d84 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 @@ -14,6 +14,7 @@ import com.hxhq.business.dto.study.StudyFormFillCc; import com.hxhq.business.dto.study.StudyFormFillCz; import com.hxhq.business.dto.study.StudyFormFillResource; import com.hxhq.business.enums.archive.ArchiveLogTypeEnum; +import com.hxhq.business.enums.study.StudyFormFillResourceTypeEnum; import com.hxhq.business.enums.zykgl.*; import com.hxhq.business.form.gsp.GspGdForm; import com.hxhq.business.form.gsp.GspJyForm; @@ -43,8 +44,7 @@ import org.springframework.transaction.annotation.Transactional; * @date 2025-12-22 */ @Service -public class SjServiceImpl extends ServiceImpl implements ISjService -{ +public class SjServiceImpl extends ServiceImpl implements ISjService { @Autowired private ISysUserService sysUserService; @@ -73,35 +73,34 @@ public class SjServiceImpl extends ServiceImpl implements ISjServi * @return 试剂库存 */ @Override - public List queryList(SjSearchListForm form) - { + public List queryList(SjSearchListForm form) { QueryWrapper queryWrapper = Wrappers.query(); queryWrapper.eq("s.del_flag", 0); - if(StringUtils.isNotEmpty(form.getMc())) { + if (StringUtils.isNotEmpty(form.getMc())) { queryWrapper.like("s.mc", form.getMc()); } - if(StringUtils.isNotEmpty(form.getBh())) { + if (StringUtils.isNotEmpty(form.getBh())) { queryWrapper.like("s.bh", form.getBh()); } - if(StringUtils.isNotEmpty(form.getStartDate())) { + if (StringUtils.isNotEmpty(form.getStartDate())) { queryWrapper.ge("s.sxr", form.getStartDate()); } - if(StringUtils.isNotEmpty(form.getEndDate())) { + if (StringUtils.isNotEmpty(form.getEndDate())) { queryWrapper.le("s.sxr", form.getEndDate()); } - if(form.getZjzt() != null) { + if (form.getZjzt() != null) { queryWrapper.eq("s.zjzt", form.getZjzt()); } - if(form.getJyzt() != null) { + if (form.getJyzt() != null) { queryWrapper.eq("s.jyzt", form.getJyzt()); } - if(StringUtils.isNotEmpty(form.getDeptName())) { + if (StringUtils.isNotEmpty(form.getDeptName())) { queryWrapper.like("d.dept_name", form.getDeptName()); } - if(StringUtils.isNotEmpty(form.getStudyName())) { + if (StringUtils.isNotEmpty(form.getStudyName())) { queryWrapper.like("t.name", form.getStudyName()); } - if(form.getArchive() != null && form.getArchive() == DaztEnum.ygd.getValue()) { + 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"); @@ -116,13 +115,13 @@ public class SjServiceImpl extends ServiceImpl implements ISjServi queryWrapper.eq("s.del_flag", 0); queryWrapper.and(p -> p.apply("(s.zjzt = {0} OR (s.zjzt IS NULL AND s.study_form_id = {1}))" , ZjztEnum.rk.getValue(), form.getStudyFormId())); - if(StringUtils.isNotEmpty(form.getMc())) { + if (StringUtils.isNotEmpty(form.getMc())) { queryWrapper.like("s.mc", form.getMc()); } - if(StringUtils.isNotEmpty(form.getBh())) { + if (StringUtils.isNotEmpty(form.getBh())) { queryWrapper.like("s.bh", form.getBh()); } - if(StringUtils.isNotEmpty(form.getStudyName())) { + if (StringUtils.isNotEmpty(form.getStudyName())) { queryWrapper.like("t.name", form.getStudyName()); } queryWrapper.orderByDesc("s.id"); @@ -186,7 +185,7 @@ public class SjServiceImpl extends ServiceImpl implements ISjServi // 台账 sjTzService.saveTz(sjOld.getId(), qmr.getUserId(), qmr.getNickName(), qmr.getUserName(), - "修改库存", "Change Inventory", form.getKc(), form.getKcdw(), form.getKcbjbz()); + "修改库存", "Change Inventory", form.getKc(), form.getKcdw(), form.getKcbjbz()); } @Override @@ -205,12 +204,12 @@ public class SjServiceImpl extends ServiceImpl implements ISjServi if (!sjOld.getZjzt().equals(ZjztEnum.rk.getValue())) { throw new SecurityException("试剂【" + sjOld.getMc() + "】不是入库状态，不能处置"); } - if(!NumberUtils.isParsable(form.getCzl())) { + if (!NumberUtils.isParsable(form.getCzl())) { throw new ServiceException("请输入正确的处置量"); } BigDecimal czl = new BigDecimal(form.getCzl()); BigDecimal kc = new BigDecimal(sjOld.getKc()); - if(czl.compareTo(kc) > 0) { + if (czl.compareTo(kc) > 0) { throw new ServiceException("处置量不应大于库存量"); } kc = kc.subtract(czl); @@ -264,12 +263,12 @@ public class SjServiceImpl extends ServiceImpl implements ISjServi if (!sj.getZjzt().equals(ZjztEnum.rk.getValue())) { throw new SecurityException("试剂【" + sj.getMc() + "】不是入库状态，不能处置"); } - if(!NumberUtils.isParsable(itemForm.getCzl())) { + if (!NumberUtils.isParsable(itemForm.getCzl())) { throw new ServiceException("请输入正确的处置量"); } BigDecimal czl = new BigDecimal(itemForm.getCzl()); BigDecimal kc = new BigDecimal(sj.getKc()); - if(czl.compareTo(kc) > 0) { + if (czl.compareTo(kc) > 0) { throw new ServiceException("处置量不应大于库存量"); } kc = kc.subtract(czl); @@ -347,7 +346,7 @@ public class SjServiceImpl extends ServiceImpl implements ISjServi Map formDataEn = new LinkedHashMap<>(); formDataEn.put("Comment", form.getRemark()); - sjJcgjService.saveJcgj(sj.getId(), JcgjlxEnum.lc.getValue(), "锁定试剂", "Lock Reagent",JcmcysEnum.green.getValue(), + sjJcgjService.saveJcgj(sj.getId(), JcgjlxEnum.lc.getValue(), "锁定试剂", "Lock Reagent", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), JctUtil.formatStr(formDataEn)); } @@ -410,7 +409,7 @@ public class SjServiceImpl extends ServiceImpl implements ISjServi Map formDataEn = new LinkedHashMap<>(); formDataEn.put("Comment", form.getRemark()); - sjJcgjService.saveJcgj(sjOld.getId(), JcgjlxEnum.lc.getValue(), "解锁试剂","Unlock Reagent", + sjJcgjService.saveJcgj(sjOld.getId(), JcgjlxEnum.lc.getValue(), "解锁试剂", "Unlock Reagent", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), JctUtil.formatStr(formDataEn)); } @@ -432,7 +431,7 @@ public class SjServiceImpl extends ServiceImpl implements ISjServi if (!sjOld.getJyzt().equals(JyztEnum.wjy.getValue())) { throw new SecurityException("试剂【" + sjOld.getMc() + "】不是未借阅状态，不能借阅"); } - if(!sjOld.getGdsqrId().equals(qmr.getUserId())){ + if (!sjOld.getGdsqrId().equals(qmr.getUserId())) { throw new ServiceException("只有归档申请人才能操作"); } //申请借阅后，借阅状态更新为待借阅，等待档案员审核期间无法进行其他操作； @@ -472,7 +471,7 @@ public class SjServiceImpl extends ServiceImpl implements ISjServi if (!sjOld.getZjzt().equals(ZjztEnum.gd.getValue())) { throw new SecurityException("试剂【" + sjOld.getMc() + "】未归档，不能解档"); } - if(!sjOld.getGdsqrId().equals(qmr.getUserId())){ + if (!sjOld.getGdsqrId().equals(qmr.getUserId())) { throw new ServiceException("只有归档申请人才能操作"); } //申请解档后，制剂状态更新为待解档，等待档案员审核期间无法进行其他操作； @@ -618,7 +617,7 @@ public class SjServiceImpl extends ServiceImpl implements ISjServi } else { queryWrapper.isNotNull("t.zjzt"); } - if(StringUtils.isNotEmpty(form.getLy())) { + if (StringUtils.isNotEmpty(form.getLy())) { queryWrapper.like("t.ly", form.getLy()); } if (StringUtils.isNoneBlank(form.getMc())) { @@ -639,6 +638,7 @@ public class SjServiceImpl extends ServiceImpl implements ISjServi @Override public void genResource(StudyFormFill studyFormFill, Template template) { + Boolean mark = template.getProduct().equals(StudyFormFillResourceTypeEnum.sj.getValue()) ? true : false; SysUser qmr = sysUserService.selectUserById(SecurityUtils.getUserId()); Long studyId = studyFormFill.getStudyId(); @@ -651,143 +651,166 @@ public class SjServiceImpl extends ServiceImpl implements ISjServi List sjList = new ArrayList<>(); LinkedList jcgjList = new LinkedList<>(); LinkedList tzList = new LinkedList<>(); - if(StringUtils.isNotEmpty(resource) && !StringUtils.equals("[]", resource)) { + if (StringUtils.isNotEmpty(resource) && !StringUtils.equals("[]", resource)) { List studyFormFillResourceList = JSONUtil.toList(resource, StudyFormFillResource.class); - List bhList = studyFormFillResourceList.stream().filter(p->p.getType()==null).map(StudyFormFillResource::getBh).collect(Collectors.toList()); - // 根据编号获取需要处置的试剂列表 - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.in(Sj::getBh, bhList); - sjList = this.list(queryWrapper); - for (Sj sj : sjList) { - sjMap.put(sj.getBh(), sj); - } - - for (StudyFormFillResource studyFormFillResource : studyFormFillResourceList) { - Sj sj = sjMap.get(studyFormFillResource.getBh()); - if(sj == null) { - sj = new Sj(); - sj.setStudyId(studyId); - sj.setStudyFormId(studyFormId); - sj.setDeptId(deptId); - sj.setZjzt(ZjztEnum.rk.getValue()); - sj.setJyzt(JyztEnum.wjy.getValue()); - sj.setDeptId(template.getDeptId()); - } - sj.setMc(studyFormFillResource.getMc()); - sj.setBh(studyFormFillResource.getBh()); - sj.setNd(String.valueOf(studyFormFillResource.getNdz())); - sj.setNddw(studyFormFillResource.getNddw()); - sj.setKc(studyFormFillResource.getKc()); - sj.setKcdw(studyFormFillResource.getKcdw()); - sj.setLy(studyFormFillResource.getSource()); - sj.setSxr(DateUtils.parseDate(studyFormFillResource.getSxrq())); - sj.setPzrq(studyFormFill.getStartDate()); - sj.setYxzq(studyFormFillResource.getYxzq()); - sj.setYxzqdw(studyFormFillResource.getYxzqdw()); - if(sj.getId() == null) { - this.save(sj); - sjList.add(sj); + List bhList = studyFormFillResourceList.stream().filter(p -> (p.getType() == null && mark) || p.getType().equals(StudyFormFillResourceTypeEnum.sj.getValue())).map(StudyFormFillResource::getBh).collect(Collectors.toList()); + // 根据编号获取需要处置的列表 + if (bhList.size() > 0) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.in(Sj::getBh, bhList); + sjList = this.list(queryWrapper); + for (Sj sj : sjList) { sjMap.put(sj.getBh(), sj); - - // 稽查轨迹 - SjJcgj sjJcgj = sjJcgjService.genJcgj(sj.getId(), JcgjlxEnum.lc.getValue(), "配制完成", "Formulation Completed", - JcmcysEnum.green.getValue(), null, null, qmr); - jcgjList.add(sjJcgj); - - // 台账 - SjTz sjTz = sjTzService.genTz(sj.getId(), "配制完成", "Formulation Completed", sj.getKc(), sj.getKcdw(), null, qmr); - tzList.add(sjTz); - } else { - this.updateById(sj); } - // 使用 - String syl = studyFormFillResource.getSyl(); - if(StringUtils.isNotEmpty(syl) && NumberUtils.isParsable(syl)) { - BigDecimal kc = new BigDecimal(sj.getKc()); - kc = kc.subtract(new BigDecimal(syl)); - baseMapper.updateKc(sj.getId(), kc.toString()); - - // 使用稽查轨迹 - Map jcnrMap = new LinkedHashMap<>(); - jcnrMap.put("使用量", syl + studyFormFillResource.getSyldw()); - Map jcnrEnMap = new LinkedHashMap<>(); - jcnrEnMap.put("Usage Amount", syl + studyFormFillResource.getSyldw()); - - SjJcgj sjJcgj = sjJcgjService.genJcgj(sj.getId(), JcgjlxEnum.lc.getValue(), "使用", "Usage", - JcmcysEnum.green.getValue(), JctUtil.formatStr(jcnrMap), JctUtil.formatStr(jcnrEnMap), qmr); - jcgjList.add(sjJcgj); - - - // 台账 - SjTz sjTz = sjTzService.genTz(sj.getId(), "使用", "Usage", syl, studyFormFillResource.getKcdw(), null, qmr); - tzList.add(sjTz); + for (StudyFormFillResource studyFormFillResource : studyFormFillResourceList) { + Sj sj = sjMap.get(studyFormFillResource.getBh()); + //配置的才保存，或更新 + if (studyFormFillResource.getType() == null) { + if (sj == null) { + sj = new Sj(); + sj.setStudyId(studyId); + sj.setStudyFormId(studyFormId); + sj.setDeptId(deptId); + sj.setZjzt(ZjztEnum.rk.getValue()); + sj.setJyzt(JyztEnum.wjy.getValue()); + sj.setDeptId(template.getDeptId()); + } + sj.setMc(studyFormFillResource.getMc()); + sj.setBh(studyFormFillResource.getBh()); + sj.setNd(String.valueOf(studyFormFillResource.getNdz())); + sj.setNddw(studyFormFillResource.getNddw()); + sj.setKc(studyFormFillResource.getKc()); + sj.setKcdw(studyFormFillResource.getKcdw()); + sj.setLy(studyFormFillResource.getSource()); + sj.setSxr(DateUtils.parseDate(studyFormFillResource.getSxrq())); + sj.setPzrq(studyFormFill.getStartDate()); + sj.setYxzq(studyFormFillResource.getYxzq()); + sj.setYxzqdw(studyFormFillResource.getYxzqdw()); + if (sj.getId() == null) { + this.save(sj); + sjList.add(sj); + sjMap.put(sj.getBh(), sj); + + // 稽查轨迹 + SjJcgj sjJcgj = sjJcgjService.genJcgj(sj.getId(), JcgjlxEnum.lc.getValue(), "配制完成", "Formulation Completed", + JcmcysEnum.green.getValue(), null, null, qmr); + jcgjList.add(sjJcgj); + + // 台账 + SjTz sjTz = sjTzService.genTz(sj.getId(), "配制完成", "Formulation Completed", sj.getKc(), sj.getKcdw(), null, qmr); + tzList.add(sjTz); + } else { + this.updateById(sj); + } + } + // 使用 + String syl = studyFormFillResource.getSyl(); + if (StringUtils.isNotEmpty(syl) && NumberUtils.isParsable(syl)) { + BigDecimal kc = new BigDecimal(sj.getKc()); + kc = kc.subtract(new BigDecimal(syl)); + baseMapper.updateKc(sj.getId(), kc.toString()); + + // 使用稽查轨迹 + Map jcnrMap = new LinkedHashMap<>(); + jcnrMap.put("使用量", syl + studyFormFillResource.getSyldw()); + + Map jcnrEnMap = new LinkedHashMap<>(); + jcnrEnMap.put("Usage Amount", syl + studyFormFillResource.getSyldw()); + + SjJcgj sjJcgj = sjJcgjService.genJcgj(sj.getId(), JcgjlxEnum.lc.getValue(), "使用", "Usage", + JcmcysEnum.green.getValue(), JctUtil.formatStr(jcnrMap), JctUtil.formatStr(jcnrEnMap), qmr); + jcgjList.add(sjJcgj); + + + // 台账 + SjTz sjTz = sjTzService.genTz(sj.getId(), "使用", "Usage", syl, studyFormFillResource.getKcdw(), null, qmr); + tzList.add(sjTz); + } + sjMap.put(sj.getBh(), sj); } - sjMap.put(sj.getBh(), sj); } } - // 存储 - String cclist = studyFormFill.getCclist(); - if(StringUtils.isNotEmpty(cclist) && !StringUtils.equals("[]", cclist)) { - List studyFormFillCcList = JSONUtil.toList(cclist, StudyFormFillCc.class); - for (StudyFormFillCc studyFormFillCc : studyFormFillCcList) { - baseMapper.updateCc(studyFormFillCc.getList(), studyFormFillCc.getCctj(), studyFormFillCc.getCcwz()); - for (String bh : studyFormFillCc.getList()) { - Sj sj = sjMap.get(bh); - - // 稽查轨迹 - LinkedHashMap jcnrMap = new LinkedHashMap<>(); - jcnrMap.put("存储位置", studyFormFillCc.getCcwz()); - jcnrMap.put("存储条件", studyFormFillCc.getCctj()); - - LinkedHashMap jcnrEnMap = new LinkedHashMap<>(); - jcnrEnMap.put("Storage Location", studyFormFillCc.getCcwz()); - jcnrEnMap.put("Storage Condition", studyFormFillCc.getCctj()); - - SjJcgj sjJcgj = sjJcgjService.genJcgj(sj.getId(), JcgjlxEnum.lc.getValue(), "存储", "Storage", - JcmcysEnum.green.getValue(), JctUtil.formatStr(jcnrMap), JctUtil.formatStr(jcnrEnMap), qmr); - jcgjList.add(sjJcgj); - - // 台账 - SjTz sjTz = sjTzService.genTz(sj.getId(), "存储", "Storage", sj.getKc(), sj.getKcdw(), null, qmr); - tzList.add(sjTz); + if (sjMap.size() > 0) { + // 存储 + String cclist = studyFormFill.getCclist(); + if (StringUtils.isNotEmpty(cclist) && !StringUtils.equals("[]", cclist)) { + List studyFormFillCcList = JSONUtil.toList(cclist, StudyFormFillCc.class); + for (StudyFormFillCc studyFormFillCc : studyFormFillCcList) { + List list = new ArrayList<>(); + for (String bh : studyFormFillCc.getList()) { + Sj sj = sjMap.get(bh); + if (sj != null) { + list.add(bh); + // 稽查轨迹 + LinkedHashMap jcnrMap = new LinkedHashMap<>(); + jcnrMap.put("存储位置", studyFormFillCc.getCcwz()); + jcnrMap.put("存储条件", studyFormFillCc.getCctj()); + + LinkedHashMap jcnrEnMap = new LinkedHashMap<>(); + jcnrEnMap.put("Storage Location", studyFormFillCc.getCcwz()); + jcnrEnMap.put("Storage Condition", studyFormFillCc.getCctj()); + + SjJcgj sjJcgj = sjJcgjService.genJcgj(sj.getId(), JcgjlxEnum.lc.getValue(), "存储", "Storage", + JcmcysEnum.green.getValue(), JctUtil.formatStr(jcnrMap), JctUtil.formatStr(jcnrEnMap), qmr); + jcgjList.add(sjJcgj); + + // 台账 + SjTz sjTz = sjTzService.genTz(sj.getId(), "存储", "Storage", sj.getKc(), sj.getKcdw(), null, qmr); + tzList.add(sjTz); + } + } + if(list.size()>0){ + baseMapper.updateCc(list, studyFormFillCc.getCctj(), studyFormFillCc.getCcwz()); + } } } - } - - // 处置，库存全变为0 - String czlist = studyFormFill.getCzlist(); - if(StringUtils.isNotEmpty(czlist) && !StringUtils.equals("[]", czlist)) { - List studyFormFillCzList = JSONUtil.toList(czlist, StudyFormFillCz.class); - for (StudyFormFillCz studyFormFillCz : studyFormFillCzList) { - for (String bh : studyFormFillCz.getList()) { - Sj sj = sjMap.get(bh); - - // 稽查轨迹 - LinkedHashMap jcnrMap = new LinkedHashMap<>(); - jcnrMap.put("处置方式", studyFormFillCz.getCzfs()); - jcnrMap.put("处置量", sj.getKc() + sj.getKcdw()); - - LinkedHashMap jcnrEnMap = new LinkedHashMap<>(); - jcnrEnMap.put("Dispose Method", studyFormFillCz.getCzfs()); - jcnrEnMap.put("Amount", sj.getKc() + sj.getKcdw()); - SjJcgj sjJcgj = sjJcgjService.genJcgj(sj.getId(), JcgjlxEnum.lc.getValue(), "处置", "Dispose", - JcmcysEnum.green.getValue(), JctUtil.formatStr(jcnrMap), JctUtil.formatStr(jcnrEnMap), qmr); - jcgjList.add(sjJcgj); - - - // 台账 - SjTz sjTz = sjTzService.genTz(sj.getId(), "处置", "Dispose", sj.getKc(), sj.getKcdw(), null, qmr); - tzList.add(sjTz); + // 处置，库存全变为0 + String czlist = studyFormFill.getCzlist(); + if (StringUtils.isNotEmpty(czlist) && !StringUtils.equals("[]", czlist)) { + List studyFormFillCzList = JSONUtil.toList(czlist, StudyFormFillCz.class); + for (StudyFormFillCz studyFormFillCz : studyFormFillCzList) { + List list = new ArrayList<>(); + for (String bh : studyFormFillCz.getList()) { + Sj sj = sjMap.get(bh); + if (sj != null) { + list.add(bh); + // 稽查轨迹 + LinkedHashMap jcnrMap = new LinkedHashMap<>(); + jcnrMap.put("处置方式", studyFormFillCz.getCzfs()); + jcnrMap.put("处置量", sj.getKc() + sj.getKcdw()); + + LinkedHashMap jcnrEnMap = new LinkedHashMap<>(); + jcnrEnMap.put("Dispose Method", studyFormFillCz.getCzfs()); + jcnrEnMap.put("Amount", sj.getKc() + sj.getKcdw()); + + SjJcgj sjJcgj = sjJcgjService.genJcgj(sj.getId(), JcgjlxEnum.lc.getValue(), "处置", "Dispose", + JcmcysEnum.green.getValue(), JctUtil.formatStr(jcnrMap), JctUtil.formatStr(jcnrEnMap), qmr); + jcgjList.add(sjJcgj); + + + // 台账 + SjTz sjTz = sjTzService.genTz(sj.getId(), "处置", "Dispose", sj.getKc(), sj.getKcdw(), null, qmr); + tzList.add(sjTz); + } + } + if(list.size()>0){ + baseMapper.updateKcBatch(list, "0"); + } } - baseMapper.updateKcBatch(studyFormFillCz.getList(), "0"); } } - sjJcgjService.saveBatch(jcgjList); - sjTzService.saveBatch(tzList); - studySjService.saveBatch(studyId, sjList); + if(jcgjList.size()>0){ + sjJcgjService.saveBatch(jcgjList); + } + if(jcgjList.size()>0){ + sjTzService.saveBatch(tzList); + } + if(jcgjList.size()>0){ + studySjService.saveBatch(studyId, sjList); + } } @Override @@ -812,12 +835,12 @@ public class SjServiceImpl extends ServiceImpl implements ISjServi Map formDataEn = new LinkedHashMap<>(); formDataEn.put("Comment", form.getRemark()); - sjJcgjService.saveJcgj(sj.getId(), JcgjlxEnum.lc.getValue(), "同意归档", "Approve Archiving", + sjJcgjService.saveJcgj(sj.getId(), JcgjlxEnum.lc.getValue(), "同意归档", "Approve Archiving", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), JctUtil.formatStr(formDataEn)); archiveLogService.saveInfo(ArchiveLogTypeEnum.sj, sj.getId(), sj.getMc(), sj.getBh(), sj.getNd() + sj.getNddw(), "同意归档"); - noticeService.save("试剂【"+sj.getMc()+"】同意归档",sj.getGdsqrId(),getUrlQz()); + noticeService.save("试剂【" + sj.getMc() + "】同意归档", sj.getGdsqrId(), getUrlQz()); } @@ -843,12 +866,12 @@ public class SjServiceImpl extends ServiceImpl implements ISjServi Map formDataEn = new LinkedHashMap<>(); formDataEn.put("Comment", form.getRemark()); - sjJcgjService.saveJcgj(sj.getId(), JcgjlxEnum.lc.getValue(), "拒绝归档", "Reject Archiving", + sjJcgjService.saveJcgj(sj.getId(), JcgjlxEnum.lc.getValue(), "拒绝归档", "Reject Archiving", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), JctUtil.formatStr(formDataEn)); archiveLogService.saveInfo(ArchiveLogTypeEnum.sj, sj.getId(), sj.getMc(), sj.getBh(), sj.getNd() + sj.getNddw(), "拒绝归档"); - noticeService.save("试剂【"+sj.getMc()+"】拒绝归档",sj.getGdsqrId(),getUrlQz()); + noticeService.save("试剂【" + sj.getMc() + "】拒绝归档", sj.getGdsqrId(), getUrlQz()); } @@ -874,12 +897,12 @@ public class SjServiceImpl extends ServiceImpl implements ISjServi Map formDataEn = new LinkedHashMap<>(); formDataEn.put("Comment", form.getRemark()); - sjJcgjService.saveJcgj(sj.getId(), JcgjlxEnum.lc.getValue(), "同意解档", "Approve De-archiving", + sjJcgjService.saveJcgj(sj.getId(), JcgjlxEnum.lc.getValue(), "同意解档", "Approve De-archiving", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), JctUtil.formatStr(formDataEn)); archiveLogService.saveInfo(ArchiveLogTypeEnum.sj, sj.getId(), sj.getMc(), sj.getBh(), sj.getNd() + sj.getNddw(), "同意解档"); - noticeService.save("试剂【"+sj.getMc()+"】同意解档",sj.getGdsqrId(),getUrlQz()); + noticeService.save("试剂【" + sj.getMc() + "】同意解档", sj.getGdsqrId(), getUrlQz()); } @@ -905,12 +928,12 @@ public class SjServiceImpl extends ServiceImpl implements ISjServi Map formDataEn = new LinkedHashMap<>(); formDataEn.put("Comment", form.getRemark()); - sjJcgjService.saveJcgj(sj.getId(), JcgjlxEnum.lc.getValue(), "拒绝解档", "Reject De-archiving", + sjJcgjService.saveJcgj(sj.getId(), JcgjlxEnum.lc.getValue(), "拒绝解档", "Reject De-archiving", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), JctUtil.formatStr(formDataEn)); archiveLogService.saveInfo(ArchiveLogTypeEnum.sj, sj.getId(), sj.getMc(), sj.getBh(), sj.getNd() + sj.getNddw(), "拒绝解档"); - noticeService.save("试剂【"+sj.getMc()+"】拒绝解档",sj.getGdsqrId(),getUrlQz()); + noticeService.save("试剂【" + sj.getMc() + "】拒绝解档", sj.getGdsqrId(), getUrlQz()); } @@ -938,12 +961,12 @@ public class SjServiceImpl extends ServiceImpl implements ISjServi Map formDataEn = new LinkedHashMap<>(); formDataEn.put("Comment", form.getRemark()); - sjJcgjService.saveJcgj(sj.getId(), JcgjlxEnum.lc.getValue(), "同意借阅", "Approve Check-out", + sjJcgjService.saveJcgj(sj.getId(), JcgjlxEnum.lc.getValue(), "同意借阅", "Approve Check-out", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), JctUtil.formatStr(formDataEn)); archiveLogService.saveInfo(ArchiveLogTypeEnum.sj, sj.getId(), sj.getMc(), sj.getBh(), sj.getNd() + sj.getNddw(), "同意借阅"); - noticeService.save("试剂【"+sj.getMc()+"】同意借阅",sj.getGdsqrId(),getUrlQz()); + noticeService.save("试剂【" + sj.getMc() + "】同意借阅", sj.getGdsqrId(), getUrlQz()); } @@ -969,12 +992,12 @@ public class SjServiceImpl extends ServiceImpl implements ISjServi Map formDataEn = new LinkedHashMap<>(); formDataEn.put("Comment", form.getRemark()); - sjJcgjService.saveJcgj(sj.getId(), JcgjlxEnum.lc.getValue(), "拒绝借阅", "Reject Check-out", + sjJcgjService.saveJcgj(sj.getId(), JcgjlxEnum.lc.getValue(), "拒绝借阅", "Reject Check-out", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), JctUtil.formatStr(formDataEn)); archiveLogService.saveInfo(ArchiveLogTypeEnum.sj, sj.getId(), sj.getMc(), sj.getBh(), sj.getNd() + sj.getNddw(), "拒绝借阅"); - noticeService.save("试剂【"+sj.getMc()+"】拒绝借阅",sj.getGdsqrId(),getUrlQz()); + noticeService.save("试剂【" + sj.getMc() + "】拒绝借阅", sj.getGdsqrId(), getUrlQz()); } @@ -1000,7 +1023,7 @@ public class SjServiceImpl extends ServiceImpl implements ISjServi Map formDataEn = new LinkedHashMap<>(); formDataEn.put("Comment", form.getRemark()); - sjJcgjService.saveJcgj(sj.getId(), JcgjlxEnum.lc.getValue(), "确认归还", "Check-out End Confirmation", + sjJcgjService.saveJcgj(sj.getId(), JcgjlxEnum.lc.getValue(), "确认归还", "Check-out End Confirmation", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), JctUtil.formatStr(formDataEn)); archiveLogService.saveInfo(ArchiveLogTypeEnum.sj, sj.getId(), sj.getMc(), sj.getBh(), sj.getNd() + sj.getNddw(), "确认归还"); @@ -1009,9 +1032,10 @@ public class SjServiceImpl extends ServiceImpl implements ISjServi /** * 获取通知的跳转url + * * @return */ - private String getUrlQz(){ - return "/resource/reagent"; + private String getUrlQz() { + return "/resource/reagent"; } } 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 b13944b..7701b95 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 @@ -438,16 +438,9 @@ public class StudyFormFillServiceImpl extends ServiceImpl