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 d3aca5b..8dccad9 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 @@ -1471,61 +1471,65 @@ public class GyzjServiceImpl extends ServiceImpl implements IG for (StudyFormFillResource studyFormFillResource : studyFormFillResourceList) { Gyzj gyzj = gyzjMap.get(studyFormFillResource.getBh()); //配置的才保存，或更新 - if (studyFormFillResource.getType() == null) { - if(studyFormFill.getSftb().equals(NormalEnum.no.getValue())) { - 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.setLy(studyFormFillResource.getLy()); - gyzj.setNd(String.valueOf(studyFormFillResource.getNd())); - gyzj.setNddw(studyFormFillResource.getNddw()); - gyzj.setKc(String.valueOf(studyFormFillResource.getKc())); - gyzj.setKcdw(studyFormFillResource.getKcdw()); - gyzj.setSxrq(DateUtils.parseDate(studyFormFillResource.getSxrq())); + if (mark) { + if (studyFormFillResource.getType() == null) { + if (studyFormFill.getSftb().equals(NormalEnum.no.getValue())) { + 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.setLy(studyFormFillResource.getLy()); + gyzj.setNd(String.valueOf(studyFormFillResource.getNd())); + 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); + } } - 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); + studyFormFillResource.setType(StudyFormFillResourceTypeEnum.gyzj.getValue()); + } else { + //使用的才更新 Resource + studyFormFillResource.setMc(gyzj.getMc()); + studyFormFillResource.setNd(gyzj.getNd()); + studyFormFillResource.setNddw(gyzj.getNddw()); + studyFormFillResource.setLy(gyzj.getLy()); + if (gyzj.getSxrq() != null) { + studyFormFillResource.setSxrq(DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss", gyzj.getSxrq())); } } - studyFormFillResource.setType(StudyFormFillResourceTypeEnum.gyzj.getValue()); - } else { - //使用的才更新 Resource - studyFormFillResource.setMc(gyzj.getMc()); - studyFormFillResource.setNd(gyzj.getNd()); - studyFormFillResource.setNddw(gyzj.getNddw()); - studyFormFillResource.setLy(gyzj.getLy()); - if (gyzj.getSxrq() != null) { - studyFormFillResource.setSxrq(DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss", gyzj.getSxrq())); - } } // 使用 - String syl = studyFormFillResource.getSyl(); - if (StringUtils.isNotEmpty(syl) && NumberUtils.isParsable(syl)) { - String kc = CalUnitTools.subTj(gyzj.getKc(), gyzj.getKcdw(), syl, studyFormFillResource.getSyldw()); - gyzj.setKc(kc); - baseMapper.updateKc(gyzj.getId(), kc); - // 使用稽查轨迹 - 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())); + if(gyzj!=null){ + String syl = studyFormFillResource.getSyl(); + if (StringUtils.isNotEmpty(syl) && NumberUtils.isParsable(syl)) { + String kc = CalUnitTools.subTj(gyzj.getKc(), gyzj.getKcdw(), syl, studyFormFillResource.getSyldw()); + gyzj.setKc(kc); + baseMapper.updateKc(gyzj.getId(), kc); + // 使用稽查轨迹 + 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); } - gyzjMap.put(gyzj.getBh(), gyzj); } //更新 Resource studyFormFill.setResource(JSONObject.toJSONString(studyFormFillResourceList)); 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 441f55f..d12481f 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 @@ -1255,62 +1255,66 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS } for (StudyFormFillResource studyFormFillResource : studyFormFillResourceList) { Mjy mjy = mjyMap.get(studyFormFillResource.getBh()); - //配置的才保存，或更新 - if (studyFormFillResource.getType() == null) { - if(studyFormFill.getSftb().equals(NormalEnum.no.getValue())) { - 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.getNd())); - mjy.setNddw(studyFormFillResource.getNddw()); - mjy.setLy(studyFormFillResource.getLy()); - mjy.setKc(String.valueOf(studyFormFillResource.getKc())); - mjy.setKcdw(studyFormFillResource.getKcdw()); - mjy.setSxrq(DateUtils.parseDate(studyFormFillResource.getSxrq())); + if (mark) { + //配置的才保存，或更新 + if (studyFormFillResource.getType() == null) { + if (studyFormFill.getSftb().equals(NormalEnum.no.getValue())) { + 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.getNd())); + mjy.setNddw(studyFormFillResource.getNddw()); + mjy.setLy(studyFormFillResource.getLy()); + 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); + } } - 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); + studyFormFillResource.setType(StudyFormFillResourceTypeEnum.mjy.getValue()); + } else { + //使用的才更新 Resource + studyFormFillResource.setMc(mjy.getMc()); + studyFormFillResource.setNd(mjy.getNd()); + studyFormFillResource.setNddw(mjy.getNddw()); + studyFormFillResource.setLy(mjy.getLy()); + if (mjy.getSxrq() != null) { + studyFormFillResource.setSxrq(DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss", mjy.getSxrq())); } } - studyFormFillResource.setType(StudyFormFillResourceTypeEnum.mjy.getValue()); - } else { - //使用的才更新 Resource - studyFormFillResource.setMc(mjy.getMc()); - studyFormFillResource.setNd(mjy.getNd()); - studyFormFillResource.setNddw(mjy.getNddw()); - studyFormFillResource.setLy(mjy.getLy()); - if (mjy.getSxrq() != null) { - studyFormFillResource.setSxrq(DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss", mjy.getSxrq())); - } } // 使用 - String syl = studyFormFillResource.getSyl(); - if (StringUtils.isNotEmpty(syl) && NumberUtils.isParsable(syl)) { - String kc = CalUnitTools.subTj(mjy.getKc(), mjy.getKcdw(), syl, studyFormFillResource.getSyldw()); - mjy.setKc(kc); - baseMapper.updateKc(mjy.getId(), kc); - // 使用稽查轨迹 - 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())); + if(mjy!=null) { + String syl = studyFormFillResource.getSyl(); + if (StringUtils.isNotEmpty(syl) && NumberUtils.isParsable(syl)) { + String kc = CalUnitTools.subTj(mjy.getKc(), mjy.getKcdw(), syl, studyFormFillResource.getSyldw()); + mjy.setKc(kc); + baseMapper.updateKc(mjy.getId(), kc); + // 使用稽查轨迹 + 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); } //更新 Resource studyFormFill.setResource(JSONObject.toJSONString(studyFormFillResourceList)); 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 4620d2b..a4013af 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 @@ -659,7 +659,7 @@ public class SjServiceImpl extends ServiceImpl implements ISjServi String empty = "[]"; if (StringUtils.isNotEmpty(resource) && !StringUtils.equals(empty, resource)) { List studyFormFillResourceList = JSONUtil.toList(resource, StudyFormFillResource.class); - List tmp= studyFormFillResourceList.stream().filter(p -> (p.getType() == null && mark) || (p.getType()!=null&&StudyFormFillResourceTypeEnum.sj.getValue()==p.getType())).collect(Collectors.toList()); + List tmp = studyFormFillResourceList.stream().filter(p -> (p.getType() == null && mark) || (p.getType() != null && StudyFormFillResourceTypeEnum.sj.getValue() == p.getType())).collect(Collectors.toList()); // 根据编号获取需要处置的列表 if (tmp.size() > 0) { List bhList = tmp.stream().map(StudyFormFillResource::getBh).collect(Collectors.toList()); @@ -673,81 +673,85 @@ public class SjServiceImpl extends ServiceImpl implements ISjServi for (StudyFormFillResource studyFormFillResource : studyFormFillResourceList) { Sj sj = sjMap.get(studyFormFillResource.getBh()); //配置的才保存，或更新 - if (studyFormFillResource.getType() == null) { - if(studyFormFill.getSftb().equals(NormalEnum.no.getValue())) { - if (sj == null) { - sj = new Sj(); + if (mark) { + if (studyFormFillResource.getType() == null) { + if (studyFormFill.getSftb().equals(NormalEnum.no.getValue())) { + 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.getNd())); + sj.setNddw(studyFormFillResource.getNddw()); + sj.setKc(studyFormFillResource.getKc()); + sj.setKcdw(studyFormFillResource.getKcdw()); + sj.setLy(studyFormFillResource.getLy()); + 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); + // 稽查轨迹 + 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); + } + sjMap.put(sj.getBh(), sj); + sjList.add(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.getNd())); - sj.setNddw(studyFormFillResource.getNddw()); - sj.setKc(studyFormFillResource.getKc()); - sj.setKcdw(studyFormFillResource.getKcdw()); - sj.setLy(studyFormFillResource.getLy()); - 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); - // 稽查轨迹 - 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); + studyFormFillResource.setType(StudyFormFillResourceTypeEnum.sj.getValue()); + } else { + //使用的才更新 Resource + studyFormFillResource.setMc(sj.getMc()); + studyFormFillResource.setNd(sj.getNd()); + studyFormFillResource.setNddw(sj.getNddw()); + studyFormFillResource.setKc(sj.getKc()); + studyFormFillResource.setKcdw(sj.getKcdw()); + studyFormFillResource.setPh(sj.getPh()); + studyFormFillResource.setLy(sj.getLy()); + if (sj.getSxr() != null) { + studyFormFillResource.setSxrq(DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss", sj.getSxr())); } - sjMap.put(sj.getBh(), sj); - sjList.add(sj); - } - studyFormFillResource.setType(StudyFormFillResourceTypeEnum.sj.getValue()); - }else{ - //使用的才更新 Resource - studyFormFillResource.setMc(sj.getMc()); - studyFormFillResource.setNd(sj.getNd()); - studyFormFillResource.setNddw(sj.getNddw()); - studyFormFillResource.setKc(sj.getKc()); - studyFormFillResource.setKcdw(sj.getKcdw()); - studyFormFillResource.setPh(sj.getPh()); - studyFormFillResource.setLy(sj.getLy()); - if(sj.getSxr()!=null){ - studyFormFillResource.setSxrq(DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss",sj.getSxr())); } } // 使用 - syl(studyFormFillResource, sj, jcgjList, tzList, qmr); - sjMap.put(sj.getBh(), sj); + if (sj != null) { + syl(studyFormFillResource, sj, jcgjList, tzList, qmr); + sjMap.put(sj.getBh(), sj); + } } } //更新 Resource studyFormFill.setResource(JSONObject.toJSONString(studyFormFillResourceList)); } - if(sjMap.size() > 0&&studyFormFill.getSftb().equals(NormalEnum.no.getValue())) { + if (sjMap.size() > 0 && studyFormFill.getSftb().equals(NormalEnum.no.getValue())) { // 存储 cc(studyFormFill, sjMap, jcgjList, tzList, qmr); // 处置，库存全变为0 cz(studyFormFill, sjMap, jcgjList, tzList, qmr); } - if(jcgjList.size()>0){ + if (jcgjList.size() > 0) { sjJcgjService.saveBatch(jcgjList); } - if(jcgjList.size()>0){ + if (jcgjList.size() > 0) { sjTzService.saveBatch(tzList); } - if(jcgjList.size()>0){ + if (jcgjList.size() > 0) { studySjService.saveBatch(studyId, sjList); } } @@ -777,17 +781,17 @@ public class SjServiceImpl extends ServiceImpl implements ISjServi } - /** * 开始配置 + * * @param form * @return */ @Override - public void startConfiguration(StudyFormConfigurationForm form){ + public void startConfiguration(StudyFormConfigurationForm form) { Sj sj = this.getSjByBh(form.getBh()); StudySubject studySubject = studySubjectService.getById(form.getStudySubjectId()); - if(sj == null) { + if (sj == null) { sj = new Sj(); sj.setBh(form.getBh()); sj.setPzrq(new Date()); @@ -807,15 +811,16 @@ public class SjServiceImpl extends ServiceImpl implements ISjServi /** * 配置完成 + * * @param form * @return */ @Override - public void configurationCompleted(StudyFormConfigurationForm form){ + public void configurationCompleted(StudyFormConfigurationForm form) { Sj sj = this.getSjByBh(form.getBh()); StudySubject studySubject = studySubjectService.getById(form.getStudySubjectId()); - if(sj == null) { + if (sj == null) { sj = new Sj(); sj.setBh(form.getBh()); sj.setKc(form.getKc()); @@ -847,13 +852,14 @@ public class SjServiceImpl extends ServiceImpl implements ISjServi /** * 分装 + * * @param form * @return */ @Override - public void subpackage(StudyFormFillSubpackageForm form){ + public void subpackage(StudyFormFillSubpackageForm form) { Sj sj = this.getSjByBh(form.getBh()); - if(sj == null) { + if (sj == null) { sj = new Sj(); sj.setBh(form.getBh()); this.save(sj); @@ -893,7 +899,7 @@ public class SjServiceImpl extends ServiceImpl implements ISjServi Map jcnrMap = new LinkedHashMap<>(); jcnrMap.put("母液编号", form.getBh()); jcnrMap.put("分装个数", String.valueOf(form.getList().size())); - jcnrMap.put("分装后编号及体积",String.join(",", fz)); + jcnrMap.put("分装后编号及体积", String.join(",", fz)); jcnrMap.put("分装人", SecurityUtils.getNickName()); jcgj.setJcnr(JctUtil.formatStr(jcnrMap)); sjJcgjService.save(jcgj); @@ -928,7 +934,7 @@ public class SjServiceImpl extends ServiceImpl implements ISjServi tzList.add(sjTz); } } - if(list.size()>0){ + if (list.size() > 0) { baseMapper.updateCc(list, studyFormFillCc.getCctj(), studyFormFillCc.getCcwz()); } } @@ -937,6 +943,7 @@ public class SjServiceImpl extends ServiceImpl implements ISjServi /** * 处置 + * * @param studyFormFill * @param sjMap * @param jcgjList @@ -974,7 +981,7 @@ public class SjServiceImpl extends ServiceImpl implements ISjServi tzList.add(sjTz); } } - if(list.size()>0){ + if (list.size() > 0) { baseMapper.updateKcBatch(list, "0"); } } @@ -1201,11 +1208,11 @@ public class SjServiceImpl extends ServiceImpl implements ISjServi @Override 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 sjList=this.list(queryWrapper); - List jcgjList=new ArrayList<>(); - for(Sj sj:sjList){ + List sjList = this.list(queryWrapper); + List jcgjList = new ArrayList<>(); + for (Sj sj : sjList) { sj.setJyzt(JyztEnum.wjy.getValue()); //稽查轨迹 SjJcgj jcgj = sjJcgjService.genJcgj(sj.getId(), JcgjlxEnum.lc.getValue(), "到期自动归还", "Check-out End on Time", @@ -1213,7 +1220,7 @@ public class SjServiceImpl extends ServiceImpl implements ISjServi jcgjList.add(jcgj); } this.updateBatchById(sjList); - if(jcgjList.size()>0){ + if (jcgjList.size() > 0) { sjJcgjService.saveBatch(jcgjList); } }