支出合同修改

jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroupSubItem.java

@@ -208,4 +208,11 @@ public class PayWorkingGroupSubItem implements Serializable {
     @TableField(exist = false)
     @ApiModelProperty(value = "收入合同处新增标识 flag = 1")
     private String flag;
+
+    /**
+     * 来款状态
+     */
+    @TableField(exist = false)
+    @ApiModelProperty(value = "来款状态")
+    private String chargeStatus;
 }

jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupSubItemMapper.xml

@@ -59,6 +59,12 @@
             <if test="paymentDate != null and paymentDate != ''">
                 AND DATE_FORMAT(ppr.payment_date,'%Y') = #{paymentDate}
             </if>
+            <if test="payWorkingGroupSubItem.chargeStatus == 1">
+                AND if(pwgs.paid_amount is null or pwgs.paid_amount = '',0,pwgs.paid_amount) = if(pwgs.receivable_amount is null or pwgs.receivable_amount = '',0,pwgs.receivable_amount)
+            </if>
+            <if test="payWorkingGroupSubItem.chargeStatus == 2">
+                AND !(if(pwgs.paid_amount is null or pwgs.paid_amount = '',0,pwgs.paid_amount) = if(pwgs.receivable_amount is null or pwgs.receivable_amount = '',0,pwgs.receivable_amount))
+            </if>
         </where>
         GROUP BY pwgs.id
         ORDER BY pwgs.create_time desc