钉钉消息通知项目名称添加默认值

jfcloud-gene-biz/src/main/java/com/github/jfcloud/gene/sample/service/biz/SampleAnimalImagingServiceImpl.java

@@ -88,6 +88,9 @@ public class SampleAnimalImagingServiceImpl extends ServiceImpl<SampleAnimalImag
 
         // 保存活体成像信息
         LiveImagingVo liveImaging = animalImaging.getLiveImaging();
+        if (Objects.isNull(animalImaging.getRequirements())) {
+            animalImaging.setRequirements("");
+        }
         if (animalImaging.getRequirements().contains("活体成像") && liveImaging != null) {
             LiveImagingDetail liveImagingDetail = BeanUtil.copyProperties(liveImaging, LiveImagingDetail.class);
             liveImagingDetail.setImagingId(sampleAnimalImaging.getId());

jfcloud-gene-biz/src/main/java/com/github/jfcloud/gene/sample/service/impl/SampleInfoServiceImpl.java

@@ -422,8 +422,12 @@ public class SampleInfoServiceImpl extends ServiceImpl<SampleInfoMapper, SampleI
         if (StrUtil.isNotBlank(proNo)) {
             projectType += "/" + proNo;
         }
-        if (StrUtil.isNotBlank(sampleInfo.getProjectName())) {
-            projectType += "/" + sampleInfo.getProjectName();
+        String projectName = sampleInfo.getProjectName();
+        if (StrUtil.isBlank(projectName) && StrUtil.isNotBlank(proNo)) {
+            projectName = Objects.requireNonNull(SampleTypeEnum.resolve(sampleInfo.getType())).getLabel() + "-" + proNo;
+        }
+        if (StrUtil.isNotBlank(projectName)) {
+            projectType += "/" + projectName;
         }
 
         Long userId;
@@ -449,7 +453,7 @@ public class SampleInfoServiceImpl extends ServiceImpl<SampleInfoMapper, SampleI
                 dingMsg = String.format("【%s】【%s/%s】已同意，请执行项目", projectType, previousStatus, previousUser);
                 break;
             default:
-                log.error("流程项目 ({}) 状态异常 {}", sampleInfo.getProjectName(), statusEnum.getDescription());
+                log.error("流程项目 ({}) 状态异常 {}", projectName, statusEnum.getDescription());
                 return;
         }