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 | 28 +++++++++++++++++++++++++---
1 files changed, 25 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/whyc/service/SOPService.java b/src/main/java/com/whyc/service/SOPService.java
index a230094..9c6eed5 100644
--- a/src/main/java/com/whyc/service/SOPService.java
+++ b/src/main/java/com/whyc/service/SOPService.java
@@ -322,6 +322,8 @@
@Transactional
public Response add(SOP sop,MultipartFile multipartFile) throws IOException {
//鏄惁瀛樺湪鏃х増鏈�,瀛樺湪鍒欐妸鎵�鏈夋棫鐗堟湰鐘舵�佹洿鏂颁负0
+ String userName = ActionUtil.getUser().getName();
+ Date now = new Date();
QueryWrapper<SOP> query = Wrappers.query();
query.eq("file_name",sop.getFileName()).eq("status",1);
List<SOP> sopListExists = mapper.selectList(query);
@@ -329,13 +331,21 @@
for (SOP sopExists : sopListExists) {
sopExists.setStatus(0);
mapper.updateById(sopExists);
+
+ SOPLockLog lockLog = new SOPLockLog();
+ lockLog.setSopId(sopExists.getId());
+ lockLog.setReason("鏂扮増鏈笂浼�,绯荤粺鑷姩閿佸畾鏃х増鏈�");
+ lockLog.setUserName(userName);
+ lockLog.setCreateTime(now);
+ lockLog.setStatus(0);
+ sopLockLogService.insert(lockLog);
}
}
List<SOPProduct> sopProductList = sop.getSopProductList();
String originalFilename = multipartFile.getOriginalFilename();
String[] fileNameSplit = originalFilename.split("\\.");
- String dateFormat = DateUtil.YYYY_MM_DD_HH_MM_SS_UNION.format(new Date());
+ String dateFormat = DateUtil.YYYY_MM_DD_HH_MM_SS_UNION.format(now);
String newFileName = fileNameSplit[0]+"_"+dateFormat+"."+fileNameSplit[1];
String fileUrlTemp = FileUtil.saveFile(multipartFile,"/sop/"+newFileName);
//String fileUrlTemp = sop.getFileUrl();
@@ -381,7 +391,6 @@
List<String> uploadTypeStrList = typeList.stream().map(type -> type.getType1() + ";" + type.getType2()).collect(Collectors.toList());
List<String> dbTypeStrList = recordListInDB.stream().map(type -> type.getType1() + ";" + type.getType2()).collect(Collectors.toList());
- Date now = new Date();
for (int i = 0; i < uploadTypeStrList.size(); i++) {
String uploadTypeStr = uploadTypeStrList.get(i);
if (!dbTypeStrList.contains(uploadTypeStr)) {
@@ -401,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) {
@@ -409,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);
@@ -446,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