数据拉取定时任务、逻辑补充

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/impl/ErpOrderInfoServiceImpl.java

@@ -7,14 +7,17 @@ import com.management.platform.mapper.ErpOrderInfoMapper;
 import com.management.platform.mapper.UserMapper;
 import com.management.platform.service.ErpOrderInfoService;
 import com.management.platform.util.HttpRespMsg;
+import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 @Service
 public class ErpOrderInfoServiceImpl extends ServiceImpl<ErpOrderInfoMapper, ErpOrderInfo> implements ErpOrderInfoService {
@@ -34,7 +37,16 @@ public class ErpOrderInfoServiceImpl extends ServiceImpl<ErpOrderInfoMapper, Erp
                 .eq(ErpOrderInfo::getProjectId, projectId)
                 .ne(ErpOrderInfo::getStatus, 4)
         );
-        httpRespMsg.setData(erpOrderInfos);
+        List<String> orderIds = new ArrayList<>();
+        List<Integer> lines = new ArrayList<>();
+        if(CollectionUtils.isNotEmpty(erpOrderInfos)){
+            orderIds = erpOrderInfos.stream().map(ErpOrderInfo::getOrderId).distinct().collect(Collectors.toList());
+            lines = erpOrderInfos.stream().map(ErpOrderInfo::getLine).distinct().collect(Collectors.toList());
+        }
+        Map<String,Object> map = new HashMap<>();
+        map.put("orderIds",orderIds);
+        map.put("lines",lines);
+        httpRespMsg.setData(map);
         return httpRespMsg;
     }