From 12154b62b42df29173cdc54d7fd35d02d9a6422b Mon Sep 17 00:00:00 2001
From: whyclxw <810412026@qq.com>
Date: 星期二, 24 六月 2025 21:48:04 +0800
Subject: [PATCH] 验收报告查询修改
---
src/main/java/com/whyc/service/BomAcceptanceService.java | 146 +++++++++++++++++++++++++++++++++++-------------
src/main/java/com/whyc/controller/BomAcceptanceController.java | 3
2 files changed, 108 insertions(+), 41 deletions(-)
diff --git a/src/main/java/com/whyc/controller/BomAcceptanceController.java b/src/main/java/com/whyc/controller/BomAcceptanceController.java
index ae197e1..c07ea60 100644
--- a/src/main/java/com/whyc/controller/BomAcceptanceController.java
+++ b/src/main/java/com/whyc/controller/BomAcceptanceController.java
@@ -81,8 +81,7 @@
@ApiOperation(value = "鍒犻櫎鍥�")
@PostMapping("delPic")
public Response delPic(@RequestParam int num,@RequestParam int picNum,@RequestParam String picUrl){
- service.delPic(num,picNum,picUrl,"");
- return new Response().set(1,true,"鍒犻櫎鍥炬垚鍔�");
+ return service.delPic(num,picNum,picUrl);
}
@ApiOperation(value = "瀵煎嚭浜у搧楠屾敹淇℃伅")
diff --git a/src/main/java/com/whyc/service/BomAcceptanceService.java b/src/main/java/com/whyc/service/BomAcceptanceService.java
index 3241da6..e43b346 100644
--- a/src/main/java/com/whyc/service/BomAcceptanceService.java
+++ b/src/main/java/com/whyc/service/BomAcceptanceService.java
@@ -304,96 +304,115 @@
return new Response().set(1,true,"缂栬緫鎴愬姛");
}
//鍒犻櫎鍥�
- public void delPic(int num, int picNum,String picUrl,String newPicUrl) {
+ public Response delPic(int num, int picNum,String picUrl) {
UpdateWrapper wrapper=new UpdateWrapper();
wrapper.eq("num",num);
if(picNum==1){
- wrapper.set("dev_picleft",newPicUrl);
+ wrapper.set("dev_picleft","");
}
if(picNum==2){
- wrapper.set("dev_picright",newPicUrl);
+ wrapper.set("dev_picright","");
}
if(picNum==3){
- wrapper.set("dev_picfront",newPicUrl);
+ wrapper.set("dev_picfront","");
}
if(picNum==4){
- wrapper.set("dev_picback",newPicUrl);
+ wrapper.set("dev_picback","");
}
- if(picNum==5){
+ /*if(picNum==5){
wrapper.set("spare_picpart",newPicUrl);
- }
- /*if(picNum==6){
- wrapper.set("bom_agreement",newPicUrl);
}*/
+ if(picNum==6){
+ wrapper.set("bom_agreement","");
+ }
if(picNum==7){
- wrapper.set("bom_manual",newPicUrl);
+ wrapper.set("bom_manual","");
}
if(picNum==8){
- wrapper.set("test_report",newPicUrl);
+ wrapper.set("test_report","");
}
if(picNum==9){
- wrapper.set("icd_file",newPicUrl);
+ wrapper.set("icd_file","");
}
if(picNum==10){
- wrapper.set("cad_picpart",newPicUrl);
+ wrapper.set("cad_picpart","");
}
if(picNum==11){
- wrapper.set("name_plate",newPicUrl);
+ wrapper.set("name_plate","");
}
/*if(picNum==12){
wrapper.set("install_pic",newPicUrl);
}*/
- if(picNum!=12&&picNum!=6){//鏂囦欢鏃朵慨鏀硅〃鐨勮褰�
+ int flag=0;
+ if(picNum!=12&&picNum!=5){//鏂囦欢鏃朵慨鏀硅〃鐨勮褰�
mapper.update(null,wrapper);
+ flag=1;
+ }else{
+ String rootFile = CommonUtil.getRootFile();//涓昏矾寰�
+ picUrl=picUrl.replace("doc_file\\acceptance_bom","");
+ String picPath=rootFile+File.separator+"acceptance_bom"+File.separator+picUrl;
+ if(picNum==5){
+ //鍒ゆ柇鏂囦欢璺緞鏄惁鍖呭惈spare
+ if(picPath.contains("spare")){
+ File file = new File(picPath);
+ if(file.isFile()){
+ //鍒犻櫎鍥剧墖
+ FileUtil.deleteFile(file);
+ flag=1;
+ }
+ }
+ }
+ if(picNum==12){
+ //鍒ゆ柇鏂囦欢璺緞鏄惁鍖呭惈install
+ if(picPath.contains("install")){
+ File file = new File(picPath);
+ if(file.isFile()){
+ //鍒犻櫎鍥剧墖
+ FileUtil.deleteFile(file);
+ flag=1;
+ }
+ }
+ }
}
- String rootFile = CommonUtil.getRootFile();//涓昏矾寰�
- picUrl=picUrl.replace("doc_file","");
- //鍒犻櫎鍥剧墖
- FileUtil.deleteFile(new File(rootFile+picUrl));
-
+ return new Response().set(1,flag>0,flag>0?"鍒犻櫎鍥剧墖鎴愬姛":"鍒犻櫎鍥剧墖澶辫触,璺緞涓嶆纭�");
}
//缂栬緫鍗曚釜鍥剧墖涓婁紶
public Response updateDevPic(MultipartFile filePic, int num,int picNum) throws IOException {
Date date = new Date();
long time = date.getTime();
String rootFile = CommonUtil.getRootFile();
- String devDirSuffix = "acceptance_bom" + File.separator + time + File.separator+ "dev" + File.separator;
- String devDir = rootFile + devDirSuffix;
- QueryWrapper wrapper=new QueryWrapper();
- wrapper.eq("num",num);
- wrapper.last("limit 1");
- BomAcceptance bomAcceptance=mapper.selectOne(wrapper);
- String picUrl="";
+ String devDirSuffix = "acceptance_bom" + File.separator + time + File.separator;
if(picNum==1){
- picUrl=bomAcceptance.getDevPicleft();
+ devDirSuffix=devDirSuffix+"dev"+ File.separator;
}
if(picNum==2){
- picUrl=bomAcceptance.getDevPicright();
+ devDirSuffix=devDirSuffix+"dev"+ File.separator;
}
if(picNum==3){
- picUrl=bomAcceptance.getDevPicfront();
+ devDirSuffix=devDirSuffix+"dev"+ File.separator;
}
if(picNum==4){
- picUrl=bomAcceptance.getDevPicback();
+ devDirSuffix=devDirSuffix+"dev"+ File.separator;
}
if(picNum==6){
- picUrl=bomAcceptance.getBomAgreement();
+ devDirSuffix=devDirSuffix+"agree"+ File.separator;
}
if(picNum==7){
- picUrl=bomAcceptance.getBomManual();
+ devDirSuffix=devDirSuffix+"bomManual"+ File.separator;
}
if(picNum==8){
- picUrl=bomAcceptance.getTestReport();
+ devDirSuffix=devDirSuffix+"testReport"+ File.separator;
}
if(picNum==9){
- picUrl=bomAcceptance.getIcdFile();
+ devDirSuffix=devDirSuffix+"icdFile"+ File.separator;
}
if(picNum==10){
- picUrl=bomAcceptance.getCadPicpart();
+ devDirSuffix=devDirSuffix+"cadPicpart"+ File.separator;
}
if(picNum==11){
- picUrl=bomAcceptance.getNamePlate();
+ devDirSuffix=devDirSuffix+"namePlate"+ File.separator;
}
+ String devDir = rootFile + devDirSuffix;
if(filePic!=null){
//瀛樺偍鏂囦欢
String originalFilename = filePic.getOriginalFilename();
@@ -403,8 +422,39 @@
createFilefolderIFNotExist(path);
filePic.transferTo(new File(path));
String devFile="doc_file" + File.separator + devDirSuffix+originalFilename;
- //鍒犻櫎鏃х殑
- delPic(num,picNum,picUrl,devFile);
+ UpdateWrapper wrapper=new UpdateWrapper();
+ if(picNum==1){
+ wrapper.set("dev_picleft",devFile);
+ }
+ if(picNum==2){
+ wrapper.set("dev_picright",devFile);
+ }
+ if(picNum==3){
+ wrapper.set("dev_picfront",devFile);
+ }
+ if(picNum==4){
+ wrapper.set("dev_picback",devFile);
+ }
+ if(picNum==6){
+ wrapper.set("bom_agreement",devFile);
+ }
+ if(picNum==7){
+ wrapper.set("bom_manual",devFile);
+ }
+ if(picNum==8){
+ wrapper.set("test_report",devFile);
+ }
+ if(picNum==9){
+ wrapper.set("icd_file",devFile);
+ }
+ if(picNum==10){
+ wrapper.set("cad_picpart",devFile);
+ }
+ if(picNum==11){
+ wrapper.set("name_plate",devFile);
+ }
+ wrapper.eq("num",num);
+ mapper.update(null,wrapper);
return new Response().set(1,true,"涓婁紶鏂板浘鐗囨垚鍔�");
}else{
return new Response().set(1,false,"鍥剧墖涓嶅瓨鍦�");
@@ -418,6 +468,15 @@
wrapper.last("limit 1");
BomAcceptance bomAcceptance=mapper.selectOne(wrapper);
String picUrl=bomAcceptance.getSparePicpart();
+ if(picUrl==null||picUrl.isEmpty()){
+ long time =new Date().getTime();
+ picUrl= "acceptance_bom" + File.separator + time + File.separator+ "spare" + File.separator;
+ String spareDir = rootFile + picUrl;
+ File fileDir = new File(spareDir);
+ if (!fileDir.exists()) {
+ fileDir.mkdirs();
+ }
+ }
//閰嶄欢瀛樺偍
if(multipartFileList!=null && multipartFileList.size()!=0){
for (int i = 0; i < multipartFileList.size(); i++) {
@@ -443,6 +502,15 @@
wrapper.last("limit 1");
BomAcceptance bomAcceptance=mapper.selectOne(wrapper);
String picUrl=bomAcceptance.getInstallPic();
+ if(picUrl==null||picUrl.isEmpty()){
+ long time =new Date().getTime();
+ picUrl= "acceptance_bom" + File.separator + time + File.separator+ "install" + File.separator;
+ String spareDir = rootFile + picUrl;
+ File fileDir = new File(spareDir);
+ if (!fileDir.exists()) {
+ fileDir.mkdirs();
+ }
+ }
//閰嶄欢瀛樺偍
if(multipartFileList!=null && multipartFileList.size()!=0){
for (int i = 0; i < multipartFileList.size(); i++) {
--
Gitblit v1.9.1