From e9d5503ee1a17a3a2c9b0b9880b711a4a62061d8 Mon Sep 17 00:00:00 2001
From: whycxzp <glperry@163.com>
Date: 星期五, 08 十二月 2023 13:29:05 +0800
Subject: [PATCH] SOP查询逻辑更新
---
src/main/java/com/whyc/service/SOPService.java | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/whyc/service/SOPService.java b/src/main/java/com/whyc/service/SOPService.java
index 4dea68b..a572034 100644
--- a/src/main/java/com/whyc/service/SOPService.java
+++ b/src/main/java/com/whyc/service/SOPService.java
@@ -410,7 +410,7 @@
}
//鏌ヨsop淇℃伅
- public Response getSopInfo(List<SopDto> sqlList, String code, String model,int pageCurr,int pageSize) {
+ public Response getSopInfo(List<SopDto> sqlList, String code, String model, Integer status, int pageCurr, int pageSize) {
String sqlStr=" ";
if(sqlList!=null&&sqlList.size()>0){
for (SopDto dto:sqlList) {
@@ -418,11 +418,14 @@
for (int i=0;i<dto.getChileType().size();i++){
sqlStr+=" and file_type like "+"'%"+dto.getParentType()+"-"+dto.getChileType().get(i)+"%' ";
}
+ }else{
+ sqlStr+=" and file_type like "+"'%"+dto.getParentType()+"%' ";
}
}
}
- //鎺掑簭
- sqlStr+=" order by create_time desc ";
+ if(status!=null) {
+ sqlStr += " and status = "+status;
+ }
List<SOP> list=mapper.getSopInfo(sqlStr,code,model);
PageInfo pageInfo= PageInfoUtils.list2PageInfo(list,pageCurr,pageSize);
--
Gitblit v1.9.1