Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer

amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/controller/RoutePointItemController.java

@@ -10,11 +10,9 @@ import com.yeejoin.amos.supervision.business.vo.RoutePointItemVo;
 import com.yeejoin.amos.supervision.core.common.request.CommonPageable;
 import com.yeejoin.amos.supervision.core.common.request.CommonRequest;
 import com.yeejoin.amos.supervision.dao.entity.Plan;
-import com.yeejoin.amos.supervision.dao.entity.RoutePointItem;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
-import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -57,11 +55,7 @@ public class RoutePointItemController extends AbstractBaseController {
         try {
             String userId = getUserId();
             if (StringUtils.isNotBlank(userId)) {
-                List<RoutePointItem> list = routePointItemService.addRoutePointItemList(plan, inputItemIds, status, userId);
-                if (CollectionUtils.isNotEmpty(list)) {
-                    return CommonResponseUtil.success();
-                }
-                return CommonResponseUtil.failure("路线点或检查项为空！");
+                return CommonResponseUtil.success(routePointItemService.addRoutePointItemList(plan, inputItemIds, status, userId));
             }
             return CommonResponseUtil.failure("创建用户为空！");
         } catch (Exception e) {

amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/service/impl/RoutePointItemServiceImpl.java

@@ -48,32 +48,33 @@ public class RoutePointItemServiceImpl implements IRoutePointItemService {
     public List<RoutePointItem> addRoutePointItemList(Plan plan, List<Long> inputItemIds, Boolean status, String userId) {
         Long planId = plan.getId();
         Long routeId = plan.getRouteId();
-        if (CollectionUtils.isNotEmpty(inputItemIds) && routeId != null && planId != null) {
+        if (routeId != null && planId != null) {
             if (status) {
                 planDao.updatePlanStatus(PlanStatusEnum.EXAMINE_DEVELOPED.getValue(), planId);
             } else {
-                List<InputItem> inputItemList = inputItemMapper.findByIdIn(inputItemIds);
-                List<RoutePoint> routePointList = routePointDao.findByRouteId(routeId);
-                if (CollectionUtils.isNotEmpty(inputItemList) && CollectionUtils.isNotEmpty(routePointList)) {
-                    List<RoutePointItem> list = new ArrayList<>();
-                    routePointList.stream().forEach(route -> {
-                        Long routePointId = route.getId();
-                        inputItemList.stream().forEach(item -> {
-                            RoutePointItem routePointItem = new RoutePointItem();
-                            routePointItem.setPlanId(planId);
-                            routePointItem.setInputItemId(item.getId());
-                            routePointItem.setBasisJson(item.getBasisJson());
-                            routePointItem.setOrderNo(item.getOrderNo());
-                            routePointItem.setRoutePointId(routePointId);
-                            routePointItem.setCreatorId(userId);
-                            routePointItem.setCreateDate(new Date());
-                            list.add(routePointItem);
+                if (CollectionUtils.isNotEmpty(inputItemIds)) {
+                    List<InputItem> inputItemList = inputItemMapper.findByIdIn(inputItemIds);
+                    List<RoutePoint> routePointList = routePointDao.findByRouteId(routeId);
+                    if (CollectionUtils.isNotEmpty(inputItemList) && CollectionUtils.isNotEmpty(routePointList)) {
+                        List<RoutePointItem> list = new ArrayList<>();
+                        routePointList.stream().forEach(route -> {
+                            Long routePointId = route.getId();
+                            inputItemList.stream().forEach(item -> {
+                                RoutePointItem routePointItem = new RoutePointItem();
+                                routePointItem.setPlanId(planId);
+                                routePointItem.setInputItemId(item.getId());
+                                routePointItem.setBasisJson(item.getBasisJson());
+                                routePointItem.setOrderNo(item.getOrderNo());
+                                routePointItem.setRoutePointId(routePointId);
+                                routePointItem.setCreatorId(userId);
+                                routePointItem.setCreateDate(new Date());
+                                list.add(routePointItem);
+                            });
                         });
-                    });
-                    return routePointItemDao.saveAll(list);
+                        return routePointItemDao.saveAll(list);
+                    }
                 }
             }
-//            routePointItemDao.deleteByPlanId(planId);
         }
         return Lists.newArrayList();
     }