Commit 610e5a84 authored by helinlin's avatar helinlin

隐患导入问题处理

parent 321531c4
...@@ -209,6 +209,7 @@ public class HiddenDangerServiceImpl implements IHiddenDangerService { ...@@ -209,6 +209,7 @@ public class HiddenDangerServiceImpl implements IHiddenDangerService {
HiddenDangerDto hiddenDangerDto = new HiddenDangerDto(); HiddenDangerDto hiddenDangerDto = new HiddenDangerDto();
hiddenDangerDto.setPlanId(planId); hiddenDangerDto.setPlanId(planId);
hiddenDangerDto.setPointId(pointArray.length > 1 ? Long.parseLong(StringUtils.trimAllWhitespace(pointArray[1])) : null); hiddenDangerDto.setPointId(pointArray.length > 1 ? Long.parseLong(StringUtils.trimAllWhitespace(pointArray[1])) : null);
hiddenDangerDto.setPointName(pointArray.length > 1 ? pointArray[0] : null);
hiddenDangerDto.setCheckInputId(seq); hiddenDangerDto.setCheckInputId(seq);
hiddenDangerDto.setDangerType(DangerHandleTypeEnum.SELF.getCode()); hiddenDangerDto.setDangerType(DangerHandleTypeEnum.SELF.getCode());
try { try {
......
...@@ -9,10 +9,10 @@ ...@@ -9,10 +9,10 @@
ci.input_name as inputItemName, ci.input_name as inputItemName,
ci.user_name as checkUserName, ci.user_name as checkUserName,
ci.create_date as checkTime, ci.create_date as checkTime,
c.point_name pp.name as pointName
FROM `p_hidden_danger` phd FROM `p_hidden_danger` phd
left join p_check_input ci on phd.check_input_id = ci.id left join p_check_input ci on phd.check_input_id = ci.id
left join p_check c on c.id = phd.check_id left join p_point pp on pp.id = phd.point_id
<where> <where>
<if test="planId !=null and planId != ''">and phd.plan_id=#{planId}</if> <if test="planId !=null and planId != ''">and phd.plan_id=#{planId}</if>
<if test="pointId !=null and pointId != ''">and phd.point_id=#{pointId}</if> <if test="pointId !=null and pointId != ''">and phd.point_id=#{pointId}</if>
......
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