From d85af61932a03bd03663daf9da33177af5824a5c Mon Sep 17 00:00:00 2001
From: jyy <935090232@qq.com>
Date: Tue, 20 Apr 2021 14:09:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/api_score_meger' into api_score_meger
---
zq-erp/src/main/java/com/matrix/system/hive/dao/SysProjUseDao.java | 12 +++++++++++-
1 files changed, 11 insertions(+), 1 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/hive/dao/SysProjUseDao.java b/zq-erp/src/main/java/com/matrix/system/hive/dao/SysProjUseDao.java
index faf7254..cd06925 100644
--- a/zq-erp/src/main/java/com/matrix/system/hive/dao/SysProjUseDao.java
+++ b/zq-erp/src/main/java/com/matrix/system/hive/dao/SysProjUseDao.java
@@ -1,6 +1,7 @@
package com.matrix.system.hive.dao;
import com.matrix.system.hive.bean.SysProjUse;
+import com.matrix.system.hive.bean.SysProjUseFlow;
import org.apache.ibatis.annotations.Param;
import com.matrix.core.pojo.PaginationVO;
@@ -18,7 +19,9 @@
public interface SysProjUseDao{
public int insert(SysProjUse sysProjUse);
-
+
+ public int insertFlow(SysProjUseFlow sysProjUseFlow);
+
public int update(SysProjUse sysProjUse);
/**
* 批量修改余次信息
@@ -37,6 +40,7 @@
public List<SysProjUse> selectByModel(@Param("record") SysProjUse sysProjUse);
+ public List<SysProjUse> selectFlowByProjUseId(Long projUseId);
public int selectTotalRecord(@Param("record") SysProjUse sysProjUse);
@@ -124,4 +128,10 @@
public int updateTcStatus(@Param("id") Long id, @Param("status") String status);
List<SysProjUse> selectHasValidProjUse();
+
+ List<SysProjUseFlow> selectProjUseFlow(@Param("record") SysProjUseFlow projUseFlow, @Param("pageVo")PaginationVO pageVo);
+
+ Integer selectProjUseFlowTotal(@Param("record") SysProjUseFlow projUseFlow);
+
+ List<SysProjUse> selectTaoCanListWithProj(@Param("record") SysProjUse sysProjUse);
}
\ No newline at end of file
--
Gitblit v1.9.1