切换分支备份

api-admin/src/main/java/com/glxp/sale/admin/controller/basic/SpsSyncDownloadController.java

@@ -63,6 +63,8 @@ public class SpsSyncDownloadController {
                 logs = logs + "第三方业务单据：" + baseResponse.getData().getThrOrderEntities().size() + "条\n";
             if (CollUtil.isNotEmpty(baseResponse.getData().getAuthAdminList()))
                 logs = logs + "系统用户信息：" + baseResponse.getData().getAuthAdminList().size() + "条\n";
+            if (CollUtil.isNotEmpty(baseResponse.getData().getDeptEntityList()))
+                logs = logs + "部门信息：" + baseResponse.getData().getAuthAdminList().size() + "条\n";
             basicExportStatusEntity.setRemark(logs);
             basicExportService.updateExportStatus(basicExportStatusEntity);
 

api-admin/src/main/java/com/glxp/sale/admin/controller/basic/SpsSyncDownloadService.java

@@ -5,6 +5,7 @@ import cn.hutool.db.sql.Order;
 import com.glxp.sale.admin.constant.ConstantStatus;
 import com.glxp.sale.admin.dao.basic.UdiInfoDao;
 import com.glxp.sale.admin.entity.auth.AuthAdmin;
+import com.glxp.sale.admin.entity.auth.DeptEntity;
 import com.glxp.sale.admin.entity.basic.*;
 import com.glxp.sale.admin.entity.info.CompanyProductRelevanceEntity;
 import com.glxp.sale.admin.entity.inout.*;
@@ -14,6 +15,7 @@ import com.glxp.sale.admin.entity.param.SyncDataBustypeEntity;
 import com.glxp.sale.admin.entity.receipt.ProductInfoEntity;
 import com.glxp.sale.admin.entity.thrsys.*;
 import com.glxp.sale.admin.req.auth.AuthAdminQueryRequest;
+import com.glxp.sale.admin.req.auth.FilterDeptRequest;
 import com.glxp.sale.admin.req.basic.*;
 import com.glxp.sale.admin.req.info.FilterCompanyProductRelevanceRequest;
 import com.glxp.sale.admin.req.inout.OrderFilterRequest;
@@ -27,6 +29,7 @@ import com.glxp.sale.admin.res.basic.SpsSyncDataResponse;
 import com.glxp.sale.admin.res.basic.SpsSyncOrderResponse;
 import com.glxp.sale.admin.res.param.SyncDataSetResponse;
 import com.glxp.sale.admin.service.auth.AuthAdminService;
+import com.glxp.sale.admin.service.auth.DeptService;
 import com.glxp.sale.admin.service.basic.*;
 import com.glxp.sale.admin.service.info.CompanyProductRelevanceService;
 import com.glxp.sale.admin.service.inout.*;
@@ -84,6 +87,9 @@ public class SpsSyncDownloadService {
     @Resource
     AuthAdminService authAdminService;
 
+    @Resource
+    DeptService deptService;
+
     public BaseResponse findProductInfo(SpsSyncDataRequest spsSyncDataRequest) {
 
         SpsSyncDataResponse syncDataResponse = new SpsSyncDataResponse();
@@ -91,11 +97,24 @@ public class SpsSyncDownloadService {
 
         //用户信息
         if (syncDataSetEntity.isSysUser()) {
+
+            //获取用户信息
             AuthAdminQueryRequest authAdminQueryRequest = new AuthAdminQueryRequest();
             BeanUtils.copyProperties(spsSyncDataRequest, authAdminQueryRequest);
             authAdminQueryRequest.setCustomerId("110");
             List<AuthAdmin> authAdminList = authAdminService.listAdminPage(authAdminQueryRequest);
             syncDataResponse.setAuthAdminList(authAdminList);
+
+
+            //获取部门信息
+            FilterDeptRequest filterDeptRequest = new FilterDeptRequest();
+            BeanUtils.copyProperties(spsSyncDataRequest, filterDeptRequest);
+            List<DeptEntity> deptEntityList = deptService.filterDepts(filterDeptRequest);
+            if (CollUtil.isNotEmpty(deptEntityList)) {
+                filterDeptRequest.setLastUpdateTime(null);
+            }
+            deptEntityList = deptService.filterDepts(filterDeptRequest);
+            syncDataResponse.setDeptEntityList(deptEntityList);
         }
 
         if (syncDataSetEntity.isBasicInv()) {

api-admin/src/main/java/com/glxp/sale/admin/controller/basic/SpsSyncExportStatusController.java

@@ -189,6 +189,7 @@ public class SpsSyncExportStatusController {
                         || CollUtil.isNotEmpty(spsSyncDataResponse.getThrProductsEntities())
                         || CollUtil.isNotEmpty(spsSyncDataResponse.getThrInvWarehouseEntities())
                         || CollUtil.isNotEmpty(spsSyncDataResponse.getAuthAdminList())
+                        || CollUtil.isNotEmpty(spsSyncDataResponse.getDeptEntityList())
                 ) {
                     BasicExportStatusTimeEntity basicExportStatusTimeEntity = basicExportTimeService.findByType(ConstantStatus.SYNC_BASIC_DATA);
                     if (basicExportStatusTimeEntity != null) {

api-admin/src/main/java/com/glxp/sale/admin/entity/auth/AuthAdmin.java

@@ -30,4 +30,7 @@ public class AuthAdmin {
     private String locInvCode;
     private String locSubInvCode;
 
+    private String dept;
+    private String deptName;
+
 }

api-admin/src/main/java/com/glxp/sale/admin/req/auth/AuthAdminSaveRequest.java

@@ -37,4 +37,5 @@ public class AuthAdminSaveRequest {
     private String locInvCode;
     private String locSubInvCode;
     private long CustomerId;
+    private String dept;
 }

api-admin/src/main/java/com/glxp/sale/admin/req/auth/FilterDeptRequest.java

@@ -8,5 +8,6 @@ public class FilterDeptRequest extends ListPageRequest {
     private String code;
     private String name;
     private Integer flag;
+    private String lastUpdateTime;
 
 }

api-admin/src/main/java/com/glxp/sale/admin/res/auth/AuthAdminResponse.java

@@ -37,5 +37,7 @@ public class AuthAdminResponse {
     private long CustomerId;
     // 角色ids
     private List<Long> roles;
+    private String dept;
+    private String deptName;
 
 }

api-admin/src/main/java/com/glxp/sale/admin/res/basic/SpsSyncDataResponse.java

@@ -1,6 +1,7 @@
 package com.glxp.sale.admin.res.basic;
 
 import com.glxp.sale.admin.entity.auth.AuthAdmin;
+import com.glxp.sale.admin.entity.auth.DeptEntity;
 import com.glxp.sale.admin.entity.basic.BasicUnitMaintainEntity;
 import com.glxp.sale.admin.entity.basic.UdiInfoEntity;
 import com.glxp.sale.admin.entity.basic.UdiRelevanceEntity;
@@ -34,6 +35,7 @@ public class SpsSyncDataResponse {
     List<WarehouseUserEntity> warehouseUserEntities;
     List<InvSubWarehouseEntity> invSubWarehouseEntities;
     List<AuthAdmin> authAdminList;
+    List<DeptEntity> deptEntityList;
 
 
 }

api-admin/src/main/java/com/glxp/sale/admin/service/auth/DeptService.java

@@ -15,7 +15,6 @@ public interface DeptService {
 
     boolean updateDept(DeptEntity deptEntity);
 
-
     boolean deleteById(Integer id);
 
 }

api-admin/src/main/java/com/glxp/sale/admin/thread/BasicBackUpdateProductService.java

@@ -325,6 +325,7 @@ public class BasicBackUpdateProductService {
                     || CollUtil.isNotEmpty(spsSyncDataResponse.getThrProductsEntities())
                     || CollUtil.isNotEmpty(spsSyncDataResponse.getThrInvWarehouseEntities())
                     || CollUtil.isNotEmpty(spsSyncDataResponse.getAuthAdminList())
+                    || CollUtil.isNotEmpty(spsSyncDataResponse.getDeptEntityList())
             ) {
                 BasicExportStatusEntity basicExportStatusEntity = new BasicExportStatusEntity();
                 basicExportStatusEntity.setId(CustomUtil.getId());

api-admin/src/main/resources/mybatis/mapper/auth/AuthAdminDao.xml

@@ -5,8 +5,8 @@
 
     <select id="listAdminPage" parameterType="com.glxp.sale.admin.req.auth.AuthAdminQueryRequest"
             resultType="com.glxp.sale.admin.entity.auth.AuthAdmin">
-        SELECT *
+        SELECT auth_user.*,auth_dept.name deptName
-        FROM auth_user
+        FROM auth_user left join auth_dept on auth_user.dept = auth_dept.code
         <where>
             <if test="ids != null and ids.size > 0">
                 AND id IN
@@ -34,7 +34,7 @@
     <insert id="replaceAuthAdmin" keyProperty="id" parameterType="com.glxp.sale.admin.entity.auth.AuthAdmin">
         replace
         INTO auth_user(id, userName, passWord, lastLoginIp,
-                              lastLoginTime, createTime, userFlag, lastModifyTime, employeeName,CustomerId,locInvCode,locSubInvCode)
+                              lastLoginTime, createTime, userFlag, lastModifyTime, employeeName,CustomerId,locInvCode,locSubInvCode,dept)
         values (
         #{id},
         #{userName},
@@ -47,7 +47,8 @@
         #{employeeName},
         #{CustomerId},
         #{locInvCode},
-        #{locSubInvCode}
+        #{locSubInvCode},
+        #{dept}
         )
     </insert>
     <select id="findByUserName" parameterType="hashmap" resultType="com.glxp.sale.admin.entity.auth.AuthAdmin">
@@ -99,7 +100,7 @@
     <insert id="insertAuthAdmin" keyProperty="id" parameterType="com.glxp.sale.admin.entity.auth.AuthAdmin">
         INSERT INTO
         auth_user(userName,passWord,lastLoginIp,lastLoginTime,createTime,userFlag
-        ,employeeName,CustomerId,lastModifyTime,locInvCode,locSubInvCode)
+        ,employeeName,CustomerId,lastModifyTime,locInvCode,locSubInvCode,dept)
         values
         (#{userName},
         <choose>
@@ -131,7 +132,7 @@
         #{createTime},
         #{userFlag,jdbcType=INTEGER},
         #{employeeName},
-        #{CustomerId},#{lastModifyTime},#{locInvCode},#{locSubInvCode})
+        #{CustomerId},#{lastModifyTime},#{locInvCode},#{locSubInvCode},#{dept})
     </insert>
 
     <update id="updateAuthAdmin" parameterType="com.glxp.sale.admin.entity.auth.AuthAdmin">
@@ -146,6 +147,8 @@
             <if test="employeeName != null">employeeName=#{employeeName},</if>
             <if test="locInvCode != null">locInvCode=#{locInvCode},</if>
             <if test="locSubInvCode != null">locSubInvCode=#{locSubInvCode},</if>
+            <if test="dept != null">dept=#{dept},</if>
+
         </trim>
         WHERE id=#{id}
     </update>
@@ -167,6 +170,6 @@
         select *
         from auth_user
         where CustomerId = 110
-        and userFlag != 0
+          and userFlag != 0
     </select>
 </mapper>