LK/income_payments_management
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改#41222

Browse Source
This commit is contained in:
梁琦涛
2021-10-22 10:34:41 +08:00
parent 475b430d44
commit 857be31bd6
1 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot-incoming-payment/src/main/java/com/jero/pack/controller/PayPackCompanyController.java
+2 -6
View File
@@ -10,14 +10,11 @@ import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
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.common.system.vo.LoginUser;
import com.jero.common.util.PasswordUtil;
import com.jero.common.util.ValidUtil;
import com.jero.common.util.oConvertUtils;
@@ -33,7 +30,6 @@ import com.jero.temporary.service.IPayContactsManagementTemporaryService;
import lombok.extern.slf4j.Slf4j;
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.jeecgframework.poi.excel.def.NormalExcelConstants;
import org.jeecgframework.poi.excel.entity.ExportParams;
@@ -98,7 +94,7 @@ public class PayPackCompanyController extends JeroController<PayPackCompany, IPa
if(!CollectionUtils.isEmpty(listPayCommonProject)){
List<PayCommonProject> listCount = listPayCommonProject.stream().filter(item->Objects.equals(p.getId(),item.getId())).collect(Collectors.toList());
if(!CollectionUtils.isEmpty(listCount)){
p.setReceiptExpense(listPayCommonProject.get(0).getPaidAmount());
p.setReceiptExpense(listCount.get(0).getPaidAmount());
}
}
if(Objects.isNull(p.getReceiptExpense())){
@@ -287,7 +283,7 @@ public class PayPackCompanyController extends JeroController<PayPackCompany, IPa
if (!CollectionUtils.isEmpty(listPayCommonProject)) {
List<PayCommonProject> listCount = listPayCommonProject.stream().filter(item -> Objects.equals(p.getId(), item.getId())).collect(Collectors.toList());
if (!CollectionUtils.isEmpty(listCount)) {
p.setReceiptExpense(listPayCommonProject.get(0).getPaidAmount());
p.setReceiptExpense(listCount.get(0).getPaidAmount());
}
}
if (Objects.isNull(p.getReceiptExpense())) {