fix:[模板管理]优化

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

@@ -244,18 +244,18 @@ public class StudyFormPlanServiceImpl extends ServiceImpl
         studyFormPlan.setTjsj(new Date());
         this.saveOrUpdate(studyFormPlan);
         //发送通知
-        Study study = studyService.getById(studyFormPlan.getStudyId());
-        String url = getUrlQz(study, "syxx");
-        String title = StudyTypeEnum.getEnumByValue(study.getType()).getText() + "【" + study.getName() + "】下配置计划表【" + studyFormPlan.getBdmc() + "】复核通过";
-        noticeService.save(title, studyFormPlan.getFhryId(), url);
-
+        if(studyFormPlan.getFhryId()!=null) {
+            Study study = studyService.getById(studyFormPlan.getStudyId());
+            String url = getUrlQz(study, "syxx");
+            String title = StudyTypeEnum.getEnumByValue(study.getType()).getText() + "【" + study.getName() + "】下配置计划表【" + studyFormPlan.getBdmc() + "】待审核，请及时处理。";
+            noticeService.save(title, studyFormPlan.getFhryId(), url);
+        }
         //稽查轨迹
         Map<String, String> formData = new LinkedHashMap<>();
         formData.put("备注", studyFormPlan.getRemark());
         studyFormPlanJcgjService.saveJcgj(studyFormPlan.getId(), JcgjlxEnum.lc.getValue(), "填写并提交记录", JcmcysEnum.green.getValue(), null, qmr, studyFormPlan.getRemark(), null);
         //签名信息
         studyFormPlanQmxxService.saveQmxx(studyFormPlan.getId(), "填写并提交记录", qmr, studyFormPlan.getRemark());
-
     }
 
 
@@ -286,12 +286,10 @@ public class StudyFormPlanServiceImpl extends ServiceImpl
         //签名信息
         studyFormPlanQmxxService.saveQmxx(studyFormPlanOld.getId(), "复核通过", qmr, studyFormPlan.getRemark());
         //发送通知
-        if (studyFormPlanOld.getFhryId() != null) {
-            Study study = studyService.getById(studyFormPlanOld.getStudyId());
-            String url = getUrlQz(study, "syxx");
-            String title = StudyTypeEnum.getEnumByValue(study.getType()).getText() + "【" + study.getName() + "】下配置计划表【" + studyFormPlanOld.getBdmc() + "】待审核，请及时处理";
-            noticeService.save(title, studyFormPlanOld.getFhryId(), url);
-        }
+        Study study = studyService.getById(studyFormPlanOld.getStudyId());
+        String url = getUrlQz(study, "syxx");
+        String title = StudyTypeEnum.getEnumByValue(study.getType()).getText() + "【" + study.getName() + "】下配置计划表【" + studyFormPlanOld.getBdmc() + "】复核通过";
+        noticeService.save(title, studyFormPlanOld.getUserId(), url);
     }
 
 
@@ -385,9 +383,9 @@ public class StudyFormPlanServiceImpl extends ServiceImpl
     public void updateBdnr(StudyFormUpdateForm form) {
         SysUser qmr = SecurityUtils.getLoginUser().getSysUser();
         //更新表单内容
-        if (StringUtils.isNoneBlank(form.getZdxgjl())) {
+        if(StringUtils.isNoneBlank(form.getZdxgjl())){
             baseMapper.updateBdnrZdxgjl(form.getId(), form.getBdnr(), form.getZdxgjl());
-        } else {
+        }else{
             baseMapper.updateBdnr(form.getId(), form.getBdnr());
         }
         //稽查轨迹
@@ -450,7 +448,7 @@ public class StudyFormPlanServiceImpl extends ServiceImpl
             formDataEn.put("字段名", jsonObject.getString("fieldEn"));
             formDataEn.put("复核意见", jsonObject.getString("content"));
             studyFormPlanJcgjs.add(studyFormPlanJcgjService.getJcgj(form.getId(), JcgjlxEnum.lc.getValue(), "复核意见", JcmcysEnum.blue.getValue(), JctUtil.formatStr(formData), StudyFormUtil.getJcnrEn(formDataEn), qmr, null));
-        } else if (StringUtils.isNoneBlank(form.getReply())) {
+        } else if (StringUtils.isNoneBlank(form.getReply())){
             JSONObject jsonObject = JSONArray.parseArray(form.getReply()).getJSONObject(0);
             //zh
             formData.put("字段名", jsonObject.getString("fieldCn"));
@@ -490,7 +488,7 @@ public class StudyFormPlanServiceImpl extends ServiceImpl
         //学科缩写:新增配制计划表：学科简称SD；非试验表单：学科简称GG；麻精药表单：学科简称GSP
         // 有预填的=预填编号+流水号，没有得=模板编号+试验编号+学科缩写+01+流水号
         String pre = template.getShowSn() + "-" + study.getSn() + "-SD-01";
-        return pre + snGenService.getNewSn(pre, SnTypeEnum.noDate.getValue());
+        return pre + snGenService.getNewSn(pre,SnTypeEnum.noDate.getValue());
     }