宠物食品附件添加自定义的输入文本

jfcloud-gene-biz/src/main/java/com/github/jfcloud/gene/sample/entity/SampleFood.java

@@ -42,6 +42,9 @@ public class SampleFood extends BaseEntity {
     @Schema(description = "样品类型")
     private String sampleType;
 
+    @Schema(description = "样品类型-自定义")
+    private String sampleTypeOther;
+
     @Schema(description = "样品照片")
     private String samplePhoto;
 

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

@@ -136,6 +136,7 @@ public class SampleFoodServiceImpl extends ServiceImpl<SampleFoodMapper, SampleF
         checkbox(mappings, "是否以干基计", "☐是      ☐否", WhetherEnum.getLabel(detail.getDryBasis()));
         checkbox(mappings, "其他要求", "☐CNAS    ☐CMA    ☐保密数据", detail.getOtherRequirements());
         checkbox(mappings, "自定义", "☐自定义", detail.getSampleType());
+        mappings.put("自定义-其他", detail.getSampleTypeOther());
         checkbox(mappings, "样品照片", "☐否（不需要）   ☐是（需要）   ☐外观   ☐内容物   ☐其他", detail.getSamplePhoto());
         mappings.put("样品照片-其他", detail.getSamplePhotoOther());
         checkbox(mappings, "样品储存要求", "☐室温   ☐冷藏（0℃~8℃）   ☐冷冻（≤18℃）   ☐避光   ☐干燥   ☐其他", detail.getStorageRequirements());
@@ -303,6 +304,7 @@ public class SampleFoodServiceImpl extends ServiceImpl<SampleFoodMapper, SampleF
             }, 5000);
         } catch (Exception e) {
             log.error("宠物食品附件生成失败 id={} error={}", sampleId, e.getMessage());
+            log.error(e.getMessage(), e);
         }
 
     }
@@ -342,7 +344,7 @@ public class SampleFoodServiceImpl extends ServiceImpl<SampleFoodMapper, SampleF
         //如果审核完成，提醒送检人和收样人
         if (GeneStatusEnum.COMPLETED.getStatus().equals(sampleInfo.getStatus())) {
             String now = DateUtil.format(new Date(), DatePattern.CHINESE_DATE_TIME_PATTERN);
-            String dingMsg = String.format("【%s】【%s/%s】%s同意，请执行项目", sampleInfo.projectType(),
+            String dingMsg = String.format("【%s】【%s/%s】%s同意，审核完成", sampleInfo.projectType(),
                     GeneStatusEnum.PROJECT_MANAGEMENT.getDescription(), UserUtil.getNickName(), now);
 
             //查询是否需要钉钉通知

jfcloud-gene-biz/src/main/java/com/github/jfcloud/gene/sample/vo/SampleFoodVo.java

@@ -37,6 +37,9 @@ public class SampleFoodVo {
     @Schema(description = "样品类型")
     private String sampleType;
 
+    @Schema(description = "样品类型-自定义")
+    private String sampleTypeOther;
+
     @Schema(description = "样品照片")
     private String samplePhoto;