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 0710353e..6a9eb1cb 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 @@ -151,20 +151,6 @@ public class PayCaseCommitteeController extends JeroController queryWrapper = Wrappers.query(); - List list = payCaseCommitteeSubitemService.listExcel(queryWrapper); - 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 87594683..1ce0ceeb 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 @@ -66,25 +66,18 @@ public class PayCaseCommitteeSubitemController extends JeroController find(@RequestParam(name="name",required =false) String name, + public Result find(@RequestParam(name="contactsName",required =false) String contactsName, @RequestParam(name="companyName",required =false) String companyName, @RequestParam(name="fenBiaoWeiName",required =false) String fenBiaoWeiName, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, @RequestParam(name="pageSize", defaultValue="10") Integer pageSize ) { - QueryWrapper queryWrapper = Wrappers.query(); - QueryWrapper queryWrapper2 = Wrappers.query(); - HashMap objectObjectHashMap = new HashMap<>(); - List pageList2 = payCaseCommitteeSubitemService.list4((pageNo-1)*pageSize,pageSize, name,companyName,fenBiaoWeiName,queryWrapper2); - objectObjectHashMap.put("pages",pageList2.size()/pageSize); - objectObjectHashMap.put("total",pageList2.size()); - objectObjectHashMap.put("courent",pageNo); - objectObjectHashMap.put("size",pageSize); - objectObjectHashMap.put("pages",(pageList2.size()/pageSize)+1); - List pageList = payCaseCommitteeSubitemService.list3((pageNo-1)*pageSize,pageSize, name,companyName,fenBiaoWeiName,queryWrapper); - if (!CollectionUtils.isEmpty(pageList)) { + + Page page = new Page<>(pageNo, pageSize); + IPage pageList = payCaseCommitteeSubitemService.list3(page,contactsName,companyName,fenBiaoWeiName); + if (!CollectionUtils.isEmpty(pageList.getRecords())) { try { - pageList.forEach(p -> { + pageList.getRecords().forEach(p -> { if (!CollectionUtils.isEmpty(p.getList())) { for (ChildrenFindByName q:p.getList() ) { @@ -94,12 +87,12 @@ public class PayCaseCommitteeSubitemController extends JeroController list = payCaseCommitteeSubitemService.listForExcel(name, companyName, fenBiaoWeiName); + List list = payCaseCommitteeSubitemService.listForExcel(contactsName, companyName, fenBiaoWeiName); return getModelAndView(list); } else { ArrayList idList = new ArrayList<>(Arrays.asList(ids.split(","))); @@ -212,7 +205,15 @@ public class PayCaseCommitteeSubitemController extends JeroController add(@Valid @RequestBody PayCaseCommitteeSubitemDTO payCaseCommitteeSubitemDTO) { PayCaseCommitteeSubitem payCaseCommitteeSubitem = new PayCaseCommitteeSubitem(); BeanUtils.copyProperties(payCaseCommitteeSubitemDTO,payCaseCommitteeSubitem); - payCaseCommitteeSubitemService.save(payCaseCommitteeSubitem); +// 新增时校验重复 + LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); + lambdaQueryWrapper.eq(PayCaseCommitteeSubitem::getContactsId, payCaseCommitteeSubitemDTO.getContactsId()); + List list = payCaseCommitteeSubitemService.list(lambdaQueryWrapper); + if (list.size() > 0) { + return Result.error("联系人重复,请重新选择"); + } else { + payCaseCommitteeSubitemService.save(payCaseCommitteeSubitem); + } return Result.OK("添加成功!"); } 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 828c8fc5..7f89f20f 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 @@ -23,7 +23,7 @@ import java.util.List; */ public interface PayCaseCommitteeSubitemMapper extends BaseMapper { - List list3 (@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); + IPage list3 (Page page,@Param("name") String name,@Param("companyName") String companyName,@Param("fenBiaoWeiName") String fenBiaoWeiName); List list2 (@Param(Constants.WRAPPER) Wrapper wrapper); 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 4b6b5861..5b3be165 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 @@ -4,7 +4,7 @@ - + @@ -13,8 +13,8 @@ + + SELECT pmb.id,pmbp.project_id as projectId,project_name as projectName,bill_no AS billNo,pmb.invoice_amount as invoiceAmount,principal_name as principalName,charge_company_name as chargeCompanyName, -contact_name as contactName,contact_mobile as contactMobile,post_status as postStatus,send_method as sendMethod ,create_time from pay_mail_bill pmb left join pay_mail_bill_project pmbp +contact_name as contactName,contact_mobile as contactMobile,post_status as postStatus,send_method as sendMethod ,create_time,post_no as postNo,send_date as sendDate,pmb.remark from pay_mail_bill pmb left join pay_mail_bill_project pmbp on(pmb.id=pmbp.bill_id) ${ew.customSqlSegment} group by pmb.id ORDER BY post_status ASC,create_time DESC diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupStatisticsController.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupStatisticsController.java index b2cb36b0..8778d535 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupStatisticsController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupStatisticsController.java @@ -100,15 +100,7 @@ public class PayWorkingGroupStatisticsController { payWorkingGroupStatistics.setComeAllMoney("0.00"); } } -// //去除项目下来款金额为零的工作组 -// ArrayList list = new ArrayList<>(); -// for(PayWorkingGroupStatistics payWorkingGroupStatistics:records) { -// if (ObjectUtils.isNotEmpty(payWorkingGroupStatistics)) { -// if (!("0".equals(payWorkingGroupStatistics.getComeAllMoney()) || payWorkingGroupStatistics.getComeAllMoney() == null)) { -// list.add(payWorkingGroupStatistics); -// } -// } -// } + //计算应收和实收总金额 double sum=0; double sum2 =0; @@ -124,7 +116,7 @@ public class PayWorkingGroupStatisticsController { if(s.getComeAllMoney()== null || s.getComeAllMoney().equals("") ) { s.setComeAllMoney("0.00"); } - if(s.getMoneyRate()== null || s.getComeAllMoney().equals("") ) { + if(s.getMoneyRate()== null || s.getMoneyRate().equals("") ) { s.setMoneyRate("0.00%"); } } @@ -160,7 +152,7 @@ public class PayWorkingGroupStatisticsController { List userList = userMapper.selectList(new QueryWrapper().eq("status", 1).eq("del_flag", 0).eq("org_code", orgCode)); idList = userList.stream().map(SysUser::getId).collect(Collectors.toList()); //所领导或者超级管理员 - } else if(roleCodes.contains(constant.SLD)||roleCodes.contains(constant.ADMIN)||roleCodes.contains(constant.QYXXWHRY)) { + } else if(roleCodes.contains(constant.SLD)||roleCodes.contains(constant.ADMIN)) { idList=null; //企业职员项目负责人 }else if(roleCodes.contains(constant.XMFZR)&&!(roleCodes.contains(constant.BMFZR)||roleCodes.contains(constant.SLD)||roleCodes.contains(constant.ADMIN))){ @@ -168,9 +160,16 @@ public class PayWorkingGroupStatisticsController { idList.add(userId); } List pageList = payWorkingGroupService.queryPageListForStatisticsExcel(payWorkingGroupSearch,idList); - for (PayWorkingGroupStatistics payWorkingGroupStatistics:pageList){ - if(payWorkingGroupStatistics.getComeAllMoney()==null||payWorkingGroupStatistics.getComeAllMoney()==""){ - payWorkingGroupStatistics.setComeAllMoney("0.00"); + //处理为空数据为0 + for(PayWorkingGroupStatistics s: pageList){ + if(s.getAllMoney()== null || s.getAllMoney().equals("") ){ + s.setAllMoney("0.00"); + } + if(s.getComeAllMoney()== null || s.getComeAllMoney().equals("") ) { + s.setComeAllMoney("0.00"); + } + if(s.getMoneyRate()== null || s.getMoneyRate().equals("") ) { + s.setMoneyRate("0.00%"); } } return AmountUtil.exportListXls(pageList, PayWorkingGroupStatistics.class,"工作组项目统计"); @@ -246,7 +245,16 @@ for(PayWorkGroupSubletStatistics s: pageList.getRecords()){ payWorkingGroupSubletSearch.setYear(year); } List pageList = payWorkingGroupSubItemService.importExcelStatistics(payWorkingGroupSubletSearch,id); + //处理为空数据为0 + for(PayWorkGroupSubletStatistics s: pageList){ + if(s.getAllMoney()== null || s.getAllMoney().equals("") ){ + s.setAllMoney("0.00"); + } + if(s.getComeAllMoney()== null || s.getComeAllMoney().equals("") ) { + s.setComeAllMoney("0.00"); + } + } return AmountUtil.exportListXls(pageList, PayWorkGroupSubletStatistics.class, "工作组成员统计"); } 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 e409b0cc..edea8941 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 @@ -69,7 +69,7 @@ public class AllProjectStatisticsController { LoginUser sysUser =(LoginUser) SecurityUtils.getSubject().getPrincipal(); String roleCode = sysUser.getRoleCode(); List roleCodes = new ArrayList<>(Arrays.asList(roleCode.split(","))); - if(roleCodes.contains(constant.SLD)||roleCodes.contains(constant.ADMIN)||roleCodes.contains(constant.QYXXWHRY)) { + if(roleCodes.contains(constant.SLD)||roleCodes.contains(constant.ADMIN)) { List idList = null; if (allProjectStatisticsSearch.getYear() == null || allProjectStatisticsSearch.getYear().equals("")) { Calendar calendar = Calendar.getInstance(); @@ -137,7 +137,7 @@ public class AllProjectStatisticsController { List userList = userMapper.selectList(new QueryWrapper().eq("status", 1).eq("del_flag", 0).eq("org_code", orgCode)); idList = userList.stream().map(SysUser::getId).collect(Collectors.toList()); //所领导或者超级管理员 - } else if(roleCodes.contains(constant.SLD)||roleCodes.contains(constant.ADMIN)||roleCodes.contains(constant.QYXXWHRY)) { + } else if(roleCodes.contains(constant.SLD)||roleCodes.contains(constant.ADMIN)) { idList=null; //企业职员项目负责人 }else if(roleCodes.contains(constant.XMFZR)&&!(roleCodes.contains(constant.BMFZR)||roleCodes.contains(constant.SLD)||roleCodes.contains(constant.ADMIN))){ @@ -184,15 +184,16 @@ public class AllProjectStatisticsController { } /** - *所领导统计 + *所领导统计导出 * */ @GetMapping(value = "/statistics/excel") - @ApiOperation(value = "所领导统计-导出统计", notes = "所领导统计-导出统计") + @ApiOperation(value = "所领导统计导出-导出统计", notes = "所领导统计导出-导出统计") public ModelAndView excel( AllProjectStatisticsSearch allProjectStatisticsSearch) { LoginUser sysUser =(LoginUser) SecurityUtils.getSubject().getPrincipal(); String roleCode = sysUser.getRoleCode(); - if(constant.SLD.equals(roleCode)||constant.ADMIN.equals(roleCode)||constant.QYXXWHRY.equals(roleCode)) { + List roleCodes = new ArrayList<>(Arrays.asList(roleCode.split(","))); + if(roleCodes.contains(constant.SLD)||roleCodes.contains(constant.ADMIN)) { if (allProjectStatisticsSearch.getYear() == null || allProjectStatisticsSearch.getYear().equals("")) { Calendar calendar = Calendar.getInstance(); String year = String.valueOf(calendar.get(Calendar.YEAR)); @@ -208,7 +209,6 @@ public class AllProjectStatisticsController { } } return AmountUtil.exportListXls(pageList, AllProjectStatistics.class, "所领导统计"); - }else { return new ModelAndView(); } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/CompanyComeMoneyStatisticsController.java b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/CompanyComeMoneyStatisticsController.java index 47600c4a..f6c91f28 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/CompanyComeMoneyStatisticsController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/CompanyComeMoneyStatisticsController.java @@ -140,7 +140,7 @@ public class CompanyComeMoneyStatisticsController { List userList = userMapper.selectList(new QueryWrapper().eq("status", 1).eq("del_flag", 0).eq("org_code", orgCode)); idList = userList.stream().map(SysUser::getId).collect(Collectors.toList()); //所领导或者超级管理员 - } else if(roleCodes.contains(constant.SLD)||roleCodes.contains(constant.ADMIN)||roleCodes.contains(constant.QYXXWHRY)) { + } else if(roleCodes.contains(constant.SLD)||roleCodes.contains(constant.ADMIN)) { idList=null; //企业职员项目负责人 }else if(roleCodes.contains(constant.XMFZR)&&!(roleCodes.contains(constant.BMFZR)||roleCodes.contains(constant.SLD)||roleCodes.contains(constant.ADMIN))){ @@ -204,7 +204,7 @@ public class CompanyComeMoneyStatisticsController { List userList = userMapper.selectList(new QueryWrapper().eq("status", 1).eq("del_flag", 0).eq("org_code", orgCode)); idList = userList.stream().map(SysUser::getId).collect(Collectors.toList()); //所领导或者超级管理员 - } else if(roleCodes.contains(constant.SLD)||roleCodes.contains(constant.ADMIN)||roleCodes.contains(constant.QYXXWHRY)) { + } else if(roleCodes.contains(constant.SLD)||roleCodes.contains(constant.ADMIN)) { idList=null; //企业职员项目负责人 }else if(roleCodes.contains(constant.XMFZR)&&!(roleCodes.contains(constant.BMFZR)||roleCodes.contains(constant.SLD)||roleCodes.contains(constant.ADMIN))){ diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/PrincipalPeopleStatisticsController.java b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/PrincipalPeopleStatisticsController.java index b83d2eb1..e6db3763 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/PrincipalPeopleStatisticsController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/PrincipalPeopleStatisticsController.java @@ -81,7 +81,7 @@ public class PrincipalPeopleStatisticsController { List userList = userMapper.selectList(new QueryWrapper().eq("status", 1).eq("del_flag", 0).eq("org_code", orgCode)); idList = userList.stream().map(SysUser::getId).collect(Collectors.toList()); //所领导或者超级管理员 - } else if(roleCodes.contains(constant.SLD)||roleCodes.contains(constant.ADMIN)||roleCodes.contains(constant.QYXXWHRY)) { + } else if(roleCodes.contains(constant.SLD)||roleCodes.contains(constant.ADMIN)) { idList=null; //企业职员项目负责人 }else if(roleCodes.contains(constant.XMFZR)&&!(roleCodes.contains(constant.BMFZR)||roleCodes.contains(constant.SLD)||roleCodes.contains(constant.ADMIN))){ @@ -211,7 +211,7 @@ public class PrincipalPeopleStatisticsController { List userList = userMapper.selectList(new QueryWrapper().eq("status", 1).eq("del_flag", 0).eq("org_code", orgCode)); idList = userList.stream().map(SysUser::getId).collect(Collectors.toList()); //所领导或者超级管理员 - } else if(roleCodes.contains(constant.SLD)||roleCodes.contains(constant.ADMIN)||roleCodes.contains(constant.QYXXWHRY)) { + } else if(roleCodes.contains(constant.SLD)||roleCodes.contains(constant.ADMIN)) { idList=null; //企业职员项目负责人 }else if(roleCodes.contains(constant.XMFZR)&&!(roleCodes.contains(constant.BMFZR)||roleCodes.contains(constant.SLD)||roleCodes.contains(constant.ADMIN))){