合并0325分支

suishenbang-quartz/src/main/java/com/dgtly/quartz/task/RyTask.java

@@ -68,6 +68,12 @@ public class RyTask
     public void analyDiyCustomer1(){
         analysisDiyCustomerComponent.analyDiyCustomer1();
     }
+
+
+    //针对特殊人的定时任务修改入库ass表
+    public void analyDiyCustomer2(){
+        analysisDiyCustomerComponent.analyDiyCustomer2();
+    }
     /**
      * @description: 获取TUC仿石漆服务商人员
      * @param: []

suishenbang-sync/suishenbang-sync-common/src/main/java/com/dgtly/sync/service/AnalysisDiyCustomerComponent.java

@@ -17,6 +17,7 @@ import com.dgtly.sync.mapper.SyncFailDetailMapper;
 import com.dgtly.sync.utils.CustomerAccessTokenUtil;
 import com.dgtly.sync.utils.CustomerAccessTokenUtil.UrlType;
 import com.dgtly.system.domain.AssRelcustomerinfo;
+import com.dgtly.system.domain.SysDictData;
 import com.dgtly.system.domain.SysUser;
 import com.dgtly.system.domain.SysUserExt;
 import com.dgtly.system.mapper.SysUserExtMapper;
@@ -24,6 +25,7 @@ import com.dgtly.system.mapper.SysUserMapper;
 import com.dgtly.system.mapper.SysUserShopExtMapper;
 import com.dgtly.system.service.IAssRelcustomerinfoService;
 import com.dgtly.system.service.ISysConfigService;
+import com.dgtly.system.service.ISysDictDataService;
 import com.dgtly.system.service.impl.SysUserServiceImpl;
 import com.dgtly.wxportal.mapper.WxQyUserMapper;
 import org.slf4j.Logger;
@@ -55,6 +57,9 @@ public class AnalysisDiyCustomerComponent {
     @Autowired
     private WxQyUserMapper wxQyUserMapper;
 
+    @Autowired
+    private ISysDictDataService sysDictDataService;
+
     @Autowired
     private ISysConfigService configService;
     @Autowired
@@ -64,6 +69,9 @@ public class AnalysisDiyCustomerComponent {
     @Autowired
     private IAssRelcustomerinfoService assRelcustomerinfoService;
 
+    @Autowired
+    private AnalysisDiyCustomerComponent analysisDiyCustomerComponent;
+
     @Autowired
     private SysUserShopExtMapper userShopExtMapper;
     private Long deptId;
@@ -85,7 +93,15 @@ public class AnalysisDiyCustomerComponent {
     private Long[] roleSfa;//5.1家装顾问挂sfa角色
 
 
-
+    public void analyDiyCustomer2() {
+        List<SysDictData> sysDictData = sysDictDataService.selectSimpleDictDataByType("sys_system_ass_cusyomer");
+        String deptCodes = sysDictData.get(0).getDictValue();
+        String [] deptCode = deptCodes.split(",");
+        for (String dCode : deptCode){
+            log.info("本次需要同步的经销商:{}",dCode);
+            getManagerList(dCode,"");
+        }
+    }
 
 
     public SyncLog analyDiyCustomer1() {
@@ -1197,7 +1213,11 @@ public class AnalysisDiyCustomerComponent {
                         if (isManager != 0 && !("019").equals(userOld.getSysUserExt().getOrgCode().substring(0, 3)) && !("019").equals(userOld.getSysUserExt().getCustomerCode().substring(0, 3))
                                 && !("019").equals(user.getSysUserExt().getOrgCode().substring(0, 3)) && !("019").equals(user.getSysUserExt().getCustomerCode().substring(0, 3))
                         ) {
-
+                            log.info("到这了");
+                            log.info("q:{}",userOld.getSysUserExt().getOrgCode());
+                            log.info("q:{}",userOld.getSysUserExt().getCustomerCode());
+                            log.info("q:{}",user.getSysUserExt().getOrgCode());
+                            log.info("q:{}",customerCode);
                             if (user.getSysUserExt().getOrgCode() != null && (!customerCode.equals(userOld.getSysUserExt().getOrgCode()) || !customerCode.equals(userOld.getSysUserExt().getCustomerCode()) )) {
 
                                 assRelcustomerinfoList = assRelcustomerinfoService.selectRelcustomerinfoByKunnr(customerCode, user.getUserId().toString());