Commit 223f16fd authored by 刘凡's avatar 刘凡

*)修改问题列表报错

parent d7ea3d47
...@@ -20,6 +20,7 @@ ...@@ -20,6 +20,7 @@
<select id="queryForSafetyProblemTracingList" resultType="java.util.Map"> <select id="queryForSafetyProblemTracingList" resultType="java.util.Map">
select select
date_format(spt.problem_time, '%Y-%m-%d %H:%i:%S') AS problemTime,
spt.*, spt.*,
(select extend::json->>'pic' from cb_data_dictionary where type = 'ISSUE_TYPE' and code = spt.problem_type_code) problemTypePic (select extend::json->>'pic' from cb_data_dictionary where type = 'ISSUE_TYPE' and code = spt.problem_type_code) problemTypePic
from tzs_safety_problem_tracing spt from tzs_safety_problem_tracing spt
......
...@@ -46,8 +46,10 @@ public class DPSubController { ...@@ -46,8 +46,10 @@ public class DPSubController {
if (ValidationUtil.isEmpty(param.get("equList"))){ if (ValidationUtil.isEmpty(param.get("equList"))){
param.put("equList", param.get("EQU_LIST_CODE")); param.put("equList", param.get("EQU_LIST_CODE"));
} }
if (!ValidationUtil.isEmpty(param.get("equListCode"))){ if (!ValidationUtil.isEmpty(param.get("equListCode"))){ // 问题列表关联设备
param.put("equList", param.get("equListCode")); param.put("equList", param.get("equListCode"));
param.put("EQU_LIST_CODE", param.get("equListCode"));
param.put("SEQUENCE_NBR", param.get("record"));
} }
Assert.notNull(param.get("record"), "设备ID不能为空"); Assert.notNull(param.get("record"), "设备ID不能为空");
Assert.notNull(param.get("equList"), "设备种类不能为空"); Assert.notNull(param.get("equList"), "设备种类不能为空");
......
...@@ -3,7 +3,10 @@ package com.yeejoin.amos.boot.module.statistcs.biz.service.impl; ...@@ -3,7 +3,10 @@ package com.yeejoin.amos.boot.module.statistcs.biz.service.impl;
import com.yeejoin.amos.boot.module.statistics.api.mapper.DPSubBizMapper; import com.yeejoin.amos.boot.module.statistics.api.mapper.DPSubBizMapper;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.typroject.tyboot.core.foundation.utils.DateTimeUtil;
import org.typroject.tyboot.core.foundation.utils.DateUtil;
import java.util.Date;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
...@@ -56,7 +59,7 @@ public class DPSubBizServiceImpl { ...@@ -56,7 +59,7 @@ public class DPSubBizServiceImpl {
map.put("key", x.get("sequence_nbr")); map.put("key", x.get("sequence_nbr"));
map.put("type", x.get("problem_type")); map.put("type", x.get("problem_type"));
map.put("descr", x.get("problem_desc")); map.put("descr", x.get("problem_desc"));
map.put("createDate", x.get("problem_time")); map.put("createDate", x.get("problemTime"));
return map; return map;
}) })
.collect(Collectors.toList()); .collect(Collectors.toList());
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment