diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/contract/controller/PaySpendingContractController.java b/jero-boot-incoming-payment/src/main/java/com/jero/contract/controller/PaySpendingContractController.java index f8af5e5c..da00b3ec 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/contract/controller/PaySpendingContractController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/contract/controller/PaySpendingContractController.java @@ -229,6 +229,18 @@ public class PaySpendingContractController extends JeroController synContract() { + paySpendingContractService.synContract(); + return Result.OK("同步成功!"); + } /** * 批量删除 * diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/IPaySpendingContractService.java b/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/IPaySpendingContractService.java index c44b332f..92811b67 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/IPaySpendingContractService.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/IPaySpendingContractService.java @@ -33,36 +33,36 @@ public interface IPaySpendingContractService extends IService ids); /** @@ -110,4 +110,7 @@ public interface IPaySpendingContractService extends IService updatePayMailContract = new LambdaUpdateWrapper<>(); updatePayMailContract.eq(PayMailContract::getContractId,id); payMailContractService.remove(updatePayMailContract); + //删除邮寄列表 + } @Override 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 be1d1a67..c0a26fac 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 @@ -2,7 +2,9 @@ package com.jero.contract.service.impl; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; +import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -85,6 +87,7 @@ public class PaySpendingContractServiceImpl extends ServiceImpl queryPageList(Page page, PaySpendingContract paySpendingContract, String startTime, String endTime,String chargeStatus) { return paySpendingContractMapper.queryPageList(page,paySpendingContract,startTime,endTime,chargeStatus); @@ -324,6 +327,7 @@ public class PaySpendingContractServiceImpl extends ServiceImpl updatePaySpendingContractInstallment = new LambdaUpdateWrapper<>(); updatePaySpendingContractInstallment.eq(PaySpendingContractInstallment::getContractId,id); paySpendingContractInstallmentService.remove(updatePaySpendingContractInstallment); + payMailContractService.remove(new LambdaQueryWrapper().eq(PayMailContract::getContractId,id)); } @Override @@ -353,6 +357,7 @@ public class PaySpendingContractServiceImpl extends ServiceImpl updatePaySpendingContractInstallment = new LambdaUpdateWrapper<>(); updatePaySpendingContractInstallment.in(PaySpendingContractInstallment::getContractId,ids); paySpendingContractInstallmentService.remove(updatePaySpendingContractInstallment); + payMailContractService.remove(new LambdaQueryWrapper().in(PayMailContract::getContractId,ids)); } @Override @@ -792,6 +797,26 @@ public class PaySpendingContractServiceImpl extends ServiceImpl().isNull("contract_type")); + payMailContractService.del(); + List list = paySpendingContractService.list(null); + ArrayList arrayList = new ArrayList<>(); + for(PaySpendingContract paySpendingContract:list){ + PayMailContract payMailContract = new PayMailContract(); + payMailContract.setContractId(paySpendingContract.getId()); + payMailContract.setPostStatus(PayIncomeContractCommon.POST_STATUS0); +// payMailContract.setMobile(PasswordUtil.encrypt(paySpendingContract.getPhone())); +// payMailContract.setEmail(""); + payMailContract.setLiaisonMan(paySpendingContract.getSignedContactsTemporaryName()); + payMailContract.setContractType(PayIncomeContractCommon.CONTRACT_TYPE1); + arrayList.add(payMailContract); + } + payMailContractService.saveBatch(arrayList); + + } + private PaySpendingContract setPaySpendingContractExcel(Map map,Map mapOpening,Map mapPack, int n,StringBuilder sb){ diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayCaseCommitteeSubitemController.java b/jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayCaseCommitteeSubitemController.java index 6049c0dc..d61e7cb6 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayCaseCommitteeSubitemController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayCaseCommitteeSubitemController.java @@ -228,15 +228,16 @@ public class PayCaseCommitteeSubitemController extends JeroController list) { if (!CollectionUtils.isEmpty(list)) { - try { - list.forEach(p -> { - if (!org.apache.commons.lang3.StringUtils.isBlank(p.getPhone())) { - p.setPhone(PasswordUtil.decrypt(p.getPhone())); - } - }); - } catch (Exception e) { - log.error("手机号解密异常！", e); - } + list.forEach(p -> { + try { + if (!org.apache.commons.lang3.StringUtils.isBlank(p.getPhone())) { + p.setPhone(PasswordUtil.decrypt(p.getPhone())); + } + } catch (Exception e) { + log.error("手机号解密异常！", e); + } + }); + } return AmountUtil.exportListXls(list, ChooseExcelWorkingGroup.class,"分标委表导出"); diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayCaseCouncilSubitemController.java b/jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayCaseCouncilSubitemController.java index 5fe40918..1190d8ca 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayCaseCouncilSubitemController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayCaseCouncilSubitemController.java @@ -288,15 +288,16 @@ public class PayCaseCouncilSubitemController extends JeroController list) { if (!CollectionUtils.isEmpty(list)) { - try { - list.forEach(p -> { + list.forEach(p -> { + try { if (!org.apache.commons.lang3.StringUtils.isBlank(p.getPhone())) { p.setPhone(PasswordUtil.decrypt(p.getPhone())); } - }); - } catch (Exception e) { - log.error("手机号解密异常！", e); - } + } catch (Exception e) { + log.error("手机号解密异常！", e); + } + }); + } return AmountUtil.exportListXls(list, ChooseExcelCouncil.class,"理事会表导出"); diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/mail/controller/PayMailBillController.java b/jero-boot-incoming-payment/src/main/java/com/jero/mail/controller/PayMailBillController.java index 6e2ec84c..07f71dc8 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/mail/controller/PayMailBillController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/mail/controller/PayMailBillController.java @@ -709,20 +709,22 @@ public class PayMailBillController extends JeroController list) { if (!CollectionUtils.isEmpty(list)) { - try { - list.forEach(p -> { + list.forEach(p -> { + try { if (!org.apache.commons.lang3.StringUtils.isBlank(p.getContactMobile())) { p.setContactMobile(PasswordUtil.decrypt(p.getContactMobile())); } if (!org.apache.commons.lang3.StringUtils.isBlank(p.getPrincipalPhone())) { p.setPrincipalPhone(PasswordUtil.decrypt(p.getPrincipalPhone())); } - }); - } catch (Exception e) { - log.error("手机号解密异常！", e); - } + } catch (Exception e) { + log.error("手机号解密异常！", e); + } + }); + } } } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/mail/controller/PayMailContractController.java b/jero-boot-incoming-payment/src/main/java/com/jero/mail/controller/PayMailContractController.java index 4e35ff0c..d4e0ccd1 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/mail/controller/PayMailContractController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/mail/controller/PayMailContractController.java @@ -75,18 +75,19 @@ public class PayMailContractController extends JeroController page = new Page<>(pageNo, pageSize); IPage pageList = payMailContractService.pageContract(page, payMailContracrList); if (!CollectionUtils.isEmpty(pageList.getRecords())) { - try { - pageList.getRecords().forEach(p -> { + pageList.getRecords().forEach(p -> { + try { if (!org.apache.commons.lang3.StringUtils.isBlank(p.getMobile())) { p.setMobile(PasswordUtil.decrypt(p.getMobile())); } String principalId = p.getPrincipalId(); SysUser sysUser = sysUserService.getById(principalId); p.setPrincipalPhone(PasswordUtil.decrypt(sysUser.getPhone())); - }); - } catch (Exception e) { - log.error("手机号解密异常！", e); - } + } catch (Exception e) { + log.error("手机号解密异常！", e); + } + }); + } return Result.OK(pageList); } @@ -269,15 +270,16 @@ public class PayMailContractController extends JeroController pageList = payMailContractService.pageContractTwo(payMailContracrList); if (!CollectionUtils.isEmpty(pageList)) { - try { - pageList.forEach(p -> { + pageList.forEach(p -> { + try { if (!org.apache.commons.lang3.StringUtils.isBlank(p.getMobile())) { p.setMobile(PasswordUtil.decrypt(p.getMobile())); } - }); - } catch (Exception e) { - log.error("手机号解密异常！", e); - } + } catch (Exception e) { + log.error("手机号解密异常！", e); + } + }); + } return AmountUtil.exportListXls(pageList, PayMailContracrList.class, "邮寄合同"); } else { @@ -286,15 +288,16 @@ public class PayMailContractController extends JeroController list = payMailContractService.getOneExcel(strings); if (!CollectionUtils.isEmpty(list)) { - try { - list.forEach(p -> { + list.forEach(p -> { + try { if (!org.apache.commons.lang3.StringUtils.isBlank(p.getMobile())) { p.setMobile(PasswordUtil.decrypt(p.getMobile())); } - }); - } catch (Exception e) { - log.error("手机号解密异常！", e); - } + } catch (Exception e) { + log.error("手机号解密异常！", e); + } + }); + } return AmountUtil.exportListXls(list, PayMailContracrList.class, "邮寄合同"); } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/mail/mapper/PayMailContractMapper.java b/jero-boot-incoming-payment/src/main/java/com/jero/mail/mapper/PayMailContractMapper.java index be2d92d5..7a719c25 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/mail/mapper/PayMailContractMapper.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/mail/mapper/PayMailContractMapper.java @@ -31,4 +31,6 @@ public interface PayMailContractMapper extends BaseMapper { PayMailContracrList checkOne(@Param("id") String id); + void del(); + } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/mail/mapper/xml/PayMailContractMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/mail/mapper/xml/PayMailContractMapper.xml index d05f2f7d..eabed5ed 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/mail/mapper/xml/PayMailContractMapper.xml +++ b/jero-boot-incoming-payment/src/main/java/com/jero/mail/mapper/xml/PayMailContractMapper.xml @@ -1,6 +1,9 @@ + + delete from pay_mail_contract where contract_id not in (select id from pay_income_contract) and contract_type='2' +