fix:[表单管理]优化

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

@@ -1618,7 +1618,7 @@ public class GyzjServiceImpl extends ServiceImpl implements IG
                             String other="其他";
                             HashMap<String, String> formData = new HashMap<>(2);
                             formData.put("存储位置", studyFormFillCc.getCcwz());
-                            formData.put("存储条件", studyFormFillCc.getCctj().equals(other)?studyFormFillCc.getCctj():studyFormFillCc.getCctjqt());
+                            formData.put("存储条件", studyFormFillCc.getCctj().equals(other)?studyFormFillCc.getCctjqt():studyFormFillCc.getCctj());
                             jcgjList.add(gyzjJcgjService.getJcgj(gyzj, 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()));
@@ -1659,7 +1659,7 @@ public class GyzjServiceImpl extends ServiceImpl implements IG
                             // 稽查轨迹
                             String other="其他";
                             HashMap<String, String> formData = new HashMap<>(2);
-                            formData.put("处置方式", studyFormFillCz.getCzfs().equals(other)?studyFormFillCz.getCzfs():studyFormFillCz.getCzfsqt());
+                            formData.put("处置方式", studyFormFillCz.getCzfs().equals(other)?studyFormFillCz.getCzfsqt():studyFormFillCz.getCzfs());
                             formData.put("处置量", gyzj.getKc() + gyzj.getKcdw());
                             jcgjList.add(gyzjJcgjService.getJcgj(gyzj, JcgjlxEnum.lc.getValue(), "处置", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), JctUtil.formatStr(GyzjJcnrUtil.getMapEn(formData)), qmr, remark));
 

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

@@ -1392,7 +1392,7 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS
                             // 稽查轨迹
                             String other="其他";
                             HashMap<String, String> formData = new HashMap<>(2);
-                            formData.put("处置方式", studyFormFillCz.getCzfs().equals(other)?studyFormFillCz.getCzfs():studyFormFillCz.getCzfsqt());
+                            formData.put("处置方式", studyFormFillCz.getCzfs().equals(other)?studyFormFillCz.getCzfsqt():studyFormFillCz.getCzfs());
                             formData.put("处置量", mjy.getKc() + mjy.getKcdw());
                             jcgjList.add(mjyJcgjService.getJcgj(mjy, JcgjlxEnum.lc.getValue(), "处置", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), JctUtil.formatStr(MjyJcnrUtil.getMapEn(formData)), qmr, remark));
 
@@ -1434,7 +1434,7 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS
                             String other="其他";
                             HashMap<String, String> formData = new HashMap<>(2);
                             formData.put("存储位置", studyFormFillCc.getCcwz());
-                            formData.put("存储条件", studyFormFillCc.getCctj().equals(other)?studyFormFillCc.getCctj():studyFormFillCc.getCctjqt());
+                            formData.put("存储条件", studyFormFillCc.getCctj().equals(other)?studyFormFillCc.getCctjqt():studyFormFillCc.getCctj());
                             jcgjList.add(mjyJcgjService.getJcgj(mjy, 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()));

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

@@ -903,11 +903,11 @@ public class SjServiceImpl extends ServiceImpl implements ISjServi
                         String other="其他";
                         LinkedHashMap<String, String> jcnrMap = new LinkedHashMap<>();
                         jcnrMap.put("存储位置", studyFormFillCc.getCcwz());
-                        jcnrMap.put("存储条件", studyFormFillCc.getCctj().equals(other)?studyFormFillCc.getCctj():studyFormFillCc.getCctjqt());
+                        jcnrMap.put("存储条件", studyFormFillCc.getCctj().equals(other)?studyFormFillCc.getCctjqt():studyFormFillCc.getCctj());
 
                         LinkedHashMap<String, String> jcnrEnMap = new LinkedHashMap<>();
                         jcnrEnMap.put("Storage Location", studyFormFillCc.getCcwz());
-                        jcnrEnMap.put("Storage Condition", studyFormFillCc.getCctj());
+                        jcnrEnMap.put("Storage Condition", studyFormFillCc.getCctj().equals(other)?studyFormFillCc.getCctjqt():studyFormFillCc.getCctj());
 
                         SjJcgj sjJcgj = sjJcgjService.genJcgj(sj, JcgjlxEnum.lc.getValue(), "存储", "Storage",
                                 JcmcysEnum.green.getValue(), JctUtil.formatStr(jcnrMap), JctUtil.formatStr(jcnrEnMap), qmr);
@@ -949,11 +949,11 @@ public class SjServiceImpl extends ServiceImpl implements ISjServi
                         // 稽查轨迹
                         String other="其他";
                         LinkedHashMap<String, String> jcnrMap = new LinkedHashMap<>();
-                        jcnrMap.put("处置方式", studyFormFillCz.getCzfs().equals(other)?studyFormFillCz.getCzfs():studyFormFillCz.getCzfsqt());
+                        jcnrMap.put("处置方式", studyFormFillCz.getCzfs().equals(other)?studyFormFillCz.getCzfsqt():studyFormFillCz.getCzfs());
                         jcnrMap.put("处置量", sj.getKc() + sj.getKcdw());
 
                         LinkedHashMap<String, String> jcnrEnMap = new LinkedHashMap<>();
-                        jcnrEnMap.put("Dispose Method", studyFormFillCz.getCzfs());
+                        jcnrEnMap.put("Dispose Method", studyFormFillCz.getCzfs().equals(other)?studyFormFillCz.getCzfsqt():studyFormFillCz.getCzfs());
                         jcnrEnMap.put("Amount", sj.getKc() + sj.getKcdw());
 
                         SjJcgj sjJcgj = sjJcgjService.genJcgj(sj, JcgjlxEnum.lc.getValue(), "处置", "Dispose",

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

@@ -546,9 +546,10 @@ public class StudyFormFillServiceImpl extends ServiceImpl
                 List<StudyFormFillCc> studyFormFillCcList = JSONUtil.toList(cclist, StudyFormFillCc.class);
                 for (StudyFormFillCc studyFormFillCc : studyFormFillCcList) {
                     //稽查轨迹
+                    String other="其他";
                     Map<String, String> formData = new LinkedHashMap<>();
                     formData.put("存储位置", studyFormFillCc.getCcwz());
-                    formData.put("存储条件", studyFormFillCc.getCctj());
+                    formData.put("存储条件", studyFormFillCc.getCctj().equals(other)?studyFormFillCc.getCctjqt():studyFormFillCc.getCctj());
                     formData.put("存储药剂", String.join(",", studyFormFillCc.getList()));
                     studyFormFillJcgjList.add(studyFormFillJcgjService.getJcgj(now, studyFormFillOld, JcgjlxEnum.lc.getValue(), "存储", JcmcysEnum.green.getValue(), formData, qmr, null));
                 }
@@ -610,6 +611,21 @@ public class StudyFormFillServiceImpl extends ServiceImpl
                             }
                         }
                     }
+//                    if (template.getProduct().equals(StudyFormFillResourceTypeEnum.gsp.getValue())) {
+//                        LambdaQueryWrapper<Gsp> queryWrapper = new LambdaQueryWrapper<>();
+//                        queryWrapper.in(Gsp::getBh, bhList);
+//                        List<Gsp> gspList = gspService.list(queryWrapper);
+//                        Map<String, Gsp> gspMap = new HashMap<>(10);
+//                        for (Gsp gsp : gspList) {
+//                            gspMap.put(gsp.getBh(), gsp);
+//                        }
+//                        for (StudyFormFillResource studyFormFillResource : studyFormFillResourceList) {
+//                            Gsp gsp = gspMap.get(studyFormFillResource.getBh());
+//                            if (gsp != null) {
+//                                result.add(studyFormFillResource);
+//                            }
+//                        }
+//                    }
                 }
             }
         }