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

同步合同邮寄数据

Browse Source
This commit is contained in:
zhangqinlin
2022-04-11 14:31:37 +08:00
parent 7553bd6673
commit 0486373d50
6 changed files with 37 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PayIncomeContractServiceImpl.java
+4 -4
View File
@@ -799,10 +799,10 @@ public class PayIncomeContractServiceImpl extends ServiceImpl<PayIncomeContractM
updatePayIncomeContract.set(PayIncomeContract::getStatus,PayIncomeContractCommon.STATUS3);
payIncomeContractService.update(updatePayIncomeContract);
// 先删除
LambdaUpdateWrapper<PayMailContract> updatePayMailContract = new LambdaUpdateWrapper<>();
updatePayMailContract.eq(PayMailContract::getContractId,payIncomeContract.getId());
payMailContractService.remove(updatePayMailContract);
// // 先删除
// LambdaUpdateWrapper<PayMailContract> updatePayMailContract = new LambdaUpdateWrapper<>();
// updatePayMailContract.eq(PayMailContract::getContractId,payIncomeContract.getId());
// payMailContractService.remove(updatePayMailContract);
// 获取财务人员，发送消息
List<SysUser> list = sysUserService.getRolesUser(Arrays.asList(RoleCommon.CWRY));
jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PaySpendingContractServiceImpl.java
+18 -1
View File
@@ -20,6 +20,7 @@ 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;
@@ -33,6 +34,7 @@ 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;
@@ -801,8 +803,23 @@ public class PaySpendingContractServiceImpl extends ServiceImpl<PaySpendingContr
public void synContract() {
payMailContractService.update(new PayMailContract().setContractType(2),new UpdateWrapper<PayMailContract>().isNull("contract_type"));
payMailContractService.del();
List<PaySpendingContract> list = paySpendingContractService.list(null);
ArrayList<PayMailContract> arrayList = new ArrayList<>();
List<PayIncomeContract> list2 = payMailContractService.selectAll();
for(PayIncomeContract payIncomeContract:list2){
PayMailContract payMailContract = new PayMailContract();
PayContactsManagementTemporary payContactsManagementTemporary = payContactsManagementTemporaryService.getById(payIncomeContract.getSignedContactsTemporaryId());
if(!Objects.isNull(payContactsManagementTemporary)){
payMailContract.setMobile(payContactsManagementTemporary.getPhone());
payMailContract.setEmail(payContactsManagementTemporary.getEmail());
payMailContract.setLiaisonMan(payContactsManagementTemporary.getName());
}
payMailContract.setContractId(payIncomeContract.getId());
payMailContract.setPostStatus(PayIncomeContractCommon.POST_STATUS0);
payMailContract.setContractType(PayIncomeContractCommon.CONTRACT_TYPE2);
arrayList.add(payMailContract);
}
List<PaySpendingContract> list = paySpendingContractService.list(null);
for(PaySpendingContract paySpendingContract:list){
PayMailContract payMailContract = new PayMailContract();
payMailContract.setContractId(paySpendingContract.getId());
jero-boot-incoming-payment/src/main/java/com/jero/mail/mapper/PayMailContractMapper.java
+3
View File
@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.jero.contract.entity.PayIncomeContract;
import com.jero.mail.entity.PayMailContracrList;
import com.jero.mail.entity.PayMailContract;
import org.apache.ibatis.annotations.Param;
@@ -33,4 +34,6 @@ public interface PayMailContractMapper extends BaseMapper<PayMailContract> {
void del();
List<PayIncomeContract> selectAll();
}
jero-boot-incoming-payment/src/main/java/com/jero/mail/mapper/xml/PayMailContractMapper.xml
+3
View File
@@ -146,4 +146,7 @@ pic.contract_amount as contractAmount FROM pay_mail_contract as pc left join pay
</select>
<select id="selectAll" resultType="com.jero.contract.entity.PayIncomeContract">
SELECT * from pay_income_contract pic WHERE pic.id not in ( SELECT pmc.contract_id from pay_mail_contract pmc WHERE pmc.contract_type='2')
</select>
</mapper>
jero-boot-incoming-payment/src/main/java/com/jero/mail/service/IPayMailContractService.java
+3
View File
@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.jero.contract.entity.PayIncomeContract;
import com.jero.mail.entity.PayMailContracrList;
import com.jero.mail.entity.PayMailContract;
@@ -32,4 +33,6 @@ public interface IPayMailContractService extends IService<PayMailContract> {
void del();
List<PayIncomeContract> selectAll();
}
jero-boot-incoming-payment/src/main/java/com/jero/mail/service/impl/PayMailContractServiceImpl.java
+6
View File
@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.jero.contract.entity.PayIncomeContract;
import com.jero.mail.entity.PayMailContracrList;
import com.jero.mail.entity.PayMailContract;
import com.jero.mail.mapper.PayMailContractMapper;
@@ -57,5 +58,10 @@ public class PayMailContractServiceImpl extends ServiceImpl<PayMailContractMappe
payMailContractMapper.del();
}
@Override
public List<PayIncomeContract> selectAll() {
return payMailContractMapper.selectAll();
}
}