个人档案远程调用

zjugis-business/src/main/java/com/zjugis/business/flow/staff/event/StaffEvent.java

@@ -1,7 +1,6 @@
 package com.zjugis.business.flow.staff.event;
 
 import com.zjugis.business.converter.staff.StaffConvert;
-import com.zjugis.business.flow.recruit.entity.RecruitDO;
 import com.zjugis.business.flow.staff.entity.StaffDO;
 import com.zjugis.business.flow.staff.service.StaffService;
 import com.zjugis.framework.common.pojo.CommonResult;
@@ -10,7 +9,7 @@ import com.zjugis.framework.workflow.exception.BusinessException;
 import com.zjugis.framework.workflow.model.BaseController;
 import com.zjugis.framework.workflow.rpc.remote.WorkflowClient;
 import com.zjugis.framework.workflow.spring.resovler.ParamModel;
-//import com.zjugis.module.adm.api.staff.StaffApi;
+import com.zjugis.module.adm.api.staff.StaffApi;
 import com.zjugis.module.adm.api.staff.dto.StaffRecordsDTO;
 import com.zjugis.module.system.api.dept.DeptApi;
 import com.zjugis.module.system.api.user.AdminUserApi;
@@ -31,6 +30,7 @@ import java.util.Objects;
 import static com.zjugis.business.constants.FlowStatusConstants.*;
 
 /**
+ * 工作流-个人档案归档
  * @author jzh
  * @since 2024/2/26 13:28
  */
@@ -41,8 +41,8 @@ public class StaffEvent extends BaseController {
 
     @Resource
     private StaffService staffService;
-//    @Resource
-//    private StaffApi staffApi;
+    @Resource
+    private StaffApi staffApi;
     @Autowired
     WorkflowClient workflowClient;
 
@@ -99,7 +99,7 @@ public class StaffEvent extends BaseController {
                 staffService.updateStaff(entity);
                 StaffRecordsDTO dto = StaffConvert.INSTANCE.convert(entity);
                 //数据归档
-//                staffApi.insertStaff(dto);
+                staffApi.insertStaff(dto);
                 return ok("true");
             } else {
                 throw new BusinessException("执行事件出错，请联系管理员！");
@@ -191,11 +191,11 @@ public class StaffEvent extends BaseController {
         }
     }
 
-//    /**
-//     * 生成最新工号
-//     */
-//    @GetMapping("/generateNum")
-//    public CommonResult<String> generateNum() {
-//        return staffApi.generateNum();
-//    }
+    /**
+     * 生成最新工号
+     */
+    @GetMapping("/generateNum")
+    public CommonResult<String> generateNum() {
+        return staffApi.generateNum();
+    }
 }

zjugis-business/src/main/java/com/zjugis/business/framework/rpc/config/RpcSystemConfiguration.java

@@ -1,6 +1,7 @@
 package com.zjugis.business.framework.rpc.config;
 
 import com.zjugis.module.adm.api.attendance.AttendanceSheetApi;
+import com.zjugis.module.adm.api.staff.StaffApi;
 import com.zjugis.module.adm.api.workday.WorkdayApi;
 import com.zjugis.module.infra.api.config.ConfigApi;
 import com.zjugis.module.system.api.company.CompanyApi;
@@ -20,6 +21,6 @@ import org.springframework.context.annotation.Configuration;
  * @Version 1.0
  */
 @Configuration(proxyBeanMethods = false)
-@EnableFeignClients(clients = {AdminUserApi.class, DeptApi.class, DictDataApi.class, AttendanceSheetApi.class, CompanyApi.class, RoleApi.class, WorkdayApi.class, ConfigApi.class, PostApi.class, DeptLeaderApi.class, DistrictApi.class})
+@EnableFeignClients(clients = {AdminUserApi.class, DeptApi.class, DictDataApi.class, AttendanceSheetApi.class, CompanyApi.class, RoleApi.class, WorkdayApi.class, ConfigApi.class, PostApi.class, DeptLeaderApi.class, DistrictApi.class, StaffApi.class})
 public class RpcSystemConfiguration {
 }

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

@@ -3,29 +3,26 @@ package com.zjugis.module.adm.api.staff;
 
 import com.zjugis.framework.common.pojo.CommonResult;
 import com.zjugis.module.adm.api.staff.dto.StaffRecordsDTO;
-import com.zjugis.module.adm.api.workday.dto.WorkdayRespDTO;
 import com.zjugis.module.adm.enums.ApiConstants;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 
 import javax.validation.Valid;
-import java.util.List;
 
 @FeignClient(name = ApiConstants.NAME)
 @Tag(name = "RPC 服务 - 入职办理")
 public interface StaffApi {
 
-//    String PREFIX = ApiConstants.PREFIX + "/staff";
-//
-//    @PostMapping(PREFIX + "/insert")
-//    @Operation(summary = "新增员工档案")
-//    CommonResult<String> insertStaff(@Valid @RequestBody StaffRecordsDTO reqDTO);
-//
-//    @PostMapping(PREFIX + "/generateNum")
-//    @Operation(summary = "生成工号")
-//    CommonResult<String> generateNum();
+    String PREFIX = ApiConstants.PREFIX + "/staff";
+
+    @PostMapping(PREFIX + "/insert")
+    @Operation(summary = "新增员工档案")
+    CommonResult<String> insertStaff(@Valid @RequestBody StaffRecordsDTO reqDTO);
+
+    @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

@@ -20,16 +20,16 @@ import static com.zjugis.framework.common.pojo.CommonResult.success;
 @RestController // 提供 RESTful API 接口，给 Feign 调用
 @Validated
 public class StaffApiImpl implements StaffApi {
-//    @Resource
-//    private RecordsService recordsService;
-//
-//    @Override
-//    public CommonResult<String> insertStaff(StaffRecordsDTO dto) {
-//        return success(recordsService.insertStaff(dto));
-//    }
-//
-//    @Override
-//    public CommonResult<String> generateNum() {
-//        return success(recordsService.generateNum());
-//    }
+    @Resource
+    private RecordsService recordsService;
+
+    @Override
+    public CommonResult<String> insertStaff(StaffRecordsDTO dto) {
+        return success(recordsService.insertStaff(dto));
+    }
+
+    @Override
+    public CommonResult<String> generateNum() {
+        return success(recordsService.generateNum());
+    }
 }