From 8876aec0c1063c0c7d601847783518a28ff43e5a 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, 27 Sep 2021 14:45:47 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E7=BB=84=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/PayWorkingGroupController.java | 16 ++++++++-------- .../PayWorkingGroupSubItemController.java | 18 ++++++------------ 2 files changed, 14 insertions(+), 20 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 1a6e6077..60d09b90 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 @@ -3,6 +3,7 @@ package com.jero.project.controller; import java.math.BigDecimal; import java.util.*; import java.util.stream.Collectors; +import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -55,13 +56,13 @@ import io.swagger.annotations.ApiOperation; @RequestMapping("/project/payWorkingGroup") @Slf4j public class PayWorkingGroupController extends JeroController { - @Autowired + @Resource private IPayWorkingGroupService payWorkingGroupService; - @Autowired + @Resource private IPayWorkingGroupSubItemService payWorkingGroupSubItemService; - @Autowired + @Resource private IPayPackCompanyProjectService payPackCompanyProjectService; - @Autowired + @Resource private IPayIncomeContractService payIncomeContractService; /** @@ -221,14 +222,13 @@ public class PayWorkingGroupController extends JeroController listPartPayment = listPayWorkingGroupSubItem.stream() .filter(p1-> (Objects.isNull(p1.getPaidAmount()) ? new BigDecimal("0.00") : p1.getPaidAmount()). - compareTo(Objects.isNull(p1.getReceivableAmount()) ? new BigDecimal("0.00") : p1.getReceivableAmount()) < 0).collect(Collectors.toList()); + compareTo(Objects.isNull(p1.getReceivableAmount()) ? new BigDecimal("0.00") : p1.getReceivableAmount()) < 0 + && (Objects.isNull(p1.getPaidAmount()) ? new BigDecimal("0.00") : p1.getPaidAmount()).compareTo(new BigDecimal("0.00")) > 0).collect(Collectors.toList()); payWorkingGroupPayment.setPartPayment(listPartPayment.size()); // 未付款 List listNotPayment = listPayWorkingGroupSubItem.stream() .filter(p1->(Objects.isNull(p1.getPaidAmount()) ? new BigDecimal("0.00") : p1.getPaidAmount()).compareTo(BigDecimal.ZERO) == 0 - && (Objects.isNull(p1.getReceivableAmount()) ? new BigDecimal("0.00") : p1.getReceivableAmount()).compareTo(BigDecimal.ZERO) > 0 - && (Objects.isNull(p1.getReceivableAmount()) ? new BigDecimal("0.00") : p1.getReceivableAmount()).compareTo( - Objects.isNull(p1.getReceivableAmount()) ? new BigDecimal("0.00") : p1.getReceivableAmount()) < 0 ) + && (Objects.isNull(p1.getReceivableAmount()) ? new BigDecimal("0.00") : p1.getReceivableAmount()).compareTo(BigDecimal.ZERO) > 0) .collect(Collectors.toList()); payWorkingGroupPayment.setNotPayment(listNotPayment.size()); p.setObj(payWorkingGroupPayment); diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupSubItemController.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupSubItemController.java index 9e40b79f..c06e8659 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupSubItemController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupSubItemController.java @@ -2,18 +2,15 @@ package com.jero.project.controller; import java.util.*; import java.util.stream.Collectors; +import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.jero.common.api.dto.message.BusTemplateMessageDTO; import com.jero.common.api.vo.Result; import com.jero.common.aspect.annotation.AutoLog; -import com.jero.common.common.ProjectCommon; import com.jero.common.dto.SendMessageDTO; import com.jero.common.enums.CompanyMessageEnums; -import com.jero.common.enums.ManagementMessageEnums; import com.jero.common.service.ProjectDetailService; import com.jero.common.service.SendMessageService; -import com.jero.common.system.api.ISysBaseAPI; import com.jero.common.system.base.controller.JeroController; import com.jero.common.system.vo.LoginUser; import com.jero.common.util.PasswordUtil; @@ -33,7 +30,6 @@ import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.apache.shiro.SecurityUtils; import org.apache.shiro.authz.annotation.RequiresPermissions; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import org.springframework.web.servlet.ModelAndView; import io.swagger.annotations.Api; @@ -49,17 +45,15 @@ import io.swagger.annotations.ApiOperation; @RequestMapping("/project/payWorkingGroupSubitem") @Slf4j public class PayWorkingGroupSubItemController extends JeroController { - @Autowired + @Resource private IPayWorkingGroupSubItemService payWorkingGroupSubItemService; - @Autowired + @Resource private ProjectDetailService projectDetailService; - @Autowired + @Resource private IPayContactsManagementTemporaryService payContactsManagementTemporaryService; - @Autowired + @Resource private IPayWorkingGroupService payWorkingGroupService; - @Autowired - private ISysBaseAPI sysBaseAPI; - @Autowired + @Resource private SendMessageService sendMessageService; /**