push

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

@@ -147,7 +147,9 @@ public class CommissionServiceImpl extends ServiceImpl<CommissionMapper, Commiss
                         CommissionExpected::getPaidAmount,
                         CommissionExpected::getPaidAmount,
                         CommissionExpected::getPaidRatio,
                         CommissionExpected::getPaidRatio,
                         CommissionExpected::getStatus,
                         CommissionExpected::getStatus,
-                        CommissionExpected::getReceivableNo)
+                        CommissionExpected::getReceivableNo,
+                        CommissionExpected::getStatusDesc
+                        )
                 .in(CommissionExpected::getCommissionExpectedBizId, commissionExpectedBizIdSet)
                 .in(CommissionExpected::getCommissionExpectedBizId, commissionExpectedBizIdSet)
                 .list();
                 .list();
         Map<String, CommissionExpected> commissionExpectedMap = commissionExpectedList.stream().collect(Collectors.toMap(CommissionExpected::getCommissionExpectedBizId, a -> a, (oldValue, newValue) -> newValue));
         Map<String, CommissionExpected> commissionExpectedMap = commissionExpectedList.stream().collect(Collectors.toMap(CommissionExpected::getCommissionExpectedBizId, a -> a, (oldValue, newValue) -> newValue));
@@ -167,6 +169,7 @@ public class CommissionServiceImpl extends ServiceImpl<CommissionMapper, Commiss
             if (commissionExpected != null) {
             if (commissionExpected != null) {
                 // 填充应收账款编号、已入账比例、待入账比例
                 // 填充应收账款编号、已入账比例、待入账比例
                 commissionVO.setReceivableNo(commissionExpected.getReceivableNo());
                 commissionVO.setReceivableNo(commissionExpected.getReceivableNo());
+                commissionVO.setStatusDesc(commissionExpected.getStatusDesc());
                 if (commissionExpected.getCommissionRatio() != null) {
                 if (commissionExpected.getCommissionRatio() != null) {
                     BigDecimal paidRatio = commissionExpected.getPaidRatio() != null ? commissionExpected.getPaidRatio() : BigDecimal.ZERO;
                     BigDecimal paidRatio = commissionExpected.getPaidRatio() != null ? commissionExpected.getPaidRatio() : BigDecimal.ZERO;
                     commissionVO.setPaidRatio(paidRatio);
                     commissionVO.setPaidRatio(paidRatio);

yd-csf-service/src/main/java/com/yd/csf/service/vo/CommissionVO.java

@@ -208,6 +208,11 @@ public class CommissionVO implements Serializable {
     private String commissionExpectedStatus;
     private String commissionExpectedStatus;
 
 
     /**
     /**
+     * 设置入账状态-修改理由
+     */
+    private String statusDesc;
+
+    /**
      * 总金额
      * 总金额
      */
      */
     @Schema(description = "总金额")
     @Schema(description = "总金额")