大屏bug修改

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/java/com/yeejoin/amos/boot/module/statistcs/biz/service/impl/EnterpriseBizServiceImpl.java

@@ -15,6 +15,7 @@ import com.yeejoin.amos.boot.module.ymt.api.mapper.TzBaseEnterpriseInfoMapper;
 import com.yeejoin.amos.component.feign.model.FeignClientResult;
 import com.yeejoin.amos.feign.privilege.Privilege;
 import com.yeejoin.amos.feign.privilege.model.CompanyModel;
+import org.apache.commons.lang3.ObjectUtils;
 import org.apache.lucene.queryparser.classic.QueryParser;
 import org.elasticsearch.action.search.SearchRequest;
 import org.elasticsearch.action.search.SearchResponse;
@@ -97,11 +98,13 @@ public class EnterpriseBizServiceImpl {
         }
 
         if(tzBaseEnterpriseInfoDto.getUnitType().contains(UnitTypeEnum.JYJCJG.getName())){
-            String jyjcStatus = tzBaseEnterpriseInfoDto.getJyjcStatus();
-            String[] array = jyjcStatus.split("-");
-            tzBaseEnterpriseInfoDto.setJyjcStatus(array[0]);
-            if(array.length > 1){
-                tzBaseEnterpriseInfoDto.setJyjcType(array[1]);
+            if(!ObjectUtils.isEmpty(tzBaseEnterpriseInfoDto.getJyjcStatus())){
+                String jyjcStatus = tzBaseEnterpriseInfoDto.getJyjcStatus();
+                String[] array = jyjcStatus.split("-");
+                tzBaseEnterpriseInfoDto.setJyjcStatus(array[0]);
+                if(array.length > 1){
+                    tzBaseEnterpriseInfoDto.setJyjcType(array[1]);
+                }
             }
         }
 

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/java/com/yeejoin/amos/boot/module/statistcs/biz/service/impl/JGDPStatisticsServiceImpl.java

@@ -3263,7 +3263,7 @@ public class JGDPStatisticsServiceImpl {
             return new HashMap<>();
         }
         Map<String,Object> resultMap = new HashMap<>();
-        String sourceTypeCode = problemModel.getSourceTypeCode();
+        String sourceTypeCode = "all".equals(problemModel.getSourceTypeCode()) ? null : problemModel.getSourceTypeCode();
         List<String> xdata = safetyProblemTracingMapper.getBusinessType(sourceTypeCode,orgCode);
         if(ObjectUtils.isEmpty(xdata)){
             return resultMap;
@@ -3328,7 +3328,7 @@ public class JGDPStatisticsServiceImpl {
         List<HashMap<String, Object>> enumList = JgBusinessTypeEnum.getEnumList();
         List<Map<String, Object>> result = new ArrayList<>();
         Map<String, Object> map = new HashMap<>();
-        map.put("title", "监督管理全部业务类型");
+        map.put("title", "监督管理全部业务");
         map.put("value", "all");
         map.put("children", enumList);
         result.add(map);

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/resources/mapper/TzBaseEnterpriseInfoMapper.xml

@@ -98,7 +98,10 @@
 		tz_base_enterprise_info
 		<if test=" tzBaseEnterpriseInfoDto.unitType.indexOf('检验检测机构') !=-1 ">
 			JOIN (select unit_code,max(accept_date) from tz_jyjc_opening_application
-			where status = #{tzBaseEnterpriseInfoDto.jyjcStatus}
+			where 1=1
+			<if test=" tzBaseEnterpriseInfoDto.jyjcStatus!=null and tzBaseEnterpriseInfoDto.jyjcStatus!='' ">
+				and status = #{tzBaseEnterpriseInfoDto.jyjcStatus}
+			</if>
 			<if test=" tzBaseEnterpriseInfoDto.jyjcType!=null and tzBaseEnterpriseInfoDto.jyjcType!='' ">
 			and open_biz_type = #{tzBaseEnterpriseInfoDto.jyjcType}
 			</if>