push

yd-csf-api/src/main/java/com/yd/csf/api/controller/ApiSalaryController.java

@@ -81,6 +81,36 @@ public class ApiSalaryController implements ApiSalaryFeignClient {
     }
 
     /**
+     * 提交核对
+     * @param request
+     * @return
+     */
+    @Override
+    public Result submitCheck(ApiSalarySubmitCheckRequest request) {
+        return apiSalaryService.submitCheck(request);
+    }
+
+    /**
+     * 核对
+     * @param request
+     * @return
+     */
+    @Override
+    public Result check(ApiSalaryCheckRequest request) {
+        return apiSalaryService.check(request);
+    }
+
+    /**
+     * 取消薪资
+     * @param request
+     * @return
+     */
+    @Override
+    public Result cancel(ApiSalaryCancelRequest request) {
+        return apiSalaryService.cancel(request);
+    }
+
+    /**
      * 批量新增-薪资单信息
      * @param request
      * @return

yd-csf-api/src/main/java/com/yd/csf/api/service/ApiSalaryService.java

@@ -20,6 +20,12 @@ public interface ApiSalaryService {
 
     Result edit(ApiSalaryEditRequest request);
 
+    Result submitCheck(ApiSalarySubmitCheckRequest request);
+
+    Result check(ApiSalaryCheckRequest request);
+
+    Result cancel(ApiSalaryCancelRequest request);
+
     Result batchAdd(ApiSalaryBatchAddRequest request);
 
     Result delSalaryRemittance(String salaryRemittanceBizId);

yd-csf-api/src/main/java/com/yd/csf/api/service/impl/ApiSalaryServiceImpl.java

@@ -157,6 +157,64 @@ public class ApiSalaryServiceImpl implements ApiSalaryService {
     }
 
     /**
+     * 提交核对
+     * @param request
+     * @return
+     */
+    @Override
+    public Result submitCheck(ApiSalarySubmitCheckRequest request) {
+        Salary salary = iSalaryService.queryOne(request.getSalaryBizId());
+        if (salary == null) {
+            throw new BusinessException("薪资单信息不存在");
+        }
+        if (SalaryStatusEnum.DTJ.getItemValue().equals(salary.getStatus())
+                || SalaryStatusEnum.TH.getItemValue().equals(salary.getStatus())) {
+            throw new BusinessException("非待提交或者退回状态不能提交核对");
+        }
+        //重新提交->待核对状态
+        salary.setStatus(SalaryStatusEnum.DHD.getItemValue());
+        iSalaryService.saveOrUpdate(salary);
+        return Result.success();
+    }
+
+    /**
+     * 核对
+     * @param request
+     * @return
+     */
+    @Override
+    public Result check(ApiSalaryCheckRequest request) {
+        Salary salary = iSalaryService.queryOne(request.getSalaryBizId());
+        if (salary == null) {
+            throw new BusinessException("薪资单信息不存在");
+        }
+        if (SalaryStatusEnum.DHD.getItemValue().equals(salary.getStatus())) {
+            throw new BusinessException("非待核对状态不能核对");
+        }
+        salary.setStatus(request.getStatus() == 1 ? SalaryStatusEnum.YHD.getItemValue() : SalaryStatusEnum.TH.getItemValue());
+        salary.setReturnRemark(request.getReturnRemark());
+        iSalaryService.saveOrUpdate(salary);
+        return Result.success();
+    }
+
+    /**
+     * 取消薪资
+     * @param request
+     * @return
+     */
+    @Override
+    public Result cancel(ApiSalaryCancelRequest request) {
+        Salary salary = iSalaryService.queryOne(request.getSalaryBizId());
+        if (salary == null) {
+            throw new BusinessException("薪资单信息不存在");
+        }
+        salary.setStatus(SalaryStatusEnum.YQX.getItemValue());
+        salary.setCancelRemark(request.getCancelRemark());
+        iSalaryService.saveOrUpdate(salary);
+        return Result.success();
+    }
+
+    /**
      * 批量新增-薪资单信息
      * @param request
      * @return
@@ -174,6 +232,7 @@ public class ApiSalaryServiceImpl implements ApiSalaryService {
             Salary salary = new Salary();
             BeanUtils.copyProperties(dto,salary);
             salary.setSalaryBizId(RandomStringGenerator.generateBizId16(CommonEnum.UID_TYPE_SALARY.getCode()));
+            salary.setStatus(SalaryStatusEnum.DTJ.getItemValue());
             List<SalaryRemittance> salaryRemittanceList = new ArrayList<>();
             SalaryRemittance remittance1 = new SalaryRemittance();
             remittance1.setSalaryBizId(salary.getSalaryBizId());

yd-csf-feign/src/main/java/com/yd/csf/feign/client/salary/ApiSalaryFeignClient.java

@@ -58,6 +58,30 @@ public interface ApiSalaryFeignClient {
     Result edit(@Validated @RequestBody ApiSalaryEditRequest request);
 
     /**
+     * 提交核对
+     * @param request
+     * @return
+     */
+    @PutMapping("/submit/check")
+    Result submitCheck(@Validated @RequestBody ApiSalarySubmitCheckRequest request);
+
+    /**
+     * 核对
+     * @param request
+     * @return
+     */
+    @PutMapping("/check")
+    Result check(@Validated @RequestBody ApiSalaryCheckRequest request);
+
+    /**
+     * 取消薪资
+     * @param request
+     * @return
+     */
+    @PutMapping("/cancel")
+    Result cancel(@Validated @RequestBody ApiSalaryCancelRequest request);
+
+    /**
      * 批量新增-薪资单信息
      * @param request
      * @return

yd-csf-feign/src/main/java/com/yd/csf/feign/enums/SalaryStatusEnum.java

@@ -10,6 +10,7 @@ public enum SalaryStatusEnum {
     YHD("已核对","3"),
     TH("退回修改","4"),
     YTS("已推送","5"),
+    YQX("已取消","6"),
     ;
 
     //字典项标签（名称）

yd-csf-feign/src/main/java/com/yd/csf/feign/fallback/salary/ApiSalaryFeignFallbackFactory.java

@@ -26,6 +26,11 @@ public class ApiSalaryFeignFallbackFactory implements FallbackFactory<ApiSalaryF
             }
 
             @Override
+            public Result pushPage(ApiSalaryPushPageRequest request) {
+                return null;
+            }
+
+            @Override
             public Result<ApiSalaryDetailResponse> detail(String salaryBizId) {
                 return null;
             }
@@ -41,6 +46,21 @@ public class ApiSalaryFeignFallbackFactory implements FallbackFactory<ApiSalaryF
             }
 
             @Override
+            public Result submitCheck(ApiSalarySubmitCheckRequest request) {
+                return null;
+            }
+
+            @Override
+            public Result check(ApiSalaryCheckRequest request) {
+                return null;
+            }
+
+            @Override
+            public Result cancel(ApiSalaryCancelRequest request) {
+                return null;
+            }
+
+            @Override
             public Result batchAdd(ApiSalaryBatchAddRequest request) {
                 return null;
             }

yd-csf-feign/src/main/java/com/yd/csf/feign/request/salary/ApiSalaryCancelRequest.java

+package com.yd.csf.feign.request.salary;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+
+@Data
+public class ApiSalaryCancelRequest {
+
+    /**
+     * 薪资单表唯一业务ID
+     */
+    @NotBlank(message = "薪资单表唯一业务ID不能为空")
+    private String salaryBizId;
+
+    /**
+     * 取消薪资备注
+     */
+    private String cancelRemark;
+}

yd-csf-feign/src/main/java/com/yd/csf/feign/request/salary/ApiSalaryCheckRequest.java

+package com.yd.csf.feign.request.salary;
+
+import lombok.Data;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
+@Data
+public class ApiSalaryCheckRequest {
+
+    /**
+     * 薪资单表唯一业务ID
+     */
+    @NotBlank(message = "薪资单表唯一业务ID不能为空")
+    private String salaryBizId;
+
+    /**
+     * 状态：1-核对通过 2-退回修改
+     */
+    @NotNull(message = "核对状态不能为空")
+    private Integer status;
+
+    /**
+     * 退回备注
+     */
+    private String returnRemark;
+}

yd-csf-feign/src/main/java/com/yd/csf/feign/request/salary/ApiSalarySubmitCheckRequest.java

+package com.yd.csf.feign.request.salary;
+
+import lombok.Data;
+import javax.validation.constraints.NotBlank;
+
+@Data
+public class ApiSalarySubmitCheckRequest {
+
+    /**
+     * 薪资单表唯一业务ID
+     */
+    @NotBlank(message = "薪资单表唯一业务ID不能为空")
+    private String salaryBizId;
+}

yd-csf-service/src/main/java/com/yd/csf/service/model/Salary.java

@@ -116,6 +116,18 @@ public class Salary implements Serializable {
     private String status;
 
     /**
+     * 取消薪资备注
+     */
+    @TableField("cancel_remark")
+    private String cancelRemark;
+
+    /**
+     * 退回备注
+     */
+    @TableField("return_remark")
+    private String returnRemark;
+
+    /**
      * 通用备注
      */
     @TableField("remark")