样本送检失效日期字段调整

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

@@ -74,7 +74,7 @@ public class SampleInfo extends BaseEntity {
     private String approvalDate;
 
     @Schema(description = "失效日期")
-    private String expiryDate;
+    private String expireDate;
 
     @Schema(description = "科研Id")
     private Long kyId;

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

@@ -220,11 +220,11 @@ public class SampleAnimalImagingServiceImpl extends ServiceImpl<SampleAnimalImag
                 });
 
         //项目管理部填写字段
-        sampleInfoObj.put("approvalNo", WordUtil.padString(sampleInfo.getApprovalNo(), 16));
-        sampleInfoObj.put("revisionNo", WordUtil.padString(sampleInfo.getRevisionNo(), 16));
-        sampleInfoObj.put("receiptDate", WordUtil.padString(sampleInfo.getReceiptDate(), 12));
-        sampleInfoObj.put("approvalDate", WordUtil.padString(sampleInfo.getApprovalDate(), 12));
-        sampleInfoObj.put("expiryDate", WordUtil.padString(sampleInfo.getExpiryDate(), 12));
+        sampleInfoObj.put("approvalNo", WordUtil.padString(sampleInfo.getApprovalNo(), 14));
+        sampleInfoObj.put("revisionNo", WordUtil.padString(sampleInfo.getRevisionNo(), 14));
+        sampleInfoObj.put("receiptDate", WordUtil.padString(sampleInfo.getReceiptDate(), 8));
+        sampleInfoObj.put("approvalDate", WordUtil.padString(sampleInfo.getApprovalDate(), 8));
+        sampleInfoObj.put("expireDate", WordUtil.padString(sampleInfo.getExpireDate(), 8));
 
         String modelName = "animalImaging.ftl";
         fileInfoService.uploadFileWithFileName(modelName, fileName, sampleInfo.getId(), sampleInfo.getStatus(), dataMap);

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

@@ -271,7 +271,7 @@ public class SampleAnimalServiceImpl extends ServiceImpl<SampleAnimalMapper, Sam
         sampleInfoObj.put("revisionNo", WordUtil.padString(sampleInfo.getRevisionNo(), 14));
         sampleInfoObj.put("receiptDate", WordUtil.padString(sampleInfo.getReceiptDate(), 8));
         sampleInfoObj.put("approvalDate", WordUtil.padString(sampleInfo.getApprovalDate(), 8));
-        sampleInfoObj.put("expiryDate", WordUtil.padString(sampleInfo.getExpiryDate(), 8));
+        sampleInfoObj.put("expireDate", WordUtil.padString(sampleInfo.getExpireDate(), 8));
 
         String modelName = "animalSampleTesting.ftl";
         fileInfoService.uploadFileWithFileName(modelName, fileName, sampleInfo.getId(), sampleInfo.getStatus(), dataMap);

jfcloud-gene-biz/src/main/resources/ftlTemplate/animalSampleTesting.ftl

@@ -302,7 +302,7 @@
 											<w:szCs w:val="24"/>
 											<w:u w:val="single"/>
 										</w:rPr>
-										<w:t xml:space="preserve"> ${sampleInfo.expiryDate!} </w:t>
+										<w:t xml:space="preserve"> ${sampleInfo.expireDate!} </w:t>
 									</w:r>
 									<w:r>
 										<w:rPr>

jfcloud-gene-biz/src/main/resources/sql/sample_init.sql

@@ -23,7 +23,7 @@ CREATE TABLE IF NOT EXISTS sample_info
     revision_no         VARCHAR(255) NULL COMMENT '修订号',
     receipt_date        VARCHAR(30)         NULL COMMENT '收件日期',
     approval_date       VARCHAR(30)         NULL COMMENT '批准日期',
-    expiry_date         VARCHAR(30)         NULL COMMENT '失效日期',
+    expire_date         VARCHAR(30)         NULL COMMENT '失效日期',
     ky_id               BIGINT       NULL COMMENT '科研Id',
 
     deleted             char(1)      NOT null default '0' COMMENT '是否被删除',