From c3a99b122b7484704b71588a26583afcc58b6270 Mon Sep 17 00:00:00 2001
From: whyclxw <810412026@qq.com>
Date: 星期三, 24 七月 2024 09:45:45 +0800
Subject: [PATCH] 不良品推送修改
---
src/main/java/com/whyc/service/DefectiveProductsService.java | 20 +++++++++++++++++++-
1 files changed, 19 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/whyc/service/DefectiveProductsService.java b/src/main/java/com/whyc/service/DefectiveProductsService.java
index 600f129..88ed06e 100644
--- a/src/main/java/com/whyc/service/DefectiveProductsService.java
+++ b/src/main/java/com/whyc/service/DefectiveProductsService.java
@@ -15,6 +15,7 @@
import com.whyc.pojo.DocUser;
import com.whyc.util.ActionUtil;
import com.whyc.util.CommonUtil;
+import com.whyc.util.FileUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -82,7 +83,7 @@
multipartFile.transferTo(file);
}
//ZipUtils.toZip(fileList,new FileOutputStream(new File(rootFile+feedbackZipPath)));
- defective.setFileUrl("doc_file" + File.separator + defectiveDirSuffix);
+ defective.setFileUrl( File.separator + defectiveDirSuffix);
}
@@ -131,6 +132,23 @@
public Response getDefectiveLimit(DefectiveDto defectiveDto) {
PageHelper.startPage(defectiveDto.getPageCurr(),defectiveDto.getPageSize());
List<DefectiveProducts> list=mapper.getDefectiveLimit(defectiveDto);
+ String rootFile = CommonUtil.getRootFile();//涓昏矾寰�
+ for (DefectiveProducts defective:list) {
+ String filePath=defective.getFileUrl();
+ if(filePath!=null&&!filePath.isEmpty()){
+ defective.setNameList(FileUtil.getFileNameWithOutDirectory(rootFile+filePath));
+ }
+ List<DefectiveProductsHistory> hisList=defective.getHisList();
+ if(hisList!=null&&hisList.size()>0){
+ for (DefectiveProductsHistory his:defective.getHisList()) {
+ String hisDelPath=his.getDelUrl();
+ if(hisDelPath!=null&&!hisDelPath.isEmpty()){
+ his.setHisNameList(FileUtil.getFileNameWithOutDirectory(rootFile+hisDelPath));
+ }
+ }
+
+ }
+ }
PageInfo pageInfo=new PageInfo(list);
return new Response().setII(1,list!=null,pageInfo,"涓嶈壇鍝侀椤垫帹閫�");
}
--
Gitblit v1.9.1