diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/SpsSyncDownloadController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/SpsSyncDownloadController.java index f6122c2..49ca683 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/SpsSyncDownloadController.java +++ b/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); diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/SpsSyncDownloadService.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/SpsSyncDownloadService.java index 81e6558..fc8c415 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/SpsSyncDownloadService.java +++ b/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 authAdminList = authAdminService.listAdminPage(authAdminQueryRequest); syncDataResponse.setAuthAdminList(authAdminList); + + + //获取部门信息 + FilterDeptRequest filterDeptRequest = new FilterDeptRequest(); + BeanUtils.copyProperties(spsSyncDataRequest, filterDeptRequest); + List deptEntityList = deptService.filterDepts(filterDeptRequest); + if (CollUtil.isNotEmpty(deptEntityList)) { + filterDeptRequest.setLastUpdateTime(null); + } + deptEntityList = deptService.filterDepts(filterDeptRequest); + syncDataResponse.setDeptEntityList(deptEntityList); } if (syncDataSetEntity.isBasicInv()) { diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/SpsSyncExportStatusController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/SpsSyncExportStatusController.java index 66e602c..7694e37 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/SpsSyncExportStatusController.java +++ b/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) { diff --git a/api-admin/src/main/java/com/glxp/sale/admin/entity/auth/AuthAdmin.java b/api-admin/src/main/java/com/glxp/sale/admin/entity/auth/AuthAdmin.java index 1c0673a..edc3a36 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/entity/auth/AuthAdmin.java +++ b/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; + } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/req/auth/AuthAdminSaveRequest.java b/api-admin/src/main/java/com/glxp/sale/admin/req/auth/AuthAdminSaveRequest.java index 3c70ed7..9369242 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/req/auth/AuthAdminSaveRequest.java +++ b/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; } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/req/auth/FilterDeptRequest.java b/api-admin/src/main/java/com/glxp/sale/admin/req/auth/FilterDeptRequest.java index 14b2476..15dfdcc 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/req/auth/FilterDeptRequest.java +++ b/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; } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/res/auth/AuthAdminResponse.java b/api-admin/src/main/java/com/glxp/sale/admin/res/auth/AuthAdminResponse.java index c3c4542..4de916d 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/res/auth/AuthAdminResponse.java +++ b/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 roles; + private String dept; + private String deptName; } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/res/basic/SpsSyncDataResponse.java b/api-admin/src/main/java/com/glxp/sale/admin/res/basic/SpsSyncDataResponse.java index c8f4512..05ebf91 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/res/basic/SpsSyncDataResponse.java +++ b/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 warehouseUserEntities; List invSubWarehouseEntities; List authAdminList; + List deptEntityList; } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/auth/DeptService.java b/api-admin/src/main/java/com/glxp/sale/admin/service/auth/DeptService.java index 62147df..234d6df 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/service/auth/DeptService.java +++ b/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); } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/thread/BasicBackUpdateProductService.java b/api-admin/src/main/java/com/glxp/sale/admin/thread/BasicBackUpdateProductService.java index 6d85372..9db4ffe 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/thread/BasicBackUpdateProductService.java +++ b/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()); diff --git a/api-admin/src/main/resources/mybatis/mapper/auth/AuthAdminDao.xml b/api-admin/src/main/resources/mybatis/mapper/auth/AuthAdminDao.xml index 27a94f7..e15eef5 100644 --- a/api-admin/src/main/resources/mybatis/mapper/auth/AuthAdminDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/auth/AuthAdminDao.xml @@ -5,8 +5,8 @@ @@ -99,7 +100,7 @@ INSERT INTO auth_user(userName,passWord,lastLoginIp,lastLoginTime,createTime,userFlag - ,employeeName,CustomerId,lastModifyTime,locInvCode,locSubInvCode) + ,employeeName,CustomerId,lastModifyTime,locInvCode,locSubInvCode,dept) values (#{userName}, @@ -131,7 +132,7 @@ #{createTime}, #{userFlag,jdbcType=INTEGER}, #{employeeName}, - #{CustomerId},#{lastModifyTime},#{locInvCode},#{locSubInvCode}) + #{CustomerId},#{lastModifyTime},#{locInvCode},#{locSubInvCode},#{dept}) @@ -146,6 +147,8 @@ employeeName=#{employeeName}, locInvCode=#{locInvCode}, locSubInvCode=#{locSubInvCode}, + dept=#{dept}, + WHERE id=#{id} @@ -167,6 +170,6 @@ select * from auth_user where CustomerId = 110 - and userFlag != 0 + and userFlag != 0 \ No newline at end of file