修改bug

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/service/impl/HealthStatusIndicatorServiceImpl.java

@@ -2762,6 +2762,7 @@ public class HealthStatusIndicatorServiceImpl {
             bizMessage.setIndexValue(idxBizFanWarningRecord.getPointName());
 //            bizMessage.setTraceId(idxBizFanWarningRecord.getSequenceNbr());
             RiskBizInfoVo riskBizInfoVo = new RiskBizInfoVo();
+            riskBizInfoVo.setBussId(String.valueOf(idxBizFanWarningRecord.getTs()));
             riskBizInfoVo.setWarningObjectName(idxBizFanWarningRecord.getEquipmentName());
             riskBizInfoVo.setWarningObjectCode(idxBizFanWarningRecord.getKks());
             riskBizInfoVo.setSourceAttribution(stationMap.get(idxBizFanWarningRecord.getGatewayId()).getProjectOrgCode());

amos-boot-system-jxiop/amos-boot-module-jxiop-api/src/main/resources/mapper/PersonBasicMapper.xml

@@ -290,7 +290,7 @@
             IFNULL(b.project_name, '') as stationName,
             '' as unitName,
             IFNULL(a.qrcode_color, 'green') as qrCodeColor,
-            IFNULL(a.rec_date, '') AS recDate,
+            IFNULL(a.rec_date, a.qrcode_date) AS recDate,
             IFNULL(head_photo, '') AS headPhoto
         FROM
             person_basic a

amos-boot-system-jxiop/amos-boot-module-jxiop-api/src/main/resources/mapper/warning/McbWarningMapper.xml

@@ -240,13 +240,19 @@
         (SELECT
         QUESTION_NUM
         FROM
-        amos_mcb.mcb_warning_warning_info
+        mcb_warning_warning_info
         WHERE
         mcb_warning_warning_info.PROCESSING_STATUS = 2
         AND QUESTION_NUM IS NOT NULL
-        AND mcb_warning_warning_info.WARNING_SOURCE_TYPE_CODE IN ( SELECT CODE FROM amos_mcb.mcb_data_dictionary WHERE remark = 'OVERVIEW' )
-        ) warnNum LEFT  join   amos_mcb.mcb_warning_question_info question on question.NUM = warnNum.QUESTION_NUM
-        LEFT JOIN amos_mcb.mcb_warning_base_source_attribution source ON source.CODE = question.SOURCE_ATTRIBUTION
+        AND mcb_warning_warning_info.WARNING_SOURCE_TYPE_CODE IN ( SELECT CODE FROM mcb_data_dictionary WHERE remark = 'OVERVIEW' )
+        ) warnNum inner  join   mcb_warning_question_info question on question.NUM = warnNum.QUESTION_NUM
+        <if test="completionStatus != null and completionStatus == 0">
+            AND question.COMPLETION_STATUS in (0,2)
+        </if>
+        <if test="completionStatus != null and completionStatus != 0">
+            AND question.COMPLETION_STATUS = #{completionStatus}
+        </if>
+        LEFT JOIN mcb_warning_base_source_attribution source ON source.CODE = question.SOURCE_ATTRIBUTION
         <where>
             <if test="projectOrgCodes != null and projectOrgCodes.size() > 0">
                 AND question.SOURCE_ATTRIBUTION IN
@@ -254,9 +260,7 @@
                     #{item}
                 </foreach>
             </if>
-            <if test="completionStatus != null and completionStatus == 0">
-                AND question.COMPLETION_STATUS in (0,2)
-            </if>
+
             <if test="startTime != null and startTime != ''">
                 AND question.CREATE_DATE &gt;= concat(#{startTime}, ' 00:00:00')
             </if>

amos-boot-system-jxiop/amos-boot-module-jxiop-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/service/impl/McbWarningServiceImpl.java

@@ -305,7 +305,7 @@ public class McbWarningServiceImpl implements IMcbWarningService {
 	private List<String> getProjectOrgCodes() {
 		List<String> projectOrgCodes = permissionService.getCurrentUserProjectOrgCodes();
 		if (Objects.isNull(projectOrgCodes)) {
-			projectOrgCodes = Collections.emptyList();
+			projectOrgCodes = new ArrayList<>();
 		}
 		log.info(JSON.toJSONString("当前用户转换获取的orgcode列表是 " + projectOrgCodes));
 		return projectOrgCodes;