diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayCaseCommitteeController.java b/jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayCaseCommitteeController.java index 749a8c48..0710353e 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayCaseCommitteeController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayCaseCommitteeController.java @@ -23,6 +23,8 @@ import com.jero.data.mapper.PayCaseCommitteeSubitemMapper; import com.jero.data.service.IPayCaseCommitteeService; import com.jero.data.entity.PayCaseCommitteeSubitem; import com.jero.data.service.IPayCaseCommitteeSubitemService; +import com.jero.statistics.entity.AllProjectStatistics; +import com.jero.util.AmountUtil; import lombok.extern.slf4j.Slf4j; import org.jeecgframework.poi.excel.def.NormalExcelConstants; import org.jeecgframework.poi.excel.entity.ExportParams; @@ -160,17 +162,7 @@ public class PayCaseCommitteeController extends JeroController queryWrapper = Wrappers.query(); List list = payCaseCommitteeSubitemService.listExcel(queryWrapper); - // Step.3 AutoPoi 导出Excel - ModelAndView mv = new ModelAndView(new JeecgEntityExcelView()); - mv.addObject(NormalExcelConstants.FILE_NAME, "分标委表"); //此处设置的filename无效 ,前端会重更新设置一下 - mv.addObject(NormalExcelConstants.CLASS, PayCaseCommitteeExcel.class); - //update-begin--Author:liusq Date:20210126 for：图片导出报错，ImageBasePath未设置-------------------- - ExportParams exportParams=new ExportParams("分标委表", "分标委表"); - exportParams.setImageBasePath(upLoadPath); - //update-end--Author:liusq Date:20210126 for：图片导出报错，ImageBasePath未设置---------------------- - mv.addObject(NormalExcelConstants.PARAMS,exportParams); - mv.addObject(NormalExcelConstants.DATA_LIST, list); - return mv; + return AmountUtil.exportListXls(list, AllProjectStatistics.class, "分标委表导出"); } 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 02c71ca9..a9b8ae9b 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 @@ -1,4 +1,5 @@ package com.jero.data.controller; +import java.util.ArrayList; import java.util.Arrays; import java.util.HashMap; import java.util.List; @@ -6,6 +7,7 @@ import java.util.List; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.StringUtils; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.jero.common.api.vo.Result; @@ -13,27 +15,25 @@ import com.jero.common.aspect.annotation.AutoLog; import com.jero.common.aspect.annotation.DictPoint; import com.jero.common.system.base.controller.JeroController; import com.jero.common.util.PasswordUtil; -import com.jero.data.entity.ChildrenFindByName; +import com.jero.data.entity.*; import com.jero.data.entity.DTO.PayCaseCommitteeSubitemDTO; -import com.jero.data.entity.PayCaseCommittee; -import com.jero.data.entity.PayCaseCommitteeSubitem; import com.jero.data.entity.VO.payCaseCommitteeSubitemVO; -import com.jero.data.entity.FindByName; import com.jero.data.mapper.PayCaseCommitteeSubitemMapper; import com.jero.data.service.IPayCaseCommitteeSubitemService; import com.jero.meeting.entity.PayMeetingRemindRecord; import com.jero.meeting.service.IPayMeetingRemindRecordService; import com.jero.project.common.PayProjectCommon; +import com.jero.util.AmountUtil; import io.swagger.annotations.ApiImplicitParam; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections.CollectionUtils; -import org.apache.commons.lang3.StringUtils; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.*; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; +import org.springframework.web.servlet.ModelAndView; import javax.annotation.Resource; import javax.validation.Valid; @@ -140,6 +140,63 @@ public class PayCaseCommitteeSubitemController extends JeroController 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,"邮寄票据"); + } + /** + * 分标委表搜索导出 + * + * + */ + @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)) { + 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())); + } + } + } + }); + } catch (Exception e) { + log.error("手机号、邮箱解密异常！", e); + } + } + + return AmountUtil.exportListXls(pageList, FindByName.class, "分标委表导出"); + } /** * 校验 */ diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/data/entity/ChooseExcelWorkingGroup.java b/jero-boot-incoming-payment/src/main/java/com/jero/data/entity/ChooseExcelWorkingGroup.java new file mode 100644 index 00000000..71e0d22a --- /dev/null +++ b/jero-boot-incoming-payment/src/main/java/com/jero/data/entity/ChooseExcelWorkingGroup.java @@ -0,0 +1,35 @@ +package com.jero.data.entity; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import org.jeecgframework.poi.excel.annotation.Excel; + +/** + * @author zql + * @date 2021/9/27 10:28 + */ +@Data +public class ChooseExcelWorkingGroup { + + @Excel(name = "分标委名称", width = 15) + @ApiModelProperty(value = "分标委名称") + private java.lang.String name; + + @Excel(name = "企业名称", width = 15) + @ApiModelProperty(value = "企业名称") + private java.lang.String companyName; + + @Excel(name = "姓名", width = 15) + @ApiModelProperty(value = "姓名") + private java.lang.String peopleName; + + @Excel(name = "电话", width = 15) + @ApiModelProperty(value = "电话") + private java.lang.String phone; + + @Excel(name = "职位", width = 15) + @ApiModelProperty(value = "职位") + private java.lang.String post; + + +} 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 4c7a2e67..78069607 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 @@ -6,15 +6,13 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; 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.data.entity.PayCaseCommittee; -import com.jero.data.entity.PayCaseCommitteeExcel; -import com.jero.data.entity.PayCaseCommitteeSubitem; +import com.jero.data.entity.*; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.jero.data.entity.VO.payCaseCommitteeSubitemVO; -import com.jero.data.entity.FindByName; import org.apache.ibatis.annotations.Param; +import java.util.ArrayList; import java.util.List; /** @@ -33,5 +31,9 @@ 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 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 9e2b7cf6..6d13ad95 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 @@ -16,8 +16,8 @@ SELECT pe.id as id,pt.name as peopleName,pm.company_name as companyName,pt.post as post,pt.phone as phone ,pe.name as name,pm.id as childrenId from pay_case_committee pe - inner JOIN pay_case_committee_subitem pm on (pe.id = pm.committee_id) - inner JOIN pay_contacts_management pt on (pm.contacts_id = pt.id) + left JOIN pay_case_committee_subitem pm on (pe.id = pm.committee_id) + left JOIN pay_contacts_management pt on (pm.contacts_id = pt.id) AND pt.name LIKE CONCAT('%',#{name},'%') @@ -29,15 +29,38 @@ AND pe.name LIKE CONCAT('%',#{fenBiaoWeiName},'%') - limit #{pageNo},#{pageSize} + + + + + + + + \ No newline at end of file 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 fe063e3b..a20b95a2 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 @@ -6,12 +6,10 @@ 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.data.entity.FindByName; -import com.jero.data.entity.PayCaseCommittee; -import com.jero.data.entity.PayCaseCommitteeExcel; -import com.jero.data.entity.PayCaseCommitteeSubitem; +import com.jero.data.entity.*; import com.jero.data.entity.VO.payCaseCommitteeSubitemVO; +import java.util.ArrayList; import java.util.List; /** @@ -33,4 +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 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 7ff2e760..3ae45e88 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 @@ -6,16 +6,14 @@ 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.data.entity.FindByName; -import com.jero.data.entity.PayCaseCommittee; -import com.jero.data.entity.PayCaseCommitteeExcel; -import com.jero.data.entity.PayCaseCommitteeSubitem; +import com.jero.data.entity.*; import com.jero.data.entity.VO.payCaseCommitteeSubitemVO; import com.jero.data.mapper.PayCaseCommitteeSubitemMapper; import com.jero.data.service.IPayCaseCommitteeSubitemService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.ArrayList; import java.util.List; @@ -55,4 +53,14 @@ public class PayCaseCommitteeSubitemServiceImpl extends ServiceImpl list4(Integer pageNo,Integer pageSize,String name,String companyName,String fenBiaoWeiName, QueryWrapper queryWrapper) { return payCaseCommitteeSubitemMapper.list4(pageNo,pageSize,name,companyName,fenBiaoWeiName, queryWrapper); } + + @Override + public List listForExcel(String name, String companyName, String fenBiaoWeiName, QueryWrapper queryWrapper) { + return payCaseCommitteeSubitemMapper.listForExcel(name,companyName,fenBiaoWeiName, queryWrapper); + } + + @Override + public List chooseExcel(ArrayList idList) { + return payCaseCommitteeSubitemMapper.chooseExcel(idList); + } } 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 22a5f324..ffd22a6b 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 @@ -312,8 +312,19 @@ public class PayMailBillController extends JeroController queryWrapper = Wrappers.query(); - List list = payMailBillService.list(queryWrapper); - return AmountUtil.exportListXls(list,PayMailBill.class,"邮寄票据"); + List pageList = payMailBillService.list(queryWrapper); + if (!CollectionUtils.isEmpty(pageList)) { + try { + pageList.forEach(p -> { + if (!org.apache.commons.lang3.StringUtils.isBlank(p.getContactMobile())) { + p.setContactMobile(PasswordUtil.decrypt(p.getContactMobile())); + } + }); + } catch (Exception e) { + log.error("手机号解密异常！", e); + } + } + return AmountUtil.exportListXls(pageList,PayMailBill.class,"邮寄票据"); }else { ArrayList strings = new ArrayList<>(Arrays.asList(ids.split(","))); ArrayList list = new ArrayList<>(); @@ -323,6 +334,18 @@ public class PayMailBillController extends JeroController { + if (!org.apache.commons.lang3.StringUtils.isBlank(p.getContactMobile())) { + p.setContactMobile(PasswordUtil.decrypt(p.getContactMobile())); + } + }); + } catch (Exception e) { + log.error("手机号解密异常！", e); + } + } + return AmountUtil.exportListXls(list,PayMailBill.class,"邮寄票据"); } 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 643b8340..2258fb03 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 @@ -27,6 +27,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.jero.util.AmountUtil; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.collections.CollectionUtils; import org.apache.shiro.SecurityUtils; import org.springframework.web.bind.annotation.*; import org.springframework.web.servlet.ModelAndView; @@ -67,6 +68,17 @@ public class PayMailContractController extends JeroController 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); } @@ -162,8 +174,19 @@ public class PayMailContractController extends JeroController queryWrapper = new QueryWrapper<>(); - List payMailBillList = payMailContractService.pageContractExcel(queryWrapper); - return AmountUtil.exportListXls(payMailBillList,PayMailBillList.class,"邮寄合同"); + 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,"邮寄合同"); } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/PayWorkingGroupMapper.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/PayWorkingGroupMapper.java index 250d6550..714758a3 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/PayWorkingGroupMapper.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/PayWorkingGroupMapper.java @@ -79,6 +79,16 @@ public interface PayWorkingGroupMapper extends BaseMapper { * @Exception */ List queryPageList3(@Param(value = "allProjectStatisticsSearch") AllProjectStatisticsSearch allProjectStatisticsSearch); + + /** + * @Description 全所统计 + * @Author zql + * @Date 2021/9/17 + * @Param + * @Return + * @Exception + */ + List queryPageList3(@Param(value = "allProjectStatisticsSearch") AllProjectStatisticsSearch allProjectStatisticsSearch,List idList); /** * @Description 企业来款查询和全所统计 * @Author zql diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/IPayWorkingGroupService.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/IPayWorkingGroupService.java index f4746606..c4ac0601 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/IPayWorkingGroupService.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/IPayWorkingGroupService.java @@ -102,7 +102,7 @@ public interface IPayWorkingGroupService extends IService { /** * 全所查询导出 */ - List queryPageListExcel( AllProjectStatisticsSearch allProjectStatisticsSearch); + List queryPageListExcel( AllProjectStatisticsSearch allProjectStatisticsSearch, List idList); /** * 个人来款统计 diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupServiceImpl.java index 5ff8715e..59d78c2f 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupServiceImpl.java @@ -182,8 +182,8 @@ public class PayWorkingGroupServiceImpl extends ServiceImpl queryPageListExcel(AllProjectStatisticsSearch allProjectStatisticsSearch) { - return payWorkingGroupMapper.queryPageList3(allProjectStatisticsSearch); + public List queryPageListExcel(AllProjectStatisticsSearch allProjectStatisticsSearch, List idList) { + return payWorkingGroupMapper.queryPageList3(allProjectStatisticsSearch,idList); } /** diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/AllProjectStatisticsController.java b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/AllProjectStatisticsController.java index 9779a417..e409b0cc 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/AllProjectStatisticsController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/AllProjectStatisticsController.java @@ -54,8 +54,6 @@ public class AllProjectStatisticsController { @Autowired private IPayWorkingGroupService payWorkingGroupService; - - /** * 分页列表查询 * @@ -200,7 +198,8 @@ public class AllProjectStatisticsController { String year = String.valueOf(calendar.get(Calendar.YEAR)); allProjectStatisticsSearch.setYear(year); } - List pageList = payWorkingGroupService.queryPageListExcel(allProjectStatisticsSearch); + List idList =null; + List pageList = payWorkingGroupService.queryPageListExcel(allProjectStatisticsSearch,idList); if (pageList != null) { for(AllProjectStatistics s: pageList){ String key = String.valueOf(s.getChargeUse()); @@ -222,12 +221,13 @@ public class AllProjectStatisticsController { @GetMapping(value = "/statistics/excelProject") @ApiOperation(value = "企业来款统计-导出统计", notes = "企业来款统计-导出统计") public ModelAndView excelProject( AllProjectStatisticsSearch allProjectStatisticsSearch) { + List idList =null; if (allProjectStatisticsSearch.getYear() == null || allProjectStatisticsSearch.getYear().equals("")) { Calendar calendar = Calendar.getInstance(); String year = String.valueOf(calendar.get(Calendar.YEAR)); allProjectStatisticsSearch.setYear(year); } - List pageList = payWorkingGroupService.queryPageListExcel(allProjectStatisticsSearch); + List pageList = payWorkingGroupService.queryPageListExcel(allProjectStatisticsSearch,idList); if (pageList != null) { for(AllProjectStatistics s: pageList){ String key = String.valueOf(s.getChargeUse());