add

src/main/java/com/zfire/jiasm/syncdata/service/impl/UploadWorkerTOGreeServiceImpl.java

@@ -413,7 +413,7 @@ public class UploadWorkerTOGreeServiceImpl implements UploadWorkerTOGreeService
         return result;
     }
 
-    private String extracted(List<SignSplb> jySignSplbList, List<SignSplb> sySignSplbList,
+    private String extractedBakt(List<SignSplb> jySignSplbList, List<SignSplb> sySignSplbList,
                              List<SignSplb> jyList, List<SignSplb> syList, WebsitQXLB websitqypl,String brandWebsitNumber) {
         String result = "";
 
@@ -474,6 +474,73 @@ public class UploadWorkerTOGreeServiceImpl implements UploadWorkerTOGreeService
         return result;
     }
 
+    private String extracted(List<SignSplb> jySignSplbList, List<SignSplb> sySignSplbList,
+                             List<SignSplb> jyList, List<SignSplb> syList, WebsitQXLB websitqypl,String brandWebsitNumber) {
+        String result = "";
+
+        if (websitqypl.getJySignSplbList().size()<1 && websitqypl.getSySignSplbList().size()<1){
+            result="网点【"+brandWebsitNumber+"】暂未签约品类";
+            return result;
+        }
+
+        // 过滤商用品类
+        if (websitqypl.getSySignSplbList().size()>0 && sySignSplbList.size()>0){
+            for (SignSplb wdsy : websitqypl.getSySignSplbList()) {
+                for (SignSplb sy : sySignSplbList) {
+                    if (sy.getSpdl().equals(wdsy.getSpdl())){
+                        List<String> syfwlbList = new ArrayList<>();
+                        // 大类名称 取交集
+                        wdsy.getFwlbList().retainAll(sy.getFwlbList());
+                        syfwlbList.addAll(wdsy.getFwlbList());
+                        SignSplb one = new SignSplb();
+                        one.setFwlbList(syfwlbList);
+                        one.setSpdl(wdsy.getSpdl());
+                        one.setSpdlName(wdsy.getSpdlName());
+                        // 以总部的为准
+                        if (wdsy.getSpxl()!=null){
+                            one.setSpxl(wdsy.getSpxl());
+                            one.setSpxlName(wdsy.getSpxlName());
+                        } else if (sy.getSpxl()!=null){
+                            one.setSpxl(sy.getSpxl());
+                            one.setSpxlName(sy.getSpxlName());
+                        }
+                        syList.add(one);
+                        break;
+                    }
+                }
+            }
+        }
+
+        // 过滤家用品类
+        if (websitqypl.getJySignSplbList().size()>0 && jySignSplbList.size()>0){
+            for (SignSplb wdjy : websitqypl.getJySignSplbList()) {
+                for (SignSplb jy : jySignSplbList) {
+                    if (jy.getSpdl().equals(wdjy.getSpdl()) ){
+                        List<String> jyfwlbList = new ArrayList<>();
+                        // 大类名称 取交集
+                        wdjy.getFwlbList().retainAll(jy.getFwlbList());
+                        jyfwlbList.addAll(wdjy.getFwlbList());
+                        SignSplb one = new SignSplb();
+                        one.setFwlbList(jyfwlbList);
+                        one.setSpdl(wdjy.getSpdl());
+                        one.setSpdlName(wdjy.getSpdlName());
+                        if (wdjy.getSpxl()!=null){
+                            one.setSpxl(wdjy.getSpxl());
+                            one.setSpxlName(wdjy.getSpxlName());
+                        } else if (jy.getSpxl()!=null){
+                            one.setSpxl(jy.getSpxl());
+                            one.setSpxlName(jy.getSpxlName());
+                        }
+                        jyList.add(one);
+                        break;
+                    }
+                }
+            }
+        }
+
+        return result;
+    }
+
     private Boolean checkNecessary(Worker worker, OutWorkerUpload item, WorkerCertificateInfo workerCertificateInfo) {
         if (StringUtils.isEmpty(workerCertificateInfo.getSfzbh())){
             updateWorkerUploadLag(item,"师傅缺失身份证信息，不上传");