From 0703f3d8ef0c102903cb12e2ff0f17b77d9669c9 Mon Sep 17 00:00:00 2001
From: furongxin <419481438@qq.com>
Date: Fri, 13 Dec 2024 11:40:10 +0800
Subject: [PATCH] =?UTF-8?q?refactor(system):=20=E4=BC=98=E5=8C=96=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E5=92=8C=E9=83=A8=E9=97=A8=E7=9B=B8=E5=85=B3=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 修改用户外勤打卡权限接口，支持批量更新
- 移除获取部门列表_by_Leader接口
- 新增获取工厂部门列表接口
-优化部门简单响应VO，增加工厂编号字段
- 修复租金订单控制器中的退款金额设置问题
---
 .../cn/iocoder/yudao/module/system/api/dept/DeptApi.java | 4 ----
 .../yudao/module/system/api/user/AdminUserApi.java       | 2 +-
 .../yudao/module/system/api/dept/DeptApiImpl.java        | 7 -------
 .../yudao/module/system/api/user/AdminUserApiImpl.java   | 2 +-
 .../system/controller/admin/dept/DeptController.java     | 9 +++++++++
 .../controller/admin/dept/vo/dept/DeptSimpleRespVO.java  | 3 +++
 .../controller/admin/rental/RentalOrderController.java   | 6 ++++--
 .../yudao/module/system/service/dept/DeptService.java    | 6 ++++++
 .../module/system/service/dept/DeptServiceImpl.java      | 8 ++++++++
 .../module/system/service/user/AdminUserService.java     | 2 +-
 .../module/system/service/user/AdminUserServiceImpl.java | 7 +++----
 11 files changed, 36 insertions(+), 20 deletions(-)

diff --git a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/dept/DeptApi.java b/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/dept/DeptApi.java
index ff482eda..d7b831cd 100644
--- a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/dept/DeptApi.java
+++ b/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/dept/DeptApi.java
@@ -73,10 +73,6 @@ public interface DeptApi {
     @Parameter(name = "factoryId", description = "工厂编号", example = "100001", required = true)
     CommonResult<DeptRespDTO> getDeptByFactoryId(@RequestParam("factoryId") Long factoryId);
 
-    @GetMapping(PREFIX + "/getListByLeader")
-    @Operation(summary = "获取所有部门信息")
-    @Parameter(name = "userId", description = "用户编号", example = "146", required = true)
-    CommonResult<List<DeptRespDTO>> getDeptListByLeader(@RequestParam("userId") Long userId);
 
     /**
      * 获得指定编号的部门 Map
diff --git a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/user/AdminUserApi.java b/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/user/AdminUserApi.java
index 34fff9a7..22bf8beb 100644
--- a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/user/AdminUserApi.java
+++ b/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/user/AdminUserApi.java
@@ -85,7 +85,7 @@ public interface AdminUserApi {
     @Operation(summary = "修改用户外勤打卡权限")
     @Parameter(name = "userId", description = "用户id", example = "1024", required = true)
     @Parameter(name = "fieldworkFlag", description = "是否可外勤打卡 | 0否 1是", example = "1", required = true)
-    void updateFieldworkType(@RequestParam("userId") Long userId,
+    void updateFieldworkType(@RequestParam("userId") Collection<Long> userId,
                              @RequestParam("fieldworkFlag") Integer fieldworkFlag);
 
     @PostMapping(PREFIX + "/updateUserStaffing")
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/api/dept/DeptApiImpl.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/api/dept/DeptApiImpl.java
index 3f32755d..d72b407f 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/api/dept/DeptApiImpl.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/api/dept/DeptApiImpl.java
@@ -108,13 +108,6 @@ public class DeptApiImpl implements DeptApi {
         return success(BeanUtils.toBean(deptDO, DeptRespDTO.class));
     }
 
-    @Override
-    public CommonResult<List<DeptRespDTO>> getDeptListByLeader(Long userId) {
-
-        List<DeptDO> deptDOS = deptService.getDeptByLeaderId(userId);
-        return success(BeanUtils.toBean(deptDOS, DeptRespDTO.class));
-    }
-
     @Override
     @DataPermission(enable = false)
     public CommonResult<List<Long>> getChildDeptList(Long deptId) {
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/api/user/AdminUserApiImpl.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/api/user/AdminUserApiImpl.java
index 7fbbfbbd..0f92eadd 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/api/user/AdminUserApiImpl.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/api/user/AdminUserApiImpl.java
@@ -100,7 +100,7 @@ public class AdminUserApiImpl implements AdminUserApi {
     }
 
     @Override
-    public void updateFieldworkType(Long userId, Integer fieldworkFlag) {
+    public void updateFieldworkType(Collection<Long> userId, Integer fieldworkFlag) {
 
         userService.updateFieldworkType(userId, fieldworkFlag);
     }
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dept/DeptController.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dept/DeptController.java
index ddcb33dc..a308dd62 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dept/DeptController.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dept/DeptController.java
@@ -164,6 +164,15 @@ public class DeptController {
         return success(BeanUtils.toBean(list, DeptSimpleRespVO.class));
     }
 
+    @GetMapping(value = { "/get-factory-dept"})
+    @Operation(summary = "获取工厂部门精简信息列表", description = "只包含被开启的部门，主要用于前端的下拉选项")
+    @DataPermission(enable = false)
+    public CommonResult<List<DeptSimpleRespVO>> getFactoryDept() {
+        List<DeptDO> list = deptService.getFactoryDept();
+
+        return success(BeanUtils.toBean(list, DeptSimpleRespVO.class));
+    }
+
     @GetMapping(value = {"/getListByType"})
     @Operation(summary = "获取指定类型的部门精简信息列表", description = "只包含被开启的部门，主要用于前端的下拉选项")
     @Parameter(name = "type", description = "类型", required = true, example = "1")
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dept/vo/dept/DeptSimpleRespVO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dept/vo/dept/DeptSimpleRespVO.java
index e9608221..9079f238 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dept/vo/dept/DeptSimpleRespVO.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dept/vo/dept/DeptSimpleRespVO.java
@@ -25,4 +25,7 @@ public class    DeptSimpleRespVO {
 
     @Schema(description = "是否为虚机构 | 0否 1是")
     private Integer virtuallyStatus;
+
+    @Schema(description = "工厂编号")
+    private Long factoryId;
 }
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/rental/RentalOrderController.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/rental/RentalOrderController.java
index 5325bf4a..84dee273 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/rental/RentalOrderController.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/rental/RentalOrderController.java
@@ -117,8 +117,10 @@ public class RentalOrderController {
         if (CollectionUtil.isNotEmpty(refundMap)) {
             // 设置对应的订单号中的 申请退款和扣款金额
             pageResult.getList().forEach(item -> {
-                item.setApplyRefundAmount(refundMap.get(item.getOrderNo()).getRefundAmount());
-                item.setApplyChargebacksAmount(refundMap.get(item.getOrderNo()).getChargebacksAmount());
+                if (refundMap.get(item.getOrderNo()) != null) {
+                    item.setApplyRefundAmount(refundMap.get(item.getOrderNo()).getRefundAmount());
+                    item.setApplyChargebacksAmount(refundMap.get(item.getOrderNo()).getChargebacksAmount());
+                }
             });
         }
 
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/dept/DeptService.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/dept/DeptService.java
index ff03e833..6a612c1b 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/dept/DeptService.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/dept/DeptService.java
@@ -191,4 +191,10 @@ public interface DeptService {
      * @return 部门列表
      */
     List<DeptDO> getDeptListByType(String type);
+
+    /**
+     * 获取工厂部门
+     * @return 部门列表
+     */
+    List<DeptDO> getFactoryDept();
 }
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/dept/DeptServiceImpl.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/dept/DeptServiceImpl.java
index e6cbe8bd..7a50dd1f 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/dept/DeptServiceImpl.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/dept/DeptServiceImpl.java
@@ -392,6 +392,14 @@ public class DeptServiceImpl implements DeptService {
                 .eq(DeptDO::getStatus, CommonStatusEnum.ENABLE.getStatus()));
     }
 
+    @Override
+    public List<DeptDO> getFactoryDept() {
+
+        return deptMapper.selectList(new LambdaQueryWrapperX<DeptDO>()
+                .eq(DeptDO::getStatus, CommonStatusEnum.ENABLE.getStatus())
+                .isNotNull(DeptDO::getFactoryId));
+    }
+
     @Override
     public List<DeptDO> getDeptList(DeptApiDTO dto) {
         List<DeptDO> list = deptMapper.selectList(new LambdaQueryWrapperX<DeptDO>()
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/user/AdminUserService.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/user/AdminUserService.java
index fc2dad70..61ac618c 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/user/AdminUserService.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/user/AdminUserService.java
@@ -122,7 +122,7 @@ public interface AdminUserService {
      * @param id            用户编号
      * @param fieldworkFlag 状态
      */
-    void updateFieldworkType(Long id, Integer fieldworkFlag);
+    void updateFieldworkType(Collection<Long> id, Integer fieldworkFlag);
 
     /**
      * 删除用户
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/user/AdminUserServiceImpl.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/user/AdminUserServiceImpl.java
index 743f7140..ba90532d 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/user/AdminUserServiceImpl.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/user/AdminUserServiceImpl.java
@@ -289,14 +289,13 @@ public class AdminUserServiceImpl implements AdminUserService {
     }
 
     @Override
-    public void updateFieldworkType(Long id, Integer fieldworkFlag) {
+    public void updateFieldworkType(Collection<Long> id, Integer fieldworkFlag) {
         // 更新状态
         AdminUserDO updateObj = new AdminUserDO();
-        updateObj.setId(id);
         updateObj.setFieldworkFlag(fieldworkFlag);
         updateObj.setFieldworkType(fieldworkFlag == 1 ? 2 : 0);  //设置为 临时外勤类型
-        userMapper.update(updateObj, new LambdaQueryWrapper<AdminUserDO>()
-                .eq(AdminUserDO::getId, id)
+        userMapper.update(updateObj, new LambdaQueryWrapperX<AdminUserDO>()
+                .in(AdminUserDO::getId, id)
                 .ne(AdminUserDO::getFieldworkType, 1));
     }