From 2a6eb66633b500683687c5fda613b40d97e67782 Mon Sep 17 00:00:00 2001 From: lijiarao Date: Mon, 13 Sep 2021 10:34:20 +0800 Subject: [PATCH 1/3] =?UTF-8?q?fix=20=E5=8F=82=E4=BC=9A=E4=BA=BA=E6=B2=A1?= =?UTF-8?q?=E6=9C=89=E8=A1=8C=E7=A8=8B=E4=BF=A1=E6=81=AF=E5=92=8C=E9=82=AE?= =?UTF-8?q?=E5=AF=84=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/PayMeetingSituationServiceImpl.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java index 51d550b9..e5fc4f45 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java @@ -269,11 +269,15 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl Date: Mon, 13 Sep 2021 11:34:12 +0800 Subject: [PATCH 2/3] =?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 --- .../controller/PayPackCompanyController.java | 17 +++++- .../pack/mapper/PayPackCompanyMapper.java | 12 ++++ .../pack/mapper/xml/PayPackCompanyMapper.xml | 59 ++++++++++++++++++- .../pack/service/IPayPackCompanyService.java | 11 ++++ .../impl/PayPackCompanyServiceImpl.java | 12 +++- 5 files changed, 108 insertions(+), 3 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/pack/controller/PayPackCompanyController.java b/jero-boot-incoming-payment/src/main/java/com/jero/pack/controller/PayPackCompanyController.java index ffd161e9..2449ba65 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/pack/controller/PayPackCompanyController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/pack/controller/PayPackCompanyController.java @@ -1,5 +1,6 @@ package com.jero.pack.controller; +import java.math.BigDecimal; import java.util.Arrays; import java.util.List; import java.util.Objects; @@ -22,6 +23,8 @@ import com.jero.pack.entity.PayPackCompany; import com.jero.pack.entity.PayPackCompanyProject; import com.jero.pack.service.IPayPackCompanyProjectService; import com.jero.pack.service.IPayPackCompanyService; +import com.jero.pack.vo.PayPackCompanyProjectInput; +import com.jero.project.entity.PayCommonProject; import com.jero.temporary.entity.PayContactsManagementTemporary; import com.jero.temporary.service.IPayContactsManagementTemporaryService; import lombok.extern.slf4j.Slf4j; @@ -73,6 +76,19 @@ public class PayPackCompanyController extends JeroController list = pageList.getRecords(); list.forEach(p->{ + // 获取 打包费用，实际到账金额 + PayPackCompanyProjectInput input = new PayPackCompanyProjectInput(); + input.setCompanyId(p.getCompanyId()); + input.setPackId(p.getId()); + PayCommonProject payCommonProject = payPackCompanyService.queryPackListCount(input); + if(!Objects.isNull(payCommonProject)){ + payCommonProject.setReceivableAmount(payCommonProject.getReceivableAmount()); + payCommonProject.setPaidAmount(payCommonProject.getPaidAmount()); + }else{ + payCommonProject.setReceivableAmount(new BigDecimal("0.00")); + payCommonProject.setPaidAmount(new BigDecimal("0.00")); + } + // todo 获取开票金额 }); } @@ -93,7 +109,6 @@ public class PayPackCompanyController extends JeroController { + /** + * @Description 查询金额 + * @Author lqt + * @Date 2021/9/13 + * @Param + * @Return + * @Exception + */ + PayCommonProject queryPackListCount(PayPackCompanyProjectInput input); + } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/pack/mapper/xml/PayPackCompanyMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/pack/mapper/xml/PayPackCompanyMapper.xml index 80b5849c..e47584a8 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/pack/mapper/xml/PayPackCompanyMapper.xml +++ b/jero-boot-incoming-payment/src/main/java/com/jero/pack/mapper/xml/PayPackCompanyMapper.xml @@ -1,5 +1,62 @@ - + \ No newline at end of file diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/pack/service/IPayPackCompanyService.java b/jero-boot-incoming-payment/src/main/java/com/jero/pack/service/IPayPackCompanyService.java index 04d601a9..6d6210bb 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/pack/service/IPayPackCompanyService.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/pack/service/IPayPackCompanyService.java @@ -2,6 +2,8 @@ package com.jero.pack.service; import com.baomidou.mybatisplus.extension.service.IService; import com.jero.pack.entity.PayPackCompany; +import com.jero.pack.vo.PayPackCompanyProjectInput; +import com.jero.project.entity.PayCommonProject; /** * @Description: pay_pack_company @@ -28,4 +30,13 @@ public interface IPayPackCompanyService extends IService { * @Exception */ void editPayPackCompany(PayPackCompany payPackCompany); + /** + * @Description 查询金额 + * @Author lqt + * @Date 2021/9/13 + * @Param + * @Return + * @Exception + */ + PayCommonProject queryPackListCount(PayPackCompanyProjectInput input); } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/pack/service/impl/PayPackCompanyServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/pack/service/impl/PayPackCompanyServiceImpl.java index fffd4de1..4bfa73be 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/pack/service/impl/PayPackCompanyServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/pack/service/impl/PayPackCompanyServiceImpl.java @@ -7,6 +7,8 @@ import com.jero.common.exception.JeroBootException; import com.jero.pack.entity.PayPackCompany; import com.jero.pack.mapper.PayPackCompanyMapper; import com.jero.pack.service.IPayPackCompanyService; +import com.jero.pack.vo.PayPackCompanyProjectInput; +import com.jero.project.entity.PayCommonProject; import com.jero.project.entity.PayWorkingGroupSubItem; import com.jero.temporary.entity.PayCompanyManagementTemporary; import com.jero.temporary.entity.PayContactsManagementTemporary; @@ -17,6 +19,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import javax.annotation.Resource; import java.util.Arrays; import java.util.Objects; @@ -35,6 +38,8 @@ public class PayPackCompanyServiceImpl extends ServiceImpl Date: Mon, 13 Sep 2021 11:42:36 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E8=B5=84=E6=96=99=E7=BB=B4=E6=8A=A4?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/PayDataFileController.java | 2 +- .../PayFileDownloadRecordController.java | 15 ++++++---- .../controller/PayWorkingGroupController.java | 28 +++++++++++++++++++ .../entity/PayWorkingGroupStatistics.java | 17 +++++++++++ .../project/mapper/PayWorkingGroupMapper.java | 9 ++++++ .../service/IPayWorkingGroupService.java | 10 +++++++ .../impl/PayWorkingGroupServiceImpl.java | 6 ++++ 7 files changed, 81 insertions(+), 6 deletions(-) create mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroupStatistics.java diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayDataFileController.java b/jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayDataFileController.java index 124426bb..bd3cd423 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayDataFileController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayDataFileController.java @@ -544,7 +544,7 @@ public class PayDataFileController extends JeroController queryWrapper = Wrappers.query(); - List list = payFileDownloadRecordService.list(queryWrapper); - // Step.3 AutoPoi 导出Excel + public ModelAndView customExportXlsList(@RequestParam(name="ids",required = true) String ids) { + ArrayList strings = new ArrayList<>(Arrays.asList(ids.split(","))); + LambdaQueryWrapper objectLambdaQueryWrapper = new LambdaQueryWrapper<>(); + objectLambdaQueryWrapper.eq(StringUtils.isNotBlank(ids),PayFileDownloadRecord::getId,strings); + List list = payFileDownloadRecordService.list(objectLambdaQueryWrapper); + // Step.3 AutoPoi 导出Excelaw ModelAndView mv = new ModelAndView(new JeecgEntityExcelView()); mv.addObject(NormalExcelConstants.FILE_NAME, "资料下载记录"); //此处设置的filename无效 ,前端会重更新设置一下 mv.addObject(NormalExcelConstants.CLASS, PayFileDownloadRecord.class); diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupController.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupController.java index 38b567f3..fcd2c58a 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupController.java @@ -94,6 +94,34 @@ public class PayWorkingGroupController extends JeroController list2(PayWorkingGroup payWorkingGroup, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize) { + if(!StringUtils.isBlank(payWorkingGroup.getWorkingGroupProject()) && payWorkingGroup.getWorkingGroupProject().length() > 50){ + return Result.error("工作组项目长度不能大于50个字符"); + } + Page page = new Page(pageNo, pageSize); + IPage pageList = payWorkingGroupService.queryPageListForStatistics(page, payWorkingGroup); + if(!Objects.isNull(pageList)){ + List listPayWorkingGroupVO = pageList.getRecords(); + if(!CollectionUtils.isEmpty(listPayWorkingGroupVO)){ + setPayWorkingGroupSubItem(listPayWorkingGroupVO); + pageList.setRecords(listPayWorkingGroupVO); + } + } + return Result.OK(pageList); + } + /** * 列表查询 * 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 new file mode 100644 index 00000000..ef5de93d --- /dev/null +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroupStatistics.java @@ -0,0 +1,17 @@ +package com.jero.project.entity; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import io.swagger.annotations.ApiModelProperty; + +/** + * @author zql + * @date 2021/9/13 10:45 + */ +public class PayWorkingGroupStatistics { + /**主键*/ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "主键") + private String id; + +} 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 57465ff6..303e2834 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 @@ -47,4 +47,13 @@ public interface PayWorkingGroupMapper extends BaseMapper { */ List queryListByNotCompany(@Param("companyId") String companyId); + /** + * @Description 查询不存在成员单位的列表 + * @Author zqk + * @Date 2021/9/13 + * @Param + * @Return + * @Exception + */ + IPage queryPageListForStatistics(Page page, PayWorkingGroup payWorkingGroup); } 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 a3700bf3..6cfa8f9d 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 @@ -60,4 +60,14 @@ public interface IPayWorkingGroupService extends IService { * @Exception */ void deleteByIds(List ids); + + /** + * @Description 工作组统计查询 + * @Author zql + * @Date 2021/9/13 + * @Param + * @Return + * @Exception + */ + IPage queryPageListForStatistics(Page page, PayWorkingGroup payWorkingGroup); } 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 7af4abf5..dad886c8 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 @@ -84,6 +84,12 @@ public class PayWorkingGroupServiceImpl extends ServiceImpl queryPageListForStatistics(Page page, PayWorkingGroup payWorkingGroup) { + return payWorkingGroupMapper.queryPageListForStatistics(page,payWorkingGroup); + } + /** * @Description 校验是存在关联合同的项目 * @Author lqt