SH-Arbitrate/Arbitrate-Backend
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'wq' of SH-Arbitrate/Arbitrate-Backend into dev

Browse Source
This commit was merged in pull request #275.
This commit is contained in:
wangqiong123
2023-12-05 11:37:31 +08:00
committed by Gitea
parent ffb0a9f6da 0be2808800
commit 57b5325154
4 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/vo/ToDoCount.java
+1 -1
View File
@@ -30,5 +30,5 @@ public class ToDoCount {
private int caseApplyStored=0; // 待案件归档
private int caseApplyArchived=0; // 已归档
private int updateOnlineHearDate=0; // 待修改开庭时间
private int ArbitratorApplyAwardConfirm=0; // 待仲裁员审核仲裁文书
private int arbitratorApplyAwardConfirm=0; // 待仲裁员审核仲裁文书
}
ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/AdjudicationServiceImpl.java
+4 -4
View File
@@ -353,11 +353,11 @@ public class AdjudicationServiceImpl implements IAdjudicationService {
String month = String.format("%02d", now.getMonthValue());
String day = String.format("%02d", now.getDayOfMonth());
// todo 服务器路径
// String modalFilePath = "/data/arbitrate-document/template/新裁决书模板.docx";
String modalFilePath = "D:/新裁决书模板.docx";
String modalFilePath = "/data/arbitrate-document/template/新裁决书模板.docx";
// String modalFilePath = "D:/新裁决书模板.docx";
// todo 服务器路径
// String saveFolderPath = "/home/ruoyi/uploadPath/upload/" + year + "/" + month + "/" + day;
String saveFolderPath = "D:/";
String saveFolderPath = "/home/ruoyi/uploadPath/upload/" + year + "/" + month + "/" + day;
// String saveFolderPath = "D:/";
String fileName = UUID.randomUUID().toString().replace("-", "") + ".docx";
String saveName = "/profile/upload/" + year + "/" + month + "/" + day + "/" + fileName;
String resultFilePath = saveFolderPath + "/" + fileName;
ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseApplicationServiceImpl.java
+8 -8
View File
@@ -394,8 +394,8 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
return AjaxResult.error("请选择要上传的文件");
}
// todo 服务器上要放开
// String targetPath = "/home/ruoyi/uploadPath/upload/unzipFile";
String targetPath = "D:/zip";
String targetPath = "/home/ruoyi/uploadPath/upload/unzipFile";
// String targetPath = "D:/zip";
File zipFile = null;
InputStream ins = null;
try {
@@ -413,8 +413,8 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
String subzipName = zipName.substring(0, zipName.indexOf(".zip"));
// String zipPath = "F:\\testZip\\uploadPath\\upload\\upload1\\unzipFile\\"+subzipName;
// todo 服务器上要放开
// String zipPath = "/home/ruoyi/uploadPath/upload/unzipFile/" + subzipName;
String zipPath = "D:/" + subzipName;
String zipPath = "/home/ruoyi/uploadPath/upload/unzipFile/" + subzipName;
// String zipPath = "D:/" + subzipName;
File dirUnzipPath = new File(zipPath);
List<File> allFiles = new ArrayList<>();
@@ -2961,16 +2961,16 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
}
UUID uuid = UUID.randomUUID();
// todo 服务器上要放开
// String targetPath = "/home/ruoyi/uploadPath/upload/unzipFile/"+uuid+ "/";
String targetPath = "D:/zip";
String targetPath = "/home/ruoyi/uploadPath/upload/unzipFile/"+uuid+ "/";
// String targetPath = "D:/zip";
File zipFile = null;
InputStream ins = null;
try {
ins = file.getInputStream();
//上传的压缩包保存的路径
// todo 服务器上要放开
// String savePath = "/home/ruoyi/uploadPath/upload/zipFile/";
String savePath = "D:/zip/";
String savePath = "/home/ruoyi/uploadPath/upload/zipFile/";
// String savePath = "D:/zip/";
String saveName = uuid + "_" + file.getOriginalFilename();
zipFile = new File(savePath + saveName);
inputChangeToFile(ins, zipFile);
ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseApplicationMapper.xml
+2 -2
View File
@@ -617,7 +617,7 @@
sum( case when t1.case_status=15 then 1 else 0 end) caseApplyAwardSend,
sum( case when t1.case_status=16 then 1 else 0 end) caseApplyStored,
sum( case when t1.case_status=17 then 1 else 0 end) caseApplyArchived,
sum( case when t1.case_status=18 then 1 else 0 end) ArbitratorApplyAwardConfirm,
sum( case when t1.case_status=18 then 1 else 0 end) arbitratorApplyAwardConfirm,
sum( case when t1.case_status=31 then 1 else 0 end) updateOnlineHearDate
from(
<trim suffixOverrides="union">
@@ -853,7 +853,7 @@
sum( case when c.case_status=15 then 1 else 0 end) caseApplyAwardSend,
sum( case when c.case_status=16 then 1 else 0 end) caseApplyStored,
sum( case when c.case_status=17 then 1 else 0 end) caseApplyArchived,
sum( case when c.case_status=18 then 1 else 0 end) ArbitratorApplyAwardConfirm,
sum( case when c.case_status=18 then 1 else 0 end) arbitratorApplyAwardConfirm,
sum( case when c.case_status=31 then 1 else 0 end) updateOnlineHearDate
FROM
case_application c