薪资单明显显示调整 可发放可以显示

yd-api/src/main/java/com/yd/api/practitioner/service/impl/PractitionerBasicInfoServiceImpl.java

@@ -1224,6 +1224,7 @@ public class PractitionerBasicInfoServiceImpl implements PractitionerBasicInfoSe
         WithdrawQueryInfo info = new WithdrawQueryInfo();
         WithdrawQueryInfo info = new WithdrawQueryInfo();
         info.setPractitionerId(requestVO.getPractitionerId());
         info.setPractitionerId(requestVO.getPractitionerId());
         info.setPayoutYearmonth(this.getPayoutYearmonth(requestVO));
         info.setPayoutYearmonth(this.getPayoutYearmonth(requestVO));
+        info.setCommissionPayoutStatus(requestVO.getCommissionPayoutStatus());
         List<WithdrawLabelInfo> list = agmsFortuneDalService.salaryPolicyNoDetails(info);
         List<WithdrawLabelInfo> list = agmsFortuneDalService.salaryPolicyNoDetails(info);
         if(null != list && list.size() >0){
         if(null != list && list.size() >0){
             for(WithdrawLabelInfo withdrawLabelInfo : list){
             for(WithdrawLabelInfo withdrawLabelInfo : list){

yd-api/src/main/java/com/yd/rmi/n22/salary/pojo/searchstaffsalarydetails/SearchStaffSalaryDetailsRequestBody.java

@@ -20,5 +20,8 @@ public class SearchStaffSalaryDetailsRequestBody {
     private String isBasic;
     private String isBasic;
     private Integer isActive;
     private Integer isActive;
     private String preFlag;
     private String preFlag;
-
+    /**
+     * 发佣状态  暂不开放  可发  保留  已发并关账
+     */
+    private Long commissionPayoutStatus;
 }
 }

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

@@ -415,7 +415,15 @@
         where (o.status = 3 or o.status = 4 or o.status is null)
         where (o.status = 3 or o.status = 4 or o.status is null)
           AND mas.drop_code like 'Commission_Payout_Status'
           AND mas.drop_code like 'Commission_Payout_Status'
           AND (f.order_price != 0 or f.order_price is null) and setting.practitioner_type_id = 28
           AND (f.order_price != 0 or f.order_price is null) and setting.practitioner_type_id = 28
+        <if test="item.payoutYearmonth != null and item.payoutYearmonth == 4  ">
             and f.commission_payout_status = 4
             and f.commission_payout_status = 4
+        </if>
+        <if test="item.payoutYearmonth != null and item.payoutYearmonth == 2  ">
+            and f.commission_payout_status = 2
+        </if>
+        <if test="item.payoutYearmonth == null ">
+            and f.commission_payout_status = 4
+        </if>
         <if test="item.payoutYearmonth != null">
         <if test="item.payoutYearmonth != null">
             and pb.payout_yearmonth = #{item.payoutYearmonth,jdbcType=VARCHAR}
             and pb.payout_yearmonth = #{item.payoutYearmonth,jdbcType=VARCHAR}
         </if>
         </if>