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/WorksheetMainService.java | 34 +++++++++++++++++++++++++++++++++-
1 files changed, 33 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/whyc/service/WorksheetMainService.java b/src/main/java/com/whyc/service/WorksheetMainService.java
index 924551c..246689d 100644
--- a/src/main/java/com/whyc/service/WorksheetMainService.java
+++ b/src/main/java/com/whyc/service/WorksheetMainService.java
@@ -493,8 +493,12 @@
String filePath = rootFile + productSoftwarePath;
String originalFilename = file.getOriginalFilename();
File zipFile = new File(filePath+File.separator+ originalFilename);
- if(!zipFile.exists()){
+ /*if(!zipFile.exists()){
zipFile.mkdirs();
+ }*/
+ File parentFile = new File(filePath);
+ if (!parentFile.exists()) {
+ parentFile.mkdirs();
}
file.transferTo(zipFile);
approving.setSoftwareUrl("doc_file"+productSoftwarePath+File.separator+ originalFilename);
@@ -892,4 +896,32 @@
e.printStackTrace();
}*/
}
+
+ /**
+ * 鏌ヨ鎵�鏈夌殑宸ュ崟,鎵�鏈変汉鍙
+ * @param param
+ * @return
+ */
+ public Response getAllPage(WorksheetMain param) {
+ Integer pageNum = param.getPageNum();
+ Integer pageSize = param.getPageSize();
+ PageHelper.startPage(pageNum,pageSize);
+
+ int createUserId = param.getCreateUserId().intValue();
+ Date beginTime = param.getBeginTime();
+ Date endTime = param.getEndTime();
+ Integer type = param.getType();
+ QueryWrapper<WorksheetMain> query = Wrappers.query();
+ if(createUserId>0){
+ query.eq("create_user_id",createUserId);
+ }
+ query.ge("begin_time",beginTime);
+ query.le("begin_time",endTime);
+ if(type!=null && type>=0){
+ query.eq("type",type);
+ }
+ List<WorksheetMain> worksheetMains = mainMapper.selectList(query);
+ PageInfo pageInfo = new PageInfo(worksheetMains);
+ return new Response().set(1,pageInfo);
+ }
}
--
Gitblit v1.9.1