fix(dms): 修复故障实例报修来源类型为空导致统计不准确问题

- 在DmsBillsFaultInstanceServiceImpl中设置默认报修来源类型为其他(9)
- 从DmsRecordAlarmInfoMapper.xml中移除alarmType字段映射
- 从查询SQL中移除notice_status、create_by、create_time、update_by、update_time字段
- 修复alarmBeginTime和alarmEndTime参数空指针检查逻辑
- 修复handleTime参数空指针检查逻辑
master
zangch@mesnac.com 3 days ago
parent 776b0790a4
commit 20f437592b

@ -130,6 +130,10 @@ public class DmsBillsFaultInstanceServiceImpl implements IDmsBillsFaultInstanceS
dmsBillsFaultInstance.setBillsStatus(DmsConstants.DMS_BILLS_FAULT_INSTANCE_STATUS_TO_REPAIR);
dmsBillsFaultInstance.setInstanceType(DmsConstants.DMS_BILLS_FAULT_INSTANCE_TYPE_MAUAL);
dmsBillsFaultInstance.setIsFlag("1");
// 设置默认报修来源类型为其他9避免 NULL 导致统计不准确
if (dmsBillsFaultInstance.getFaultSourceType() == null || dmsBillsFaultInstance.getFaultSourceType().isEmpty()) {
dmsBillsFaultInstance.setFaultSourceType("9");
}
// 设置默认审批状态为未审批(避免 NULL 导致查询时被过滤)
if (dmsBillsFaultInstance.getApproveStatus() == null || dmsBillsFaultInstance.getApproveStatus().isEmpty()) {
dmsBillsFaultInstance.setApproveStatus("0");

@ -28,7 +28,6 @@
<!-- <result property="alarmLevel" column="alarm_level"/> -->
<!-- <result property="noticeType" column="notice_type"/> -->
<!-- <result property="recoverType" column="recover_type"/> -->
<!-- <result property="alarmType" column="alarm_type"/> -->
<result property="deviceCode" column="device_code"/>
<result property="deviceName" column="device_name"/>
</resultMap>
@ -46,15 +45,10 @@
drai.alarm_data,
drai.alarm_status,
drai.handle_suggest,
drai.notice_status,
drai.handle_user,
drai.handle_time,
drai.cause_analysis,
drai.remark,
drai.create_by,
drai.create_time,
drai.update_by,
drai.update_time
drai.remark
from dms_record_alarm_info drai
left join base_deviceledger dbdl on drai.device_id = dbdl.OBJ_ID
</sql>
@ -65,10 +59,10 @@
<if test="alarmId != null ">and drai.alarm_id = #{alarmId}</if>
<if test="deviceId != null ">and drai.device_id = #{deviceId}</if>
<if test="alarmRuleId != null ">and drai.alarm_rule_id = #{alarmRuleId}</if>
<if test="params.beginAlarmBeginTime != null and params.beginAlarmBeginTime != '' and params.endAlarmBeginTime != null and params.endAlarmBeginTime != ''">
<if test="params != null and params.beginAlarmBeginTime != null and params.beginAlarmBeginTime != '' and params.endAlarmBeginTime != null and params.endAlarmBeginTime != ''">
and drai.alarm_begin_time between #{params.beginAlarmBeginTime} and #{params.endAlarmBeginTime}
</if>
<if test="params.beginAlarmEndTime != null and params.beginAlarmEndTime != '' and params.endAlarmEndTime != null and params.endAlarmEndTime != ''">
<if test="params != null and params.beginAlarmEndTime != null and params.beginAlarmEndTime != '' and params.endAlarmEndTime != null and params.endAlarmEndTime != ''">
and drai.alarm_end_time between #{params.beginAlarmEndTime} and #{params.endAlarmEndTime}
</if>
<if test="continueTime != null ">and drai.continue_time = #{continueTime}</if>
@ -78,7 +72,7 @@
<if test="handleSuggest != null and handleSuggest != ''">and drai.handle_suggest = #{handleSuggest}</if>
<if test="noticeStatus != null and noticeStatus != ''">and drai.notice_status = #{noticeStatus}</if>
<if test="handleUser != null and handleUser != ''">and drai.handle_user = #{handleUser}</if>
<if test="params.beginHandleTime != null and params.beginHandleTime != '' and params.endHandleTime != null and params.endHandleTime != ''">
<if test="params != null and params.beginHandleTime != null and params.beginHandleTime != '' and params.endHandleTime != null and params.endHandleTime != ''">
and drai.handle_time between #{params.beginHandleTime} and #{params.endHandleTime}
</if>
<if test="causeAnalysis != null and causeAnalysis != ''">and drai.cause_analysis = #{causeAnalysis}</if>

Loading…
Cancel
Save