From a84c6a9b5002dce7d71a7f13fb557af8b54ba50f Mon Sep 17 00:00:00 2001 From: zhangqinlin <1500920753@qq.com> Date: Mon, 13 Sep 2021 14:45:26 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E8=B5=84=E6=96=99=E4=B8=8B=E8=BD=BDbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PayFileDownloadRecordController.java | 56 ++++++++++++------- .../data/entity/PayFileDownloadRecord.java | 4 +- .../entity/PayWorkingGroupStatistics.java | 17 +++++- .../mapper/xml/PayWorkingGroupMapper.xml | 18 ++++++ 4 files changed, 71 insertions(+), 24 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayFileDownloadRecordController.java b/jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayFileDownloadRecordController.java index 64887ed7..d40dc8cd 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayFileDownloadRecordController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayFileDownloadRecordController.java @@ -129,26 +129,42 @@ public class PayFileDownloadRecordController extends JeroController strings = new ArrayList<>(Arrays.asList(ids.split(","))); - ArrayList list = new ArrayList<>(); - for(String id:strings) { - LambdaQueryWrapper objectLambdaQueryWrapper = new LambdaQueryWrapper<>(); - objectLambdaQueryWrapper.eq(StringUtils.isNotBlank(ids), PayFileDownloadRecord::getId, id); - PayFileDownloadRecord one = payFileDownloadRecordService.getOne(objectLambdaQueryWrapper,false); - // Step.3 AutoPoi 导出Excelaw - list.add(one); - } - ModelAndView mv = new ModelAndView(new JeecgEntityExcelView()); - mv.addObject(NormalExcelConstants.FILE_NAME, "资料下载记录"); //此处设置的filename无效 ,前端会重更新设置一下 - mv.addObject(NormalExcelConstants.CLASS, PayFileDownloadRecord.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; + public ModelAndView customExportXlsList(@RequestParam(name="ids",required = false) String ids) { + if(StringUtils.isBlank(ids)){ + QueryWrapper queryWrapper = Wrappers.query(); + List list = payFileDownloadRecordService.list(queryWrapper); + ModelAndView mv = new ModelAndView(new JeecgEntityExcelView()); + mv.addObject(NormalExcelConstants.FILE_NAME, "资料下载记录"); //此处设置的filename无效 ,前端会重更新设置一下 + mv.addObject(NormalExcelConstants.CLASS, PayFileDownloadRecord.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; + }else { + ArrayList strings = new ArrayList<>(Arrays.asList(ids.split(","))); + ArrayList list = new ArrayList<>(); + for (String id : strings) { + LambdaQueryWrapper objectLambdaQueryWrapper = new LambdaQueryWrapper<>(); + objectLambdaQueryWrapper.eq(StringUtils.isNotBlank(ids), PayFileDownloadRecord::getId, id); + PayFileDownloadRecord one = payFileDownloadRecordService.getOne(objectLambdaQueryWrapper, false); + // Step.3 AutoPoi 导出Excelaw + list.add(one); + } + ModelAndView mv = new ModelAndView(new JeecgEntityExcelView()); + mv.addObject(NormalExcelConstants.FILE_NAME, "资料下载记录"); //此处设置的filename无效 ,前端会重更新设置一下 + mv.addObject(NormalExcelConstants.CLASS, PayFileDownloadRecord.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; + } + } } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/data/entity/PayFileDownloadRecord.java b/jero-boot-incoming-payment/src/main/java/com/jero/data/entity/PayFileDownloadRecord.java index 2adcb45d..59f39612 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/data/entity/PayFileDownloadRecord.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/data/entity/PayFileDownloadRecord.java @@ -39,8 +39,8 @@ public class PayFileDownloadRecord implements Serializable { @ApiModelProperty(value = "文件名称") private java.lang.String fileName; /**文件目录*/ - @Excel(name = "文件目录", width = 15) - @ApiModelProperty(value = "文件目录") + @Excel(name = "目录层级", width = 15) + @ApiModelProperty(value = "目录层级") private java.lang.String filePath; /**企业名称*/ @Excel(name = "企业名称", width = 15) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroupStatistics.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroupStatistics.java index ef5de93d..dd9de753 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroupStatistics.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroupStatistics.java @@ -3,15 +3,28 @@ package com.jero.project.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import io.swagger.annotations.ApiModelProperty; +import lombok.Data; /** * @author zql * @date 2021/9/13 10:45 */ +@Data public class PayWorkingGroupStatistics { - /**主键*/ - @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "主键") private String id; + @ApiModelProperty(value = "工作组") + private String workGroup; + + @ApiModelProperty(value = "应收总金额") + private String allMoney; + + @ApiModelProperty(value = "实收总金额") + private String comeAllMoney; + + @ApiModelProperty(value = "完收完成率") + private String moneyRate; + } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupMapper.xml index 756d96af..c0f1cf97 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupMapper.xml +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupMapper.xml @@ -101,4 +101,22 @@ FROM pay_working_group WHERE id NOT IN (SELECT working_group_id FROM pay_working_group_subitem WHERE charge_company_id=#{companyId}) + \ No newline at end of file From dd6989339556e92b6b82e8bedec8b27464f8d237 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= <18222067976@163.com> Date: Mon, 13 Sep 2021 14:58:22 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E6=89=93=E5=8C=85=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/PayIncomeContractServiceImpl.java | 38 ++++++++++++------- .../xml/PayPackCompanyProjectMapper.xml | 1 + .../PayPackCompanyProjectServiceImpl.java | 9 ++--- .../jero/project/entity/PayCommonProject.java | 1 - 4 files changed, 30 insertions(+), 19 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PayIncomeContractServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PayIncomeContractServiceImpl.java index ef08ee6c..1c71a42a 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PayIncomeContractServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PayIncomeContractServiceImpl.java @@ -439,7 +439,6 @@ public class PayIncomeContractServiceImpl extends ServiceImpl queryPayPackCompanyProject = new LambdaQueryWrapper<>(); queryPayPackCompanyProject.eq(PayPackCompanyProject::getProjectId,payCommonProject.getId()); + queryPayPackCompanyProject.eq(PayPackCompanyProject::getCome,PayIncomeContractCommon.COME1); List listPayPackCompanyProject = payPackCompanyProjectService.list(queryPayPackCompanyProject); - // todo 如果在打包企业中&& 来源为支出合同，取消打包,变更打包企业金额 否则不进行操作 - if(!CollectionUtils.isEmpty(listPayPackCompanyProject) && Objects.equals(listPayPackCompanyProject.get(0).getCome(),PayIncomeContractCommon.COME1)){ - payPackCompanyService.update(); + // 存在数据，取消打包,变更项目打包状态， 否则不进行操作 + if(!CollectionUtils.isEmpty(listPayPackCompanyProject)){ payPackCompanyProjectService.removeById(listPayPackCompanyProject.get(0).getId()); LambdaUpdateWrapper updatePayCommonProject = new LambdaUpdateWrapper<>(); updatePayCommonProject.set(PayCommonProject::getUpdateBy,sysUser.getUsername()); @@ -525,13 +525,25 @@ public class PayIncomeContractServiceImpl extends ServiceImpl updatePayWorkingGroupSubItem = new LambdaUpdateWrapper<>(); - updatePayWorkingGroupSubItem.set(PayWorkingGroupSubItem::getUpdateBy,sysUser.getUsername()); - updatePayWorkingGroupSubItem.set(PayWorkingGroupSubItem::getUpdateTime,new Date()); - updatePayWorkingGroupSubItem.set(PayWorkingGroupSubItem::getPack,PayIncomeContractCommon.PACK0); - updatePayWorkingGroupSubItem.eq(PayWorkingGroupSubItem::getId,listPayWorkingGroupSubItem.getId()); - payWorkingGroupSubItemService.update(updatePayWorkingGroupSubItem); + + // 合同为打包 + if(Objects.equals(payIncomeContract.getPack(),PayIncomeContractCommon.PACK1)){ + // 查询打包项目来源是否为收入合同 + LambdaQueryWrapper queryPayPackCompanyProject = new LambdaQueryWrapper<>(); + queryPayPackCompanyProject.eq(PayPackCompanyProject::getProjectId,listPayWorkingGroupSubItem.getId()); + queryPayPackCompanyProject.eq(PayPackCompanyProject::getCome,PayIncomeContractCommon.COME1); + List listPayPackCompanyProject = payPackCompanyProjectService.list(queryPayPackCompanyProject); + // 存在数据，取消打包,变更项目打包状态， 否则不进行操作 + if(!CollectionUtils.isEmpty(listPayPackCompanyProject)){ + payPackCompanyProjectService.removeById(listPayPackCompanyProject.get(0).getId()); + LambdaUpdateWrapper updatePayWorkingGroupSubItem = new LambdaUpdateWrapper<>(); + updatePayWorkingGroupSubItem.set(PayWorkingGroupSubItem::getUpdateBy,sysUser.getUsername()); + updatePayWorkingGroupSubItem.set(PayWorkingGroupSubItem::getUpdateTime,new Date()); + updatePayWorkingGroupSubItem.set(PayWorkingGroupSubItem::getPack,PayIncomeContractCommon.PACK0); + updatePayWorkingGroupSubItem.eq(PayWorkingGroupSubItem::getId,listPayWorkingGroupSubItem.getId()); + payWorkingGroupSubItemService.update(updatePayWorkingGroupSubItem); + } + } break; case PayIncomeContractCommon.PROJECT_TYPE3: // todo 会议项目 diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/pack/mapper/xml/PayPackCompanyProjectMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/pack/mapper/xml/PayPackCompanyProjectMapper.xml index d23ff39b..559dcad8 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/pack/mapper/xml/PayPackCompanyProjectMapper.xml +++ b/jero-boot-incoming-payment/src/main/java/com/jero/pack/mapper/xml/PayPackCompanyProjectMapper.xml @@ -89,6 +89,7 @@ AND DATE_FORMAT(ppr.payment_date,'%Y') = #{paymentDate} + WHERE project.id IS NOT NULL AND project.id != '' GROUP BY ppcp.project_id ORDER BY ppcp.create_time desc