Browse Source

附件名称为null判断

陈长荣 2 tháng trước cách đây
mục cha
commit
a43456d21e

+ 1 - 1
jfcloud-gene-biz/src/main/java/com/github/jfcloud/gene/flow/service/impl/FlowInfoServiceImpl.java

@@ -377,7 +377,7 @@ public class FlowInfoServiceImpl extends ServiceImpl<FlowInfoMapper, FlowInfo> i
         String createDate = DateUtil.format(flowInfo.getCreateTime(), DatePattern.CHINESE_DATE_PATTERN);
         String fileName = String.format("立项报告-动物%s申请表-%s-%s-%s-%s.docx",
                 GeneTargetEnum.getNameByCode(flowInfo.getTarget()),
-                detail.getProjectName(), detail.getProjectLeaderName(), createDate,
+                StrUtil.nullToEmpty(detail.getProjectName()), StrUtil.nullToEmpty(detail.getProjectLeaderName()), createDate,
                 RandomUtil.randomString(RandomUtil.BASE_CHAR_NUMBER_LOWER, 4));
         log.info("生成word 项目名称:{} 文件名称:{}", detail.getProjectName(), fileName);
 

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

@@ -122,7 +122,7 @@ public class SampleAnimalImagingServiceImpl extends ServiceImpl<SampleAnimalImag
         //文件名称:项目名称-申请人-申请日期-随机四位.docx
         String applyDate = DateUtil.format(sampleInfo.getApplyTime(), DatePattern.CHINESE_DATE_PATTERN);
         String fileName = String.format("动物影像检测分析申请表-%s-%s-%s-%s.docx",
-                sampleInfo.getProjectName(), sampleInfo.getApplicantName(), applyDate,
+                StrUtil.nullToEmpty(sampleInfo.getProjectName()), StrUtil.nullToEmpty(sampleInfo.getApplicantName()), applyDate,
                 RandomUtil.randomString(RandomUtil.BASE_CHAR_NUMBER_LOWER, 4));
         log.info("生成word 项目名称:{} 文件名称:{}", sampleInfo.getProjectName(), fileName);
 

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

@@ -191,7 +191,7 @@ public class SampleAnimalServiceImpl extends ServiceImpl<SampleAnimalMapper, Sam
         //文件名称:项目名称-申请人-申请日期-随机四位.docx
         String applyDate = DateUtil.format(sampleInfo.getApplyTime(), DatePattern.CHINESE_DATE_PATTERN);
         String fileName = String.format("动物样本检测送检申请表-%s-%s-%s-%s.docx",
-                sampleInfo.getProjectName(), sampleInfo.getApplicantName(), applyDate,
+                StrUtil.nullToEmpty(sampleInfo.getProjectName()), StrUtil.nullToEmpty(sampleInfo.getApplicantName()), applyDate,
                 RandomUtil.randomString(RandomUtil.BASE_CHAR_NUMBER_LOWER, 4));
         log.info("生成word 项目名称:{} 文件名称:{}", sampleInfo.getProjectName(), fileName);