From 92f04a3a69fb625fad8ba0d85eb7b719c9132f99 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, 6 Sep 2021 18:05:57 +0800 Subject: [PATCH] =?UTF-8?q?=E6=94=B6=E5=85=A5=E5=90=88=E5=90=8C-=E5=B7=A5?= =?UTF-8?q?=E4=BD=9C=E7=BB=84=E5=88=97=E8=A1=A8=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/PayWorkingGroupController.java | 107 ++++++++++-------- .../project/mapper/PayWorkingGroupMapper.java | 2 +- .../mapper/xml/PayWorkingGroupMapper.xml | 5 +- .../service/IPayWorkingGroupService.java | 2 +- .../impl/PayWorkingGroupServiceImpl.java | 4 +- .../src/main/resources/application-dev.yml | 16 +-- 6 files changed, 78 insertions(+), 58 deletions(-) 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 eb3ba543..8984a375 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 @@ -73,37 +73,7 @@ public class PayWorkingGroupController extends JeroController listPayWorkingGroupVO = pageList.getRecords(); if(!CollectionUtils.isEmpty(listPayWorkingGroupVO)){ - listPayWorkingGroupVO.forEach(p->{ - LambdaQueryWrapper query = new LambdaQueryWrapper<>(); - query.eq(PayWorkingGroupSubItem::getWorkingGroupId,p.getId()); - List listPayWorkingGroupSubItem = payWorkingGroupSubItemService.list(query); - if(!CollectionUtils.isEmpty(listPayWorkingGroupSubItem)){ - PayWorkingGroupPayment payWorkingGroupPayment = new PayWorkingGroupPayment(); - // 已付全款 - List listAllPayment = listPayWorkingGroupSubItem.stream() - .filter(p1->(Objects.isNull(p1.getPaidAmount()) ? 0 : p1.getPaidAmount()) - == (Objects.isNull(p1.getReceivableAmount()) ? 0 : p1.getReceivableAmount())).collect(Collectors.toList()); - payWorkingGroupPayment.setAllPayment(listAllPayment.size()); - // 部分付款 - List listPartPayment = listPayWorkingGroupSubItem.stream() - .filter(p1->(Objects.isNull(p1.getPaidAmount()) ? 0 : p1.getPaidAmount()) - < (Objects.isNull(p1.getReceivableAmount()) ? 0 : p1.getReceivableAmount())).collect(Collectors.toList()); - payWorkingGroupPayment.setPartPayment(listPartPayment.size()); - // 未付款 - List listNotPayment = listPayWorkingGroupSubItem.stream() - .filter(p1->(Objects.isNull(p1.getPaidAmount()) ? 0 : p1.getPaidAmount()) == 0 - && (Objects.isNull(p1.getReceivableAmount()) ? 0 : p1.getReceivableAmount()) != 0 ) - .collect(Collectors.toList()); - payWorkingGroupPayment.setNotPayment(listNotPayment.size()); - p.setObj(payWorkingGroupPayment); - }else{ - PayWorkingGroupPayment payWorkingGroupPayment = new PayWorkingGroupPayment(); - payWorkingGroupPayment.setAllPayment(0); - payWorkingGroupPayment.setPartPayment(0); - payWorkingGroupPayment.setNotPayment(0); - p.setObj(payWorkingGroupPayment); - } - }); + setPayWorkingGroupSubItem(listPayWorkingGroupVO); pageList.setRecords(listPayWorkingGroupVO); } } @@ -126,23 +96,70 @@ public class PayWorkingGroupController extends JeroController queryListByCompany(@RequestParam(name = "companyId") String companyId, - @RequestParam(name = "year",required = false) String year) { - if(StringUtils.isBlank(companyId)){ + /** + * 根据成员单位列表查询 + * + * @param companyId 企业id + * @param workingGroupProject 工作组项目 + * @param year 运行年份 + * @return + */ + @AutoLog(value = "工作组项目-根据成员单位列表查询") + @ApiOperation(value="工作组项目-根据成员单位列表查询", notes="工作组项目-根据单位列表查询") + @GetMapping(value = "/queryListByCompany") + public Result queryListByCompany(@RequestParam(name = "companyId") String companyId, + @RequestParam(name = "workingGroupProject") String workingGroupProject, + @RequestParam(name = "year",required = false) String year) { + if(StringUtils.isBlank(companyId)){ return Result.error("企业id不能为空！"); } - List list = payWorkingGroupService.queryListByCompany(companyId,year); + List list = payWorkingGroupService.queryListByCompany(companyId,workingGroupProject,year); + if(CollectionUtils.isEmpty(list)){ + setPayWorkingGroupSubItem(list); + } return Result.OK(list); - } + } + /** + * @Description 获取进度 + * @Author lqt + * @Date 2021/9/6 + * @Param list 集合 + * @Return + * @Exception + */ + private void setPayWorkingGroupSubItem(List list){ + list.forEach(p->{ + LambdaQueryWrapper query = new LambdaQueryWrapper<>(); + query.eq(PayWorkingGroupSubItem::getWorkingGroupId,p.getId()); + List listPayWorkingGroupSubItem = payWorkingGroupSubItemService.list(query); + if(!CollectionUtils.isEmpty(listPayWorkingGroupSubItem)){ + PayWorkingGroupPayment payWorkingGroupPayment = new PayWorkingGroupPayment(); + // 已付全款 + List listAllPayment = listPayWorkingGroupSubItem.stream() + .filter(p1->(Objects.isNull(p1.getPaidAmount()) ? 0 : p1.getPaidAmount()) + == (Objects.isNull(p1.getReceivableAmount()) ? 0 : p1.getReceivableAmount())).collect(Collectors.toList()); + payWorkingGroupPayment.setAllPayment(listAllPayment.size()); + // 部分付款 + List listPartPayment = listPayWorkingGroupSubItem.stream() + .filter(p1->(Objects.isNull(p1.getPaidAmount()) ? 0 : p1.getPaidAmount()) + < (Objects.isNull(p1.getReceivableAmount()) ? 0 : p1.getReceivableAmount())).collect(Collectors.toList()); + payWorkingGroupPayment.setPartPayment(listPartPayment.size()); + // 未付款 + List listNotPayment = listPayWorkingGroupSubItem.stream() + .filter(p1->(Objects.isNull(p1.getPaidAmount()) ? 0 : p1.getPaidAmount()) == 0 + && (Objects.isNull(p1.getReceivableAmount()) ? 0 : p1.getReceivableAmount()) != 0 ) + .collect(Collectors.toList()); + payWorkingGroupPayment.setNotPayment(listNotPayment.size()); + p.setObj(payWorkingGroupPayment); + }else{ + PayWorkingGroupPayment payWorkingGroupPayment = new PayWorkingGroupPayment(); + payWorkingGroupPayment.setAllPayment(0); + payWorkingGroupPayment.setPartPayment(0); + payWorkingGroupPayment.setNotPayment(0); + p.setObj(payWorkingGroupPayment); + } + }); + } /** * 添加 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 d3086caf..f32c447f 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 @@ -34,6 +34,6 @@ public interface PayWorkingGroupMapper extends BaseMapper { * @Return * @Exception */ - List queryListByCompany(@Param("companyId") String companyId,@Param("year") String year); + List queryListByCompany(@Param("companyId") String companyId,@Param("workingGroupProject") String workingGroupProject, @Param("year") String year); } 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 ca17e2fb..6c124113 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 @@ -38,7 +38,7 @@ ORDER BY create_time DESC - SELECT pwg.id, pwg.working_group_project AS workingGroupProject, @@ -64,6 +64,9 @@ FROM pay_working_group pwg LEFT JOIN pay_working_group_subitem pwgs ON pwg.id = pwgs.working_group_id + + AND pwg.working_group_project = #{workingGroupProject} + AND pwgs.charge_company_id = #{companyId} 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 8a6b9acc..f3e9c11a 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 @@ -32,5 +32,5 @@ public interface IPayWorkingGroupService extends IService { * @Return * @Exception */ - List queryListByCompany(String companyId,String year); + List queryListByCompany(String companyId,String workingGroupProject,String year); } 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 9a510650..48b74e28 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 @@ -31,7 +31,7 @@ public class PayWorkingGroupServiceImpl extends ServiceImpl queryListByCompany(String companyId, String year) { - return payWorkingGroupMapper.queryListByCompany(companyId,year); + public List queryListByCompany(String companyId,String workingGroupProject, String year) { + return payWorkingGroupMapper.queryListByCompany(companyId,workingGroupProject,year); } } diff --git a/jero-boot-single-startup/src/main/resources/application-dev.yml b/jero-boot-single-startup/src/main/resources/application-dev.yml index 2d96129f..80da42da 100644 --- a/jero-boot-single-startup/src/main/resources/application-dev.yml +++ b/jero-boot-single-startup/src/main/resources/application-dev.yml @@ -40,9 +40,9 @@ spring: job-store-type: jdbc initialize-schema: embedded #设置自动启动，默认为 true - auto-startup: true + auto-startup: false #启动时更新己存在的Job - overwrite-existing-jobs: true + overwrite-existing-jobs: false properties: org: quartz: @@ -137,14 +137,14 @@ spring: driver-class-name: com.p6spy.engine.spy.P6SpyDriver # 多数据源配置 #multi-datasource1: - #url: jdbc:mysql://localhost:3306/jero-boot2?useUnicode=true&characterEncoding=utf8&autoReconnect=true&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai - #username: root - #password: root - #driver-class-name: com.mysql.cj.jdbc.Driver +# url: jdbc:mysql://localhost:3306/income_payments?useUnicode=true&characterEncoding=utf8&autoReconnect=true&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai +# username: root +# password: root +# driver-class-name: com.mysql.cj.jdbc.Driver #redis 配置 redis: database: 14 - host: 192.168.18.254 + host: localhost lettuce: pool: max-active: 8 #最大连接数据库连接数,设 0 为没有限制 @@ -152,7 +152,7 @@ spring: max-wait: -1ms #最大建立连接等待时间。如果超过此时间将接到异常。设为-1表示无限制。 min-idle: 0 #最小等待连接中的数量,设 0 为没有限制 shutdown-timeout: 100ms - password: hzwlsoft.com + password: port: 6379 #mybatis plus 设置