Skip to content

A
amos-boot-biz
Commit 32973e9a authored by chenzhao's avatar chenzhao
Browse files
Options

Merge branch 'develop_dl_plan6_temp' of…

Merge branch 'develop_dl_plan6_temp' of http://39.98.45.134:8090/moa/amos-boot-biz into develop_dl_plan6_temp
parents f0edbff5 3851ef01
Show whitespace changes
Inline Side-by-side
Showing with 6 additions and 3 deletions
amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/controller/PointController.java
View file @ 32973e9a
...@@ -143,9 +143,8 @@ public class PointController extends AbstractBaseController { ...@@ -143,9 +143,8 @@ public class PointController extends AbstractBaseController {
List<RoutePoint> routePointList = iRoutePointDao.queryByPointId(pointClassify.getPointId()); List<RoutePoint> routePointList = iRoutePointDao.queryByPointId(pointClassify.getPointId());
AgencyUserModel user = getUserInfo(); AgencyUserModel user = getUserInfo();
PointClassify newPointClassify = new PointClassify(); PointClassify newPointClassify = new PointClassify();
if(pointClassify.getId()!=null){ if(pointClassify.getId()==null){
newPointClassify.setId(pointClassify.getId());
}
newPointClassify.setEquipmentId(pointClassify.getEquipmentId()); newPointClassify.setEquipmentId(pointClassify.getEquipmentId());
newPointClassify.setName(pointClassify.getName()); newPointClassify.setName(pointClassify.getName());
newPointClassify.setInspectionSpecName(pointClassify.getInspectionName()); newPointClassify.setInspectionSpecName(pointClassify.getInspectionName());
...@@ -182,6 +181,10 @@ public class PointController extends AbstractBaseController { ...@@ -182,6 +181,10 @@ public class PointController extends AbstractBaseController {
newPointClassify.setCode(pointClassify.getCode()); newPointClassify.setCode(pointClassify.getCode());
iPointService.addPointClassifyByPointId(newPointClassify); iPointService.addPointClassifyByPointId(newPointClassify);
}else{
newPointClassify.setId(pointClassify.getId());
}
List<PointInputItemVo> customInputList = pointClassify.getEquipIputDetailData();//巡检项 List<PointInputItemVo> customInputList = pointClassify.getEquipIputDetailData();//巡检项
......
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