Commit f1162917 authored by suhuiguang's avatar suhuiguang

1.冗余地址

parent 7b8cfff9
...@@ -35,6 +35,12 @@ public class PlanTaskPointInputItemBo { ...@@ -35,6 +35,12 @@ public class PlanTaskPointInputItemBo {
* 编号 * 编号
*/ */
private String pointNo; private String pointNo;
/**
* 地址
*/
private String address;
/** /**
* 巡检任务id * 巡检任务id
......
...@@ -168,6 +168,7 @@ public class CheckServiceImpl implements ICheckService { ...@@ -168,6 +168,7 @@ public class CheckServiceImpl implements ICheckService {
check.setOwnerId(route.getOwnerId()); check.setOwnerId(route.getOwnerId());
check.setOwnerName(route.getOwnerName()); check.setOwnerName(route.getOwnerName());
check.setBuildingName(point.getBuildingName()); check.setBuildingName(point.getBuildingName());
check.setAddress(point.getAddress());
check.setEquipmentName(point.getEquipmentName()); check.setEquipmentName(point.getEquipmentName());
check.setPlanType(detail.get("planType").toString()); check.setPlanType(detail.get("planType").toString());
check.setUserName(personIdentity.getPersonName()); check.setUserName(personIdentity.getPersonName());
......
...@@ -202,6 +202,7 @@ public class JobService implements IJobService { ...@@ -202,6 +202,7 @@ public class JobService implements IJobService {
check.setBeginTime(planTask.getBeginTime()); check.setBeginTime(planTask.getBeginTime());
check.setEndTime(planTask.getEndTime()); check.setEndTime(planTask.getEndTime());
check.setBuildingName(arg.getBuildingName()); check.setBuildingName(arg.getBuildingName());
check.setAddress(arg.getAddress());
check.setUploadTime(new Date()); check.setUploadTime(new Date());
check.setPlanId(arg.getPlanId()); check.setPlanId(arg.getPlanId());
check.setPlanName(arg.getPlanName()); check.setPlanName(arg.getPlanName());
......
...@@ -393,6 +393,7 @@ ...@@ -393,6 +393,7 @@
temp1.buildingName, temp1.buildingName,
temp1.equipmentName, temp1.equipmentName,
temp1.remark as riskAndManage, temp1.remark as riskAndManage,
temp1.address,
temp1.ownerName, temp1.ownerName,
pii.`name` inputName, pii.`name` inputName,
temp2.* temp2.*
...@@ -416,7 +417,8 @@ ...@@ -416,7 +417,8 @@
p.point_no as pointNo, p.point_no as pointNo,
p.building_name as buildingName, p.building_name as buildingName,
p.equipment_name as equipmentName, p.equipment_name as equipmentName,
p.remark p.remark,
p.address
FROM FROM
p_route_point_item prpi p_route_point_item prpi
LEFT JOIN p_route_point prp ON prp.id = prpi.route_point_id LEFT JOIN p_route_point prp ON prp.id = prpi.route_point_id
......
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