fix bug

dsk-admin/src/main/resources/application-dev.yml

@@ -189,7 +189,8 @@ sms:
     territory: ap-guangzhou
 
 dsk:
-  exportBackUrl: http://111.204.34.146:9099/prod-api/export/backUrl
+  exportBackUrl: http://172.17.0.12:9099/prod-api/export/backUrl
+
 
 sa-token:
   # 是否允许同一账号并发登录 (为true时允许一起登录, 为false时新登录挤掉旧登录)

dsk-admin/src/main/resources/application-prod.yml

@@ -190,4 +190,5 @@ sms:
     territory: ap-guangzhou
 
 dsk:
-  exportBackUrl: https://szhapi.jiansheku.com/export/backUrl
\ No newline at end of file
+#  exportBackUrl: https://szhapi.jiansheku.com/export/backUrl
+  exportBackUrl: http://172.17.0.12:9099/prod-api/export/backUrl
\ No newline at end of file

dsk-admin/src/main/resources/application-test.yml

@@ -189,7 +189,7 @@ sms:
     territory: ap-guangzhou
 
 dsk:
-  exportBackUrl: http://111.204.34.146:9099/prod-api/export/backUrl
+  exportBackUrl: http://172.17.0.12:9099/prod-api/export/backUrl
 
 sa-token:
   # 是否允许同一账号并发登录 (为true时允许一起登录, 为false时新登录挤掉旧登录)

dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/service/impl/CustomerInfoServiceImpl.java

@@ -85,7 +85,7 @@ public class CustomerInfoServiceImpl extends ServiceImpl<DCustomerMapper, DCusto
                 }
                 //关键字标红
                 if (!ObjectUtils.isEmpty(bo.getLeaderName())) {
-                    item.setCustomerName(StringUtils.markInRed(item.getLeaderName(), bo.getLeaderName()));
+                    item.setLeaderName(StringUtils.markInRed(item.getLeaderName(), bo.getLeaderName()));
                 }
             });
         }

dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/service/impl/DCustomerServiceImpl.java

@@ -107,9 +107,10 @@ public class DCustomerServiceImpl extends ServiceImpl<DCustomerMapper, DCustomer
         if (ObjectUtil.isEmpty(riskData)) {
             return TableDataInfo.build(page);
         }
+        a:
         for (Map<String, Object> risk : ((List<Map<String, Object>>) riskData)) {
             for (DCustomerListVo vo : page.getRecords()) {
-                if (vo.getCompanyId() == risk.get("cid")) {
+                if (vo.getCompanyId().toString().equals(risk.get("cid").toString())) {
                     vo.setRiskTotal((Long) risk.get("riskCount"));
                     vo.setJudicatureRiskCount((Long) risk.get("sfCount"));
                     vo.setOperatingRiskCount((Long) risk.get("jyCount"));
@@ -117,6 +118,7 @@ public class DCustomerServiceImpl extends ServiceImpl<DCustomerMapper, DCustomer
                     //TODO:不良行为与涉诉限用禁用需对接甲方数据
                     vo.setBadBehaviorCount(0L);
                     vo.setLimitedCount(0L);
+                    continue a;
                 }
             }
         }
@@ -237,6 +239,7 @@ public class DCustomerServiceImpl extends ServiceImpl<DCustomerMapper, DCustomer
         if (ObjectUtil.isNotEmpty(userId)) {
             riskStatisticsVo.setUserId(userId);
         }
+        riskStatisticsVo.setSystemCode("zjyj");
         Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/monitor/dynamicRiskStatistics", BeanUtil.beanToMap(riskStatisticsVo, false, false));
         return BeanUtil.toBean(map, R.class);
     }

dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/service/impl/IDProjectServiceImpl.java

@@ -36,7 +36,6 @@ import com.dsk.jsk.domain.EnterpriseInfoHeaderBody;
 import com.dsk.system.utils.DskOpenApiUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.MapUtils;
-import org.apache.poi.ss.formula.functions.DProduct;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -77,6 +76,9 @@ public class IDProjectServiceImpl extends ServiceImpl<DProjectMapper, DProject>
         if (StringUtils.isNotBlank(advisoryBodyName)) {
             //根据咨询机构名称查询咨询机构Cids
             List<Long> advisoryBodyCids = advisoryBodyMapper.selectAdvisoryBodyCidsByName(advisoryBodyName);
+            if (advisoryBodyCids.isEmpty()) {
+                return TableDataInfo.build();
+            }
             //根据咨询机构Cids查询项目Keys
             List<Long> projectKeys1 = advisoryBodyProjectMapper.selectProjectKeysByAdvisoryBodyCids(advisoryBodyCids);
             if (projectKeys1.isEmpty()) {
@@ -128,6 +130,12 @@ public class IDProjectServiceImpl extends ServiceImpl<DProjectMapper, DProject>
             if (StringUtils.isNotBlank(projectSearchBo.getProjectName())) {
                 projectSearchVo.setProjectName(StringUtils.markInRed(projectSearchVo.getProjectName(), projectSearchBo.getProjectName()));
             }
+            //if (StringUtils.isNotBlank(projectSearchBo.getOwnerUnit())) {
+            //    projectSearchVo.setOwnerName(StringUtils.markInRed(projectSearchVo.getOwnerName(), projectSearchBo.getOwnerUnit()));
+            //}
+            //if (StringUtils.isNotBlank(projectSearchBo.getAdvisoryBodyName())) {
+            //    projectSearchVo.getAdvisoryBody().setAdvisoryBodyName(StringUtils.markInRed(projectSearchVo.getAdvisoryBody().getAdvisoryBodyName(), projectSearchBo.getAdvisoryBodyName()));
+            //}
 
             //查询业主单位Cid
             String ownerName = projectSearchVo.getOwnerName();

dsk-module/dsk-biz-api/src/main/java/com/dsk/jsk/service/EnterpriseService.java

@@ -50,14 +50,17 @@ public class EnterpriseService {
 
     static {
         qualificationMap.put("construction", "建筑业企业资质");
-        qualificationMap.put("engineeringDesign", "工程设计资质");
-        qualificationMap.put("engineeringInvestigation", "工程勘察资质");
+        //接口文档写的"工程设计资质",正确的是"工程设计"
+        qualificationMap.put("engineeringDesign", "工程设计");
+        //接口文档写的"工程勘察资质",正确的是"工程勘察"
+        qualificationMap.put("engineeringInvestigation", "工程勘察");
         qualificationMap.put("engineeringSupervision", "工程监理");
         qualificationMap.put("costConsultation", "造价咨询企业资质");
         qualificationMap.put("designConstruction", "设计施工一体化企业资质");
         qualificationMap.put("biddingAgency", "招标代理机构资质");
         qualificationMap.put("constructionLabor", "施工劳务资质");
         qualificationMap.put("powerFacilityLicense", "承装（修、试）电力设施许可证");
+        //接口文档写的"房地产估价资质",正确的是"房地产估价机构资质"
         qualificationMap.put("realEstateAppraisal", "房地产估价资质");
         qualificationMap.put("cqHighwayMaintenance", "重庆公路养护资质");
         qualificationMap.put("blastingUnit", "爆破从业单位资质");
@@ -82,8 +85,9 @@ public class EnterpriseService {
         qualificationMap.put("geology", "地质勘查资质");
         qualificationMap.put("roadCuring", "公路养护从业资格");
         qualificationMap.put("websiteOfFiling", "备案网站");
-        qualificationMap.put("museum", "博物馆资质");
-        qualificationMap.put("safeCert", "安许证");
+        //接口文档写的"博物馆资质",正确的是"博物馆陈列展览资质"
+        qualificationMap.put("museum", "博物馆陈列展览资质");
+        qualificationMap.put("safeCert", "安全生产许可证");
         qualificationMap.put("mediumLess", "缺人资质");
         qualificationMap.put("certificateChange", "资质变更");
     }