diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/mapper/GyzjMapper.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/mapper/GyzjMapper.java index c1bf725..e5ec153 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/mapper/GyzjMapper.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/mapper/GyzjMapper.java @@ -47,16 +47,16 @@ public interface GyzjMapper extends BaseMapper /** * 批量修改库存 - * @param bhList 试剂编号 + * @param idList id * @param kc 库存量 */ - void updateKcBatch(@Param("bhList") List bhList, @Param("kc") String kc); + void updateKcBatch(@Param("idList") List idList, @Param("kc") String kc); /** * 修改存储条件 - * @param bhList 试剂编号 + * @param idList id * @param cctj 存储条件 * @param ccwz 存储位置 */ - void updateCc(@Param("bhList") List bhList, @Param("cctj") String cctj, @Param("ccwz") String ccwz); + void updateCc(@Param("idList") List idList, @Param("cctj") String cctj, @Param("ccwz") String ccwz); } diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/mapper/MjyMapper.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/mapper/MjyMapper.java index 60be648..66aac2f 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/mapper/MjyMapper.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/mapper/MjyMapper.java @@ -48,16 +48,16 @@ public interface MjyMapper extends BaseMapper /** * 批量修改库存 - * @param bhList 试剂编号 + * @param idList id * @param kc 库存量 */ - void updateKcBatch(@Param("bhList") List bhList, @Param("kc") String kc); + void updateKcBatch(@Param("idList") List idList, @Param("kc") String kc); /** * 修改存储条件 - * @param bhList 试剂编号 + * @param idList id * @param cctj 存储条件 * @param ccwz 存储位置 */ - void updateCc(@Param("bhList") List bhList, @Param("cctj") String cctj, @Param("ccwz") String ccwz); + void updateCc(@Param("idList") List idList, @Param("cctj") String cctj, @Param("ccwz") String ccwz); } diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/mapper/SjMapper.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/mapper/SjMapper.java index 2a60ddb..6a846ac 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/mapper/SjMapper.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/mapper/SjMapper.java @@ -49,16 +49,16 @@ public interface SjMapper extends BaseMapper /** * 批量修改库存 - * @param bhList 试剂编号 + * @param idList id * @param kc 库存量 */ - void updateKcBatch(@Param("bhList") List bhList, @Param("kc") String kc); + void updateKcBatch(@Param("idList") List idList, @Param("kc") String kc); /** * 修改存储条件 - * @param bhList 试剂编号 + * @param idList id * @param cctj 存储条件 * @param ccwz 存储位置 */ - void updateCc(@Param("bhList") List bhList, @Param("cctj") String cctj, @Param("ccwz") String ccwz); + void updateCc(@Param("idList") List idList, @Param("cctj") String cctj, @Param("ccwz") String ccwz); } diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GspServiceImpl.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GspServiceImpl.java index b22a46a..c576a47 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GspServiceImpl.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GspServiceImpl.java @@ -66,7 +66,7 @@ public class GspServiceImpl extends ServiceImpl implements IGspS */ @Override public void storageResource(StudyFormFill studyFormFill, Template template,String remark){ - + //todo } /** 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 9e98c59..c3cdfa9 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 @@ -86,10 +86,14 @@ public class GyzjServiceImpl extends ServiceImpl implements IG gyzj.setBh(form.getBh()); gyzj.setStudyId(form.getStudyId()); gyzj.setBdId(form.getStudyFormId()); + gyzj.setZjzt(ZjztEnum.wrk.getValue()); + gyzj.setJyzt(JyztEnum.wjy.getValue()); this.save(gyzj); } else { gyzj.setStudyId(form.getStudyId()); gyzj.setBdId(form.getStudyFormId()); + gyzj.setZjzt(ZjztEnum.wrk.getValue()); + gyzj.setJyzt(JyztEnum.wjy.getValue()); this.updateById(gyzj); } } @@ -1549,25 +1553,19 @@ public class GyzjServiceImpl extends ServiceImpl implements IG 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.gyzj.getValue() == p.getType())).collect(Collectors.toList()); - // 根据编号获取需要处置的列表 if (tmp.size() > 0) { List bhList = tmp.stream().map(StudyFormFillResource::getBh).collect(Collectors.toList()); LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.in(Gyzj::getBh, bhList); gyzjList = this.list(queryWrapper); for (Gyzj gyzj : gyzjList) { + gyzj.setCczt(CcztEnum.Cc.getValue()); + this.updateById(gyzj); gyzjMap.put(gyzj.getBh(), gyzj); } - for (StudyFormFillResource studyFormFillResource : studyFormFillResourceList) { - Gyzj gyzj = gyzjMap.get(studyFormFillResource.getBh()); - if (gyzj != null) { - gyzj.setCczt(CcztEnum.Cc.getValue()); - this.updateById(gyzj); - } - } + // 存储 + cc(studyFormFill, gyzjMap, jcgjList, tzList, remark, qmr); } - // 存储 - cc(studyFormFill, gyzjMap, jcgjList, tzList, remark, qmr); } if (jcgjList.size() > 0) { gyzjJcgjService.saveBatch(jcgjList); @@ -1597,11 +1595,11 @@ public class GyzjServiceImpl extends ServiceImpl implements IG if (StringUtils.isNotEmpty(cclist) && !StringUtils.equals(empty, cclist)) { List studyFormFillCcList = JSONUtil.toList(cclist, StudyFormFillCc.class); for (StudyFormFillCc studyFormFillCc : studyFormFillCcList) { - List list = new ArrayList<>(); + List list = new ArrayList<>(); for (String bh : studyFormFillCc.getList()) { Gyzj gyzj = gyzjMap.get(bh); if (gyzj != null) { - list.add(bh); + list.add(gyzj.getId()); // 稽查轨迹 HashMap formData = new HashMap<>(2); formData.put("存储位置", studyFormFillCc.getCcwz()); @@ -1638,11 +1636,11 @@ public class GyzjServiceImpl extends ServiceImpl implements IG if (StringUtils.isNotEmpty(czlist) && !StringUtils.equals(empty, czlist)) { List studyFormFillCzList = JSONUtil.toList(czlist, StudyFormFillCz.class); for (StudyFormFillCz studyFormFillCz : studyFormFillCzList) { - List list = new ArrayList<>(); + List list = new ArrayList<>(); for (String bh : studyFormFillCz.getList()) { Gyzj gyzj = gyzjMap.get(bh); if (gyzj != null) { - list.add(bh); + list.add(gyzj.getId()); // 稽查轨迹 HashMap formData = new HashMap<>(2); formData.put("处置方式", studyFormFillCz.getCzfs()); 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 3b8705d..387c600 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 @@ -1330,25 +1330,19 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS 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.mjy.getValue() == p.getType())).collect(Collectors.toList()); - // 根据编号获取需要处置的列表 if (tmp.size() > 0) { List bhList = tmp.stream().map(StudyFormFillResource::getBh).collect(Collectors.toList()); LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.in(Mjy::getBh, bhList); mjyList = this.list(queryWrapper); for (Mjy mjy : mjyList) { + mjy.setCczt(CcztEnum.Cc.getValue()); + this.updateById(mjy); mjyMap.put(mjy.getBh(), mjy); } - for (StudyFormFillResource studyFormFillResource : studyFormFillResourceList) { - Mjy mjy = mjyMap.get(studyFormFillResource.getBh()); - if (mjy != null) { - mjy.setCczt(CcztEnum.Cc.getValue()); - this.updateById(mjy); - } - } + // 存储 + cc(studyFormFill, mjyMap, jcgjList, tzList, remark, qmr); } - // 存储 - cc(studyFormFill, mjyMap, jcgjList, tzList, remark, qmr); } if (jcgjList.size() > 0) { mjyJcgjService.saveBatch(jcgjList); @@ -1380,11 +1374,11 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS if (StringUtils.isNotEmpty(czlist) && !StringUtils.equals(empty, czlist)) { List studyFormFillCzList = JSONUtil.toList(czlist, StudyFormFillCz.class); for (StudyFormFillCz studyFormFillCz : studyFormFillCzList) { - List list = new ArrayList<>(); + List list = new ArrayList<>(); for (String bh : studyFormFillCz.getList()) { Mjy mjy = mjyMap.get(bh); if (mjy != null) { - list.add(bh); + list.add(mjy.getId()); // 稽查轨迹 HashMap formData = new HashMap<>(2); formData.put("处置方式", studyFormFillCz.getCzfs()); @@ -1420,11 +1414,11 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS if (StringUtils.isNotEmpty(cclist) && !StringUtils.equals(empty, cclist)) { List studyFormFillCcList = JSONUtil.toList(cclist, StudyFormFillCc.class); for (StudyFormFillCc studyFormFillCc : studyFormFillCcList) { - List list = new ArrayList<>(); + List list = new ArrayList<>(); for (String bh : studyFormFillCc.getList()) { Mjy mjy = mjyMap.get(bh); if (mjy != null) { - list.add(bh); + list.add(mjy.getId()); // 稽查轨迹 HashMap formData = new HashMap<>(2); formData.put("存储位置", studyFormFillCc.getCcwz()); 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 b50e043..b2ebd6b 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 @@ -875,11 +875,11 @@ public class SjServiceImpl extends ServiceImpl implements ISjServi if (StringUtils.isNotEmpty(cclist) && !StringUtils.equals(empty, cclist)) { List studyFormFillCcList = JSONUtil.toList(cclist, StudyFormFillCc.class); for (StudyFormFillCc studyFormFillCc : studyFormFillCcList) { - List list = new ArrayList<>(); + List list = new ArrayList<>(); for (String bh : studyFormFillCc.getList()) { Sj sj = sjMap.get(bh); if (sj != null) { - list.add(bh); + list.add(sj.getId()); // 稽查轨迹 LinkedHashMap jcnrMap = new LinkedHashMap<>(); jcnrMap.put("存储位置", studyFormFillCc.getCcwz()); @@ -921,11 +921,11 @@ public class SjServiceImpl extends ServiceImpl implements ISjServi if (StringUtils.isNotEmpty(czlist) && !StringUtils.equals(empty, czlist)) { List studyFormFillCzList = JSONUtil.toList(czlist, StudyFormFillCz.class); for (StudyFormFillCz studyFormFillCz : studyFormFillCzList) { - List list = new ArrayList<>(); + List list = new ArrayList<>(); for (String bh : studyFormFillCz.getList()) { Sj sj = sjMap.get(bh); if (sj != null) { - list.add(bh); + list.add(sj.getId()); // 稽查轨迹 LinkedHashMap jcnrMap = new LinkedHashMap<>(); jcnrMap.put("处置方式", studyFormFillCz.getCzfs()); 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 a070669..6344ccf 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 @@ -489,13 +489,13 @@ public class StudyFormFillServiceImpl extends ServiceImpl - UPDATE t_gyzj SET kc = #{kc} WHERE bh in - - (#{item}) + UPDATE t_gyzj SET kc = #{kc} WHERE id in + + #{item} - UPDATE t_gyzj SET cctj = #{cctj}, ccwz = #{ccwz} WHERE bh in - - (#{item}) + UPDATE t_gyzj SET cctj = #{cctj}, ccwz = #{ccwz} WHERE id in + + #{item} diff --git a/hxhq-modules/hxhq-system/src/main/resources/mapper/business/MjyMapper.xml b/hxhq-modules/hxhq-system/src/main/resources/mapper/business/MjyMapper.xml index 23225df..580cf9c 100644 --- a/hxhq-modules/hxhq-system/src/main/resources/mapper/business/MjyMapper.xml +++ b/hxhq-modules/hxhq-system/src/main/resources/mapper/business/MjyMapper.xml @@ -38,15 +38,15 @@ - UPDATE t_mjy SET kc = #{kc} WHERE bh in - - (#{item}) + UPDATE t_mjy SET kc = #{kc} WHERE id in + + #{item} - UPDATE t_mjy SET cctj = #{cctj}, ccwz = #{ccwz} WHERE bh in - - (#{item}) + UPDATE t_mjy SET cctj = #{cctj}, ccwz = #{ccwz} WHERE id in + + #{item} diff --git a/hxhq-modules/hxhq-system/src/main/resources/mapper/business/SjMapper.xml b/hxhq-modules/hxhq-system/src/main/resources/mapper/business/SjMapper.xml index 496b185..99a33de 100644 --- a/hxhq-modules/hxhq-system/src/main/resources/mapper/business/SjMapper.xml +++ b/hxhq-modules/hxhq-system/src/main/resources/mapper/business/SjMapper.xml @@ -4,14 +4,14 @@ "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - UPDATE t_sj SET kc = #{kc} WHERE bh in - + UPDATE t_sj SET kc = #{kc} WHERE id in + #{item} - UPDATE t_sj SET cctj = #{cctj}, ccwz = #{ccwz} WHERE bh in - + UPDATE t_sj SET cctj = #{cctj}, ccwz = #{ccwz} WHERE id in + #{item}