Commit 48ddf722 authored by suhuiguang's avatar suhuiguang

reafact(jyjc): 报检规则4.0开发

1.代码整理
parent 1749ee5b
package com.yeejoin.amos.boot.module.jyjc.biz.file.inspectapp.factory.support; package com.yeejoin.amos.boot.module.jyjc.biz.file.inspectapp.factory.support;
public interface DocGenerator { public interface DocGenerator {
String generate(String appId); String generate(String appSeq);
} }
...@@ -44,9 +44,9 @@ public class GenericDocGeneratorStrategy implements SupportableDocGenerator { ...@@ -44,9 +44,9 @@ public class GenericDocGeneratorStrategy implements SupportableDocGenerator {
} }
@Override @Override
public String generate(String appId) { public String generate(String appSeq) {
Map<String, Object> params = appDocCmService.getBaseInFo(appId); Map<String, Object> params = appDocCmService.getBaseInFo(appSeq);
JyjcInspectionApplication inspectionApplication = jyjcInspectionApplicationService.getBaseMapper().selectById(appId); JyjcInspectionApplication inspectionApplication = jyjcInspectionApplicationService.getBaseMapper().selectById(appSeq);
params.put("numberOfEquip", inspectionApplication.getNumberOfEquip()); params.put("numberOfEquip", inspectionApplication.getNumberOfEquip());
setEquipExcelData(inspectionApplication, params); setEquipExcelData(inspectionApplication, params);
this.setRequestContext(); this.setRequestContext();
......
...@@ -39,9 +39,9 @@ public class PipelineDocGeneratorStrategy implements SupportableDocGenerator { ...@@ -39,9 +39,9 @@ public class PipelineDocGeneratorStrategy implements SupportableDocGenerator {
} }
@Override @Override
public String generate(String appId) { public String generate(String appSeq) {
Map<String, Object> params = appDocCmService.getBaseInFo(appId); Map<String, Object> params = appDocCmService.getBaseInFo(appSeq);
JyjcInspectionApplication inspectionApplication = jyjcInspectionApplicationService.getBaseMapper().selectById(appId); JyjcInspectionApplication inspectionApplication = jyjcInspectionApplicationService.getBaseMapper().selectById(appSeq);
this.setPipelineInfo(params, inspectionApplication); this.setPipelineInfo(params, inspectionApplication);
this.setRequestContext(); this.setRequestContext();
return this.generatePdfAndUpload(params); return this.generatePdfAndUpload(params);
......
...@@ -11,7 +11,7 @@ public class DocGeneratorWrapper implements DocGenerator { ...@@ -11,7 +11,7 @@ public class DocGeneratorWrapper implements DocGenerator {
} }
@Override @Override
public String generate(String appId) { public String generate(String appSeq) {
return docGenerator.generate(appId); return docGenerator.generate(appSeq);
} }
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment