修改接口

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/controller/PointController.java

@@ -229,12 +229,16 @@ public class PointController extends AbstractBaseController {
 				newPointClassify.setCategoryName(pointClassify.getCategoryName());
 				newPointClassify.setCode(pointClassify.getCode());
 				newPointClassify.setBuildingName(pointClassify.getBuildingName());
+				if(pointClassify.getId()!=null){
+					newPointClassify.setId(pointClassify.getId());
+				}
 				iPointService.addPointClassifyByPointId(newPointClassify);
 
 				List<PointInputItemVo> customInputList = pointClassify.getEquipIputDetailData();//巡检项
 
 				for (PointInputItemVo pItemVo : customInputList) {
 					    PointInputItem pointInputItem = new PointInputItem();
+					if(pItemVo.getPointItemId()==0l) {
 						pointInputItem.setPointId(pointClassify.getPointId());
 						pointInputItem.setInputItemId(pItemVo.getId());
 						pointInputItem.setClassifyIds(Long.valueOf(newPointClassify.getId()).toString());
@@ -242,11 +246,11 @@ public class PointController extends AbstractBaseController {
 						pointInputItem.setOrderNo(pItemVo.getpOrderNo());
 						PointInputItem pointInputItemResult = iPointInputItemDao.save(pointInputItem);
 						//更新巡检路线
-						if(routePointList.size()>0){
+						if (routePointList.size() > 0) {
 
-							Long classifyId=newPointClassify.getId();
+							Long classifyId = newPointClassify.getId();
 
-							for (RoutePoint routePoint :routePointList) {
+							for (RoutePoint routePoint : routePointList) {
 								RoutePointItem routePointItem = new RoutePointItem();
 								routePointItem.setPointClassifyId(classifyId);
 								routePointItem.setPointInputItemId(pointInputItemResult.getId());
@@ -254,7 +258,21 @@ public class PointController extends AbstractBaseController {
 								iRoutePointItemDao.save(routePointItem);
 							}
 						}
+					}else{
+						pointInputItem.setId(pItemVo.getPointItemId());
+						pointInputItem.setInputItemId(pItemVo.getId());
+						pointInputItem.setPointId(pointClassify.getPointId());
+						pointInputItem.setClassifyIds(Long.valueOf(newPointClassify.getId()).toString());
+						pointInputItem.setId(pItemVo.getPointItemId());
+						pointInputItem.setOrderNo(pItemVo.getpOrderNo());
+						iPointInputItemDao.save(pointInputItem);
+
+
+
 
+
+
+					}
 				}