From af9f01775251629168de6fe6350194b1d8a353f1 Mon Sep 17 00:00:00 2001 From: zhangqinlin <1500920753@qq.com> Date: Wed, 13 Oct 2021 09:06:19 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=90=9C=E7=B4=A2%bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/PayMailBillController.java | 116 +++++++++++------- .../controller/PayMailContractController.java | 23 ++-- .../jero/mail/mapper/PayMailBillMapper.java | 5 +- .../mail/mapper/PayMailContractMapper.java | 4 +- .../mail/mapper/xml/PayMailBillMapper.xml | 59 +++++++++ .../mail/mapper/xml/PayMailContractMapper.xml | 16 ++- .../mail/service/IPayMailBillService.java | 5 +- .../mail/service/IPayMailContractService.java | 4 +- .../service/impl/PayMailBillServiceImpl.java | 10 +- .../impl/PayMailContractServiceImpl.java | 8 +- 10 files changed, 179 insertions(+), 71 deletions(-) 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 056db95d..377d5c13 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 @@ -22,6 +22,7 @@ import com.jero.common.service.SendMessageService; import com.jero.common.system.base.controller.JeroController; import com.jero.common.system.vo.LoginUser; import com.jero.common.util.PasswordUtil; +import com.jero.common.util.oConvertUtils; import com.jero.mail.commont.constant; import com.jero.mail.entity.PayMailBill; import com.jero.mail.entity.PayMailBillProject; @@ -82,7 +83,53 @@ public class PayMailBillController extends JeroController queryPageList( PayMailBillSearch payMailBillSearch, +// @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, +// @RequestParam(name="pageSize", defaultValue="10") Integer pageSize +// ) { +//// QueryWrapper queryWrapper = new QueryWrapper<>(); +// Page page = new Page<>(pageNo, pageSize); +// if(ObjectUtils.isNotEmpty(payMailBillSearch.getEndTime())) { +// Calendar calendar = Calendar.getInstance(); +// calendar.setTime(payMailBillSearch.getEndTime()); +// calendar.add(Calendar.HOUR, 23);//时 +// calendar.add(Calendar.MINUTE, 59);//时 +// calendar.add(Calendar.SECOND, 59);//秒 +// payMailBillSearch.setEndTime(calendar.getTime()); +// } +// if(ObjectUtils.isNotEmpty(payMailBillSearch.getChargeCompanyName())) { +// payMailBillSearch.setChargeCompanyName(SearchUtil.exchenge(payMailBillSearch.getChargeCompanyName())); +// } +// if(ObjectUtils.isNotEmpty(payMailBillSearch.getProjectName())) { +// payMailBillSearch.setProjectName(SearchUtil.exchenge(payMailBillSearch.getProjectName())); +// } +// IPage pageList = payMailBillService.pageLists(page, payMailBillSearch); +// if (!CollectionUtils.isEmpty(pageList.getRecords())) { +// try { +// pageList.getRecords().forEach(p -> { +// if (!org.apache.commons.lang3.StringUtils.isBlank(p.getContactMobile())) { +// p.setContactMobile(PasswordUtil.decrypt(p.getContactMobile())); +// } +// }); +// } catch (Exception e) { +// log.error("手机号解密异常！", e); +// } +// } +// return Result.OK(pageList); +// } + + /** * 分页列表查询 * * @param payMailBillSearch @@ -94,9 +141,9 @@ public class PayMailBillController extends JeroController queryPageList( PayMailBillSearch payMailBillSearch, - @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, - @RequestParam(name="pageSize", defaultValue="10") Integer pageSize - ) { + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize + ) { QueryWrapper queryWrapper = new QueryWrapper<>(); Page page = new Page<>(pageNo, pageSize); @@ -121,15 +168,13 @@ public class PayMailBillController extends JeroController pageList = payMailBillService.pageList(page, queryWrapper); @@ -149,8 +194,6 @@ public class PayMailBillController extends JeroController queryWrapper = new QueryWrapper<>(); - if (ObjectUtil.isNotEmpty(payMailBillSearch.getStartTime()) && ObjectUtil.isNotEmpty(payMailBillSearch.getEndTime())) { - Calendar calendar= Calendar.getInstance(); + if(ObjectUtils.isNotEmpty(payMailBillSearch.getEndTime())) { + Calendar calendar = Calendar.getInstance(); calendar.setTime(payMailBillSearch.getEndTime()); - calendar.add(Calendar.HOUR,23);//时 - calendar.add(Calendar.MINUTE,59);//时 - calendar.add(Calendar.SECOND,59);//秒 - queryWrapper.ge("send_date", payMailBillSearch.getStartTime()); - queryWrapper.le("send_date", calendar.getTime()); - - }else if (ObjectUtil.isNotEmpty(payMailBillSearch.getStartTime())){ - queryWrapper.ge("send_date", payMailBillSearch.getStartTime()); - - }else if (ObjectUtil.isNotEmpty(payMailBillSearch.getEndTime())){ - Calendar calendar= Calendar.getInstance(); - calendar.setTime(payMailBillSearch.getEndTime()); - calendar.add(Calendar.HOUR,23);//时 - calendar.add(Calendar.MINUTE,59);//时 - calendar.add(Calendar.SECOND,59);//秒 - queryWrapper.le("send_date", calendar.getTime()); + calendar.add(Calendar.HOUR, 23);//时 + calendar.add(Calendar.MINUTE, 59);//时 + calendar.add(Calendar.SECOND, 59);//秒 + payMailBillSearch.setEndTime(calendar.getTime()); } - if (ObjectUtil.isNotEmpty(payMailBillSearch.getChargeCompanyName())){ - queryWrapper.like("charge_company_name",payMailBillSearch.getChargeCompanyName()); + if(ObjectUtils.isNotEmpty(payMailBillSearch.getChargeCompanyName())) { + payMailBillSearch.setChargeCompanyName(SearchUtil.exchenge(payMailBillSearch.getChargeCompanyName())); } - if (ObjectUtil.isNotEmpty(payMailBillSearch.getPrincipalId())){ - queryWrapper.like("principal_id",payMailBillSearch.getPrincipalId()); + if(ObjectUtils.isNotEmpty(payMailBillSearch.getProjectName())) { + payMailBillSearch.setProjectName(SearchUtil.exchenge(payMailBillSearch.getProjectName())); } - if (ObjectUtil.isNotEmpty(payMailBillSearch.getProjectName())){ - queryWrapper.like("project_name",payMailBillSearch.getProjectName()); - } - List pageList = payMailBillService.pageListTwo(queryWrapper); + List pageList = payMailBillService.pageListTwo(payMailBillSearch); if (!CollectionUtils.isEmpty(pageList)) { try { pageList.forEach(p -> { @@ -363,13 +388,10 @@ public class PayMailBillController extends JeroController strings = new ArrayList<>(Arrays.asList(ids.split(","))); - ArrayList list = new ArrayList<>(); - for (String id : strings) { - LambdaQueryWrapper objectLambdaQueryWrapper = new LambdaQueryWrapper<>(); - objectLambdaQueryWrapper.eq(StringUtils.isNotBlank(ids), PayMailBill::getId, id); - PayMailBill one = payMailBillService.getOne(objectLambdaQueryWrapper, false); - list.add(one); - } + + + List list = payMailBillService.listByIds(strings); + if (!CollectionUtils.isEmpty(list)) { try { list.forEach(p -> { 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 5f9d09c0..8df753fe 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 @@ -26,6 +26,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.jero.util.AmountUtil; +import com.jero.util.SearchUtil; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang3.ObjectUtils; @@ -60,13 +61,13 @@ public class PayMailContractController extends JeroController queryPageList(PayMailBillList payMailBillList, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, - @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, - HttpServletRequest req) { - QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(payMailBillList, req.getParameterMap()); + @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize + ) { + payMailBillList.setContractName(SearchUtil.exchenge(payMailBillList.getContractName())); + payMailBillList.setContractNum(SearchUtil.exchenge(payMailBillList.getContractNum())); + payMailBillList.setSignedCompanyTemporaryName(SearchUtil.exchenge(payMailBillList.getSignedCompanyTemporaryName())); Page page = new Page<>(pageNo, pageSize); - queryWrapper.orderByAsc("post_status"); - queryWrapper.orderByDesc("pc.create_time"); - IPage pageList = payMailContractService.pageContract(page, queryWrapper); + IPage pageList = payMailContractService.pageContract(page,payMailBillList); if (!CollectionUtils.isEmpty(pageList.getRecords())) { try { pageList.getRecords().forEach(p -> { @@ -188,12 +189,12 @@ public class PayMailContractController extends JeroController queryWrapper = QueryGenerator.initQueryWrapper(payMailBillList, req.getParameterMap()); - queryWrapper.orderByAsc("post_status"); - queryWrapper.orderByDesc("pc.create_time"); - List pageList = payMailContractService.pageContractTwo(queryWrapper); + payMailBillList.setContractName(SearchUtil.exchenge(payMailBillList.getContractName())); + payMailBillList.setContractNum(SearchUtil.exchenge(payMailBillList.getContractNum())); + payMailBillList.setSignedCompanyTemporaryName(SearchUtil.exchenge(payMailBillList.getSignedCompanyTemporaryName())); + List pageList = payMailContractService.pageContractTwo(payMailBillList); if (!CollectionUtils.isEmpty(pageList)) { try { pageList.forEach(p -> { diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/mail/mapper/PayMailBillMapper.java b/jero-boot-incoming-payment/src/main/java/com/jero/mail/mapper/PayMailBillMapper.java index 3d216206..1ee4bb54 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/mail/mapper/PayMailBillMapper.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/mail/mapper/PayMailBillMapper.java @@ -53,7 +53,7 @@ public interface PayMailBillMapper extends BaseMapper { IPage pageList(Page page, @org.apache.ibatis.annotations.Param(Constants.WRAPPER) QueryWrapper queryWrapper); - List pageList( @org.apache.ibatis.annotations.Param(Constants.WRAPPER) QueryWrapper queryWrapper); + List pageListss(@Param("payMailBillSearch") PayMailBillSearch payMailBillSearch); /** * @Description 获取更用户相关的项目id @@ -65,4 +65,7 @@ public interface PayMailBillMapper extends BaseMapper { * @Exception */ List getCompanyCommonProject(@Param("projectType") String projectType,@Param("userId") String userId); + + + IPage pageLists(Page page,@Param("payMailBillSearch") PayMailBillSearch payMailBillSearch); } 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 6c6f23e6..a67edac2 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 @@ -21,9 +21,9 @@ import java.util.List; */ public interface PayMailContractMapper extends BaseMapper { - IPage pageContract(Page page, @Param(Constants.WRAPPER) QueryWrapper queryWrapper); + IPage pageContract(Page page, @Param("payMailBillList") PayMailBillList payMailBillList); - List pageContract( @Param(Constants.WRAPPER) QueryWrapper queryWrapper); + List pageContract(@Param("payMailBillList") PayMailBillList payMailBillList); List pageContractExcel(@Param(Constants.WRAPPER) QueryWrapper queryWrapper); diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/mail/mapper/xml/PayMailBillMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/mail/mapper/xml/PayMailBillMapper.xml index 43d217ac..f8057354 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/mail/mapper/xml/PayMailBillMapper.xml +++ b/jero-boot-incoming-payment/src/main/java/com/jero/mail/mapper/xml/PayMailBillMapper.xml @@ -61,4 +61,63 @@ on(pmb.id=pmbp.bill_id) group by pmb.id ORDER BY post_status ASC,create_time DESC + + + + + + + \ No newline at end of file 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 0437284e..50da9f5d 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 @@ -18,7 +18,21 @@ pic.principal_name as principalName, pic.principal_id as principalId, pic.contract_amount as contractAmount FROM pay_mail_contract as pc left join pay_income_contract as pic on(pc.contract_id=pic.id) left join pay_company_management pcm on(pic.signed_company_id=pcm.id) - ${ew.customSqlSegment} + + + pic.contract_num like concat('%',concat(#{payMailBillList.contractNum},'%')) escape '/' + + + pic.contract_name like concat('%',concat(#{payMailBillList.contractName},'%')) escape '/' + + + pcm.company_name like concat('%',concat(#{payMailBillList.signedCompanyTemporaryName},'%')) escape '/' + + + pic.principal_id = #{payMailBillList.principalId} + + +order by post_status ASC , pc.create_time DESC