diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/common/enums/MessageUrlEnums.java b/jero-boot-incoming-payment/src/main/java/com/jero/common/enums/MessageUrlEnums.java index 33803818..22f2694c 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/common/enums/MessageUrlEnums.java +++ b/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"), diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/company/mapper/xml/PayCompanyManagementMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/company/mapper/xml/PayCompanyManagementMapper.xml index 6bedfc1e..1724493a 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/company/mapper/xml/PayCompanyManagementMapper.xml +++ b/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, diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/company/mapper/xml/PayContactsManagementMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/company/mapper/xml/PayContactsManagementMapper.xml index 81307450..cad96439 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/company/mapper/xml/PayContactsManagementMapper.xml +++ b/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, diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroupSubItem.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroupSubItem.java index 9d9d4b85..c4ce3bb8 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroupSubItem.java +++ b/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; } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupSubItemMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupSubItemMapper.xml index 41731c10..897b43ad 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupSubItemMapper.xml +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupSubItemMapper.xml @@ -59,6 +59,12 @@ AND DATE_FORMAT(ppr.payment_date,'%Y') = #{paymentDate} + + 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) + + + 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)) + GROUP BY pwgs.id ORDER BY pwgs.create_time desc