系统管理

uboot-common/src/main/java/com/chinaunicom/mall/ebtp/common/base/client/SystemClient.java

@@ -44,9 +44,13 @@ public interface SystemClient {
         @ApiParam(value = "查询对象数据", required = false) @SpringQueryMap SysUser param
     );
 
+    @ApiOperation("根据用户ID集合查询所有用户信息")
+    @PostMapping("/v1/sysuser/getUsersByIds")
+    BaseResponse<List<SysUser>> getUsersByIds(@RequestBody List<String> ids);
+
     @ApiOperation("根据用户ID查询本单位下所有用户分页数据")
     @PostMapping("/v1/sysuser/getPageByUserCompany")
-    BaseResponse<IPage<SysUser>> getPageByUserCompany(@ApiParam(value = "分页及查询条件", required = true) @RequestBody SysUserVO sysUserVO);
+    BaseResponse<Page<SysUser>> getPageByUserCompany(@ApiParam(value = "分页及查询条件", required = true) @RequestBody SysUserVO sysUserVO);
 
     // -----------------------供应商用户接口-----------------------
     @ApiOperation("供应商注册（自动生成账号并设置统一重置密码）")
@@ -57,6 +61,10 @@ public interface SystemClient {
     @PostMapping("/v1/supplieruser/update")
     BaseResponse<Boolean> update(@ApiParam(value = "供应商用户信息", required = true) @RequestBody SysSupplierUser sysSupplierUser);
 
+    @ApiOperation("供应商用户分页查询")
+    @PostMapping("/v1/supplieruser/getPage")
+    BaseResponse<Page<SysSupplierUser>> getPage(@RequestBody SysSupplierUser sysSupplierUser);
+
     // -----------------------组织接口-----------------------
     @ApiOperation("查询组织信息（当前组织及下级组织列表）")
     @GetMapping("/v1/sysorg/queryOrgWithChildren")
@@ -74,6 +82,10 @@ public interface SystemClient {
     @GetMapping("/v1/sysorg/queryAll")
     BaseResponse<List<SysOrgVO>> queryAll(@SpringQueryMap SysOrg sysOrg);
 
+    @ApiOperation("查询分页数据")
+    @PostMapping("/v1/sysorg/getPage")
+    BaseResponse<Page<SysOrg>> getOrgPage(@ApiParam(value = "对象数据", required = true) @RequestBody SysOrgVO sysOrgVO);
+
     @Configuration
     class FeignConfig {
         @Value("${check.tokentime.checkpublicKey}")

uboot-common/src/main/java/com/chinaunicom/mall/ebtp/common/base/fallback/SystemClientFallback.java

@@ -31,7 +31,12 @@ public class SystemClientFallback implements SystemClient {
     }
 
     @Override
-    public BaseResponse<IPage<SysUser>> getPageByUserCompany(SysUserVO sysUserVO) {
+    public BaseResponse<List<SysUser>> getUsersByIds(List<String> ids) {
+        return null;
+    }
+
+    @Override
+    public BaseResponse<Page<SysUser>> getPageByUserCompany(SysUserVO sysUserVO) {
         return null;
     }
 
@@ -45,6 +50,11 @@ public class SystemClientFallback implements SystemClient {
         return null;
     }
 
+    @Override
+    public BaseResponse<Page<SysSupplierUser>> getPage(SysSupplierUser sysSupplierUser) {
+        return null;
+    }
+
     @Override
     public BaseResponse<List<SysOrg>> getOrgWithChildren(SysOrg sysOrg) {
         return null;
@@ -64,4 +74,9 @@ public class SystemClientFallback implements SystemClient {
     public BaseResponse<List<SysOrgVO>> queryAll(SysOrg sysOrg) {
         return null;
     }
+
+    @Override
+    public BaseResponse<Page<SysOrg>> getOrgPage(SysOrgVO sysOrgVO) {
+        return null;
+    }
 }

uboot-common/src/main/java/com/chinaunicom/mall/ebtp/common/workflow/constant/BusinessTypeEnum.java

@@ -16,8 +16,8 @@ public enum BusinessTypeEnum {
     BLACKLIST_APPROVAL("blacklistApproval", "黑名单审批"),
     EXIT_APPROVAL("exitApproval", "退出审批"),
     CATEGORY_LIBRARY_APPROVAL("categoryLibraryApproval", "品类库审批"),
-    EVALUATION_APPROVAL("evaluationApproval", "评价审批"),
-    ANNUAL_REVIEW_APPROVAL("annualReviewApproval", "年审审批");
+    CATEGORY_LIBRARY_SUPPLIER_APPROVAL("categoryLibrarySupplierApproval","品类库供应商入库审批"),
+    EVALUATION_APPROVAL("evaluationApproval", "评价审批");
 
     private final String key;
     private final String desc;