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/SoftwareService.java | 53 ++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 48 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/whyc/service/SoftwareService.java b/src/main/java/com/whyc/service/SoftwareService.java
index fec9c39..4c6b142 100644
--- a/src/main/java/com/whyc/service/SoftwareService.java
+++ b/src/main/java/com/whyc/service/SoftwareService.java
@@ -6,10 +6,13 @@
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import com.whyc.constant.UserOperation;
+import com.whyc.dto.CodeFilesDto;
import com.whyc.dto.FileDirPath;
import com.whyc.dto.Response;
import com.whyc.dto.SoftDto;
+import com.whyc.mapper.SoftcodeMapper;
import com.whyc.mapper.SoftwareMapper;
+import com.whyc.pojo.Softcode;
import com.whyc.pojo.Software;
import com.whyc.util.ActionUtil;
import com.whyc.util.CommonUtil;
@@ -34,6 +37,7 @@
import java.time.LocalDateTime;
import java.time.LocalTime;
import java.time.ZoneId;
+import java.util.ArrayList;
import java.util.Date;
import java.util.LinkedList;
import java.util.List;
@@ -43,6 +47,9 @@
public class SoftwareService {
@Autowired(required = false)
private SoftwareMapper mapper;
+
+ @Autowired(required = false)
+ private SoftcodeMapper codeMapper;
@Autowired
private DocLogService logService;
@@ -147,10 +154,16 @@
for (SoftDto dto:list) {
QueryWrapper wrapper=new QueryWrapper();
wrapper.eq("file_name",dto.getFileName());
- if(mapper.selectCount(wrapper)>0){
+ wrapper.last("limit 1");
+ Softcode code=codeMapper.selectOne(wrapper);
+ if(code!=null){
+ dto.setCodeNum(code.getNum());
dto.setCodeFlag(1);
+ dto.setCodeName(code.getCodeName());
}else{
+ dto.setCodeNum(0);
dto.setCodeFlag(0);
+ dto.setCodeName("");
}
}
PageInfo pageInfo=new PageInfo(list);
@@ -346,7 +359,7 @@
return new Response().set(1,flag>0,"浠秈d瀹炵幇杞欢鍒犻櫎");
}
- //鏌ヨ鏃ユ湡涓夊ぉ鍐呯殑鎵�鏈変笂浼犺蒋浠跺悕绉�
+ //鏌ヨ鏃ユ湡涓夊ぉ鍐呯殑鎵�鏈変笂浼犺蒋浠�
public Response getFileNameByCreateTime(String createTime) {
//鑾峰彇endtime鐨勪笁澶╁墠鐨勬椂闂�
LocalDate createDay= LocalDate.parse(createTime);
@@ -358,12 +371,42 @@
Date starttime=Date.from(startOfDay.atZone(ZoneId.systemDefault()).toInstant());
QueryWrapper wrapper=new QueryWrapper();
- wrapper.select("distinct file_name");
+ wrapper.select("distinct file_name","type","version","based_version","owner","filing_date","create_time");
wrapper.ge("create_time",starttime);
wrapper.le("create_time",endtime);
+ wrapper.eq("owner",ActionUtil.getUser().getName());
List<Software> list=mapper.selectList(wrapper);
//鑾峰彇list涓璮ileName鐨勯泦鍚�
- List<String> nameList = list.stream().map(Software::getFileName).collect(Collectors.toList());
- return new Response().setII(1,nameList!=null,nameList,"鏌ヨ鏃ユ湡涓夊ぉ鍐呯殑鎵�鏈変笂浼犺蒋浠跺悕绉�");
+ //List<String> nameList = list.stream().map(Software::getFileName).collect(Collectors.toList());
+ return new Response().setII(1,list!=null,list,"鏌ヨ鏃ユ湡涓夊ぉ鍐呯殑鎵�鏈変笂浼犺蒋浠�");
+ }
+ //鏌ヨ褰撳墠owner鐨勬湭涓婁紶婧愮爜璁板綍
+ public Response getFileNameByOwnerWithCode(String owner) {
+ List<Software> list=mapper.getFileNameByOwnerWithCode(owner);
+ return new Response().setII(1,list!=null,list,"鏌ヨ褰撳墠owner鐨勬湭涓婁紶婧愮爜璁板綍");
+ }
+ //鎵归噺娣诲姞婧愮爜鍖�
+ public Response setCodeByFileNmaes(CodeFilesDto dto) {
+ QueryWrapper wrapper=new QueryWrapper();
+ wrapper.eq("num",dto.getNum());
+ wrapper.last("limit 1");
+ Softcode softcode=codeMapper.selectOne(wrapper);
+ if(softcode==null){
+ return new Response().set(1,false,"婧愮爜鍖呬笉瀛樺湪");
+ }else{
+ //鑾峰彇list涓璮ileName鐨勯泦鍚�
+ List<String> nameList = dto.getFileNames();
+ List<Softcode> softcodeList=new ArrayList<>();
+ for (String fileName : nameList) {
+ Softcode s=new Softcode();
+ s.setFileName(fileName);
+ s.setCodeUrl(softcode.getCodeUrl());
+ s.setCodeName(softcode.getCodeName());
+ s.setCreateTime(new Date());
+ softcodeList.add(s);
+ }
+ codeMapper.insertBatchSomeColumn(softcodeList);
+ return new Response().set(1,true,"鎵归噺娣诲姞婧愮爜鍖�");
+ }
}
}
--
Gitblit v1.9.1