From 1ecd1f78a80b00d98efcf25c5c7bab811ba98c43 Mon Sep 17 00:00:00 2001 From: zhangqinlin <1500920753@qq.com> Date: Mon, 27 Sep 2021 16:44:05 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=A8=E6=89=80=E7=BB=9F=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/PayMailBillController.java | 39 ++++- .../controller/PayMailContractController.java | 162 ++++++++++-------- .../jero/mail/mapper/PayMailBillMapper.java | 3 + .../mail/mapper/PayMailContractMapper.java | 5 + .../mail/mapper/xml/PayMailContractMapper.xml | 25 +++ .../mail/service/IPayMailBillService.java | 3 + .../mail/service/IPayMailContractService.java | 5 + .../service/impl/PayMailBillServiceImpl.java | 5 + .../impl/PayMailContractServiceImpl.java | 11 ++ 9 files changed, 183 insertions(+), 75 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 ffd22a6b..b4e4b593 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 @@ -309,10 +309,43 @@ public class PayMailBillController extends JeroController queryWrapper = Wrappers.query(); - List pageList = payMailBillService.list(queryWrapper); + QueryWrapper queryWrapper = new QueryWrapper<>(); + if (ObjectUtil.isNotEmpty(payMailBillSearch.getStartTime()) && 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.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()); + } + if (ObjectUtil.isNotEmpty(payMailBillSearch.getChargeCompanyName())){ + queryWrapper.like("charge_company_name",payMailBillSearch.getChargeCompanyName()); + } + if (ObjectUtil.isNotEmpty(payMailBillSearch.getPrincipalId())){ + queryWrapper.like("principal_id",payMailBillSearch.getPrincipalId()); + } + if (ObjectUtil.isNotEmpty(payMailBillSearch.getProjectName())){ + queryWrapper.like("project_name",payMailBillSearch.getProjectName()); + } + List pageList = payMailBillService.pageListTwo(queryWrapper); if (!CollectionUtils.isEmpty(pageList)) { try { pageList.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 2258fb03..27ca3eb0 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 @@ -1,11 +1,10 @@ package com.jero.mail.controller; -import java.util.HashMap; -import java.util.List; -import java.util.Objects; +import java.util.*; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.StringUtils; import com.jero.common.api.vo.Result; import com.jero.common.aspect.annotation.AutoLog; @@ -19,6 +18,7 @@ import com.jero.common.system.vo.LoginUser; import com.jero.common.util.PasswordUtil; import com.jero.contract.entity.PayIncomeContract; import com.jero.contract.service.IPayIncomeContractService; +import com.jero.mail.entity.PayMailBill; import com.jero.mail.entity.PayMailBillList; import com.jero.mail.entity.PayMailContract; import com.jero.mail.service.IPayMailContractService; @@ -45,49 +45,47 @@ import io.swagger.annotations.ApiOperation; @RequestMapping("/payMailContract/payMailContract") @Slf4j public class PayMailContractController extends JeroController { - @Resource - private IPayMailContractService payMailContractService; - @Resource - private IPayIncomeContractService payIncomeContractService; - @Resource - private SendMessageService sendMessageService; - - /** - * 邮寄合同-分页列表查询 - * - */ - @AutoLog(value = "邮寄合同-分页列表查询") - @ApiOperation(value="邮寄合同-分页列表查询", notes="邮寄合同-分页列表查询") - @GetMapping(value = "/list") - public Result 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()); - Page page = new Page<>(pageNo, pageSize); - queryWrapper.orderByAsc("post_status"); - queryWrapper.orderByDesc("pc.create_time"); - IPage pageList = payMailContractService.pageContract(page, queryWrapper); - if (!CollectionUtils.isEmpty(pageList.getRecords())) { - try { - pageList.getRecords().forEach(p -> { - if (!org.apache.commons.lang3.StringUtils.isBlank(p.getMobile())) { - p.setMobile(PasswordUtil.decrypt(p.getMobile())); - } - }); - } catch (Exception e) { - log.error("手机号解密异常！", e); - } - } - return Result.OK(pageList); - } + @Resource + private IPayMailContractService payMailContractService; + @Resource + private IPayIncomeContractService payIncomeContractService; + @Resource + private SendMessageService sendMessageService; + + /** + * 邮寄合同-分页列表查询 + */ + @AutoLog(value = "邮寄合同-分页列表查询") + @ApiOperation(value = "邮寄合同-分页列表查询", notes = "邮寄合同-分页列表查询") + @GetMapping(value = "/list") + public Result 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()); + Page page = new Page<>(pageNo, pageSize); + queryWrapper.orderByAsc("post_status"); + queryWrapper.orderByDesc("pc.create_time"); + IPage pageList = payMailContractService.pageContract(page, queryWrapper); + if (!CollectionUtils.isEmpty(pageList.getRecords())) { + try { + pageList.getRecords().forEach(p -> { + if (!org.apache.commons.lang3.StringUtils.isBlank(p.getMobile())) { + p.setMobile(PasswordUtil.decrypt(p.getMobile())); + } + }); + } catch (Exception e) { + log.error("手机号解密异常！", e); + } + } + return Result.OK(pageList); + } /** - * 邮寄合同-编辑（邮寄和修改按钮统一接口） - * + * 邮寄合同-编辑（邮寄和修改按钮统一接口） */ - @ApiOperation(value="邮寄合同-编辑（邮寄和修改按钮统一接口）", notes="邮寄合同-编辑（邮寄和修改按钮统一接口）") + @ApiOperation(value = "邮寄合同-编辑（邮寄和修改按钮统一接口）", notes = "邮寄合同-编辑（邮寄和修改按钮统一接口）") @PostMapping(value = "/edit") public Result edit(@RequestBody PayMailContract payMailContract ) { @@ -95,21 +93,21 @@ public class PayMailContractController extends JeroController map = new HashMap<>(); - if(Objects.isNull(payIncomeContract)){ - map.put("contractName",payIncomeContract.getContractName()); + HashMap map = new HashMap<>(); + if (Objects.isNull(payIncomeContract)) { + map.put("contractName", payIncomeContract.getContractName()); } sendMessageDTO.setFromUser(sysUser.getUsername()); sendMessageDTO.setTemplateCode(CompanyMessageEnums.MSG10.getCode()); @@ -119,7 +117,7 @@ public class PayMailContractController extends JeroController queryWrapper = new QueryWrapper<>(); - List pageList = payMailContractService.pageContractExcel(queryWrapper); - if (!CollectionUtils.isEmpty(pageList)) { - try { - pageList.forEach(p -> { - if (!org.apache.commons.lang3.StringUtils.isBlank(p.getMobile())) { - p.setMobile(PasswordUtil.decrypt(p.getMobile())); - } - }); - } catch (Exception e) { - log.error("手机号解密异常！", e); - } - } - return AmountUtil.exportListXls(pageList,PayMailBillList.class,"邮寄合同"); - } + /** + * 导出excel + */ + @AutoLog(value = "邮寄合同-导出") + @ApiOperation(value = "邮寄合同-导出", notes = "邮寄合同-导出") + @GetMapping(value = "/exportXls") + public ModelAndView exportXls(PayMailBillList payMailBillList, @RequestParam(name = "ids", required = false) String ids,HttpServletRequest req) { + if (StringUtils.isBlank(ids)) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(payMailBillList, req.getParameterMap()); + queryWrapper.orderByAsc("post_status"); + queryWrapper.orderByDesc("pc.create_time"); + List pageList = payMailContractService.pageContractTwo(queryWrapper); + if (!CollectionUtils.isEmpty(pageList)) { + try { + pageList.forEach(p -> { + if (!org.apache.commons.lang3.StringUtils.isBlank(p.getMobile())) { + p.setMobile(PasswordUtil.decrypt(p.getMobile())); + } + }); + } catch (Exception e) { + log.error("手机号解密异常！", e); + } + } + return AmountUtil.exportListXls(pageList, PayMailBillList.class, "邮寄合同"); + } else { + ArrayList strings = new ArrayList<>(Arrays.asList(ids.split(","))); + + List list = payMailContractService.getOneExcel(strings); + + if (!CollectionUtils.isEmpty(list)) { + try { + list.forEach(p -> { + if (!org.apache.commons.lang3.StringUtils.isBlank(p.getMobile())) { + p.setMobile(PasswordUtil.decrypt(p.getMobile())); + } + }); + } catch (Exception e) { + log.error("手机号解密异常！", e); + } + } + return AmountUtil.exportListXls(list, PayMailBillList.class, "邮寄合同"); + } + } } 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 4910798d..8f8713a5 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 @@ -51,4 +51,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); } 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 5bd64044..65c8e029 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 @@ -10,6 +10,7 @@ import com.jero.mail.entity.PayMailBillList; import com.jero.mail.entity.PayMailContract; import org.apache.ibatis.annotations.Param; +import java.util.ArrayList; import java.util.List; /** @@ -22,6 +23,10 @@ public interface PayMailContractMapper extends BaseMapper { IPage pageContract(Page page, @Param(Constants.WRAPPER) QueryWrapper queryWrapper); + List pageContract( @Param(Constants.WRAPPER) QueryWrapper queryWrapper); + List pageContractExcel(@Param(Constants.WRAPPER) QueryWrapper queryWrapper); + List getOneExcel(@Param("strings") ArrayList strings); + } 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 d8d58761..a2439f1e 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 @@ -35,4 +35,29 @@ pic.principal_name as principalName, pic.contract_amount as contractAmount FROM pay_mail_contract as pc left join pay_income_contract as pic on(pc.contract_id=pic.id) ${ew.customSqlSegment} + + \ No newline at end of file diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/mail/service/IPayMailBillService.java b/jero-boot-incoming-payment/src/main/java/com/jero/mail/service/IPayMailBillService.java index ce9e074c..8b5a7fb9 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/mail/service/IPayMailBillService.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/mail/service/IPayMailBillService.java @@ -72,4 +72,7 @@ public interface IPayMailBillService extends IService { */ IPage pageList(Page page, QueryWrapper queryWrapper); + + + List pageListTwo(QueryWrapper queryWrapper); } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/mail/service/IPayMailContractService.java b/jero-boot-incoming-payment/src/main/java/com/jero/mail/service/IPayMailContractService.java index eb3d512f..7f340045 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/mail/service/IPayMailContractService.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/mail/service/IPayMailContractService.java @@ -11,6 +11,7 @@ import com.jero.mail.mapper.PayMailContractMapper; import org.springframework.beans.factory.annotation.Autowired; import javax.annotation.Resource; +import java.util.ArrayList; import java.util.List; /** @@ -26,4 +27,8 @@ public interface IPayMailContractService extends IService { IPage pageContract(Page page, QueryWrapper queryWrapper); List pageContractExcel(QueryWrapper queryWrapper); + List pageContractTwo(QueryWrapper queryWrapper); + + List getOneExcel(ArrayList strings); + } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/mail/service/impl/PayMailBillServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/mail/service/impl/PayMailBillServiceImpl.java index 50cbae27..1a5cd3fc 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/mail/service/impl/PayMailBillServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/mail/service/impl/PayMailBillServiceImpl.java @@ -258,6 +258,11 @@ public class PayMailBillServiceImpl extends ServiceImpl pageListTwo(QueryWrapper queryWrapper) { + return payMailBillMapper.pageList(queryWrapper); + } + //校验不同项目是否属于同一个公司 private String checkCompanyProject(List bmpList) { diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/mail/service/impl/PayMailContractServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/mail/service/impl/PayMailContractServiceImpl.java index ce3ac650..4b3f45dd 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/mail/service/impl/PayMailContractServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/mail/service/impl/PayMailContractServiceImpl.java @@ -11,6 +11,7 @@ import com.jero.mail.service.IPayMailContractService; import org.springframework.stereotype.Service; import javax.annotation.Resource; +import java.util.ArrayList; import java.util.List; @@ -35,4 +36,14 @@ public class PayMailContractServiceImpl extends ServiceImpl pageContractExcel(QueryWrapper queryWrapper) { return payMailContractMapper.pageContractExcel(queryWrapper); } + + @Override + public List pageContractTwo(QueryWrapper queryWrapper) { + return payMailContractMapper.pageContract(queryWrapper); + } + + @Override + public List getOneExcel(ArrayList strings) { + return payMailContractMapper.getOneExcel(strings); + } }