lyhzzz %!s(int64=2) %!d(string=hai) anos
pai
achega
9f58b5ecff

+ 2 - 0
src/main/java/com/fdkankan/manage/service/IOrderService.java

@@ -26,4 +26,6 @@ public interface IOrderService extends IService<Order> {
     PageInfo pageList(OrderParam param);
     PageInfo pageList(OrderParam param);
 
 
     void export(HttpServletRequest req, HttpServletResponse resp) throws Exception;
     void export(HttpServletRequest req, HttpServletResponse resp) throws Exception;
+
+    List<Order> getByOrderSnList(List<String> orderSnList);
 }
 }

+ 23 - 0
src/main/java/com/fdkankan/manage/service/impl/CameraServiceImpl.java

@@ -247,6 +247,7 @@ public class CameraServiceImpl extends ServiceImpl<ICameraMapper, Camera> implem
     @Override
     @Override
     public Integer outs(List<CameraInOutParam> params){
     public Integer outs(List<CameraInOutParam> params){
         setCompanyIdByDb(params);
         setCompanyIdByDb(params);
+        checkOrderSn(params);
         HashMap<String, Object> resultMap = getResultMap(params);
         HashMap<String, Object> resultMap = getResultMap(params);
         HashMap<Long,CameraDetail> detailMap = (HashMap<Long, CameraDetail>) resultMap.get("detailMap");
         HashMap<Long,CameraDetail> detailMap = (HashMap<Long, CameraDetail>) resultMap.get("detailMap");
         HashMap<String, Camera> snCodeMap = (HashMap<String, Camera>) resultMap.get("snCodeMap");
         HashMap<String, Camera> snCodeMap = (HashMap<String, Camera>) resultMap.get("snCodeMap");
@@ -259,6 +260,28 @@ public class CameraServiceImpl extends ServiceImpl<ICameraMapper, Camera> implem
 
 
     }
     }
 
 
+    private void checkOrderSn(List<CameraInOutParam> params) {
+        List<String> orderSnList = params.stream().map(CameraInOutParam::getOrderSn).collect(Collectors.toList());
+        if(orderSnList.size() >0){
+            List<Order> orders =  orderService.getByOrderSnList(orderSnList);
+            List<String> dbOrderSn = orders.stream().map(Order::getOrderSn).collect(Collectors.toList());
+            List<Integer> errorList = new ArrayList<>();
+            Integer index = 0;
+            for (String sn : orderSnList) {
+                index ++;
+                if(StringUtils.isBlank(sn)){
+                    continue;
+                }
+                if(!dbOrderSn.contains(sn)){
+                    errorList.add(index);
+                }
+            }
+            excelService.toExcelError(errorList);
+        }
+
+    }
+
+
     private Integer saveBatchDetail(HashMap<Long, CameraDetail> detailMap, List<CameraInOutParam> params){
     private Integer saveBatchDetail(HashMap<Long, CameraDetail> detailMap, List<CameraInOutParam> params){
         List<CameraDetail> cameraDetails = new ArrayList<>();
         List<CameraDetail> cameraDetails = new ArrayList<>();
         for (CameraInOutParam param : params) {
         for (CameraInOutParam param : params) {

+ 14 - 0
src/main/java/com/fdkankan/manage/service/impl/OrderServiceImpl.java

@@ -18,6 +18,7 @@ import org.springframework.stereotype.Service;
 
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpServletResponse;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.List;
 import java.util.stream.Collectors;
 import java.util.stream.Collectors;
 
 
@@ -54,12 +55,25 @@ public class OrderServiceImpl extends ServiceImpl<IOrderMapper, Order> implement
     }
     }
 
 
     @Override
     @Override
+    public List<Order> getByOrderSnList(List<String> orderSnList) {
+        if(orderSnList.size() >0){
+            LambdaQueryWrapper<Order> wrapper = new LambdaQueryWrapper<>();
+            wrapper.in(Order::getOrderSn,orderSnList);
+            wrapper.orderByDesc(Order::getCreateTime);
+            return this.list(wrapper);
+        }
+        return new ArrayList<>();
+    }
+
+    @Override
     public PageInfo pageList(OrderParam param) {
     public PageInfo pageList(OrderParam param) {
         CacheUtil.orderParam = param;
         CacheUtil.orderParam = param;
         Page<OrderVo> page = this.getBaseMapper().pageList(new Page<>(param.getPageNum(),param.getPageSize()),param);
         Page<OrderVo> page = this.getBaseMapper().pageList(new Page<>(param.getPageNum(),param.getPageSize()),param);
         return PageInfo.PageInfo(page);
         return PageInfo.PageInfo(page);
     }
     }
 
 
+
+
     @Override
     @Override
     public void export(HttpServletRequest req, HttpServletResponse resp) throws Exception {
     public void export(HttpServletRequest req, HttpServletResponse resp) throws Exception {
         OrderParam param = CacheUtil.orderParam;
         OrderParam param = CacheUtil.orderParam;