全所统计

This commit is contained in:
zhangqinlin
2021-09-27 10:51:39 +08:00
parent bc2587433a
commit 299eadd2a8
13 changed files with 238 additions and 45 deletions
@@ -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<PayCaseCommittee,
public ModelAndView customExportXlsList() {
QueryWrapper<PayCaseCommitteeExcel> queryWrapper = Wrappers.query();
List<PayCaseCommitteeExcel> 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, "分标委表导出");
}
@@ -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<PayCaseCom
}
return Result.OK(list);
}
/**
* 分标委选择导出-导出
*
*/
@ApiOperation(value="分标委选择导出-导出", notes="分标委选择导出-导出")
@GetMapping(value = "/exportXlsChoose")
public ModelAndView exportXls(@RequestParam(name = "ids",required = false) String ids) {
ArrayList<String> idList = new ArrayList<>(Arrays.asList(ids.split(",")));
List<ChooseExcelWorkingGroup> 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<PayCaseCommittee> queryWrapper = Wrappers.query();
List<FindByName> 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, "分标委表导出");
}
/**
* 校验
*/
@@ -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;
}
@@ -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<PayCaseCommitt
List<FindByName> 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<PayCaseCommittee> wrapper);
List<FindByName> listForExcel (@Param("name") String name,@Param("companyName") String companyName,@Param("fenBiaoWeiName") String fenBiaoWeiName,@Param(Constants.WRAPPER) Wrapper<PayCaseCommittee> wrapper);
List<ChooseExcelWorkingGroup> chooseExcel(ArrayList<String> idList);
}
@@ -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)
<where>
<if test=" name!=null and name != ''">
AND pt.name LIKE CONCAT('%',#{name},'%')
@@ -29,15 +29,38 @@
AND pe.name LIKE CONCAT('%',#{fenBiaoWeiName},'%')
</if>
</where>
<!--group by pe.id-->
limit #{pageNo},#{pageSize}
</select>
<select id="listForExcel" resultMap="people">
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
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)
<where>
<if test=" name!=null and name != ''">
AND pt.name LIKE CONCAT('%',#{name},'%')
</if>
<if test=" companyName!=null and companyName != ''">
AND pm.company_name LIKE CONCAT('%',#{companyName},'%')
</if>
<if test=" fenBiaoWeiName!=null and fenBiaoWeiName != ''">
AND pe.name LIKE CONCAT('%',#{fenBiaoWeiName},'%')
</if>
</where>
</select>
<select id="list4" resultMap="people">
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)
<where>
<if test=" name!=null and name != ''">
AND pt.name LIKE CONCAT('%',#{name},'%')
@@ -49,7 +72,7 @@
AND pe.name LIKE CONCAT('%',#{fenBiaoWeiName},'%')
</if>
</where>
<!--group by pe.id-->
group by pe.id
</select>
<select id="list2" resultType="com.jero.data.entity.VO.payCaseCommitteeSubitemVO">
@@ -69,4 +92,23 @@
left JOIN pay_contacts_management pt on (pm.contacts_id = pt.id)
${ew.customSqlSegment}
</select>
<select id="chooseExcel" resultType="com.jero.data.entity.ChooseExcelWorkingGroup">
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)
left JOIN pay_contacts_management pt on (pm.contacts_id = pt.id)
<where>
<if test="idList !=null and idList != ''">
pm.id in
<foreach item="item" open="(" separator="," close=")" collection="idList">
#{item}
</foreach>
</if>
</where>
</select>
</mapper>
@@ -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<PayCaseCommitt
List<FindByName> list4(Integer pageNo,Integer pageSize,String name,String companyName,String fenBiaoWeiName, QueryWrapper<PayCaseCommittee> queryWrapper);
List<FindByName> listForExcel(String name, String companyName, String fenBiaoWeiName, QueryWrapper<PayCaseCommittee> queryWrapper);
List<ChooseExcelWorkingGroup> chooseExcel(ArrayList<String> idList);
}
@@ -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<PayCaseCommi
public List<FindByName> list4(Integer pageNo,Integer pageSize,String name,String companyName,String fenBiaoWeiName, QueryWrapper<PayCaseCommittee> queryWrapper) {
return payCaseCommitteeSubitemMapper.list4(pageNo,pageSize,name,companyName,fenBiaoWeiName, queryWrapper);
}
@Override
public List<FindByName> listForExcel(String name, String companyName, String fenBiaoWeiName, QueryWrapper<PayCaseCommittee> queryWrapper) {
return payCaseCommitteeSubitemMapper.listForExcel(name,companyName,fenBiaoWeiName, queryWrapper);
}
@Override
public List<ChooseExcelWorkingGroup> chooseExcel(ArrayList<String> idList) {
return payCaseCommitteeSubitemMapper.chooseExcel(idList);
}
}
@@ -312,8 +312,19 @@ public class PayMailBillController extends JeroController<PayMailBill, IPayMailB
public ModelAndView exportXls(@RequestParam(name = "ids",required = false) String ids) {
if(StringUtils.isBlank(ids)){
QueryWrapper<PayMailBill> queryWrapper = Wrappers.query();
List<PayMailBill> list = payMailBillService.list(queryWrapper);
return AmountUtil.exportListXls(list,PayMailBill.class,"邮寄票据");
List<PayMailBill> 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<String> strings = new ArrayList<>(Arrays.asList(ids.split(",")));
ArrayList<PayMailBill> list = new ArrayList<>();
@@ -323,6 +334,18 @@ public class PayMailBillController extends JeroController<PayMailBill, IPayMailB
PayMailBill one = payMailBillService.getOne(objectLambdaQueryWrapper, false);
list.add(one);
}
if (!CollectionUtils.isEmpty(list)) {
try {
list.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(list,PayMailBill.class,"邮寄票据");
}
@@ -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<PayMailContract, I
queryWrapper.orderByAsc("post_status");
queryWrapper.orderByDesc("pc.create_time");
IPage<PayMailBillList> 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<PayMailContract, I
@GetMapping(value = "/exportXls")
public ModelAndView exportXls() {
QueryWrapper<PayMailBillList> queryWrapper = new QueryWrapper<>();
List<PayMailBillList> payMailBillList = payMailContractService.pageContractExcel(queryWrapper);
return AmountUtil.exportListXls(payMailBillList,PayMailBillList.class,"邮寄合同");
List<PayMailBillList> 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,"邮寄合同");
}
@@ -79,6 +79,16 @@ public interface PayWorkingGroupMapper extends BaseMapper<PayWorkingGroup> {
* @Exception
*/
List<AllProjectStatistics> queryPageList3(@Param(value = "allProjectStatisticsSearch") AllProjectStatisticsSearch allProjectStatisticsSearch);
/**
* @Description 全所统计
* @Author zql
* @Date 2021/9/17
* @Param
* @Return
* @Exception
*/
List<AllProjectStatistics> queryPageList3(@Param(value = "allProjectStatisticsSearch") AllProjectStatisticsSearch allProjectStatisticsSearch,List<String> idList);
/**
* @Description 企业来款查询和全所统计
* @Author zql
@@ -102,7 +102,7 @@ public interface IPayWorkingGroupService extends IService<PayWorkingGroup> {
/**
* 全所查询导出
*/
List<AllProjectStatistics> queryPageListExcel( AllProjectStatisticsSearch allProjectStatisticsSearch);
List<AllProjectStatistics> queryPageListExcel( AllProjectStatisticsSearch allProjectStatisticsSearch, List<String> idList);
/**
* 个人来款统计
@@ -182,8 +182,8 @@ public class PayWorkingGroupServiceImpl extends ServiceImpl<PayWorkingGroupMappe
* @return
*/
@Override
public List<AllProjectStatistics> queryPageListExcel(AllProjectStatisticsSearch allProjectStatisticsSearch) {
return payWorkingGroupMapper.queryPageList3(allProjectStatisticsSearch);
public List<AllProjectStatistics> queryPageListExcel(AllProjectStatisticsSearch allProjectStatisticsSearch, List<String> idList) {
return payWorkingGroupMapper.queryPageList3(allProjectStatisticsSearch,idList);
}
/**
@@ -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<AllProjectStatistics> pageList = payWorkingGroupService.queryPageListExcel(allProjectStatisticsSearch);
List<String> idList =null;
List<AllProjectStatistics> 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<String> 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<AllProjectStatistics> pageList = payWorkingGroupService.queryPageListExcel(allProjectStatisticsSearch);
List<AllProjectStatistics> pageList = payWorkingGroupService.queryPageListExcel(allProjectStatisticsSearch,idList);
if (pageList != null) {
for(AllProjectStatistics s: pageList){
String key = String.valueOf(s.getChargeUse());