push

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

@@ -131,6 +131,16 @@ public class ApiSalaryController implements ApiSalaryFeignClient {
     }
 
     /**
+     * 薪资单信息-汇款明细-查询汇率
+     * @param request
+     * @return
+     */
+    @Override
+    public Result<BigDecimal> getExchangeRate(ApiSalaryExchangeRateRequest request) {
+        return apiSalaryService.getExchangeRate(request);
+    }
+
+    /**
      * 计算-实发金额
      * @param request
      * @return

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

@@ -30,6 +30,8 @@ public interface ApiSalaryService {
 
     Result delSalaryRemittance(String salaryRemittanceBizId);
 
+    Result<BigDecimal> getExchangeRate(ApiSalaryExchangeRateRequest request);
+
     Result<BigDecimal> calculatePaidAmount(ApiSalaryCalculatePaidAmountRequest request);
 
     Result<BigDecimal> calculateTotalAmount(ApiSalaryCalculateTotalAmountRequest request);

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

@@ -98,6 +98,14 @@ public interface ApiSalaryFeignClient {
     Result delSalaryRemittance(@NotBlank(message = "薪资汇款明细表唯一业务ID不能为空") @RequestParam(value = "salaryRemittanceBizId") String salaryRemittanceBizId);
 
     /**
+     * 薪资单信息-汇款明细-查询汇率
+     * @param request
+     * @return
+     */
+    @PostMapping("/get/exchangeRate")
+    Result<BigDecimal> getExchangeRate(@Validated @RequestBody ApiSalaryExchangeRateRequest request);
+
+    /**
      * 计算-实发金额
      * @param request
      * @return

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

+package com.yd.csf.feign.request.salary;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+
+@Data
+public class ApiSalaryExchangeRateRequest {
+
+    /**
+     * 原币种
+     */
+    @NotBlank(message = "原币种不能为空")
+    private String fromCurrency;
+
+    /**
+     * 目标币种
+     */
+    @NotBlank(message = "目标币种不能为空")
+    private String toCurrency;
+}

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

@@ -17,7 +17,7 @@ public class ApiSalaryPushPageRequest extends PageDto {
     private String month;
 
     /**
-     * 薪资单状态：1-待审核提交 2-待审核 3-审核退回 4-待核对提交 5-待核对 6-核对退回 7-已核对 8-已推送 9-已取消
+     * 薪资单状态：1-待提交 2-待核对 3-已核对 4-退回 5-已推送 6-已取消
      */
     private String status;
 }

yd-csf-feign/src/main/java/com/yd/csf/feign/response/salary/ApiSalaryPushPageResponse.java

@@ -29,7 +29,7 @@ public class ApiSalaryPushPageResponse {
     private BigDecimal grossAmount;
 
     /**
-     * 扣款合计（单位：HKD）
+     * 扣款合计（单位：HKD）（ 扣款合计 = 应发 - 实发）
      */
     private BigDecimal totalDeductions;
 
@@ -39,6 +39,11 @@ public class ApiSalaryPushPageResponse {
     private String otherRemark;
 
     /**
+     * 薪资单状态：1-待提交 2-待核对 3-已核对 4-退回 5-已推送 6-已取消
+     */
+    private String status;
+
+    /**
      * 制作人（创建人名称）
      */
     private String creatorName;

yd-csf-service/src/main/java/com/yd/csf/service/dao/SalaryMapper.java

@@ -3,7 +3,9 @@ package com.yd.csf.service.dao;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yd.csf.feign.request.salary.ApiSalaryPageRequest;
+import com.yd.csf.feign.request.salary.ApiSalaryPushPageRequest;
 import com.yd.csf.feign.response.salary.ApiSalaryPageResponse;
+import com.yd.csf.feign.response.salary.ApiSalaryPushPageResponse;
 import com.yd.csf.service.model.Salary;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
@@ -20,4 +22,7 @@ public interface SalaryMapper extends BaseMapper<Salary> {
 
     IPage<ApiSalaryPageResponse> page(@Param("page") Page<ApiSalaryPageResponse> page,
                                       @Param("request") ApiSalaryPageRequest request);
+
+    IPage<ApiSalaryPushPageResponse> pushPage(@Param("page") Page<ApiSalaryPushPageResponse> page,
+                                              @Param("request") ApiSalaryPushPageRequest request);
 }

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

@@ -110,7 +110,7 @@ public class Salary implements Serializable {
     private String otherRemark;
 
     /**
-     * 薪资单状态：1-待提交 2-待核对 3-已核对 4-退回 5-已推送
+     * 薪资单状态：1-待提交 2-待核对 3-已核对 4-退回 5-已推送 6-已取消
      */
     @TableField("status")
     private String status;

yd-csf-service/src/main/java/com/yd/csf/service/service/ISalaryService.java

@@ -3,6 +3,7 @@ package com.yd.csf.service.service;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yd.csf.feign.request.salary.ApiSalaryPageRequest;
+import com.yd.csf.feign.request.salary.ApiSalaryPushPageRequest;
 import com.yd.csf.feign.response.salary.ApiSalaryPageResponse;
 import com.yd.csf.feign.response.salary.ApiSalaryPushPageResponse;
 import com.yd.csf.service.model.Salary;
@@ -21,6 +22,9 @@ public interface ISalaryService extends IService<Salary> {
     IPage<ApiSalaryPageResponse> page(Page<ApiSalaryPageResponse> page,
                                       ApiSalaryPageRequest request);
 
+    IPage<ApiSalaryPushPageResponse> pushPage(Page<ApiSalaryPushPageResponse> page,
+                                              ApiSalaryPushPageRequest request);
+
 
     Salary queryOne(String brokerBizId,String month,
                     String salaryBizId,Boolean isExcludeMy);

yd-csf-service/src/main/java/com/yd/csf/service/service/impl/SalaryServiceImpl.java

@@ -4,7 +4,9 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yd.csf.feign.request.salary.ApiSalaryPageRequest;
+import com.yd.csf.feign.request.salary.ApiSalaryPushPageRequest;
 import com.yd.csf.feign.response.salary.ApiSalaryPageResponse;
+import com.yd.csf.feign.response.salary.ApiSalaryPushPageResponse;
 import com.yd.csf.service.model.Salary;
 import com.yd.csf.service.dao.SalaryMapper;
 import com.yd.csf.service.service.ISalaryService;
@@ -29,6 +31,12 @@ public class SalaryServiceImpl extends ServiceImpl<SalaryMapper, Salary> impleme
     }
 
     @Override
+    public IPage<ApiSalaryPushPageResponse> pushPage(Page<ApiSalaryPushPageResponse> page,
+                                                     ApiSalaryPushPageRequest request) {
+        return this.baseMapper.pushPage(page,request);
+    }
+
+    @Override
     public Salary queryOne(String brokerBizId, String month,
                            String salaryBizId,Boolean isExcludeMy) {
         return this.baseMapper.selectOne(new LambdaQueryWrapper<Salary>()

yd-csf-service/src/main/resources/mappers/SalaryMapper.xml

@@ -28,4 +28,30 @@
         GROUP BY s.salary_biz_id
         ORDER BY s.create_time DESC
     </select>
+
+    <select id="pushPage" resultType="com.yd.csf.feign.response.salary.ApiSalaryPushPageResponse">
+        select
+        s.broker_name,
+        s.month,
+        s.paid_amount,
+        s.gross_amount,
+        (s.gross_amount - s.paid_amount) as totalDeductions,
+        s.other_remark,
+        s.status,
+        s.creator_name,
+        s.create_time
+        from salary s
+        <where>
+            <if test="request.brokerName != null and request.brokerName != ''">
+                AND s.broker_name LIKE CONCAT('%', #{request.brokerName}, '%')
+            </if>
+            <if test="request.month != null and request.month != ''">
+                AND s.month = #{request.month}
+            </if>
+            <if test="request.status != null and request.status != ''">
+                AND s.status = #{request.status}
+            </if>
+            AND s.is_deleted = 0
+        </where>
+    </select>
 </mapper>