fix:[模板管理]优化

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/dto/study/StudyFormFillCc.java

@@ -15,9 +15,18 @@ public class StudyFormFillCc {
      */
 
     private String cctj;
+    private String cctjqt;
     private String ccwz;
     private List<String> list;
 
+    public String getCctjqt() {
+        return cctjqt;
+    }
+
+    public void setCctjqt(String cctjqt) {
+        this.cctjqt = cctjqt;
+    }
+
     public String getCctj() {
         return cctj;
     }

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/dto/study/StudyFormFillCz.java

@@ -14,8 +14,17 @@ public class StudyFormFillCz {
      */
 
     private String czfs;
+    private String czfsqt;
     private List<String> list;
 
+    public String getCzfsqt() {
+        return czfsqt;
+    }
+
+    public void setCzfsqt(String czfsqt) {
+        this.czfsqt = czfsqt;
+    }
+
     public String getCzfs() {
         return czfs;
     }

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

@@ -209,9 +209,10 @@ public class GspServiceImpl extends ServiceImpl implements IGspS
                         if (gsp != null) {
                             list.add(gsp.getId());
                             // 稽查轨迹
+                            String other="其他";
                             HashMap<String, String> formData = new HashMap<>(2);
                             formData.put("存储位置", studyFormFillCc.getCcwz());
-                            formData.put("存储条件", studyFormFillCc.getCctj());
+                            formData.put("存储条件", studyFormFillCc.getCctj().equals(other)?studyFormFillCc.getCctj():studyFormFillCc.getCctjqt());
                             jcgjList.add(gspJcgjService.getJcgj(gsp, JcgjlxEnum.lc.getValue(), "存储", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), JctUtil.formatStr(GyzjJcnrUtil.getMapEn(formData)), qmr, remark));
                             // 台账
                             tzList.add(gspTzService.getTzGen(gsp.getId(), null, null, null, null, null, null, null, null, qmr, "存储", gsp.getKc(), gsp.getKcdw(), remark, studyFormFill.getId()));
@@ -250,8 +251,10 @@ public class GspServiceImpl extends ServiceImpl implements IGspS
                         if (gsp != null) {
                             list.add(gsp.getId());
                             // 稽查轨迹
+
+                            String other="其他";
                             HashMap<String, String> formData = new HashMap<>(2);
-                            formData.put("处置方式", studyFormFillCz.getCzfs());
+                            formData.put("处置方式", studyFormFillCz.getCzfs().equals(other)?studyFormFillCz.getCzfs():studyFormFillCz.getCzfsqt());
                             formData.put("处置量", gsp.getKc() + gsp.getKcdw());
                             jcgjList.add(gspJcgjService.getJcgj(gsp, 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/GyzjServiceImpl.java

@@ -1615,9 +1615,10 @@ public class GyzjServiceImpl extends ServiceImpl implements IG
                         if (gyzj != null) {
                             list.add(gyzj.getId());
                             // 稽查轨迹
+                            String other="其他";
                             HashMap<String, String> formData = new HashMap<>(2);
                             formData.put("存储位置", studyFormFillCc.getCcwz());
-                            formData.put("存储条件", studyFormFillCc.getCctj());
+                            formData.put("存储条件", studyFormFillCc.getCctj().equals(other)?studyFormFillCc.getCctj():studyFormFillCc.getCctjqt());
                             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()));
@@ -1656,8 +1657,9 @@ public class GyzjServiceImpl extends ServiceImpl implements IG
                         if (gyzj != null) {
                             list.add(gyzj.getId());
                             // 稽查轨迹
+                            String other="其他";
                             HashMap<String, String> formData = new HashMap<>(2);
-                            formData.put("处置方式", studyFormFillCz.getCzfs());
+                            formData.put("处置方式", studyFormFillCz.getCzfs().equals(other)?studyFormFillCz.getCzfs():studyFormFillCz.getCzfsqt());
                             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

@@ -1390,8 +1390,9 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS
                         if (mjy != null) {
                             list.add(mjy.getId());
                             // 稽查轨迹
+                            String other="其他";
                             HashMap<String, String> formData = new HashMap<>(2);
-                            formData.put("处置方式", studyFormFillCz.getCzfs());
+                            formData.put("处置方式", studyFormFillCz.getCzfs().equals(other)?studyFormFillCz.getCzfs():studyFormFillCz.getCzfsqt());
                             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));
 
@@ -1430,9 +1431,10 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS
                         if (mjy != null) {
                             list.add(mjy.getId());
                             // 稽查轨迹
+                            String other="其他";
                             HashMap<String, String> formData = new HashMap<>(2);
                             formData.put("存储位置", studyFormFillCc.getCcwz());
-                            formData.put("存储条件", studyFormFillCc.getCctj());
+                            formData.put("存储条件", studyFormFillCc.getCctj().equals(other)?studyFormFillCc.getCctj():studyFormFillCc.getCctjqt());
                             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

@@ -900,9 +900,10 @@ public class SjServiceImpl extends ServiceImpl implements ISjServi
                     if (sj != null) {
                         list.add(sj.getId());
                         // 稽查轨迹
+                        String other="其他";
                         LinkedHashMap<String, String> jcnrMap = new LinkedHashMap<>();
                         jcnrMap.put("存储位置", studyFormFillCc.getCcwz());
-                        jcnrMap.put("存储条件", studyFormFillCc.getCctj());
+                        jcnrMap.put("存储条件", studyFormFillCc.getCctj().equals(other)?studyFormFillCc.getCctj():studyFormFillCc.getCctjqt());
 
                         LinkedHashMap<String, String> jcnrEnMap = new LinkedHashMap<>();
                         jcnrEnMap.put("Storage Location", studyFormFillCc.getCcwz());
@@ -946,8 +947,9 @@ public class SjServiceImpl extends ServiceImpl implements ISjServi
                     if (sj != null) {
                         list.add(sj.getId());
                         // 稽查轨迹
+                        String other="其他";
                         LinkedHashMap<String, String> jcnrMap = new LinkedHashMap<>();
-                        jcnrMap.put("处置方式", studyFormFillCz.getCzfs());
+                        jcnrMap.put("处置方式", studyFormFillCz.getCzfs().equals(other)?studyFormFillCz.getCzfs():studyFormFillCz.getCzfsqt());
                         jcnrMap.put("处置量", sj.getKc() + sj.getKcdw());
 
                         LinkedHashMap<String, String> jcnrEnMap = new LinkedHashMap<>();