fix:[表单管理]优化

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/Gyzj.java

@@ -52,6 +52,10 @@ public class Gyzj extends MpBaseEntity
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date sxrq;
 
+
+    /** 来源 */
+    private String ly;
+
     /** 制剂状态：1：入库；3：已发放；5：已锁定；7：待归档；9：归档；11：待解档 */
     private Integer zjzt;
 
@@ -241,6 +245,14 @@ public class Gyzj extends MpBaseEntity
     /** 归档申请人名称 */
     private String gdsqrMc;
 
+    public String getLy() {
+        return ly;
+    }
+
+    public void setLy(String ly) {
+        this.ly = ly;
+    }
+
     public Long getGdsqrId() {
         return gdsqrId;
     }

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/Mjy.java

@@ -50,6 +50,9 @@ public class Mjy extends MpBaseEntity
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date sxrq;
 
+    /** 来源 */
+    private String ly;
+
     /** 制剂状态：1：入库；3：已发放；5：已锁定；7：待归档；9：归档；11：待解档 */
     private Integer zjzt;
 
@@ -215,6 +218,14 @@ public class Mjy extends MpBaseEntity
     /** 归档申请人名称 */
     private String gdsqrMc;
 
+    public String getLy() {
+        return ly;
+    }
+
+    public void setLy(String ly) {
+        this.ly = ly;
+    }
+
     public Long getGdsqrId() {
         return gdsqrId;
     }

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/mapper/StudyFormApplyMapper.java

@@ -42,7 +42,17 @@ public interface StudyFormApplyMapper extends BaseMapper
      * @param bmId
      * @param sdId
      */
-    void updateBdnr(@Param("id") Long id,@Param("bdnr") String bdnr,@Param("zdxgjl") String zdxgjl,@Param("syId") Long syId,@Param("bmId") Long bmId,@Param("sdId") Long sdId);
+    void updateBdnrZdxgjl(@Param("id") Long id,@Param("bdnr") String bdnr,@Param("zdxgjl") String zdxgjl,@Param("syId") Long syId,@Param("bmId") Long bmId,@Param("sdId") Long sdId);
+
+    /**
+     * 更新表单内容
+     * @param id
+     * @param bdnr
+     * @param syId
+     * @param bmId
+     * @param sdId
+     */
+    void updateBdnr(@Param("id") Long id,@Param("bdnr") String bdnr,@Param("syId") Long syId,@Param("bmId") Long bmId,@Param("sdId") Long sdId);
 
     /**
      * 更新复核意见

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/mapper/StudyFormFillMapper.java

@@ -39,7 +39,14 @@ public interface StudyFormFillMapper extends BaseMapper
      * @param bdnr
      * @param zdxgjl
      */
-    void updateBdnr(@Param("id") Long id,@Param("bdnr") String bdnr,@Param("zdxgjl") String zdxgjl);
+    void updateBdnrZdxgjl(@Param("id") Long id,@Param("bdnr") String bdnr,@Param("zdxgjl") String zdxgjl);
+
+    /**
+     * 更新表单内容
+     * @param id
+     * @param bdnr
+     */
+    void updateBdnr(@Param("id") Long id,@Param("bdnr") String bdnr);
 
     /**
      * 更新复核意见

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/mapper/StudyFormPlanMapper.java

@@ -37,7 +37,14 @@ public interface StudyFormPlanMapper extends BaseMapper
      * @param bdnr
      * @param zdxgjl
      */
-    void updateBdnr(@Param("id") Long id,@Param("bdnr") String bdnr,@Param("zdxgjl") String zdxgjl);
+    void updateBdnrZdxgjl(@Param("id") Long id,@Param("bdnr") String bdnr,@Param("zdxgjl") String zdxgjl);
+
+    /**
+     * 更新表单内容
+     * @param id
+     * @param bdnr
+     */
+    void updateBdnr(@Param("id") Long id,@Param("bdnr") String bdnr);
 
     /**
      * 更新复核意见

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/mapper/StudyFormPreMapper.java

@@ -39,7 +39,14 @@ public interface StudyFormPreMapper extends BaseMapper
      * @param bdnr
      * @param zdxgjl
      */
-    void updateBdnr(@Param("id") Long id,@Param("bdnr") String bdnr,@Param("zdxgjl") String zdxgjl);
+    void updateBdnrZdxgjl(@Param("id") Long id,@Param("bdnr") String bdnr,@Param("zdxgjl") String zdxgjl);
+
+    /**
+     * 更新表单内容
+     * @param id
+     * @param bdnr
+     */
+    void updateBdnr(@Param("id") Long id,@Param("bdnr") String bdnr);
 
     /**
      * 更新复核意见

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

@@ -5,6 +5,7 @@ import java.util.*;
 import java.util.stream.Collectors;
 
 import cn.hutool.json.JSONUtil;
+import com.alibaba.fastjson2.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -1354,6 +1355,14 @@ public class GyzjServiceImpl extends ServiceImpl implements IG
                             gyzj.setBdId(studyFormId);
                             gyzj.setZjzt(ZjztEnum.wrk.getValue());
                             gyzj.setJyzt(JyztEnum.wjy.getValue());
+                        }else{
+                            //更新 Resource
+                            studyFormFillResource.setMc(gyzj.getMc());
+                            studyFormFillResource.setNd(gyzj.getNd());
+                            studyFormFillResource.setNddw(gyzj.getNddw());
+                            studyFormFillResource.setLy(gyzj.getLy());
+                            studyFormFillResource.setType(StudyFormFillResourceTypeEnum.gyzj.getValue());
+                            studyFormFillResource.setSxrq(DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss",gyzj.getSxrq()));
                         }
                         gyzj.setMc(studyFormFillResource.getMc());
                         gyzj.setBh(studyFormFillResource.getBh());
@@ -1391,6 +1400,8 @@ public class GyzjServiceImpl extends ServiceImpl implements IG
                     }
                     gyzjMap.put(gyzj.getBh(), gyzj);
                 }
+                //更新 Resource
+                studyFormFill.setResource(JSONObject.toJSONString(studyFormFillResourceList));
             }
             // 处置、存储
             czCc(studyFormFill,gyzjMap,jcgjList,tzList,remark,qmr);

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

@@ -5,6 +5,7 @@ import java.util.*;
 import java.util.stream.Collectors;
 
 import cn.hutool.json.JSONUtil;
+import com.alibaba.fastjson2.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -1257,6 +1258,14 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS
                             mjy.setBdId(studyFormId);
                             mjy.setZjzt(ZjztEnum.wrk.getValue());
                             mjy.setJyzt(JyztEnum.wjy.getValue());
+                        }else{
+                            //更新 Resource
+                            studyFormFillResource.setMc(mjy.getMc());
+                            studyFormFillResource.setNd(mjy.getNd());
+                            studyFormFillResource.setNddw(mjy.getNddw());
+                            studyFormFillResource.setLy(mjy.getLy());
+                            studyFormFillResource.setType(StudyFormFillResourceTypeEnum.mjy.getValue());
+                            studyFormFillResource.setSxrq(DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss",mjy.getSxrq()));
                         }
                         mjy.setMc(studyFormFillResource.getMc());
                         mjy.setBh(studyFormFillResource.getBh());
@@ -1294,6 +1303,8 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS
                     }
                     mjyMap.put(mjy.getBh(), mjy);
                 }
+                //更新 Resource
+                studyFormFill.setResource(JSONObject.toJSONString(studyFormFillResourceList));
             }
             // 处置、存储
             czCc(studyFormFill,mjyMap,jcgjList,tzList,remark,qmr);

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

@@ -5,6 +5,7 @@ import java.util.*;
 import java.util.stream.Collectors;
 
 import cn.hutool.json.JSONUtil;
+import com.alibaba.fastjson2.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -676,6 +677,15 @@ public class SjServiceImpl extends ServiceImpl implements ISjServi
                             sj.setZjzt(ZjztEnum.rk.getValue());
                             sj.setJyzt(JyztEnum.wjy.getValue());
                             sj.setDeptId(template.getDeptId());
+                        }else{
+                            //更新 Resource
+                            studyFormFillResource.setMc(sj.getMc());
+                            studyFormFillResource.setNd(sj.getNd());
+                            studyFormFillResource.setNddw(sj.getNddw());
+                            studyFormFillResource.setPh(sj.getPh());
+                            studyFormFillResource.setLy(sj.getLy());
+                            studyFormFillResource.setType(StudyFormFillResourceTypeEnum.sj.getValue());
+                            studyFormFillResource.setSxrq(DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss",sj.getSxr()));
                         }
                         sj.setMc(studyFormFillResource.getMc());
                         sj.setBh(studyFormFillResource.getBh());
@@ -729,8 +739,11 @@ public class SjServiceImpl extends ServiceImpl implements ISjServi
                         tzList.add(sjTz);
                     }
                     sjMap.put(sj.getBh(), sj);
+
                 }
             }
+            //更新 Resource
+            studyFormFill.setResource(JSONObject.toJSONString(studyFormFillResourceList));
         }
 
         if (sjMap.size() > 0) {

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

@@ -574,7 +574,11 @@ public class StudyFormApplyServiceImpl extends ServiceImpl
     public void updateBdnr(StudyFormUpdateForm form) {
         SysUser qmr = SecurityUtils.getLoginUser().getSysUser();
         JSONObject bdnr = JSONObject.parseObject(form.getBdnr());
-        baseMapper.updateBdnr(form.getId(), form.getBdnr(), form.getZdxgjl(), bdnr.getLong("syId"), bdnr.getLong("bmId"), bdnr.getLong("sdId"));
+        if(StringUtils.isNoneBlank(form.getZdxgjl())) {
+            baseMapper.updateBdnrZdxgjl(form.getId(), form.getBdnr(), form.getZdxgjl(), bdnr.getLong("syId"), bdnr.getLong("bmId"), bdnr.getLong("sdId"));
+        }else{
+            baseMapper.updateBdnr(form.getId(), form.getBdnr(),  bdnr.getLong("syId"), bdnr.getLong("bmId"), bdnr.getLong("sdId"));
+        }
         //稽查轨迹
         if (StringUtils.isNoneBlank(form.getFiledValue())) {
             JSONArray jsonArray = JSONArray.parseArray(form.getFiledValue());

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

@@ -444,6 +444,8 @@ public class StudyFormFillServiceImpl extends ServiceImpl
         sjService.genResource(studyFormFill, template);
         gyzjService.genResource(studyFormFill, template, remark);
         mjyService.genResource(studyFormFill, template, remark);
+        //更新 Resource
+        this.updateById(studyFormFill);
     }
 
     /**
@@ -638,7 +640,11 @@ public class StudyFormFillServiceImpl extends ServiceImpl
     @Override
     public void updateBdnr(StudyFormUpdateForm form) {
         SysUser qmr = SecurityUtils.getLoginUser().getSysUser();
-        baseMapper.updateBdnr(form.getId(), form.getBdnr(), form.getZdxgjl());
+        if(StringUtils.isNoneBlank(form.getZdxgjl())){
+            baseMapper.updateBdnrZdxgjl(form.getId(), form.getBdnr(), form.getZdxgjl());
+        }else{
+            baseMapper.updateBdnr(form.getId(), form.getBdnr());
+        }
         //稽查轨迹
         if (StringUtils.isNoneBlank(form.getFiledValue())) {
             JSONArray jsonArray = JSONArray.parseArray(form.getFiledValue());

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

@@ -378,7 +378,11 @@ public class StudyFormPlanServiceImpl extends ServiceImpl
     public void updateBdnr(StudyFormUpdateForm form) {
         SysUser qmr = SecurityUtils.getLoginUser().getSysUser();
         //更新表单内容
-        baseMapper.updateBdnr(form.getId(), form.getBdnr(), form.getZdxgjl());
+        if(StringUtils.isNoneBlank(form.getZdxgjl())){
+            baseMapper.updateBdnrZdxgjl(form.getId(), form.getBdnr(), form.getZdxgjl());
+        }else{
+            baseMapper.updateBdnr(form.getId(), form.getBdnr());
+        }
         //稽查轨迹
         if (StringUtils.isNoneBlank(form.getFiledValue())) {
             JSONArray jsonArray = JSONArray.parseArray(form.getFiledValue());

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

@@ -502,7 +502,11 @@ public class StudyFormPreServiceImpl extends ServiceImpl
     public void updateBdnr(StudyFormUpdateForm form) {
         SysUser qmr = SecurityUtils.getLoginUser().getSysUser();
         //更新表单内容
-        baseMapper.updateBdnr(form.getId(), form.getBdnr(), form.getZdxgjl());
+        if(StringUtils.isNoneBlank(form.getZdxgjl())){
+            baseMapper.updateBdnrZdxgjl(form.getId(), form.getBdnr(), form.getZdxgjl());
+        }else{
+            baseMapper.updateBdnr(form.getId(), form.getBdnr());
+        }
         //稽查轨迹
 
         if (StringUtils.isNoneBlank(form.getFiledValue())) {

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

@@ -25,6 +25,10 @@
     </select>
 
     <update id="updateBdnr" >
+        update  t_study_form_apply set bdnr=#{bdnr},sy_id=#{syId},bm_id=#{bmId},sd_id=#{sdId}  where id=#{id};
+    </update>
+
+    <update id="updateBdnrZdxgjl" >
         update  t_study_form_apply set bdnr=#{bdnr},zdxgjl=#{zdxgjl},sy_id=#{syId},bm_id=#{bmId},sd_id=#{sdId}  where id=#{id};
     </update>
 

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

@@ -26,6 +26,10 @@
     </select>
 
     <update id="updateBdnr" >
+        update  t_study_form_fill set bdnr=#{bdnr}  where id=#{id};
+    </update>
+
+    <update id="updateBdnrZdxgjl" >
         update  t_study_form_fill set bdnr=#{bdnr},zdxgjl=#{zdxgjl}  where id=#{id};
     </update>
 

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

@@ -24,6 +24,10 @@
     </select>
 
     <update id="updateBdnr" >
+        update  t_study_form_plan set bdnr=#{bdnr}  where id=#{id};
+    </update>
+
+    <update id="updateBdnrZdxgjl" >
         update  t_study_form_plan set bdnr=#{bdnr},zdxgjl=#{zdxgjl}  where id=#{id};
     </update>
 

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

@@ -25,6 +25,10 @@
     </select>
 
     <update id="updateBdnr" >
+        update  t_study_form_pre set bdnr=#{bdnr}  where id=#{id};
+    </update>
+
+    <update id="updateBdnrZdxgjl" >
         update  t_study_form_pre set bdnr=#{bdnr},zdxgjl=#{zdxgjl}  where id=#{id};
     </update>