From c87738a78f57e6f68a0111d68ef3748b29dc1eda Mon Sep 17 00:00:00 2001 From: 李宇 <986321569@qq.com> Date: 星期三, 23 六月 2021 12:21:59 +0800 Subject: [PATCH] 修改试剂排序 --- src/main/java/com/nanometer/smartlab/service/OpeUseFlowService.java | 18 +++++++++++++++--- 1 files changed, 15 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/nanometer/smartlab/service/OpeUseFlowService.java b/src/main/java/com/nanometer/smartlab/service/OpeUseFlowService.java index 8c8242d..c030f9d 100644 --- a/src/main/java/com/nanometer/smartlab/service/OpeUseFlowService.java +++ b/src/main/java/com/nanometer/smartlab/service/OpeUseFlowService.java @@ -3,7 +3,7 @@ import com.nanometer.smartlab.entity.OpeApplyReserve; import com.nanometer.smartlab.entity.OpeUseFlow; import com.nanometer.smartlab.entity.OpeWarehouseReserve; -import com.nanometer.smartlab.entity.SysReagent; +import com.nanometer.smartlab.entity.dto.PersonUseDetail; import java.text.ParseException; import java.util.Date; @@ -23,10 +23,10 @@ int getOpeUseFlowTotalCount(String reagentId, String reagentCode, Integer status, String userId); - List<OpeUseFlow> getOpeUseFlowListByName(String houseName,String reagentId, String reagentCode, Integer status, String userId, Date startDate,Date endDate, + List<OpeUseFlow> getOpeUseFlowListByName(String houseName,String reagentId, String reagentCode,String containerCode, Integer status, String userId, Date startDate,Date endDate, Integer first, Integer pageSize); - int getOpeUseFlowTotalCountByName(String houseName, String reagentId, String reagentCode, Integer status, String userId, Date startDate,Date endDate); + int getOpeUseFlowTotalCountByName(String houseName, String reagentId, String reagentCode,String containerCode, Integer status, String userId, Date startDate,Date endDate); boolean update(OpeUseFlow opeUseFlow); @@ -47,4 +47,16 @@ Map<String,String> getApplyUserByReagentCode(String reagentCode); void updateReceiptNumberByCode2(List<OpeWarehouseReserve> codeTmp, String receiptNumber); + + int getPersonalUseInfoCount(String reagentCode,String userId, Date startTime, Date endTime, String receiptNumber, String department, String project,String applyPerson,String reagentName); + + List<OpeUseFlow> getPersonalUseInfoList(String reagentCode,String userId, Date startTime, Date endTime, String receiptNumber, String department, String project,String applyPerson,String reagentName, int first, int pageSize); + + List<PersonUseDetail> getApplyInfo(String receiptNumber); + + int getApplyInfoSize(String receiptNumber); + + int getOpeUseFlow(OpeUseFlow opeUseFlow); + + void scrapReagent(String reagentId,String reagentCode, String userId); } -- Gitblit v1.9.2