Browse Source

用款成本查询问题修改

yewc 1 year ago
parent
commit
9d880b3459

+ 1 - 0
zjugis-business/src/main/java/com/zjugis/business/flow/usemoney/dao/UseMoneyDao.java

@@ -49,6 +49,7 @@ public interface UseMoneyDao extends BaseMapperX<UseMoneyDO> {
                 .likeIfPresent(UseMoneyDO::getUseMoneyNo, pageReqVO.getUseMoneyNo())
                 .inIfPresent(UseMoneyDO::getProjectId, pageReqVO.getProjectId())
                 .inIfPresent(UseMoneyDO::getUserId, pageReqVO.getUserList())
+                .inIfPresent(UseMoneyDO::getId, pageReqVO.getIds())
                 .in(UseMoneyDO::getFlowStatus, FLOW_FINISHED, FLOW_PAYMENT)
                 .gt(pageReqVO.getApplyOn()!=null,UseMoneyDO::getApplyTime, pageReqVO.getApplyOn())
                 .lt(pageReqVO.getApplyOff()!=null,UseMoneyDO::getApplyTime, pageReqVO.getApplyOff())

+ 11 - 0
zjugis-business/src/main/java/com/zjugis/business/flow/usemoney/service/UseMoneyServiceImpl.java

@@ -269,6 +269,17 @@ public class UseMoneyServiceImpl implements UseMoneyService {
             pageReqVO.setUserList(projectId);
             pageReqVO.setDeptId(null);
         }
+        if(pageReqVO.getProject()!=null&&pageReqVO.getProject().size()>0){
+            List<String> ids=new ArrayList<>();
+            for(String id:pageReqVO.getProject()){
+                List<String> ids1=useMoneyDao.getAllIdByProject(id);
+                ids.addAll(ids1);
+            }
+            if(ids.size()==0){
+                ids.add("null");
+            }
+            pageReqVO.setIds(ids);
+        }
         List<UseMoneyDO> useMoneyList = useMoneyDao.getUseMoneyList(pageReqVO);
         UseMoneyOverviewVO result = new UseMoneyOverviewVO();
         double totalAmount = useMoneyList.stream().collect(Collectors.summarizingDouble(value -> value.getTotalAmount().doubleValue())).getSum();