fix:[填报表单]优化

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

@@ -15,6 +15,7 @@ import com.hxhq.business.dto.gyzj.ListDto;
 import com.hxhq.business.dto.study.StudyFormFillCc;
 import com.hxhq.business.dto.study.StudyFormFillCz;
 import com.hxhq.business.dto.study.StudyFormFillResource;
+import com.hxhq.business.enums.NormalEnum;
 import com.hxhq.business.enums.archive.ArchiveLogTypeEnum;
 import com.hxhq.business.enums.study.StudyFormFillResourceTypeEnum;
 import com.hxhq.business.enums.zykgl.*;
@@ -1470,33 +1471,35 @@ public class GyzjServiceImpl extends ServiceImpl implements IG
                     Gyzj gyzj = gyzjMap.get(studyFormFillResource.getBh());
                     //配置的才保存，或更新
                     if (studyFormFillResource.getType() == null) {
-                        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(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);
+                            }
+                            studyFormFillResource.setType(StudyFormFillResourceTypeEnum.gyzj.getValue());
                         }
-                        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());
@@ -1526,9 +1529,11 @@ public class GyzjServiceImpl extends ServiceImpl implements IG
                 //更新 Resource
                 studyFormFill.setResource(JSONObject.toJSONString(studyFormFillResourceList));
             }
-            // 存储、处置
-            cc(studyFormFill, gyzjMap, jcgjList, tzList, remark, qmr);
-            cz(studyFormFill, gyzjMap, jcgjList, tzList, remark, qmr);
+            if(studyFormFill.getSftb().equals(NormalEnum.no.getValue())) {
+                // 存储、处置
+                cc(studyFormFill, gyzjMap, jcgjList, tzList, remark, qmr);
+                cz(studyFormFill, gyzjMap, jcgjList, tzList, remark, qmr);
+            }
         }
         if (jcgjList.size() > 0) {
             gyzjJcgjService.saveBatch(jcgjList);

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

@@ -15,6 +15,7 @@ import com.hxhq.business.dto.mjy.ListDto;
 import com.hxhq.business.dto.study.StudyFormFillCc;
 import com.hxhq.business.dto.study.StudyFormFillCz;
 import com.hxhq.business.dto.study.StudyFormFillResource;
+import com.hxhq.business.enums.NormalEnum;
 import com.hxhq.business.enums.archive.ArchiveLogTypeEnum;
 import com.hxhq.business.enums.study.StudyFormFillResourceTypeEnum;
 import com.hxhq.business.enums.zykgl.*;
@@ -1256,33 +1257,35 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS
                     Mjy mjy = mjyMap.get(studyFormFillResource.getBh());
                     //配置的才保存，或更新
                     if (studyFormFillResource.getType() == null) {
-                        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(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);
+                            }
+                            studyFormFillResource.setType(StudyFormFillResourceTypeEnum.mjy.getValue());
                         }
-                        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());
@@ -1312,9 +1315,11 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS
                 //更新 Resource
                 studyFormFill.setResource(JSONObject.toJSONString(studyFormFillResourceList));
             }
-            // 处置、存储
-            cc(studyFormFill, mjyMap, jcgjList, tzList, remark, qmr);
-            cz(studyFormFill, mjyMap, jcgjList, tzList, remark, qmr);
+            if(studyFormFill.getSftb().equals(NormalEnum.no.getValue())){
+                // 处置、存储
+                cc(studyFormFill, mjyMap, jcgjList, tzList, remark, qmr);
+                cz(studyFormFill, mjyMap, jcgjList, tzList, remark, qmr);
+            }
         }
         if (jcgjList.size() > 0) {
             mjyJcgjService.saveBatch(jcgjList);

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

@@ -506,9 +506,9 @@ public class StudyFormFillServiceImpl extends ServiceImpl
                 studyFormFillOld.setEndDate(new Date());
                 studyFormFillOld.setCclist(studyFormFill.getCclist());
                 studyFormFillOld.setCzlist(studyFormFill.getCzlist());
-                //生成物资
-                genResource(studyFormFillOld, studyFormFill.getRemark());
             }
+            //生成物资
+            genResource(studyFormFillOld, studyFormFill.getRemark());
             studyFormFillOld.setSftb(NormalEnum.yes.getValue());
             this.updateById(studyFormFillOld);
             List<ObjectCompareUtil.FieldChange> fieldChanges = ObjectCompareUtil.compareObjectsNotNull(studyFormFillOld, studyFormFill);