LK/income_payments_management
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/2022-4-7'

Browse Source 
# Conflicts:
#	jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PayIncomeContractServiceImpl.java
This commit is contained in:
lijiarao
2022-04-12 15:45:24 +08:00
parent fa13cfa32a b967391e3c
commit 1208be79d4
3 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
db/增量SQL/收入合同联系人名称显示错误修改.sql
+4
View File
@@ -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)
jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PaySpendingContractServiceImpl.java
-3
View File
@@ -20,7 +20,6 @@ import com.jero.common.util.ImportExcelUtil;
import com.jero.common.util.PasswordUtil; import com.jero.common.util.PasswordUtil;
import com.jero.common.util.ValidUtil; import com.jero.common.util.ValidUtil;
import com.jero.contract.common.PayIncomeContractCommon; import com.jero.contract.common.PayIncomeContractCommon;
import com.jero.contract.entity.PayIncomeContract;
import com.jero.contract.entity.PaySpendingContract; import com.jero.contract.entity.PaySpendingContract;
import com.jero.contract.entity.PaySpendingContractAudit; import com.jero.contract.entity.PaySpendingContractAudit;
import com.jero.contract.entity.PaySpendingContractInstallment; 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.service.IPaySpendingContractService;
import com.jero.contract.vo.PaySpendingContractImportExcel; import com.jero.contract.vo.PaySpendingContractImportExcel;
import com.jero.contract.vo.PaySpendingContractInput; import com.jero.contract.vo.PaySpendingContractInput;
import com.jero.mail.entity.PayMailContract;
import com.jero.mail.service.IPayMailContractService; import com.jero.mail.service.IPayMailContractService;
import com.jero.modules.system.entity.SysUser; import com.jero.modules.system.entity.SysUser;
import com.jero.modules.system.service.ISysUserService; import com.jero.modules.system.service.ISysUserService;
import com.jero.temporary.entity.PayContactsManagementTemporary;
import com.jero.temporary.service.IPayContactsManagementTemporaryService; import com.jero.temporary.service.IPayContactsManagementTemporaryService;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections.CollectionUtils; import org.apache.commons.collections.CollectionUtils;
jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupSubItemMapper.xml
+1 -1
View File
@@ -58,7 +58,7 @@
<if test="payWorkingGroupSubItem.chargeStatus == 2"> <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)) 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>
<if test="payWorkingGroupSubItem.pack != null and payWorkingGroupSubItem.pack != ''"> <if test="payWorkingGroupSubItem.pack != null">
and pack = #{payWorkingGroupSubItem.pack} and pack = #{payWorkingGroupSubItem.pack}
</if> </if>
</where> </where>