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 |   12 +++++++++---
 1 files changed, 9 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..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,11 +418,17 @@
                     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;
+        }
+        if(fileName!=null) {
+            sqlStr += " and file_name like "+"'%"+fileName+"%' ";
+        }
         List<SOP> list=mapper.getSopInfo(sqlStr,code,model);
         PageInfo pageInfo= PageInfoUtils.list2PageInfo(list,pageCurr,pageSize);
 

--
Gitblit v1.9.1