发佣检核8-发佣列表字段

yd-api/src/main/java/com/yd/api/commission/service/impl/LifeCommissionServiceImpl.java

@@ -376,7 +376,6 @@ public class LifeCommissionServiceImpl implements LifeCommissionService {
             // 批量设置fortune为可发佣
             // 批量设置fortune为可发佣
             for (AclCustomerFortune f : fortuneList) {
             for (AclCustomerFortune f : fortuneList) {
                 f.setCommissionPayoutStatus(fortuneCommissionPayoutStatus);
                 f.setCommissionPayoutStatus(fortuneCommissionPayoutStatus);
-                f.setStatus("3".equals(status) ? "0" : status);//新发佣检核状态字段
                 f.setCommissionPayoutAt(new Date());
                 f.setCommissionPayoutAt(new Date());
                 f.setCommissionPayoutBy(Long.valueOf(loginId));
                 f.setCommissionPayoutBy(Long.valueOf(loginId));
             }
             }

yd-api/src/main/java/com/yd/dal/entity/agms/fortune/CommissionPayoutStatus.java

 package com.yd.dal.entity.agms.fortune;
 package com.yd.dal.entity.agms.fortune;
 
 
+import com.fasterxml.jackson.annotation.JsonFormat;
+
 import java.math.BigDecimal;
 import java.math.BigDecimal;
+import java.util.Date;
 
 
 /**
 /**
  * @author xxy
  * @author xxy
@@ -93,7 +96,7 @@ public class CommissionPayoutStatus {
     /**
     /**
      * 预计发佣年月
      * 预计发佣年月
      */
      */
-    private String predictMonthPeriod;
+    private Date predictMonthPeriod;
     /**
     /**
      * 发佣年月
      * 发佣年月
      */
      */
@@ -275,12 +278,12 @@ public class CommissionPayoutStatus {
                 ", monthPeriod='" + monthPeriod + '\'' +
                 ", monthPeriod='" + monthPeriod + '\'' +
                 '}';
                 '}';
     }
     }
-
-    public String getPredictMonthPeriod() {
+    @JsonFormat(pattern = "yyyy-MM", timezone = "GMT+8")
+    public Date getPredictMonthPeriod() {
         return predictMonthPeriod;
         return predictMonthPeriod;
     }
     }
 
 
-    public void setPredictMonthPeriod(String predictMonthPeriod) {
+    public void setPredictMonthPeriod(Date predictMonthPeriod) {
         this.predictMonthPeriod = predictMonthPeriod;
         this.predictMonthPeriod = predictMonthPeriod;
     }
     }
 }
 }

yd-api/src/main/resources/mapper/agms/AgmsFortuneMapper.xml

@@ -126,6 +126,9 @@
         </if>
         </if>
         <if test="item.commissionPayoutStatus != null">
         <if test="item.commissionPayoutStatus != null">
             and t.status = #{item.commissionPayoutStatus,jdbcType=BIGINT}
             and t.status = #{item.commissionPayoutStatus,jdbcType=BIGINT}
+            <if test="'1'.equals(item.commissionPayoutStatus)">
+                and oc.commission_check_id is not null
+            </if>
         </if>
         </if>
         <if test="item.commissionPayoutYearmonth != null">
         <if test="item.commissionPayoutYearmonth != null">
             and c.check_yearmonth = #{item.commissionPayoutYearmonth,jdbcType=VARCHAR}
             and c.check_yearmonth = #{item.commissionPayoutYearmonth,jdbcType=VARCHAR}