部门用款查询bug修改

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

@@ -53,7 +53,7 @@ public interface UseMoneyDao extends BaseMapperX<UseMoneyDO> {
                 .orderByDesc(UseMoneyDO::getApplyTime));
     }
 
-    default PageResult<UseMoneyDO> getUseMoneyDeptPage(UseMoneyPageReqVO pageReqVO, List<String> projectIds, List<String> deptIds, List<String> ids) {
+    default PageResult<UseMoneyDO> getUseMoneyDeptPage(UseMoneyPageReqVO pageReqVO, List<String> projectIds, List<String> deptIds) {
         return selectPage(pageReqVO, new LambdaQueryWrapperX<UseMoneyDO>()
                 .eqIfPresent(UseMoneyDO::getUserId, pageReqVO.getUserId())
                 .eqIfPresent(UseMoneyDO::getTotalAmount, pageReqVO.getTotalAmount())
@@ -64,12 +64,13 @@ public interface UseMoneyDao extends BaseMapperX<UseMoneyDO> {
                 .and(wq -> wq.in(UseMoneyDO::getDeptId, deptIds)
                         .or()
                         .in(projectIds.size()>0,UseMoneyDO::getProjectId, projectIds)
-                        .or()
-                        .in(ids.size()>0,UseMoneyDO::getId, ids))
+//                        .or()
+//                        .in(ids.size()>0,UseMoneyDO::getId, ids)
+                )
                 .orderByDesc(UseMoneyDO::getApplyTime));
     }
 
-    default List<UseMoneyDO> getUseMoneyDeptList(UseMoneyPageReqVO pageReqVO, List<String> projectIds, List<String> deptIds, List<String> ids) {
+    default List<UseMoneyDO> getUseMoneyDeptList(UseMoneyPageReqVO pageReqVO, List<String> projectIds, List<String> deptIds) {
         return selectList(new LambdaQueryWrapperX<UseMoneyDO>()
                 .eqIfPresent(UseMoneyDO::getUserId, pageReqVO.getUserId())
                 .eqIfPresent(UseMoneyDO::getTotalAmount, pageReqVO.getTotalAmount())
@@ -78,8 +79,9 @@ public interface UseMoneyDao extends BaseMapperX<UseMoneyDO> {
                 .and(wq -> wq.in(UseMoneyDO::getDeptId, deptIds)
                         .or()
                         .in(projectIds.size()>0,UseMoneyDO::getProjectId, projectIds)
-                        .or()
-                        .in(ids.size()>0,UseMoneyDO::getId, ids))
+//                        .or()
+//                        .in(ids.size()>0,UseMoneyDO::getId, ids)
+                )
                 .orderByDesc(UseMoneyDO::getApplyTime));
     }
 

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

@@ -193,8 +193,8 @@ public class UseMoneyServiceImpl implements UseMoneyService {
         Set<String> dept=commonService.getDeptCondition(pageReqVO.getDeptId());
         List<String> stringList = Arrays.asList(dept.toArray(new String[0]));
         //如果是代码，详情中有该部门的也要查询出来
-        List<String> ids=useMoneyDetailService.getListByDeptId(deptProjectIds,stringList);
-        PageResult<UseMoneyDO> pageResult = useMoneyDao.getUseMoneyDeptPage(pageReqVO, deptProjectIds,stringList,ids);
+        //List<String> ids=useMoneyDetailService.getListByDeptId(deptProjectIds,stringList);
+        PageResult<UseMoneyDO> pageResult = useMoneyDao.getUseMoneyDeptPage(pageReqVO, deptProjectIds,stringList);
         PageResult<UseMoneyRespVO> useMoneyRespVOPageResult = getUseMoneyRespVOPageResult(pageResult);
         return useMoneyRespVOPageResult;
     }
@@ -335,8 +335,8 @@ public class UseMoneyServiceImpl implements UseMoneyService {
         Set<String> dept=commonService.getDeptCondition(pageReqVO.getDeptId());
         List<String> stringList = Arrays.asList(dept.toArray(new String[0]));
         //如果是代码，详情中有该部门的也要查询出来
-        List<String> ids=useMoneyDetailService.getListByDeptId(deptProjectIds,stringList);
-        List<UseMoneyDO> useMoneyDeptList = useMoneyDao.getUseMoneyDeptList(pageReqVO, deptProjectIds,stringList,ids);
+       // List<String> ids=useMoneyDetailService.getListByDeptId(deptProjectIds,stringList);
+        List<UseMoneyDO> useMoneyDeptList = useMoneyDao.getUseMoneyDeptList(pageReqVO, deptProjectIds,stringList);
         UseMoneyOverviewVO result = new UseMoneyOverviewVO();
         double totalAmount = useMoneyDeptList.stream().collect(Collectors.summarizingDouble(value -> value.getTotalAmount().doubleValue())).getSum();
         double totalUseAmount = useMoneyDeptList.stream().filter(useMoneyDO -> useMoneyDO.getFlowStatus() == FLOW_FINISHED).collect(Collectors.summarizingDouble(value -> value.getTotalAmount().doubleValue())).getSum();