fix:[填报表单]优化

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<String> bhList, @Param("kc") String kc);
+    void updateKcBatch(@Param("idList") List<Long> idList, @Param("kc") String kc);
 
     /**
      * 修改存储条件
-     * @param bhList    试剂编号
+     * @param idList   id
      * @param cctj  存储条件
      * @param ccwz  存储位置
      */
-    void updateCc(@Param("bhList") List<String> bhList, @Param("cctj") String cctj, @Param("ccwz") String ccwz);
+    void updateCc(@Param("idList") List<Long> idList, @Param("cctj") String cctj, @Param("ccwz") String ccwz);
 }

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<String> bhList, @Param("kc") String kc);
+    void updateKcBatch(@Param("idList") List<Long> idList, @Param("kc") String kc);
 
     /**
      * 修改存储条件
-     * @param bhList    试剂编号
+     * @param idList    id
      * @param cctj  存储条件
      * @param ccwz  存储位置
      */
-    void updateCc(@Param("bhList") List<String> bhList, @Param("cctj") String cctj, @Param("ccwz") String ccwz);
+    void updateCc(@Param("idList") List<Long> idList, @Param("cctj") String cctj, @Param("ccwz") String ccwz);
 }

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<String> bhList, @Param("kc") String kc);
+    void updateKcBatch(@Param("idList") List<Long> idList, @Param("kc") String kc);
 
     /**
      * 修改存储条件
-     * @param bhList    试剂编号
+     * @param idList    id
      * @param cctj  存储条件
      * @param ccwz  存储位置
      */
-    void updateCc(@Param("bhList") List<String> bhList, @Param("cctj") String cctj, @Param("ccwz") String ccwz);
+    void updateCc(@Param("idList") List<Long> idList, @Param("cctj") String cctj, @Param("ccwz") String ccwz);
 }

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
     }
 
     /**

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<StudyFormFillResource> studyFormFillResourceList = JSONUtil.toList(resource, StudyFormFillResource.class);
             List<StudyFormFillResource> 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<String> bhList = tmp.stream().map(StudyFormFillResource::getBh).collect(Collectors.toList());
                 LambdaQueryWrapper<Gyzj> 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<StudyFormFillCc> studyFormFillCcList = JSONUtil.toList(cclist, StudyFormFillCc.class);
                 for (StudyFormFillCc studyFormFillCc : studyFormFillCcList) {
-                    List<String> list = new ArrayList<>();
+                    List<Long> list = new ArrayList<>();
                     for (String bh : studyFormFillCc.getList()) {
                         Gyzj gyzj = gyzjMap.get(bh);
                         if (gyzj != null) {
-                            list.add(bh);
+                            list.add(gyzj.getId());
                             // 稽查轨迹
                             HashMap<String, String> 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<StudyFormFillCz> studyFormFillCzList = JSONUtil.toList(czlist, StudyFormFillCz.class);
                 for (StudyFormFillCz studyFormFillCz : studyFormFillCzList) {
-                    List<String> list = new ArrayList<>();
+                    List<Long> list = new ArrayList<>();
                     for (String bh : studyFormFillCz.getList()) {
                         Gyzj gyzj = gyzjMap.get(bh);
                         if (gyzj != null) {
-                            list.add(bh);
+                            list.add(gyzj.getId());
                             // 稽查轨迹
                             HashMap<String, String> formData = new HashMap<>(2);
                             formData.put("处置方式", studyFormFillCz.getCzfs());

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<StudyFormFillResource> studyFormFillResourceList = JSONUtil.toList(resource, StudyFormFillResource.class);
             List<StudyFormFillResource> 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<String> bhList = tmp.stream().map(StudyFormFillResource::getBh).collect(Collectors.toList());
                 LambdaQueryWrapper<Mjy> 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<StudyFormFillCz> studyFormFillCzList = JSONUtil.toList(czlist, StudyFormFillCz.class);
                 for (StudyFormFillCz studyFormFillCz : studyFormFillCzList) {
-                    List<String> list = new ArrayList<>();
+                    List<Long> list = new ArrayList<>();
                     for (String bh : studyFormFillCz.getList()) {
                         Mjy mjy = mjyMap.get(bh);
                         if (mjy != null) {
-                            list.add(bh);
+                            list.add(mjy.getId());
                             // 稽查轨迹
                             HashMap<String, String> 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<StudyFormFillCc> studyFormFillCcList = JSONUtil.toList(cclist, StudyFormFillCc.class);
                 for (StudyFormFillCc studyFormFillCc : studyFormFillCcList) {
-                    List<String> list = new ArrayList<>();
+                    List<Long> list = new ArrayList<>();
                     for (String bh : studyFormFillCc.getList()) {
                         Mjy mjy = mjyMap.get(bh);
                         if (mjy != null) {
-                            list.add(bh);
+                            list.add(mjy.getId());
                             // 稽查轨迹
                             HashMap<String, String> formData = new HashMap<>(2);
                             formData.put("存储位置", studyFormFillCc.getCcwz());

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<StudyFormFillCc> studyFormFillCcList = JSONUtil.toList(cclist, StudyFormFillCc.class);
             for (StudyFormFillCc studyFormFillCc : studyFormFillCcList) {
-                List<String> list = new ArrayList<>();
+                List<Long> list = new ArrayList<>();
                 for (String bh : studyFormFillCc.getList()) {
                     Sj sj = sjMap.get(bh);
                     if (sj != null) {
-                        list.add(bh);
+                        list.add(sj.getId());
                         // 稽查轨迹
                         LinkedHashMap<String, String> 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<StudyFormFillCz> studyFormFillCzList = JSONUtil.toList(czlist, StudyFormFillCz.class);
             for (StudyFormFillCz studyFormFillCz : studyFormFillCzList) {
-                List<String> list = new ArrayList<>();
+                List<Long> list = new ArrayList<>();
                 for (String bh : studyFormFillCz.getList()) {
                     Sj sj = sjMap.get(bh);
                     if (sj != null) {
-                        list.add(bh);
+                        list.add(sj.getId());
                         // 稽查轨迹
                         LinkedHashMap<String, String> jcnrMap = new LinkedHashMap<>();
                         jcnrMap.put("处置方式", studyFormFillCz.getCzfs());

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyFormFillServiceImpl.java

@@ -489,13 +489,13 @@ public class StudyFormFillServiceImpl extends ServiceImpl
         checkPassword(qmr, studyFormFill.getQmrmm());
         if (studyFormFill.getId() != null) {
             StudyFormFill studyFormFillOld = this.queryInfo(studyFormFill.getId());
+            studyFormFillOld.setResource(studyFormFill.getResource());
             Template template = templateService.getById(studyFormFillOld.getTemplateId());
             //只有列表有 开始配置 配置完成的时候，并且点了配置完成后 ，药剂存储才能选到配置出来的药剂，其余都只能选择使用的
-            mjyService.storageResource(studyFormFillOld,template,studyFormFill.getRemark());
-            gyzjService.storageResource(studyFormFillOld,template,studyFormFill.getRemark());
-            gspService.storageResource(studyFormFillOld,template,studyFormFill.getRemark());
-            //更新 Resource
-            this.updateById(studyFormFillOld);
+            mjyService.storageResource(studyFormFill,template,studyFormFill.getRemark());
+            gyzjService.storageResource(studyFormFill,template,studyFormFill.getRemark());
+            gspService.storageResource(studyFormFill,template,studyFormFill.getRemark());
+
             String cclist = studyFormFill.getCclist();
             String empty = "[]";
             if (StringUtils.isNotEmpty(cclist) && !StringUtils.equals(empty, cclist)) {

hxhq-modules/hxhq-system/src/main/resources/mapper/business/GyzjMapper.xml

@@ -40,15 +40,15 @@
     </select>
 
     <update id="updateKcBatch">
-        UPDATE t_gyzj SET kc = #{kc} WHERE bh in
-        <foreach item="item" index="index" collection="bhList" separator=",">
-            (#{item})
+        UPDATE t_gyzj SET kc = #{kc} WHERE id in
+        <foreach item="item" index="index" collection="idList" open="(" separator="," close=")">
+            #{item}
         </foreach>
     </update>
     <update id="updateCc">
-        UPDATE t_gyzj SET cctj = #{cctj}, ccwz = #{ccwz} WHERE bh in
-        <foreach item="item" index="index" collection="bhList" separator=",">
-            (#{item})
+        UPDATE t_gyzj SET cctj = #{cctj}, ccwz = #{ccwz} WHERE id in
+        <foreach item="item" index="index" collection="idList" open="(" separator="," close=")">
+            #{item}
         </foreach>
     </update>
     <update id="updateKc">

hxhq-modules/hxhq-system/src/main/resources/mapper/business/MjyMapper.xml

@@ -38,15 +38,15 @@
     </select>
 
     <update id="updateKcBatch">
-        UPDATE t_mjy SET kc = #{kc} WHERE bh in
-        <foreach item="item" index="index" collection="bhList" separator=",">
-            (#{item})
+        UPDATE t_mjy SET kc = #{kc} WHERE id in
+        <foreach item="item" index="index" collection="idList" open="(" separator="," close=")">
+            #{item}
         </foreach>
     </update>
     <update id="updateCc">
-        UPDATE t_mjy SET cctj = #{cctj}, ccwz = #{ccwz} WHERE bh in
-        <foreach item="item" index="index" collection="bhList" separator=",">
-            (#{item})
+        UPDATE t_mjy SET cctj = #{cctj}, ccwz = #{ccwz} WHERE id in
+        <foreach item="item" index="index" collection="idList" open="(" separator="," close=")">
+            #{item}
         </foreach>
     </update>
     <update id="updateKc">

hxhq-modules/hxhq-system/src/main/resources/mapper/business/SjMapper.xml

@@ -4,14 +4,14 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.hxhq.business.mapper.SjMapper">
     <update id="updateKcBatch">
-        UPDATE t_sj SET kc = #{kc} WHERE bh in
-        <foreach item="item" index="index" collection="bhList"  open="(" separator="," close=")">
+        UPDATE t_sj SET kc = #{kc} WHERE id in
+        <foreach item="item" index="index" collection="idList"  open="(" separator="," close=")">
             #{item}
         </foreach>
     </update>
     <update id="updateCc">
-        UPDATE t_sj SET cctj = #{cctj}, ccwz = #{ccwz} WHERE bh in
-        <foreach item="item" index="index" collection="bhList"  open="(" separator="," close=")">
+        UPDATE t_sj SET cctj = #{cctj}, ccwz = #{ccwz} WHERE id in
+        <foreach item="item" index="index" collection="idList" open="(" separator="," close=")">
             #{item}
         </foreach>
     </update>