|
@@ -381,6 +381,17 @@ public class FlowInfoServiceImpl extends ServiceImpl<FlowInfoMapper, FlowInfo> i
|
|
|
RandomUtil.randomString(RandomUtil.BASE_CHAR_NUMBER_LOWER, 4));
|
|
|
log.info("生成word 项目名称:{} 文件名称:{}", detail.getProjectName(), fileName);
|
|
|
|
|
|
+ //遗传背景说明
|
|
|
+ if (detail.getTarget().contains(GeneTargetEnum.PURIFICATION.getCode())) {
|
|
|
+ StrainPurificationInfoDto purification = detail.getPurification();
|
|
|
+
|
|
|
+ //遗传背景替换
|
|
|
+ String geneticBackground = purification.getGeneticBackground();
|
|
|
+ if (StrUtil.isNotBlank(geneticBackground)) {
|
|
|
+ purification.setGeneticBackground(geneticBackground.replace("CKO", "CK"));
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
JSONObject dataMap = JSON.parseObject(JSON.toJSONString(detail));
|
|
|
wordDataService.fillDocCreator(dataMap);
|
|
|
|
|
@@ -393,16 +404,6 @@ public class FlowInfoServiceImpl extends ServiceImpl<FlowInfoMapper, FlowInfo> i
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- //遗传背景说明
|
|
|
- if (detail.getTarget().contains(GeneTargetEnum.PURIFICATION.getCode())) {
|
|
|
- JSONObject noteObj = new JSONObject();
|
|
|
- String geneticBackgroundNote = detail.getPurification().getGeneticBackgroundNote();
|
|
|
- if (StrUtil.isNotBlank(geneticBackgroundNote)) {
|
|
|
- noteObj = JSON.parseObject(geneticBackgroundNote);
|
|
|
- }
|
|
|
- dataMap.getJSONObject("purification").put("geneticBackgroundNote", noteObj);
|
|
|
- }
|
|
|
-
|
|
|
dataMap.put("approvalNo", WordUtil.padString(flowInfo.getApprovalNo(), 14));
|
|
|
dataMap.put("revisionNo", WordUtil.padString(flowInfo.getRevisionNo(), 14));
|
|
|
dataMap.put("receiptDate", WordUtil.padString(flowInfo.getReceiptDate(), 12));
|