支出合同修改

jero-boot-incoming-payment/src/main/java/com/jero/common/enums/MessageUrlEnums.java

@@ -9,7 +9,7 @@ public enum MessageUrlEnums {
     M_OPEN_TYPE2("M_OPEN_TYPE2","url","/contractManagement/RevenueContractDetail"),
     M_OPEN_TYPE3("M_OPEN_TYPE3","url","/contractManagement/RevenueContractDetail"),
     M_OPEN_TYPE4("M_OPEN_TYPE4","url","/contractManagement/RevenueContractDetail"),
-    M_OPEN_TYPE5("M_OPEN_TYPE5","component","@views/incomePayments/meetManage/modules/AuditModal"),
+    M_OPEN_TYPE5("M_OPEN_TYPE5","component","/meetManage/modules/AuditModal"),
     M_OPEN_TYPE6("M_OPEN_TYPE6","component","/ProjectDetailModal"),
     M_OPEN_TYPE7("M_OPEN_TYPE7","component","/ProjectDetailModal"),
     M_OPEN_TYPE8("M_OPEN_TYPE8","url","/incomePayments/meetManage/SignUpInfoDetail"),

jero-boot-incoming-payment/src/main/java/com/jero/company/mapper/xml/PayCompanyManagementMapper.xml

@@ -14,7 +14,6 @@
             bank_account AS bankAccount,
             duty_code AS dutyCode,
             data_source AS dataSource,
-            signing_up AS signingUp,
             remarks,
             create_by AS createBy,
             create_time AS createTime,

jero-boot-incoming-payment/src/main/java/com/jero/company/mapper/xml/PayContactsManagementMapper.xml

@@ -46,8 +46,6 @@
             pcm.email,
             pcm.contact_address AS contactAddress,
             pcm.postal_code AS postalCode,
-            pcm.data_source AS dataSource,
-            pcm.signing_up AS signingUp,
             pcm.remarks,
             pcm.create_by AS createBy,
             pcm.create_time AS createTime,

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