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/data/controller/PayFileDownloadRecordController.java b/jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayFileDownloadRecordController.java index 64887ed7..11c26047 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 @@ -9,6 +9,7 @@ import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -19,10 +20,7 @@ import com.jero.common.api.vo.Result; import com.jero.common.aspect.annotation.AutoLog; import com.jero.common.system.base.controller.JeroController; import com.jero.common.system.query.QueryGenerator; -import com.jero.data.entity.PayCaseCommitteeExcel; -import com.jero.data.entity.PayCaseCommitteeSubitem; -import com.jero.data.entity.PayDistributionRecord; -import com.jero.data.entity.PayFileDownloadRecord; +import com.jero.data.entity.*; import com.jero.data.service.IPayFileDownloadRecordService; import com.jero.modules.oss.entity.OSSFile; import com.jero.modules.oss.service.IOSSFileService; @@ -71,13 +69,36 @@ public class PayFileDownloadRecordController extends JeroController queryPageList(PayFileDownloadRecord payFileDownloadRecord, + public Result queryPageList(payFileDownloadRecordPage payFileDownloadRecord, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, HttpServletRequest req) { - QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(payFileDownloadRecord, req.getParameterMap()); + QueryWrapper queryWrapper = new QueryWrapper<>(); + if (ObjectUtil.isNotEmpty(payFileDownloadRecord.getStartTime()) && ObjectUtil.isNotEmpty(payFileDownloadRecord.getEndTime())) { + queryWrapper.gt("create_time", payFileDownloadRecord.getStartTime()); + queryWrapper.lt("create_time", payFileDownloadRecord.getEndTime()); + + }else if (ObjectUtil.isNotEmpty(payFileDownloadRecord.getStartTime())){ + queryWrapper.gt("create_time", payFileDownloadRecord.getStartTime()); + + }else if (ObjectUtil.isNotEmpty(payFileDownloadRecord.getEndTime())){ + queryWrapper.lt("create_time", payFileDownloadRecord.getEndTime()); + + } + if (ObjectUtil.isNotEmpty(payFileDownloadRecord.getFileName())){ + queryWrapper.like("file_name",payFileDownloadRecord.getFileName()); + } + if (ObjectUtil.isNotEmpty(payFileDownloadRecord.getMeetingName())){ + queryWrapper.like("meeting_name",payFileDownloadRecord.getMeetingName()); + } + if (ObjectUtil.isNotEmpty(payFileDownloadRecord.getDownloadName())){ + queryWrapper.like("download_name",payFileDownloadRecord.getDownloadName()); + } + if (ObjectUtil.isNotEmpty(payFileDownloadRecord.getCompanyName())){ + queryWrapper.like("company_name",payFileDownloadRecord.getCompanyName()); + } queryWrapper.orderByDesc("create_time"); - Page page = new Page(pageNo, pageSize); + Page page = new Page<>(pageNo, pageSize); IPage pageList = payFileDownloadRecordService.page(page, queryWrapper); return Result.OK(pageList); } @@ -92,7 +113,9 @@ 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/data/entity/payFileDownloadRecordPage.java b/jero-boot-incoming-payment/src/main/java/com/jero/data/entity/payFileDownloadRecordPage.java new file mode 100644 index 00000000..dd4f5c1f --- /dev/null +++ b/jero-boot-incoming-payment/src/main/java/com/jero/data/entity/payFileDownloadRecordPage.java @@ -0,0 +1,43 @@ +package com.jero.data.entity; + +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import org.jeecgframework.poi.excel.annotation.Excel; +import org.springframework.format.annotation.DateTimeFormat; + +/** + * @author zql + * @date 2021/9/13 15:21 + */ +@Data +public class payFileDownloadRecordPage { + @Excel(name = "文件名称", width = 15) + @ApiModelProperty(value = "文件名称") + private java.lang.String fileName; + /**企业名称*/ + @Excel(name = "企业名称", width = 15) + @ApiModelProperty(value = "企业名称") + private java.lang.String companyName; + /**下载用户名称*/ + @Excel(name = "下载用户名称", width = 15) + @ApiModelProperty(value = "下载用户名称") + private java.lang.String downloadName; + + @ApiModelProperty(value = "会议名称") + private java.lang.String meetingName; + + /**开始时间*/ + @Excel(name = "开始时间", width = 20, format = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "开始时间") + private java.util.Date startTime; + + /**结束时间*/ + @Excel(name = "结束时间", width = 20, format = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "结束时间") + private java.util.Date endTime; +} 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 + SELECT + id, + working_group_project AS workGroup + FROM pay_working_group + + + AND working_group_project LIKE concat('%',concat(#{payWorkingGroup.workingGroupProject},'%')) + + + AND principal_id_a = #{payWorkingGroup.principalIdA} + + + AND year = #{payWorkingGroup.year} + + + ORDER BY create_time DESC + \ No newline at end of file diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayCommonProjectServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayCommonProjectServiceImpl.java index ff0a8fa9..86dee4c4 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayCommonProjectServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayCommonProjectServiceImpl.java @@ -96,6 +96,7 @@ public class PayCommonProjectServiceImpl extends ServiceImpl update = new LambdaUpdateWrapper<>();