用款添加根据分外包获取列表

zjugis-module-adm/zjugis-module-adm-api/src/main/java/com/zjugis/module/adm/api/staff/StaffApi.java

@@ -36,6 +36,10 @@ public interface StaffApi {
     @Operation(summary = "更新员工所在部门跟岗位")
     CommonResult<String> updateDeptPost(@Valid @RequestBody StaffDeptPostDTO dto);
 
+    @PostMapping(PREFIX + "/changeDept")
+    @Operation(summary = "更新员工所在部门跟岗位")
+    CommonResult<Integer> updateDept(@Valid @RequestBody StaffDeptPostDTO dto);
+
     @PostMapping(PREFIX + "generateNum")
     @Operation(summary = "生成员工工号")
     CommonResult<String> generateNum();

zjugis-module-adm/zjugis-module-adm-biz/src/main/java/com/zjugis/module/adm/api/staff/StaffApiImpl.java

@@ -49,6 +49,18 @@ public class StaffApiImpl implements StaffApi {
         return success(recordsService.updateStaff(vo));
     }
 
+    @Override
+    public CommonResult<Integer> updateDept(StaffDeptPostDTO dto) {
+        //获取员工档案
+        RecordsRespVO vo = recordsService.getRecordDetail(dto.getUserId());
+
+        //修改档案
+        vo.setDeptId(dto.getDeptId());
+        vo.setDeptName(dto.getDeptName());
+        vo.setId(dto.getUserId());
+        return success(recordsService.updateStaffDept(vo));
+    }
+
     @Override
     public CommonResult<String> generateNum() {
         return success(recordsService.generateNum());

zjugis-module-adm/zjugis-module-adm-biz/src/main/java/com/zjugis/module/adm/dal/mysql/staff/RecordsMapper.java

@@ -21,4 +21,9 @@ public interface RecordsMapper extends BaseMapperX<StaffRecordSDO> {
         return selectList(new LambdaQueryWrapperX<StaffRecordSDO>()
                 .in(StaffRecordSDO::getUserId, ids));
     }
+
+    default int updateByUserId(StaffRecordSDO entity){
+        return update(entity,new LambdaQueryWrapperX<StaffRecordSDO>()
+                .eq(StaffRecordSDO::getUserId, entity.getUserId()));
+    }
 }

zjugis-module-adm/zjugis-module-adm-biz/src/main/java/com/zjugis/module/adm/job/workday/WorkdayJob.java

@@ -0,0 +1,13 @@
+package com.zjugis.module.adm.job.workday;
+
+import org.springframework.stereotype.Component;
+
+/**
+ * @Author 陈俊
+ * @Date 2024/11/14 11:16
+ * @Version 1.0
+ */
+@Component
+public class WorkdayJob {
+
+}

zjugis-module-adm/zjugis-module-adm-biz/src/main/java/com/zjugis/module/adm/service/staff/RecordsService.java

@@ -75,4 +75,6 @@ public interface RecordsService {
     Integer updateContract(StaffRecordsDTO dto);
 
     String report(StaffReportDTO dto);
+
+    int updateStaffDept(RecordsRespVO vo);
 }

zjugis-module-adm/zjugis-module-adm-biz/src/main/java/com/zjugis/module/adm/service/staff/RecordsServiceImpl.java

@@ -529,6 +529,15 @@ public class RecordsServiceImpl implements RecordsService {
         return result.getCheckedData();
     }
 
+    @Override
+    public int updateStaffDept(RecordsRespVO vo) {
+        StaffRecordSDO entity = new StaffRecordSDO();
+        entity.setUserId(vo.getUserId());
+        entity.setDeptId(vo.getDeptId());
+        entity.setDeptName(vo.getDeptName());
+        return recordsMapper.updateByUserId(entity);
+    }
+
     private UserBaseDTO initUser(StaffRecordSDO staffRecordSDO) {
         UserBaseDTO dto = new UserBaseDTO();
         dto.setUsername(staffRecordSDO.getLoginName());

zjugis-module-system/zjugis-module-system-biz/pom.xml

@@ -40,6 +40,11 @@
             <artifactId>zjugis-module-infra-api</artifactId>
             <version>${revision}</version>
         </dependency>
+        <dependency>
+            <groupId>com.zjugis.cloud</groupId>
+            <artifactId>zjugis-module-adm-api</artifactId>
+            <version>${revision}</version>
+        </dependency>
 
         <!-- 业务组件 -->
         <dependency>

zjugis-module-system/zjugis-module-system-biz/src/main/java/com/zjugis/module/system/framework/rpc/config/RpcConfiguration.java

@@ -1,10 +1,11 @@
 package com.zjugis.module.system.framework.rpc.config;
 
+import com.zjugis.module.adm.api.staff.StaffApi;
 import com.zjugis.module.infra.api.file.FileApi;
 import org.springframework.cloud.openfeign.EnableFeignClients;
 import org.springframework.context.annotation.Configuration;
 
 @Configuration(proxyBeanMethods = false)
-@EnableFeignClients(clients = FileApi.class)
+@EnableFeignClients(clients = {FileApi.class, StaffApi.class})
 public class RpcConfiguration {
 }

zjugis-module-system/zjugis-module-system-biz/src/main/java/com/zjugis/module/system/service/user/AdminUserServiceImpl.java

@@ -12,6 +12,8 @@ import com.zjugis.framework.common.util.collection.CollectionUtils;
 import com.zjugis.framework.datapermission.core.util.DataPermissionUtils;
 import com.zjugis.framework.mybatis.core.query.LambdaQueryWrapperX;
 import com.zjugis.framework.web.core.util.WebFrameworkUtils;
+import com.zjugis.module.adm.api.staff.StaffApi;
+import com.zjugis.module.adm.api.staff.dto.StaffDeptPostDTO;
 import com.zjugis.module.infra.api.file.FileApi;
 import com.zjugis.module.system.api.user.dto.UserBaseDTO;
 import com.zjugis.module.system.api.user.dto.UserUpdateDTO;
@@ -95,6 +97,8 @@ public class AdminUserServiceImpl implements AdminUserService {
 
     @Resource
     private FileApi fileApi;
+    @Resource
+    private StaffApi staffApi;
 
     @Override
     @Transactional(rollbackFor = Exception.class)
@@ -130,6 +134,11 @@ public class AdminUserServiceImpl implements AdminUserService {
         // 更新用户
         AdminUserDO updateObj = UserConvert.INSTANCE.convert(reqVO);
         userMapper.updateById(updateObj);
+        StaffDeptPostDTO dto = new StaffDeptPostDTO();
+        dto.setUserId(reqVO.getId());
+        dto.setDeptName(reqVO.getDeptName());
+        dto.setDeptId(reqVO.getDeptId());
+        staffApi.updateDept(dto).getCheckedData();
         // 更新岗位
         updateUserPost(reqVO, updateObj);
     }