修改检查项接口

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

@@ -704,7 +704,7 @@ public class RouteController extends AbstractBaseController {
 													@ApiParam(value = "巡检点id", required = true) @RequestParam Long pointId,
 													@ApiParam(value = "巡检点巡检项id", required = true) @RequestParam List<Long> inputItemIds) {
 		try {
-			routeService.updateRoutePointInputItemNew(routeId, pointId, inputItemIds.toArray(new Long[0]));
+			routeService.updateRoutePointInputItemNew(routeId, pointId, inputItemIds);
 			return CommonResponseUtil.success();
 		} catch (Exception e) {
 			log.error(e.getMessage(), e);

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/service/impl/PointServiceImpl.java

@@ -799,13 +799,16 @@ public class PointServiceImpl implements IPointService {
         Long[] longs = new Long[]{pointId};
         List<RoutePoint> list = iRoutePointDao.queryRoutePoint(routeId, longs);
         String excludeItems = list.get(0).getExcludeItems();
-        resList.forEach(e->{
-            if (excludeItems.contains(e.get("itemId").toString())){
-                e.put("checked",false);
-            }else {
-                e.put("checked",true);
-            }
-        });
+        if(excludeItems!=null){
+            resList.forEach(e->{
+                if (excludeItems.contains(e.get("itemId").toString())){
+                    e.put("checked",true);
+                }else {
+                    e.put("checked",false);
+                }
+            });
+        }
+
         return resList;
     }
 

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/service/impl/RouteServiceImpl.java

@@ -571,37 +571,19 @@ public class RouteServiceImpl implements IRouteService {
     }
 
     @Transactional
-    public void updateRoutePointInputItemNew(Long routeId, Long pointId, Long[] inputItemIds) {
+    public void updateRoutePointInputItemNew(Long routeId, Long pointId, List<Long> inputItemIds) {
         Long[] pointIds = {pointId};
-        String creatorId = "";
-        long routePointId = 0;
-        RoutePoint routePoint = null;
-        // 1.先查找并删除表中已有的行（旧的项）
         List<RoutePoint> oldRoutePointList = iRoutePointDao.queryRoutePoint(routeId, pointIds);
-        if (oldRoutePointList.size() > 0) {
-            routePoint = oldRoutePointList.get(0);
-
-            creatorId = routePoint.getCreatorId();
-            routePointId = routePoint.getId();
+        if(oldRoutePointList!=null&&oldRoutePointList.size()>0){
+            RoutePoint RoutePoint=oldRoutePointList.get(0);
+           if(inputItemIds!=null){
+               String excludeItem =  StringUtils.join(inputItemIds.toArray(), ",");
+               RoutePoint.setExcludeItems(excludeItem);
+           }else{
+               RoutePoint.setExcludeItems(null);
+           }
+            iRoutePointDao.save(RoutePoint);
         }
-        iRoutePointItemDao.delRoutePointItem(routePointId);
-
-        // 2.保存新的项到数据库
-        List<RoutePointItem> routePointList = new ArrayList<>();
-        int orderNo = 0;
-        for (Long inputItemId : inputItemIds) {
-          //     PointInputItem pointInputItem = iPointInputItemDao.getPointInputItem(pointId, inputItemId);
-            RoutePointItem routePointItem = new RoutePointItem();
-            routePointItem.setCreatorId(creatorId);
-            routePointItem.setOrderNo(orderNo++);
-            routePointItem.setPointInputItemId(inputItemId);
-            routePointItem.setRoutePointId(routePointId);
-            routePointItem.setRoutePoint(routePoint);
-            PointInputItem pointInputItem = iPointInputItemDao.getOne(inputItemId);
-            routePointItem.setPointClassifyId(Long.valueOf(pointInputItem.getClassifyIds()));
-            routePointList.add(routePointItem);
-        }
-        iRoutePointItemDao.saveAll(routePointList);
     }
 
     @Override

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/service/intfc/IRouteService.java

@@ -139,7 +139,7 @@ public interface IRouteService {
 	 */
 	void updateRoutePointInputItem(Long routeId, Long pointId, Long[] inputItemIds);
 
-	void updateRoutePointInputItemNew(Long routeId, Long pointId, Long[] inputItemIds);
+	void updateRoutePointInputItemNew(Long routeId, Long pointId, List<Long> inputItemIds);
 
 	/**
 	 * 	列出巡检点的巡检项及其分类