diff --git a/db/增量SQL/收入合同联系人名称显示错误修改.sql b/db/增量SQL/收入合同联系人名称显示错误修改.sql new file mode 100644 index 00000000..3227024a --- /dev/null +++ b/db/增量SQL/收入合同联系人名称显示错误修改.sql @@ -0,0 +1,4 @@ +update pay_mail_contract p set p.liaison_man = ( +select pcmt.name from pay_income_contract pic +left join pay_contacts_management_temporary pcmt on pic.signed_contacts_temporary_id = pcmt.id +where pic.id = p.contract_id) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PaySpendingContractServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PaySpendingContractServiceImpl.java index 83586600..e2c7ecc3 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PaySpendingContractServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PaySpendingContractServiceImpl.java @@ -20,7 +20,6 @@ import com.jero.common.util.ImportExcelUtil; import com.jero.common.util.PasswordUtil; import com.jero.common.util.ValidUtil; import com.jero.contract.common.PayIncomeContractCommon; -import com.jero.contract.entity.PayIncomeContract; import com.jero.contract.entity.PaySpendingContract; import com.jero.contract.entity.PaySpendingContractAudit; import com.jero.contract.entity.PaySpendingContractInstallment; @@ -30,11 +29,9 @@ import com.jero.contract.service.IPaySpendingContractInstallmentService; import com.jero.contract.service.IPaySpendingContractService; import com.jero.contract.vo.PaySpendingContractImportExcel; import com.jero.contract.vo.PaySpendingContractInput; -import com.jero.mail.entity.PayMailContract; import com.jero.mail.service.IPayMailContractService; import com.jero.modules.system.entity.SysUser; import com.jero.modules.system.service.ISysUserService; -import com.jero.temporary.entity.PayContactsManagementTemporary; import com.jero.temporary.service.IPayContactsManagementTemporaryService; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections.CollectionUtils; 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 cd91167a..7687cc39 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 @@ -58,7 +58,7 @@ 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 pack = #{payWorkingGroupSubItem.pack}