|
@@ -267,11 +267,11 @@ public class SampleAnimalServiceImpl extends ServiceImpl<SampleAnimalMapper, Sam
|
|
|
});
|
|
|
|
|
|
//项目管理部填写字段
|
|
|
- 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("expiryDate", WordUtil.padString(sampleInfo.getExpiryDate(), 8));
|
|
|
|
|
|
String modelName = "animalSampleTesting.ftl";
|
|
|
fileInfoService.uploadFileWithFileName(modelName, fileName, sampleInfo.getId(), sampleInfo.getStatus(), dataMap);
|