From 121d2b8e26482b13f3d9afd0302cb72d01ab28f4 Mon Sep 17 00:00:00 2001 From: zhangqinlin <1500920753@qq.com> Date: Mon, 27 Sep 2021 11:08:56 +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 --- .../PayCaseCommitteeSubitemController.java | 68 ++++++++----------- .../mapper/PayCaseCommitteeSubitemMapper.java | 2 +- .../xml/PayCaseCommitteeSubitemMapper.xml | 4 +- .../IPayCaseCommitteeSubitemService.java | 2 +- .../PayCaseCommitteeSubitemServiceImpl.java | 4 +- 5 files changed, 33 insertions(+), 47 deletions(-) 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 a9b8ae9b..ac1d8c39 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 @@ -27,6 +27,7 @@ import com.jero.util.AmountUtil; import io.swagger.annotations.ApiImplicitParam; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections.CollectionUtils; +import org.jetbrains.annotations.NotNull; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.transaction.annotation.Transactional; @@ -142,61 +143,46 @@ public class PayCaseCommitteeSubitemController extends JeroController list = payCaseCommitteeSubitemService.listForExcel(name, companyName, fenBiaoWeiName); + return getModelAndView(list); + } else { ArrayList idList = new ArrayList<>(Arrays.asList(ids.split(","))); List list= payCaseCommitteeSubitemService.chooseExcel(idList); - 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); - } - } - - return AmountUtil.exportListXls(list, ChooseExcelWorkingGroup.class,"邮寄票据"); + return getModelAndView(list); } - /** - * 分标委表搜索导出 - * - * - */ - @AutoLog(value = "分标委表搜索导出-导出") - @ApiOperation(value="分标委表搜索导出-导出", notes="分标委表搜索导出-导出") - @GetMapping(value = "/exportXls",produces = "text/text;charset=utf-8") - public ModelAndView customExportXlsList(@RequestParam(name="name",required =false) String name, - @RequestParam(name="companyName",required =false) String companyName, - @RequestParam(name="fenBiaoWeiName",required =false) String fenBiaoWeiName) { - QueryWrapper queryWrapper = Wrappers.query(); - List pageList = payCaseCommitteeSubitemService.listForExcel(name,companyName,fenBiaoWeiName,queryWrapper); - if (!CollectionUtils.isEmpty(pageList)) { + } + + @NotNull + private ModelAndView getModelAndView(List list) { + if (!CollectionUtils.isEmpty(list)) { try { - pageList.forEach(p -> { - if (!CollectionUtils.isEmpty(p.getList())) { - for (ChildrenFindByName q:p.getList() - ) { - if (!org.apache.commons.lang3.StringUtils.isBlank(q.getPhone())){ - q.setPhone(PasswordUtil.decrypt(q.getPhone())); - } - } + list.forEach(p -> { + if (!org.apache.commons.lang3.StringUtils.isBlank(p.getPhone())) { + p.setPhone(PasswordUtil.decrypt(p.getPhone())); } }); } catch (Exception e) { - log.error("手机号、邮箱解密异常！", e); + log.error("手机号解密异常！", e); } } - return AmountUtil.exportListXls(pageList, FindByName.class, "分标委表导出"); + return AmountUtil.exportListXls(list, ChooseExcelWorkingGroup.class,"分标委表导出"); } + /** * 校验 */ diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/PayCaseCommitteeSubitemMapper.java b/jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/PayCaseCommitteeSubitemMapper.java index 78069607..828c8fc5 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/PayCaseCommitteeSubitemMapper.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/PayCaseCommitteeSubitemMapper.java @@ -31,7 +31,7 @@ public interface PayCaseCommitteeSubitemMapper extends BaseMapper list4(@Param("pageNo") Integer pageNo,@Param("pageSize") Integer pageSize,@Param("name") String name,@Param("companyName") String companyName,@Param("fenBiaoWeiName") String fenBiaoWeiName,@Param(Constants.WRAPPER) Wrapper wrapper); - List listForExcel (@Param("name") String name,@Param("companyName") String companyName,@Param("fenBiaoWeiName") String fenBiaoWeiName,@Param(Constants.WRAPPER) Wrapper wrapper); + List listForExcel (@Param("name") String name,@Param("companyName") String companyName,@Param("fenBiaoWeiName") String fenBiaoWeiName); List chooseExcel(ArrayList idList); diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/xml/PayCaseCommitteeSubitemMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/xml/PayCaseCommitteeSubitemMapper.xml index 6d13ad95..4b6b5861 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/xml/PayCaseCommitteeSubitemMapper.xml +++ b/jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/xml/PayCaseCommitteeSubitemMapper.xml @@ -33,8 +33,8 @@ - + SELECT pt.name as peopleName,pm.company_name as companyName,pt.post as post,pt.phone as phone ,pe.name as name from pay_case_committee pe left JOIN pay_case_committee_subitem pm on (pe.id = pm.committee_id) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/data/service/IPayCaseCommitteeSubitemService.java b/jero-boot-incoming-payment/src/main/java/com/jero/data/service/IPayCaseCommitteeSubitemService.java index a20b95a2..746284f2 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/data/service/IPayCaseCommitteeSubitemService.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/data/service/IPayCaseCommitteeSubitemService.java @@ -31,7 +31,7 @@ public interface IPayCaseCommitteeSubitemService extends IService list4(Integer pageNo,Integer pageSize,String name,String companyName,String fenBiaoWeiName, QueryWrapper queryWrapper); - List listForExcel(String name, String companyName, String fenBiaoWeiName, QueryWrapper queryWrapper); + List listForExcel(String name, String companyName, String fenBiaoWeiName); List chooseExcel(ArrayList idList); } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/data/service/impl/PayCaseCommitteeSubitemServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/data/service/impl/PayCaseCommitteeSubitemServiceImpl.java index 3ae45e88..a5f1e373 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/data/service/impl/PayCaseCommitteeSubitemServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/data/service/impl/PayCaseCommitteeSubitemServiceImpl.java @@ -55,8 +55,8 @@ public class PayCaseCommitteeSubitemServiceImpl extends ServiceImpl listForExcel(String name, String companyName, String fenBiaoWeiName, QueryWrapper queryWrapper) { - return payCaseCommitteeSubitemMapper.listForExcel(name,companyName,fenBiaoWeiName, queryWrapper); + public List listForExcel(String name, String companyName, String fenBiaoWeiName) { + return payCaseCommitteeSubitemMapper.listForExcel(name,companyName,fenBiaoWeiName); } @Override