fix：[试验管理][计划表单]bug

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

@@ -55,6 +55,12 @@ public class StudyFormPlan extends MpBaseEntity
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date tjsj;
 
+    /** 复核人员id(通知用) */
+    private Long fhryId;
+
+    /** 复核人员名称(通知用) */
+    private String fhryMc;
+
     /** 签名意义 */
     @TableField(exist = false)
     private String qmyy;
@@ -80,6 +86,22 @@ public class StudyFormPlan extends MpBaseEntity
     @TableField(exist = false)
     private String studyMc;
 
+    public Long getFhryId() {
+        return fhryId;
+    }
+
+    public void setFhryId(Long fhryId) {
+        this.fhryId = fhryId;
+    }
+
+    public String getFhryMc() {
+        return fhryMc;
+    }
+
+    public void setFhryMc(String fhryMc) {
+        this.fhryMc = fhryMc;
+    }
+
     public String getStudySn() {
         return studySn;
     }

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

@@ -305,26 +305,15 @@ public class StudyFormApplyServiceImpl extends ServiceImpl
     @Override
     public void tj(StudyFormApply studyFormApply) {
         //验证签名人密码 todo
-        if (studyFormApply.getId() == null || studyFormApply.getId().longValue() < 0) {
-            throw new ServiceException("参数id不正确");
-        }
-        StudyFormApply studyFormApplyOld = this.getById(studyFormApply.getId());
-        if (studyFormApplyOld == null) {
-            throw new ServiceException("表单不存在或已删除");
-        }
-        studyFormApplyOld.setBdzt(StudyFormApplyBdztEnum.ytj.getValue());
-        studyFormApplyOld.setBdnr(studyFormApply.getBdnr());
-        studyFormApplyOld.setBdmc(studyFormApply.getBdmc());
-        studyFormApplyOld.setBdsm(studyFormApply.getBdsm());
-        studyFormApplyOld.setTjsj(new Date());
-        this.updateById(studyFormApplyOld);
+        studyFormApply.setBdzt(StudyFormApplyBdztEnum.ytj.getValue());
+        studyFormApply.setTjsj(new Date());
+        this.updateById(studyFormApply);
         //稽查轨迹
         Map<String, String> formData = new LinkedHashMap<>();
         formData.put("备注",studyFormApply.getRemark());
-        studyFormApplyJcgjService.saveJcgj(studyFormApplyOld.getId(), JcgjlxEnum.lc.getValue(), "填写并提交记录", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getNickName());
+        studyFormApplyJcgjService.saveJcgj(studyFormApply.getId(), JcgjlxEnum.lc.getValue(), "填写并提交记录", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getNickName());
         //签名信息
-        studyFormApplyQmxxService.saveQmxx(studyFormApplyOld.getId(),"填写并提交记录",SecurityUtils.getUserId(),SecurityUtils.getNickName(),studyFormApply.getRemark());
-
+        studyFormApplyQmxxService.saveQmxx(studyFormApply.getId(),"填写并提交记录",SecurityUtils.getUserId(),SecurityUtils.getNickName(),studyFormApply.getRemark());
     }
 
 

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

@@ -184,25 +184,15 @@ public class StudyFormPlanServiceImpl extends ServiceImpl
     @Override
     public void tj(StudyFormPlan studyFormPlan) {
         //验证签名人密码 todo
-        if (studyFormPlan.getId() == null || studyFormPlan.getId().longValue() < 0) {
-            throw new ServiceException("参数id不正确");
-        }
-        StudyFormPlan studyFormPlanOld = this.getById(studyFormPlan.getId());
-        if (studyFormPlanOld == null) {
-            throw new ServiceException("表单不存在或已删除");
-        }
-        studyFormPlanOld.setBdzt(StudyFormPlanBdztEnum.ytj.getValue());
-        studyFormPlanOld.setBdnr(studyFormPlan.getBdnr());
-        studyFormPlanOld.setBdmc(studyFormPlan.getBdmc());
-        studyFormPlanOld.setBdsm(studyFormPlan.getBdsm());
-        studyFormPlanOld.setTjsj(new Date());
-        this.updateById(studyFormPlanOld);
+        studyFormPlan.setBdzt(StudyFormPlanBdztEnum.ytj.getValue());
+        studyFormPlan.setTjsj(new Date());
+        this.saveOrUpdate(studyFormPlan);
         //稽查轨迹
         Map<String, String> formData = new LinkedHashMap<>();
         formData.put("备注",studyFormPlan.getRemark());
-        studyFormPlanJcgjService.saveJcgj(studyFormPlanOld.getId(), JcgjlxEnum.lc.getValue(), "填写并提交记录", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getNickName());
+        studyFormPlanJcgjService.saveJcgj(studyFormPlan.getId(), JcgjlxEnum.lc.getValue(), "填写并提交记录", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getNickName());
         //签名信息
-        studyFormPlanQmxxService.saveQmxx(studyFormPlanOld.getId(),"填写并提交记录",SecurityUtils.getUserId(),SecurityUtils.getNickName(),studyFormPlan.getRemark());
+        studyFormPlanQmxxService.saveQmxx(studyFormPlan.getId(),"填写并提交记录",SecurityUtils.getUserId(),SecurityUtils.getNickName(),studyFormPlan.getRemark());
 
     }