薪资单

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

@@ -101,6 +101,16 @@ public class ApiSalaryController implements ApiSalaryFeignClient {
     }
     }
 
 
     /**
     /**
+     * 推送
+     * @param request
+     * @return
+     */
+    @Override
+    public Result push(ApiSalaryPushRequest request) {
+        return apiSalaryService.push(request);
+    }
+
+    /**
      * 取消薪资
      * 取消薪资
      * @param request
      * @param request
      * @return
      * @return

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

@@ -24,6 +24,8 @@ public interface ApiSalaryService {
 
 
     Result check(ApiSalaryCheckRequest request);
     Result check(ApiSalaryCheckRequest request);
 
 
+    Result push(ApiSalaryPushRequest request);
+
     Result cancel(ApiSalaryCancelRequest request);
     Result cancel(ApiSalaryCancelRequest request);
 
 
     Result batchAdd(ApiSalaryBatchAddRequest request);
     Result batchAdd(ApiSalaryBatchAddRequest request);

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

@@ -192,7 +192,7 @@ public class ApiSalaryServiceImpl implements ApiSalaryService {
         if (salary == null) {
         if (salary == null) {
             throw new BusinessException("薪资单信息不存在");
             throw new BusinessException("薪资单信息不存在");
         }
         }
-        if (SalaryStatusEnum.DHD.getItemValue().equals(salary.getStatus())) {
+        if (!SalaryStatusEnum.DHD.getItemValue().equals(salary.getStatus())) {
             throw new BusinessException("非待核对状态不能核对");
             throw new BusinessException("非待核对状态不能核对");
         }
         }
         salary.setStatus(request.getStatus() == 1 ? SalaryStatusEnum.YHD.getItemValue() : SalaryStatusEnum.TH.getItemValue());
         salary.setStatus(request.getStatus() == 1 ? SalaryStatusEnum.YHD.getItemValue() : SalaryStatusEnum.TH.getItemValue());
@@ -202,6 +202,25 @@ public class ApiSalaryServiceImpl implements ApiSalaryService {
     }
     }
 
 
     /**
     /**
+     * 推送
+     * @param request
+     * @return
+     */
+    @Override
+    public Result push(ApiSalaryPushRequest request) {
+        Salary salary = iSalaryService.queryOne(request.getSalaryBizId());
+        if (salary == null) {
+            throw new BusinessException("薪资单信息不存在");
+        }
+        if (!SalaryStatusEnum.YHD.getItemValue().equals(salary.getStatus())) {
+            throw new BusinessException("非已核对状态不能推送");
+        }
+        salary.setStatus(SalaryStatusEnum.YTS.getItemValue());
+        iSalaryService.saveOrUpdate(salary);
+        return Result.success();
+    }
+
+    /**
      * 取消薪资
      * 取消薪资
      * @param request
      * @param request
      * @return
      * @return

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

@@ -74,6 +74,14 @@ public interface ApiSalaryFeignClient {
     Result check(@Validated @RequestBody ApiSalaryCheckRequest request);
     Result check(@Validated @RequestBody ApiSalaryCheckRequest request);
 
 
     /**
     /**
+     * 推送
+     * @param request
+     * @return
+     */
+    @PutMapping("/push")
+    Result push(@Validated @RequestBody ApiSalaryPushRequest request);
+
+    /**
      * 取消薪资
      * 取消薪资
      * @param request
      * @param request
      * @return
      * @return

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

@@ -56,6 +56,11 @@ public class ApiSalaryFeignFallbackFactory implements FallbackFactory<ApiSalaryF
             }
             }
 
 
             @Override
             @Override
+            public Result push(ApiSalaryPushRequest request) {
+                return null;
+            }
+
+            @Override
             public Result cancel(ApiSalaryCancelRequest request) {
             public Result cancel(ApiSalaryCancelRequest request) {
                 return null;
                 return null;
             }
             }
@@ -71,6 +76,11 @@ public class ApiSalaryFeignFallbackFactory implements FallbackFactory<ApiSalaryF
             }
             }
 
 
             @Override
             @Override
+            public Result<BigDecimal> getExchangeRate(ApiSalaryExchangeRateRequest request) {
+                return null;
+            }
+
+            @Override
             public Result<BigDecimal> calculatePaidAmount(ApiSalaryCalculatePaidAmountRequest request) {
             public Result<BigDecimal> calculatePaidAmount(ApiSalaryCalculatePaidAmountRequest request) {
                 return null;
                 return null;
             }
             }

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

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