用款列表增加查询条件

zjugis-business/src/main/java/com/zjugis/business/flow/usemoney/controller/vo/UseMoneyPageReqVO.java

@@ -65,4 +65,16 @@ public class UseMoneyPageReqVO extends PageParam {
 
     @Schema(description = "人员id")
     private List<String> userList;
+
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    private LocalDate finishOn;
+
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    private LocalDate finishOff;
+
+    @Schema(description = "项目id")
+    private String project;
+
+    @Schema(description = "id")
+    private List<String> ids;
 }

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

@@ -32,9 +32,12 @@ 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())
+                .gt(pageReqVO.getFinishOn()!=null,UseMoneyDO::getFlowFinishtime, pageReqVO.getFinishOn())
+                .lt(pageReqVO.getFinishOff()!=null,UseMoneyDO::getFlowFinishtime, pageReqVO.getFinishOff())
                 .orderByDesc(UseMoneyDO::getApplyTime));
     }
 
@@ -82,4 +85,6 @@ public interface UseMoneyDao extends BaseMapperX<UseMoneyDO> {
     Integer getCount(@Param("params") UseMoneyDO entity);
 
     UseMoneyOverviewVO getUseMoneyOverviewHx(@Param("params")UseMoneyPageReqVO pageReqVO);
+
+    List<String> getAllIdByProject(String project);
 }

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

@@ -1,6 +1,7 @@
 package com.zjugis.business.flow.usemoney.service;
 
 import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson2.JSON;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.zjugis.business.bean.entity.ContractSub;
@@ -155,6 +156,10 @@ public class UseMoneyServiceImpl implements UseMoneyService {
             pageReqVO.setUserList(projectId);
             pageReqVO.setDeptId(null);
         }
+        if(StrUtil.isNotEmpty(pageReqVO.getProject())){
+           List<String> ids=useMoneyDao.getAllIdByProject(pageReqVO.getProject());
+           pageReqVO.setIds(ids);
+        }
         PageResult<UseMoneyDO> pageResult = useMoneyDao.getUseMoneyPage(pageReqVO);
         PageResult<UseMoneyRespVO> useMoneyRespVOPageResult = getUseMoneyRespVOPageResult(pageResult);
         return useMoneyRespVOPageResult;

zjugis-business/src/main/resources/mapper/oracle/UseMoneyMapper.xml

@@ -211,4 +211,14 @@
 <!--        </where>-->
 <!--        ORDER BY T.APPLY_TIME DESC NULLS LAST-->
 <!--    </select>-->
+    <select id="getAllIdByProject" resultType="java.lang.String">
+        SELECT T1.id
+        from
+        WF_USE_MONEY T1
+        LEFT JOIN WF_USE_MONEY_DETAIL T2 ON T2.USE_MONEY_ID = T1.ID
+        <where>
+            T1.ISVALID = 1 and T1.FLOW_STATUS=90 AND T2.ISVALID = 1
+            and (t1.PROJECT_ID=#{project} or t2.PROJECT_ID=#{project})
+        </where>
+    </select>
 </mapper>