增加报表中企业信息

background-service/zksy-admin/src/main/java/com/zksy/web/controller/basicData/InformationController.java

@@ -37,7 +37,6 @@ public class InformationController extends BaseController{
     @ApiOperation(value = "企业信用报告", notes = "企业信用报告")
     public AjaxResult report(String creditCode)
     {
-        creditCode = "91431227MA4LY5GC2Y";
         return service.queryByCreditCode(creditCode);
     }
 }

background-service/zksy-system/src/main/java/com/zksy/basicData/service/InformationService.java

@@ -2,10 +2,9 @@ package com.zksy.basicData.service;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.zksy.basicData.mapper.BaseTableMapper;
-import com.zksy.basicData.mapper.XcrAbnormalBusinessOperationsMapper;
-import com.zksy.basicData.mapper.XcrEBaseinfoMapper;
-import com.zksy.basicData.mapper.XcrOtherInfo36Mapper;
+import com.zksy.basicData.domain.XcrAdministrativeLicensing;
+import com.zksy.basicData.domain.XcrBranchOfficesInfo;
+import com.zksy.basicData.mapper.*;
 import com.zksy.common.core.domain.AjaxResult;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.poi.ss.formula.functions.T;
@@ -14,6 +13,7 @@ import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.PostConstruct;
+import javax.annotation.Resource;
 import java.lang.reflect.ParameterizedType;
 import java.lang.reflect.Type;
 import java.util.Arrays;
@@ -26,20 +26,40 @@ import java.util.stream.Collectors;
 @Service
 @Slf4j
 public class InformationService {
+    @Resource
+    private XcrEBaseinfoMapper xcrEBaseinfoMapper;//企业基本信息
+    @Resource
+    private XcrEnterpriseAnnualReportShareholderMapper xcrEnterpriseAnnualReportShareholderMapper;//企业年报股东及出资信息
+    @Resource
+    private XcrChangeFilingMapper xcrChangeFilingMapper;//变更备案信息
+    @Resource
+    private XcrBranchOfficesInfoMapper xcrBranchOfficesInfoMapper;//分支机构
 
-    @Autowired
-    private XcrAbnormalBusinessOperationsMapper xcrAbnormalBusinessOperationsMapper;
-    @Autowired
-    private XcrEBaseinfoMapper xcrEBaseinfoMapper;
-    @Autowired
-    private XcrOtherInfo36Mapper xcrOtherInfo36Mapper;
+    @Resource
+    private XcrAnnualReportExternalInvestmentMapper xcrAnnualReportExternalInvestmentMapper;//企业年报对外投资信息
+    @Resource
+    private XcrAdministrativeLicensingMapper xcrAdministrativeLicensingMapper;//行政许可
+    //资质证书
+    //企业认证信息
+    //企业商标
+    //专利
+    //软件著作权
+    //社会荣誉
+    //行业信用评价结果
+    //第三方信用评价结果
+    @Resource
+    private XcrOtherInfo36Mapper xcrOtherInfo36Mapper;//行政奖励，水费
+    @Resource
+    private XcrAbnormalBusinessOperationsMapper xcrAbnormalBusinessOperationsMapper;//经营异常名录信息
 
     @Autowired
     private ThreadPoolTaskExecutor taskExecutor;
     private List<BaseMapper<?>> mappers;
     @PostConstruct
     public void init() {
-        this.mappers = Arrays.asList(xcrAbnormalBusinessOperationsMapper, xcrEBaseinfoMapper,xcrOtherInfo36Mapper);
+        this.mappers = Arrays.asList(xcrEBaseinfoMapper,xcrEnterpriseAnnualReportShareholderMapper,xcrChangeFilingMapper,
+                xcrBranchOfficesInfoMapper,xcrAnnualReportExternalInvestmentMapper,xcrAdministrativeLicensingMapper,
+                xcrOtherInfo36Mapper, xcrAbnormalBusinessOperationsMapper);
     }
     public AjaxResult queryByCreditCode(String creditCode) {
         Map<String, List<?>> resultMap = new ConcurrentHashMap<>();