修改问题

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

@@ -5,16 +5,18 @@
 
 	<select id="getInfoByUseUnit"
 		resultType="com.yeejoin.amos.boot.module.tzs.api.dto.EquEnterDto">
-		 SELECT
-		    RI.sequence_nbr,
-		    RI.use_org_code,
-		    RI.equ_category,
-		    RI.product_name,
-		    UI.address
-		    FROM tz_jg_registration_info RI
-		    LEFT JOIN tz_jg_use_info UI ON RI.sequence_code = UI.sequence_code
-				LEFT JOIN tz_base_enterprise_info EI ON EI.use_code = UI.use_unit_credit_code
-		    WHERE EI.use_unit =#{useUnit}
+		SELECT
+			RI.sequence_nbr,
+			RI.use_org_code,
+			RI.equ_category,
+			RI.product_name,
+			UI.address
+		FROM
+			idx_biz_jg_register_info RI
+				LEFT JOIN idx_biz_jg_use_info UI ON RI."RECORD" = UI."RECORD"
+				LEFT JOIN tz_base_enterprise_info EI ON EI.use_code = UI."USE_UNIT_CREDIT_CODE"
+				LEFT JOIN idx_biz_jg_other_info oi ON oi."RECORD" = RI."RECORD"
+		WHERE EI.use_unit =#{useUnit} and oi."CLAIM_STATUS" = '已认领'
 	</select>
 
 	<select id="getInfo"

amos-boot-system-ugp/amos-boot-module-ugp-api/src/main/resources/mapper/QualityProblemMapper.xml

@@ -72,10 +72,10 @@
 
     <select id="qualityProblemStatistics" resultType="java.util.Map">
         SELECT
-            qi.generate_stage AS name,
-            count(1) AS value
+        IFNULL(qi.generate_stage,'其他阶段') AS name,
+        count(1) AS value
         FROM
-            tz_ugp_quality_problem AS qi
+        (SELECT NULLIF(qi.generate_stage,'') AS generate_stage, qi.project_id FROM tz_ugp_quality_problem qi) AS qi
         <where>
             <if test="projectIds != null and projectIds.size > 0">
                 and qi.project_id in

amos-boot-system-ugp/amos-boot-module-ugp-biz/src/main/java/com/yeejoin/amos/boot/module/ugp/biz/service/impl/ProjectServiceImpl.java

@@ -935,7 +935,9 @@ public class ProjectServiceImpl extends BaseService<ProjectDto, Project, Project
     private void changeStatus(List<Map<String, Object>> data, List<Map<String, Object>> fileList) {
         data.forEach(item -> {
             List<Map<String, Object>> collect = fileList.stream().filter(itemData -> itemData.get(symbolKey).equals(item.get(symbolKey))).collect(Collectors.toList());
-            item.put("auditStatus", ObjectUtils.isEmpty(collect.get(0).get(status)) ? "" : collect.get(0).get(status));
+            if(!ValidationUtil.isEmpty(collect)) {
+                item.put("auditStatus", ObjectUtils.isEmpty(collect.get(0).get(status)) ? "" : collect.get(0).get(status));
+            }
         });
     }
 }
\ No newline at end of file