fix：[试验管理]bug修改

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/StudyFormApplyController.java

@@ -153,6 +153,16 @@ public class StudyFormApplyController extends BaseController {
         return AjaxResult.success(studyFormApplyService.bc(studyFormApply));
     }
 
+    /**
+     * 仅保存
+     */
+    @PostMapping("/bcOnly")
+    @RequiresPermissions(value={"business:drugFormApply:bj","business:drugFormApply:xz"}, logical= Logical.OR)
+    public AjaxResult bcOnly(@RequestBody StudyFormApply studyFormApply) {
+        return AjaxResult.success(studyFormApplyService.bcOnly(studyFormApply));
+    }
+
+
 
     /**
      * 提交

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/StudyFormFillController.java

@@ -63,7 +63,7 @@ public class StudyFormFillController extends BaseController {
      * 稽查轨迹列表
      */
     @GetMapping("/jcgjList")
-    @RequiresPermissions(value = {"business:studyFormFill:bj", "business:nonTrialFormFill:bj", "business:drugFormFill:bj"}, logical = Logical.OR)
+    @RequiresPermissions(value = {"business:studyFormFill:xq", "business:nonTrialFormFill:xq", "business:drugFormFill:xq"}, logical = Logical.OR)
     public TableDataInfo jcgjList(StudyFormFillJcgj form) {
         startPage();
         List<StudyFormFillJcgj> list = studyFormFillJcgjService.queryList(form);
@@ -158,6 +158,17 @@ public class StudyFormFillController extends BaseController {
         return AjaxResult.success(studyFormFillService.bc(studyFormFill));
     }
 
+    /**
+     * 仅保存
+     */
+    @PostMapping("/bcOnly")
+    @RequiresPermissions(value = {"business:studyFormFill:bj", "business:studyFormFill:xz",
+            "business:nonTrialFormFill:bj", "business:nonTrialFormFill:xz",
+            "business:drugFormFill:bj", "business:drugFormFill:xz"}, logical = Logical.OR)
+    public AjaxResult bcOnly(@RequestBody StudyFormFill studyFormFill) {
+        return AjaxResult.success(studyFormFillService.bcOnly(studyFormFill));
+    }
+
 
     /**
      * 提交

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/StudyFormPlanController.java

@@ -122,6 +122,15 @@ public class StudyFormPlanController extends BaseController
         return AjaxResult.success(studyFormPlanService.bc(studyFormPlan));
     }
 
+    /**
+     * 仅保存
+     */
+    @PostMapping("/bcOnly")
+    @RequiresPermissions(value={"business:studyFormPlan:bj","business:studyFormPlan:xz"}, logical= Logical.OR)
+    public AjaxResult bcOnly(@RequestBody StudyFormPlan studyFormPlan) {
+        return AjaxResult.success(studyFormPlanService.bcOnly(studyFormPlan));
+    }
+
 
     /**
      * 提交

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/StudyFormPreController.java

@@ -133,6 +133,18 @@ public class StudyFormPreController extends BaseController
     }
 
     /**
+     * 仅保存
+     */
+    @PostMapping("/bcOnly")
+    @RequiresPermissions(value={"business:studyFormPre:bj","business:studyFormPre:xz",
+            "business:nonTrialFormPre:bj","business:nonTrialFormPre:xz",
+            "business:drugFormPre:bj","business:drugFormPre:xz"}, logical= Logical.OR)
+    public AjaxResult bcOnly(@RequestBody StudyFormPre studyFormPre)
+    {
+        return AjaxResult.success(studyFormPreService.bcOnly(studyFormPre));
+    }
+
+    /**
      * 提交
      */
     @PostMapping("/tj")

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

@@ -67,6 +67,12 @@ public interface IStudyFormApplyService extends IService
     public StudyFormApply bc(StudyFormApply studyFormApply);
 
     /**
+     * 仅保存
+     * @param studyFormApply
+     */
+    public StudyFormApply bcOnly(StudyFormApply studyFormApply);
+
+    /**
      * 提交
      * @param studyFormApply
      */

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

@@ -65,6 +65,17 @@ public interface IStudyFormFillService extends IService
      */
     public StudyFormFill bc(StudyFormFill studyFormFill);
 
+    /**
+     * 预填填报
+     * @param studyFormFill
+     */
+    public void bcAuto(StudyFormFill studyFormFill);
+
+    /**
+     * 仅保存
+     * @param studyFormFill
+     */
+    public StudyFormFill bcOnly(StudyFormFill studyFormFill);
 
     /**
      * 提交

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

@@ -44,6 +44,12 @@ public interface IStudyFormPlanService extends IService
      */
     public StudyFormPlan bc(StudyFormPlan studyFormPlan);
 
+    /**
+     * 仅保存
+     * @param studyFormPlan
+     */
+    public StudyFormPlan bcOnly(StudyFormPlan studyFormPlan);
+
 
     /**
      * 提交

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

@@ -44,6 +44,12 @@ public interface IStudyFormPreService extends IService
     public StudyFormPre bc(StudyFormPre studyFormPre);
 
     /**
+     * 仅保存
+     * @param studyFormPre
+     */
+    public StudyFormPre bcOnly(StudyFormPre studyFormPre);
+
+    /**
      * 提交
      * @param studyFormPre
      */

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

@@ -297,7 +297,43 @@ public class StudyFormApplyServiceImpl extends ServiceImpl
         }
         //签名信息
         studyFormApplyQmxxService.saveQmxx(studyFormApply.getId(), "填写并保存记录", qmr, studyFormApply.getRemark());
-        return result;
+        return baseMapper.queryInfo(result.getId());
+    }
+
+    /**
+     * 仅保存
+     *
+     * @param studyFormApply
+     */
+    @Override
+    public StudyFormApply bcOnly(StudyFormApply studyFormApply) {
+        StudyFormApply result = null;
+        SysUser qmr = SecurityUtils.getLoginUser().getSysUser();
+        if (studyFormApply.getId() != null) {
+            StudyFormApply studyFormApplyOld = this.queryInfo(studyFormApply.getId());
+            if (studyFormApplyOld == null) {
+                throw new ServiceException("信息不存在或已删除");
+            }
+            if (!qmr.getUserId().equals(studyFormApplyOld.getUserId())) {
+                throw new ServiceException("只能操作自己的表单");
+            }
+            studyFormApplyOld.setBdmc(studyFormApply.getBdmc());
+            studyFormApplyOld.setTemplateId(studyFormApply.getTemplateId());
+            studyFormApplyOld.setBdnr(studyFormApply.getBdnr());
+            studyFormApplyOld.setBdzt(StudyFormApplyBdztEnum.tbz.getValue());
+            this.updateById(studyFormApplyOld);
+            result = studyFormApplyOld;
+        } else {
+
+            studyFormApply.setBdzt(StudyFormApplyBdztEnum.tbz.getValue());
+            studyFormApply.setUserId(qmr.getUserId());
+            studyFormApply.setBdbh(getSn(studyFormApply));
+            studyFormApply.setUserMc(qmr.getNickName());
+            studyFormApply.setUserMcEn(qmr.getUserName());
+            this.save(studyFormApply);
+            result = studyFormApply;
+        }
+        return baseMapper.queryInfo(result.getId());
     }
 
 
@@ -550,7 +586,7 @@ public class StudyFormApplyServiceImpl extends ServiceImpl
                 formDataEn.put("字段名", jsonObject.getString("fieldEn"));
                 formDataEn.put("填入值", jsonObject.getString("value"));
                 formDataEn.put("填写人", qmr.getNickName());
-                studyFormApplyJcgjs.add(studyFormApplyJcgjService.getJcgj(form.getId(), JcgjlxEnum.lc.getValue(), "填写", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), StudyFormUtil.getJcnrEn(formDataEn), null, null));
+                studyFormApplyJcgjs.add(studyFormApplyJcgjService.getJcgj(form.getId(), JcgjlxEnum.xg.getValue(), "填写", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), StudyFormUtil.getJcnrEn(formDataEn), null, null));
             }
             studyFormApplyJcgjService.saveBatch(studyFormApplyJcgjs);
         }

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

@@ -266,6 +266,8 @@ public class StudyFormFillServiceImpl extends ServiceImpl
     @Override
     public StudyFormFill bc(StudyFormFill studyFormFill) {
         SysUser qmr = SecurityUtils.getLoginUser().getSysUser();
+        //验证签名人密码
+        checkPassword(SecurityUtils.getLoginUser().getSysUser(), studyFormFill.getQmrmm());
         StudyFormFill result = null;
         if (studyFormFill.getId() != null) {
             StudyFormFill studyFormFillOld = this.queryInfo(studyFormFill.getId());
@@ -280,17 +282,10 @@ public class StudyFormFillServiceImpl extends ServiceImpl
             studyFormFillOld.setBdzt(StudyFormFillBdztEnum.tbz.getValue());
             this.updateById(studyFormFillOld);
             result = studyFormFillOld;
-            List<ObjectCompareUtil.FieldChange> fieldChanges = ObjectCompareUtil.compareObjectsNotNULL(studyFormFillOld, studyFormFill);
-            if (fieldChanges.size() > 0) {
-                //稽查轨迹
-                List<StudyFormFillJcgj> studyFormFillJcgjs = new ArrayList<>();
-                for (ObjectCompareUtil.FieldChange fieldChange : fieldChanges) {
-                    studyFormFillJcgjs.add(studyFormFillJcgjService.getJcgj(studyFormFillOld.getId(), JcgjlxEnum.xg.getValue(), "修改", JcmcysEnum.orange.getValue(), fieldChange.toString(), fieldChange.toEnString(), SecurityUtils.getLoginUser().getSysUser(), studyFormFill.getRemark()));
-                }
-                studyFormFillJcgjService.saveBatch(studyFormFillJcgjs);
-            }
+            //签名信息
+            studyFormFillQmxxService.saveQmxx(studyFormFill.getId(), "填写并保存记录", qmr, studyFormFill.getRemark());
             //稽查轨迹
-            studyFormFillJcgjService.saveJcgj(studyFormFillOld.getId(), JcgjlxEnum.lc.getValue(), "填写并提交记录", JcmcysEnum.green.getValue(), null, SecurityUtils.getLoginUser().getSysUser(), studyFormFill.getRemark(), null);
+            studyFormFillJcgjService.saveJcgj(studyFormFillOld.getId(), JcgjlxEnum.lc.getValue(), "填写并保存记录", JcmcysEnum.green.getValue(), null, SecurityUtils.getLoginUser().getSysUser(), studyFormFill.getRemark(), null);
         } else {
             studyFormFill.setBdzt(StudyFormFillBdztEnum.tbz.getValue());
             studyFormFill.setUserId(SecurityUtils.getUserId());
@@ -299,15 +294,66 @@ public class StudyFormFillServiceImpl extends ServiceImpl
             studyFormFill.setUserMc(SecurityUtils.getNickName());
             this.save(studyFormFill);
             result = studyFormFill;
+            //签名信息
+            studyFormFillQmxxService.saveQmxx(studyFormFill.getId(), "填写并保存记录", qmr, studyFormFill.getRemark());
             //稽查轨迹
             studyFormFillJcgjService.saveJcgj(studyFormFill.getId(), JcgjlxEnum.lc.getValue(), "创建记录", JcmcysEnum.green.getValue(), null, SecurityUtils.getLoginUser().getSysUser(), studyFormFill.getRemark(), null);
         }
+        return baseMapper.queryInfo(result.getId());
+    }
 
+    /**
+     * 保存
+     *
+     * @param studyFormFill
+     */
+    @Override
+    public void bcAuto(StudyFormFill studyFormFill) {
+        SysUser qmr=SecurityUtils.getLoginUser().getSysUser();
+        studyFormFill.setBdzt(StudyFormFillBdztEnum.tbz.getValue());
+        studyFormFill.setUserId(SecurityUtils.getUserId());
+        studyFormFill.setBdbh(getSn(studyFormFill));
+        studyFormFill.setStartDate(new Date());
+        studyFormFill.setUserMc(SecurityUtils.getNickName());
+        this.save(studyFormFill);
+        //稽查轨迹
+        studyFormFillJcgjService.saveJcgj(studyFormFill.getId(), JcgjlxEnum.lc.getValue(), "创建记录", JcmcysEnum.green.getValue(), null,qmr , studyFormFill.getRemark(), null);
         //签名信息
-        studyFormFillQmxxService.saveQmxx(studyFormFill.getId(), "填写并保存记录", qmr, studyFormFill.getRemark());
-        return result;
+        studyFormFillQmxxService.saveQmxx(studyFormFill.getId(), "创建记录", qmr, studyFormFill.getRemark());
     }
 
+    /**
+     * 仅保存
+     *
+     * @param studyFormFill
+     */
+    @Override
+    public StudyFormFill bcOnly(StudyFormFill studyFormFill) {
+        StudyFormFill result = null;
+        if (studyFormFill.getId() != null) {
+            StudyFormFill studyFormFillOld = this.queryInfo(studyFormFill.getId());
+            if (studyFormFillOld == null) {
+                throw new ServiceException("信息不存在或已删除");
+            }
+            if (!SecurityUtils.getUserId().equals(studyFormFillOld.getUserId())) {
+                throw new ServiceException("只能操作自己的表单");
+            }
+            studyFormFillOld.setBdmc(studyFormFill.getBdmc());
+            studyFormFillOld.setBdnr(studyFormFill.getBdnr());
+            studyFormFillOld.setBdzt(StudyFormFillBdztEnum.tbz.getValue());
+            this.updateById(studyFormFillOld);
+            result = studyFormFillOld;
+        } else {
+            studyFormFill.setBdzt(StudyFormFillBdztEnum.tbz.getValue());
+            studyFormFill.setUserId(SecurityUtils.getUserId());
+            studyFormFill.setBdbh(getSn(studyFormFill));
+            studyFormFill.setStartDate(new Date());
+            studyFormFill.setUserMc(SecurityUtils.getNickName());
+            this.save(studyFormFill);
+            result = studyFormFill;
+        }
+        return baseMapper.queryInfo(result.getId());
+    }
 
     /**
      * 提交
@@ -592,7 +638,7 @@ public class StudyFormFillServiceImpl extends ServiceImpl
                 formDataEn.put("字段名", jsonObject.getString("fieldEn"));
                 formDataEn.put("填入值", jsonObject.getString("value"));
                 formDataEn.put("填写人", qmr.getNickName());
-                studyFormFillJcgjs.add(studyFormFillJcgjService.getJcgj(form.getId(), JcgjlxEnum.lc.getValue(), "填写", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), StudyFormUtil.getJcnrEn(formDataEn), null, null));
+                studyFormFillJcgjs.add(studyFormFillJcgjService.getJcgj(form.getId(), JcgjlxEnum.xg.getValue(), "填写", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), StudyFormUtil.getJcnrEn(formDataEn), null, null));
             }
             studyFormFillJcgjService.saveBatch(studyFormFillJcgjs);
         }

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

@@ -181,9 +181,45 @@ public class StudyFormPlanServiceImpl extends ServiceImpl
         }
         //签名信息
         studyFormPlanQmxxService.saveQmxx(studyFormPlan.getId(), "填写并保存记录", qmr, studyFormPlan.getRemark());
-        return result;
+        return baseMapper.queryInfo(result.getId());
     }
 
+    /**
+     * 仅保存
+     *
+     * @param studyFormPlan
+     */
+    @Override
+    public StudyFormPlan bcOnly(StudyFormPlan studyFormPlan) {
+        StudyFormPlan result = null;
+        SysUser qmr = SecurityUtils.getLoginUser().getSysUser();
+        if (studyFormPlan.getId() != null) {
+            StudyFormPlan studyFormPlanOld = this.queryInfo(studyFormPlan.getId());
+            if (studyFormPlanOld == null) {
+                throw new ServiceException("信息不存在或已删除");
+            }
+            if (!qmr.getUserId().equals(studyFormPlanOld.getUserId())) {
+                throw new ServiceException("只能操作自己的表单");
+            }
+            studyFormPlanOld.setBdmc(studyFormPlan.getBdmc());
+            studyFormPlanOld.setTemplateId(studyFormPlan.getTemplateId());
+            studyFormPlanOld.setBdnr(studyFormPlan.getBdnr());
+            studyFormPlanOld.setBdzt(StudyFormPlanBdztEnum.tbz.getValue());
+            this.updateById(studyFormPlanOld);
+            result = studyFormPlanOld;
+        } else {
+            studyFormPlan.setBdzt(StudyFormPlanBdztEnum.tbz.getValue());
+            studyFormPlan.setUserId(qmr.getUserId());
+            studyFormPlan.setUserMc(qmr.getNickName());
+            studyFormPlan.setBdbh(getSn(studyFormPlan));
+            studyFormPlan.setUserMcEn(qmr.getUserName());
+            this.save(studyFormPlan);
+            result = studyFormPlan;
+        }
+        return baseMapper.queryInfo(result.getId());
+    }
+
+
 
     /**
      * 提交
@@ -359,7 +395,7 @@ public class StudyFormPlanServiceImpl extends ServiceImpl
                 formDataEn.put("字段名", jsonObject.getString("fieldEn"));
                 formDataEn.put("填入值", jsonObject.getString("value"));
                 formDataEn.put("填写人", qmr.getNickName());
-                studyFormPlanJcgjs.add(studyFormPlanJcgjService.getJcgj(form.getId(), JcgjlxEnum.lc.getValue(), "填写", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), StudyFormUtil.getJcnrEn(formDataEn), null, null));
+                studyFormPlanJcgjs.add(studyFormPlanJcgjService.getJcgj(form.getId(), JcgjlxEnum.xg.getValue(), "填写", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), StudyFormUtil.getJcnrEn(formDataEn), null, null));
             }
             studyFormPlanJcgjService.saveBatch(studyFormPlanJcgjs);
         }

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

@@ -159,7 +159,41 @@ public class StudyFormPreServiceImpl extends ServiceImpl
         }
         //签名信息
         studyFormPreQmxxService.saveQmxx(studyFormPre.getId(), "制作保存预制表单", qmr, studyFormPre.getRemark());
-        return result;
+        return baseMapper.queryInfo(result.getId());
+    }
+
+    /**
+     * 仅保存
+     *
+     * @param studyFormPre
+     */
+    @Override
+    public StudyFormPre bcOnly(StudyFormPre studyFormPre) {
+        StudyFormPre result = null;
+        SysUser qmr = SecurityUtils.getLoginUser().getSysUser();
+        if (studyFormPre.getId() != null) {
+            StudyFormPre studyFormPreOld = this.getById(studyFormPre.getId());
+            if (studyFormPreOld == null) {
+                throw new ServiceException("信息不存在或已删除");
+            }
+            if (!qmr.getUserId().equals(studyFormPreOld.getUserId())) {
+                throw new ServiceException("只能操作自己的表单");
+            }
+            studyFormPreOld.setBdmc(studyFormPre.getBdmc());
+            studyFormPreOld.setTemplateId(studyFormPre.getTemplateId());
+            studyFormPreOld.setBdnr(studyFormPre.getBdnr());
+            this.updateById(studyFormPreOld);
+            result = studyFormPreOld;
+        } else {
+            studyFormPre.setBdbh(getSn(studyFormPre));
+            studyFormPre.setUserId(qmr.getUserId());
+            studyFormPre.setUserMc(qmr.getNickName());
+            studyFormPre.setUserMcEn(qmr.getNickName());
+            studyFormPre.setBdzt(StudyFormPreBdztEnum.tbz.getValue());
+            this.save(studyFormPre);
+            result = studyFormPre;
+        }
+        return baseMapper.queryInfo(result.getId());
     }
 
     /**
@@ -320,9 +354,7 @@ public class StudyFormPreServiceImpl extends ServiceImpl
         studyFormFill.setBdnr(studyFormPreOld.getBdnr());
         studyFormFill.setStartDate(time);
         studyFormFill.setTemplateId(studyFormPreOld.getTemplateId());
-        studyFormFillService.bc(studyFormFill);
-        //签名信息
-        studyFormFillQmxxService.saveQmxx(studyFormFill.getId(), "创建记录", qmr, studyFormFill.getRemark());
+        studyFormFillService.bcAuto(studyFormFill);
         return studyFormFill;
     }
 
@@ -474,7 +506,7 @@ public class StudyFormPreServiceImpl extends ServiceImpl
                 formDataEn.put("字段名", jsonObject.getString("fieldEn"));
                 formDataEn.put("填入值", jsonObject.getString("value"));
                 formDataEn.put("填写人", qmr.getNickName());
-                studyFormPreJcgjs.add(studyFormPreJcgjService.getJcgj(form.getId(), JcgjlxEnum.lc.getValue(), "填写", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), StudyFormUtil.getJcnrEn(formDataEn), null, null));
+                studyFormPreJcgjs.add(studyFormPreJcgjService.getJcgj(form.getId(), JcgjlxEnum.xg.getValue(), "填写", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), StudyFormUtil.getJcnrEn(formDataEn), null, null));
             }
             studyFormPreJcgjService.saveBatch(studyFormPreJcgjs);
         }