feat(dms): 添加停机原因查询接口并优化停机记录查询

- 新增不分页查询所有停机原因信息列表的接口
- 修改停机记录查询SQL,关联停机原因基础表获取准确原因描述
- 修复停机原因字段显示问题,使用nvl函数处理空值情况
- 优化DmsRecordShutDownServiceImpl类的代码格式
master
zangch@mesnac.com 1 week ago
parent 0cd68eed0f
commit 697d7fab9f

@ -96,4 +96,16 @@ public class DmsBaseShutReasonController extends BaseController
{
return toAjax(dmsBaseShutReasonService.deleteDmsBaseShutReasonByShutReasonIds(shutReasonIds));
}
/**
*
*/
//@PreAuthorize("@ss.hasPermi('dms:shutReason:list')" )
@GetMapping("/selectDmsBaseShutReasonList")
public AjaxResult selectDmsBaseShutReasonList(DmsBaseShutReason dmsBaseShutReason)
{
List<DmsBaseShutReason> list = dmsBaseShutReasonService.selectDmsBaseShutReasonList(dmsBaseShutReason);
return AjaxResult.success(list);
}
}

@ -19,8 +19,8 @@ import java.util.List;
* @date 2024-01-15
*/
@Service
public class DmsRecordShutDownServiceImpl implements IDmsRecordShutDownService
{
public class DmsRecordShutDownServiceImpl implements IDmsRecordShutDownService{
@Autowired
private DmsRecordShutDownMapper dmsRecordShutDownMapper;

@ -30,7 +30,7 @@
r.machine_id as device_id,
r.shut_type_id as shut_type,
r.shut_reason_id,
r.shut_reason,
nvl(s.shut_reason, r.shut_reason) as shut_reason,
r.shut_begin_time,
r.shut_end_time,
r.shut_time,
@ -45,6 +45,7 @@
d.device_name as device_name
from dms_record_shut_down r
left join base_deviceledger d on r.machine_id = d.OBJ_ID
left join dms_base_shut_reason s on r.shut_reason_id = s.shut_reason_id
</sql>
<select id="selectDmsRecordShutDownList" parameterType="DmsRecordShutDown" resultMap="DmsRecordShutDownResult">

Loading…
Cancel
Save