From cf9a5039e6db9d1d5963e3fe1a37d00169ec2ef7 Mon Sep 17 00:00:00 2001
From: whyclxw <810412026@qq.com>
Date: 星期三, 25 六月 2025 11:18:22 +0800
Subject: [PATCH] 验收报告修改
---
src/main/java/com/whyc/service/SOPService.java | 15 ++++++++++++++-
1 files changed, 14 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/whyc/service/SOPService.java b/src/main/java/com/whyc/service/SOPService.java
index defc03d..9c6eed5 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,String fileName, int pageCurr, int pageSize) {
String sqlStr=" ";
if(sqlList!=null&&sqlList.size()>0){
for (SopDto dto:sqlList) {
@@ -418,8 +418,16 @@
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()+"%' ";
}
}
+ }
+ if(status!=null) {
+ sqlStr += " and status = "+status;
+ }
+ if(fileName!=null) {
+ sqlStr += " and file_name like "+"'%"+fileName+"%' ";
}
List<SOP> list=mapper.getSopInfo(sqlStr,code,model);
PageInfo pageInfo= PageInfoUtils.list2PageInfo(list,pageCurr,pageSize);
@@ -455,4 +463,9 @@
return new Response().setII(1,"璁剧疆瀹屾垚");
}
+ //鏌ヨsop鍘嗗彶
+ public Response getSopHis(String fileName) {
+ List<SOP> list=mapper.getSopHis(fileName);
+ return new Response().setII(1,list.size()>0,list,"鏌ヨsop鍘嗗彶");
+ }
}
--
Gitblit v1.9.1