From 319bc23ce77d59d036a06785fcf727c48e0c56d6 Mon Sep 17 00:00:00 2001
From: lxw <810412026@qq.com>
Date: 星期一, 26 六月 2023 16:03:44 +0800
Subject: [PATCH] sop修改
---
src/main/java/com/whyc/service/SOPService.java | 27 ++++-----------------------
1 files changed, 4 insertions(+), 23 deletions(-)
diff --git a/src/main/java/com/whyc/service/SOPService.java b/src/main/java/com/whyc/service/SOPService.java
index 5e03659..d13910f 100644
--- a/src/main/java/com/whyc/service/SOPService.java
+++ b/src/main/java/com/whyc/service/SOPService.java
@@ -1,8 +1,5 @@
package com.whyc.service;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import com.whyc.dto.Response;
import com.whyc.dto.SopDto;
@@ -10,11 +7,7 @@
import com.whyc.pojo.SOP;
import com.whyc.pojo.SOPFileType;
import com.whyc.pojo.SOPProduct;
-import com.whyc.pojo.Software;
-import com.whyc.util.ActionUtil;
-import com.whyc.util.CommonUtil;
-import com.whyc.util.DateUtil;
-import com.whyc.util.FileUtil;
+import com.whyc.util.*;
import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
import org.apache.poi.ss.usermodel.Cell;
import org.apache.poi.ss.usermodel.Sheet;
@@ -23,11 +16,9 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
-import org.springframework.util.FileCopyUtils;
import org.springframework.web.multipart.MultipartFile;
import javax.annotation.Resource;
-import java.io.File;
import java.io.IOException;
import java.io.InputStream;
import java.text.ParseException;
@@ -380,7 +371,6 @@
//鏌ヨsop淇℃伅
public Response getSopInfo(List<SopDto> sqlList, String code, String model,int pageCurr,int pageSize) {
- PageHelper.startPage(pageCurr,pageSize);
String sqlStr=" ";
if(sqlList!=null&&sqlList.size()>0){
for (SopDto dto:sqlList) {
@@ -392,19 +382,10 @@
}
}
List<SOP> list=mapper.getSopInfo(sqlStr,code,model);
- PageInfo pageInfo=new PageInfo(list);
+ PageInfo pageInfo= PageInfoUtils.list2PageInfo(list,pageCurr,pageSize);
+
return new Response().setII(1,list.size()>0,pageInfo,"鏌ヨsop淇℃伅");
}
- //鏇存柊sop璇存槑锛堜笉鍚攣淇℃伅锛�
- @Transactional
- public Response updateSop(SOP sop) {
- List<SOPProduct> sopProductList = sop.getSopProductList();
- mapper.updateById(sop);
- if(sopProductList.size()>0) {
- sopProductList.forEach(product -> product.setSopId(sop.getId()));
- productService.updateBySid(sopProductList,sop.getId());
- }
- return new Response().setII(1,"鏇存柊sop璇存槑瀹屾垚");
- }
+
}
--
Gitblit v1.9.1