1.修改报备sync和导出sql增加字段

suishenbang-order/src/main/resources/mapper/order/CustomersStartMapper.xml

@@ -77,6 +77,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                     suboffice_code,
                     suboffice_name,
                     customer_id,
+                    BUSINESS_UNIT,
                     customer_name
                 FROM
                     order_sales_sum_tuc_customer
@@ -89,7 +90,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         WHERE
             ce.org_attestation_time IS NOT NULL
         GROUP BY
-            ce.chains_code
+            ce.chains_code,mds.BUSINESS_UNIT
         ORDER BY
             mds.company_name DESC
     </select>

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

@@ -347,8 +347,10 @@ public class AnalysisSysUserService implements IAnalysisSysUserService {
                     }
                     /** =============用户基本信息构建 end===============*/
 
-
-
+                    SysUser sysUser=sysUserService.selectUserByLoginName(user.getLoginName());
+                    if("1".equals(sysUser.getIsSync())){
+                        continue;
+                    }
                     /**======== 构建diy用户扩展信息表 start===============*/
                     SysUserExt userExt = new SysUserExt();
                     userExt.setBossEmployeeId(m.getBossEmployeeId());
@@ -450,7 +452,6 @@ public class AnalysisSysUserService implements IAnalysisSysUserService {
                     loginNameList = loginNameList.stream().map(String::toUpperCase).collect(Collectors.toSet());
                     if (loginNameList.contains(user.getLoginName().toUpperCase())) {
                         /**  更新 */
-                        SysUser sysUser=sysUserService.selectUserByLoginName(user.getLoginName());
                         if(!sysUser.getSysUserExt().getSalesLevel().equals(userExt.getSalesLevel())){
                             sysUserService.deleteByLoginName(user.getLoginName());
                         }else if(!sysUser.getSysUserExt().getPostCode().equals(userExt.getPostCode())){
@@ -601,7 +602,10 @@ public class AnalysisSysUserService implements IAnalysisSysUserService {
                         user.setStatus("0");
                     }
                     /** =============用户基本信息构建 end===============*/
-
+                    SysUser sysUser=sysUserService.selectUserByLoginName(user.getLoginName());
+                    if("1".equals(sysUser.getIsSync())){
+                        continue;
+                    }
 
                     /**======== 构建diy用户扩展信息表 start===============*/
                     SysUserExt userExt = new SysUserExt();
@@ -674,7 +678,6 @@ public class AnalysisSysUserService implements IAnalysisSysUserService {
                     loginNameList = loginNameList.stream().map(String::toUpperCase).collect(Collectors.toSet());
                     if (loginNameList.contains(user.getLoginName().toUpperCase())) {
                         /**  更新 */
-                        SysUser sysUser=sysUserService.selectUserByLoginName(user.getLoginName());
                         if(!sysUser.getSysUserExt().getSalesLevel().equals(userExt.getSalesLevel())){
                             sysUserService.deleteByLoginName(user.getLoginName());
                         }else if(!sysUser.getSysUserExt().getPostCode().equals(userExt.getPostCode())){
@@ -815,7 +818,10 @@ public class AnalysisSysUserService implements IAnalysisSysUserService {
                         user.setStatus("0");
                     }
                     /** =============用户基本信息构建 end===============*/
-
+                    SysUser sysUser=sysUserService.selectUserByLoginName(user.getLoginName());
+                    if(sysUser.getIsSync().equals("1")){
+                        continue;
+                    }
 
                     /**======== 构建diy用户扩展信息表 start===============*/
                     SysUserExt userExt = new SysUserExt();
@@ -874,7 +880,6 @@ public class AnalysisSysUserService implements IAnalysisSysUserService {
                     loginNameList = loginNameList.stream().map(String::toUpperCase).collect(Collectors.toSet());
                     if (loginNameList.contains(user.getLoginName().toUpperCase())) {
                         /**  更新 */
-                        SysUser sysUser=sysUserService.selectUserByLoginName(user.getLoginName());
                        if(!sysUser.getSysUserExt().getSalesLevel().equals(userExt.getSalesLevel())){
                            sysUserService.deleteByLoginName(user.getLoginName());
                        }else if(!sysUser.getSysUserExt().getPostCode().equals(userExt.getPostCode())){
@@ -996,7 +1001,10 @@ public class AnalysisSysUserService implements IAnalysisSysUserService {
                         user.setStatus("0");
                     }
                     /** =============用户基本信息构建 end===============*/
-
+                    SysUser sysUser=sysUserService.selectUserByLoginName(user.getLoginName());
+                    if(sysUser.getIsSync().equals("1")){
+                        continue;
+                    }
 
                     /**======== 构建用户扩展信息表 start===============*/
                     SysUserExt userExt = new SysUserExt();
@@ -1013,7 +1021,6 @@ public class AnalysisSysUserService implements IAnalysisSysUserService {
                     loginNameList = loginNameList.stream().map(String::toUpperCase).collect(Collectors.toSet());
                     if (loginNameList.contains(user.getLoginName().toUpperCase())) {
                         /**  更新 */
-                        SysUser sysUser=sysUserService.selectUserByLoginName(user.getLoginName());
                         sysUserService.deleteByLoginName(user.getLoginName());
                         SysUserRole role=new SysUserRole();
                         role.setUserId(sysUser.getUserId());
@@ -1110,10 +1117,11 @@ public class AnalysisSysUserService implements IAnalysisSysUserService {
         userExt.setOrgName("品保中心");
         userExt.setOrgCode("1");
         /**======== 构建用户扩展信息表 end===============*/
+        SysUser sysUser=sysUserService.selectUserByLoginName(user.getLoginName());
+        if(!("1").equals(sysUser.getIsSync())){
         loginNameList = loginNameList.stream().map(String::toUpperCase).collect(Collectors.toSet());
         if (loginNameList.contains(user.getLoginName().toUpperCase())) {
             /**  更新 */
-            SysUser sysUser=sysUserService.selectUserByLoginName(user.getLoginName());
             sysUserService.deleteByLoginName(user.getLoginName());
             SysUserRole role=new SysUserRole();
             role.setUserId(sysUser.getUserId());
@@ -1133,6 +1141,7 @@ public class AnalysisSysUserService implements IAnalysisSysUserService {
             user.setSysUserExt(userExt);
             sysUserService.insertUserAndSalesExt(user);
         }
+        }
     }
 
 

suishenbang-sync/suishenbang-sync-manager/src/main/java/com/dgtly/sync/controller/SyncController.java

@@ -68,6 +68,7 @@ public class SyncController {
             analysisSysUserService.analysisSysUser(null);
             analysisSysUserService.analysisSysCwUser(null);
             analysisSysUserService.analysisSysYSLUser(null);
+            analysisSysUserService.analysisSysClueReporting();
         }catch (Exception e){
             log.error("解析用户出错",e);
         }