Commit e381cbd4 authored by suhuiguang's avatar suhuiguang

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

1.循环依赖
parent 0073656f
...@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; ...@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.yeejoin.amos.boot.module.common.api.enums.EquipmentClassifityEnum; import com.yeejoin.amos.boot.module.common.api.enums.EquipmentClassifityEnum;
import com.yeejoin.amos.boot.module.jyjc.api.entity.JyjcInspectionApplication; import com.yeejoin.amos.boot.module.jyjc.api.entity.JyjcInspectionApplication;
import com.yeejoin.amos.boot.module.jyjc.api.entity.JyjcInspectionApplicationEquip; import com.yeejoin.amos.boot.module.jyjc.api.entity.JyjcInspectionApplicationEquip;
import com.yeejoin.amos.boot.module.jyjc.api.mapper.JyjcInspectionApplicationMapper;
import com.yeejoin.amos.boot.module.jyjc.biz.file.inspectapp.factory.support.SupportableDocGenerator; import com.yeejoin.amos.boot.module.jyjc.biz.file.inspectapp.factory.support.SupportableDocGenerator;
import com.yeejoin.amos.boot.module.jyjc.biz.file.inspectapp.strategy.common.InspectAppDocCmService; import com.yeejoin.amos.boot.module.jyjc.biz.file.inspectapp.strategy.common.InspectAppDocCmService;
import com.yeejoin.amos.boot.module.jyjc.biz.service.impl.JyjcInspectionApplicationEquipServiceImpl; import com.yeejoin.amos.boot.module.jyjc.biz.service.impl.JyjcInspectionApplicationEquipServiceImpl;
...@@ -30,7 +31,7 @@ import java.util.stream.Collectors; ...@@ -30,7 +31,7 @@ import java.util.stream.Collectors;
@Slf4j @Slf4j
public class GenericDocGeneratorStrategy implements SupportableDocGenerator { public class GenericDocGeneratorStrategy implements SupportableDocGenerator {
private final JyjcInspectionApplicationServiceImpl jyjcInspectionApplicationService; private final JyjcInspectionApplicationMapper jyjcInspectionApplicationMapper;
private final JyjcInspectionApplicationEquipServiceImpl jyjcInspectionApplicationEquipService; private final JyjcInspectionApplicationEquipServiceImpl jyjcInspectionApplicationEquipService;
...@@ -50,7 +51,7 @@ public class GenericDocGeneratorStrategy implements SupportableDocGenerator { ...@@ -50,7 +51,7 @@ public class GenericDocGeneratorStrategy implements SupportableDocGenerator {
StopWatch stopWatch = new StopWatch(); StopWatch stopWatch = new StopWatch();
stopWatch.start("1.组织数据"); stopWatch.start("1.组织数据");
Map<String, Object> params = appDocCmService.getBaseInFo(appSeq); Map<String, Object> params = appDocCmService.getBaseInFo(appSeq);
JyjcInspectionApplication inspectionApplication = jyjcInspectionApplicationService.getBaseMapper().selectById(appSeq); JyjcInspectionApplication inspectionApplication = jyjcInspectionApplicationMapper.selectById(appSeq);
params.put("numberOfEquip", inspectionApplication.getNumberOfEquip()); params.put("numberOfEquip", inspectionApplication.getNumberOfEquip());
setEquipExcelData(inspectionApplication, params); setEquipExcelData(inspectionApplication, params);
stopWatch.stop(); stopWatch.stop();
......
...@@ -205,6 +205,7 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec ...@@ -205,6 +205,7 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
private TzBaseEnterpriseInfoMapper baseEnterpriseInfoMapper; private TzBaseEnterpriseInfoMapper baseEnterpriseInfoMapper;
@Resource @Resource
@Lazy
private DocGeneratorFactory docGeneratorFactory; private DocGeneratorFactory docGeneratorFactory;
@Autowired @Autowired
......
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