From aae315a059efda37b2494b2f8986df5de41d3459 Mon Sep 17 00:00:00 2001
From: qitz <18810291185@163.com>
Date: Thu, 2 Nov 2023 17:56:46 +0800
Subject: [PATCH 1/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=85=AC=E7=AB=A0?=
=?UTF-8?q?=E7=AE=A1=E7=90=86=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../resources/mapper/wisdomarbitrate/DeptIdentifyMapper.xml | 3 +++
1 file changed, 3 insertions(+)
diff --git a/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/DeptIdentifyMapper.xml b/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/DeptIdentifyMapper.xml
index a4404e2..7b8ad5c 100644
--- a/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/DeptIdentifyMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/DeptIdentifyMapper.xml
@@ -34,6 +34,9 @@
AND d.dept_id = #{deptId}
+
+ AND d.user_id = #{userId}
+
From 6b1ee10b33d6892d0d39503aec33f98756bd3192 Mon Sep 17 00:00:00 2001
From: qitz <18810291185@163.com>
Date: Fri, 3 Nov 2023 10:38:42 +0800
Subject: [PATCH 2/5] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=8F=91=E9=82=AE?=
=?UTF-8?q?=E4=BB=B6=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../wisdomarbitrate/service/impl/AdjudicationServiceImpl.java | 2 +-
.../resources/mapper/wisdomarbitrate/SendMailRecordMapper.xml | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/AdjudicationServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/AdjudicationServiceImpl.java
index 3ac266d..66949fa 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/AdjudicationServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/AdjudicationServiceImpl.java
@@ -556,7 +556,7 @@ public class AdjudicationServiceImpl implements IAdjudicationService {
for (CaseAttach caseAttach : caseAttachList) {
if (caseAttach.getAnnexType() == 3) {
String annexName = caseAttach.getAnnexName();
- String prefix = "/profile/upload/";
+ String prefix = "/profile/upload";
int startIndex = prefix.length();
String path = caseAttach.getAnnexPath() + annexName.substring(startIndex);
file = new File(path);
diff --git a/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/SendMailRecordMapper.xml b/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/SendMailRecordMapper.xml
index d1e75d9..f6c3d23 100644
--- a/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/SendMailRecordMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/SendMailRecordMapper.xml
@@ -25,6 +25,7 @@
AND c.case_num = #{caseNum}
+ order by s.send_time desc
From b2c3e6433352c6d9006602b57134c0cc216fc3ee Mon Sep 17 00:00:00 2001
From: 18792927508 <1322446236@qq.com>
Date: Fri, 3 Nov 2023 10:50:51 +0800
Subject: [PATCH 3/5] =?UTF-8?q?=E5=AF=BC=E5=85=A5=E6=97=B6=E5=8A=A0?=
=?UTF-8?q?=E6=A1=88=E4=BB=B6=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../com/ruoyi/wisdomarbitrate/domain/CaseApplication.java | 6 ++++--
.../service/impl/CaseApplicationServiceImpl.java | 6 ++++++
.../mapper/wisdomarbitrate/CaseApplicationMapper.xml | 3 ++-
3 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/CaseApplication.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/CaseApplication.java
index 355ee58..134caf8 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/CaseApplication.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/CaseApplication.java
@@ -16,6 +16,9 @@ public class CaseApplication extends BaseEntity {
/** ID */
private Long id;
+ /** 案件名称 */
+ @Excel(name = "案件名称")
+ private String caseName;
/** 案件编号 */
// @Excel(name = "案件编号")
private String caseNum;
@@ -127,8 +130,7 @@ public class CaseApplication extends BaseEntity {
/** 仲裁员名称 */
private String arbitratorName;
- /** 案件名称 */
- private String caseName;
+
/** 案件描述 */
private String caseDescribe;
diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseApplicationServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseApplicationServiceImpl.java
index cad7a7e..b70f2ad 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseApplicationServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseApplicationServiceImpl.java
@@ -1472,6 +1472,11 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
* @param failureMsg
*/
private void validBaseColumn(CaseApplication caseApplication, StringBuilder failureMsg) {
+ if( StrUtil.isEmpty(caseApplication.getCaseName())){
+ failureMsg.append("【案件名称】字段不能为空；");
+ }else if(caseApplication.getCaseName().length()>50){
+ failureMsg.append("【案件名称】字段超出指定长度，最大长度为50；");
+ }
BigDecimal caseSubjectAmount = caseApplication.getCaseSubjectAmount();
if(null== caseSubjectAmount){
failureMsg.append("【案件标的】字段不合法；");
@@ -2391,6 +2396,7 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
private void copyCaseApplication(CaseApplication caseApplicationinsertDiffer, CaseApplication caseApplicationNew) {
caseApplicationNew.setArbitratClaims(caseApplicationinsertDiffer.getArbitratClaims());
caseApplicationNew.setCaseNum(caseApplicationinsertDiffer.getCaseNum());
+ caseApplicationNew.setCaseName(caseApplicationinsertDiffer.getCaseName());
caseApplicationNew.setCaseSubjectAmount(caseApplicationinsertDiffer.getCaseSubjectAmount());
caseApplicationNew.setLoanStartDate(caseApplicationinsertDiffer.getLoanStartDate());
caseApplicationNew.setLoanEndDate(caseApplicationinsertDiffer.getLoanEndDate());
diff --git a/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseApplicationMapper.xml b/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseApplicationMapper.xml
index 7bd95db..de4523e 100644
--- a/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseApplicationMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseApplicationMapper.xml
@@ -372,7 +372,7 @@
insert into case_application(
-
+ case_name ,
case_num,
case_subject_amount,
register_date,
@@ -400,6 +400,7 @@
import_flag,
create_time
)values(
+ #{caseName},
#{caseNum},
#{caseSubjectAmount},
sysdate(),
From 9c8bb4b00d089cc54c9da51b5afff2d1d9dd9b5f Mon Sep 17 00:00:00 2001
From: 18792927508 <1322446236@qq.com>
Date: Fri, 3 Nov 2023 10:57:03 +0800
Subject: [PATCH 4/5] =?UTF-8?q?Revert=20"=E5=AF=BC=E5=85=A5=E6=97=B6?=
=?UTF-8?q?=E5=8A=A0=E6=A1=88=E4=BB=B6=E5=90=8D=E7=A7=B0"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
This reverts commit b2c3e6433352c6d9006602b57134c0cc216fc3ee.
---
.../com/ruoyi/wisdomarbitrate/domain/CaseApplication.java | 6 ++----
.../service/impl/CaseApplicationServiceImpl.java | 6 ------
.../mapper/wisdomarbitrate/CaseApplicationMapper.xml | 3 +--
3 files changed, 3 insertions(+), 12 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/CaseApplication.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/CaseApplication.java
index 134caf8..355ee58 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/CaseApplication.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/CaseApplication.java
@@ -16,9 +16,6 @@ public class CaseApplication extends BaseEntity {
/** ID */
private Long id;
- /** 案件名称 */
- @Excel(name = "案件名称")
- private String caseName;
/** 案件编号 */
// @Excel(name = "案件编号")
private String caseNum;
@@ -130,7 +127,8 @@ public class CaseApplication extends BaseEntity {
/** 仲裁员名称 */
private String arbitratorName;
-
+ /** 案件名称 */
+ private String caseName;
/** 案件描述 */
private String caseDescribe;
diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseApplicationServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseApplicationServiceImpl.java
index b70f2ad..cad7a7e 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseApplicationServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseApplicationServiceImpl.java
@@ -1472,11 +1472,6 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
* @param failureMsg
*/
private void validBaseColumn(CaseApplication caseApplication, StringBuilder failureMsg) {
- if( StrUtil.isEmpty(caseApplication.getCaseName())){
- failureMsg.append("【案件名称】字段不能为空；");
- }else if(caseApplication.getCaseName().length()>50){
- failureMsg.append("【案件名称】字段超出指定长度，最大长度为50；");
- }
BigDecimal caseSubjectAmount = caseApplication.getCaseSubjectAmount();
if(null== caseSubjectAmount){
failureMsg.append("【案件标的】字段不合法；");
@@ -2396,7 +2391,6 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
private void copyCaseApplication(CaseApplication caseApplicationinsertDiffer, CaseApplication caseApplicationNew) {
caseApplicationNew.setArbitratClaims(caseApplicationinsertDiffer.getArbitratClaims());
caseApplicationNew.setCaseNum(caseApplicationinsertDiffer.getCaseNum());
- caseApplicationNew.setCaseName(caseApplicationinsertDiffer.getCaseName());
caseApplicationNew.setCaseSubjectAmount(caseApplicationinsertDiffer.getCaseSubjectAmount());
caseApplicationNew.setLoanStartDate(caseApplicationinsertDiffer.getLoanStartDate());
caseApplicationNew.setLoanEndDate(caseApplicationinsertDiffer.getLoanEndDate());
diff --git a/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseApplicationMapper.xml b/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseApplicationMapper.xml
index de4523e..7bd95db 100644
--- a/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseApplicationMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseApplicationMapper.xml
@@ -372,7 +372,7 @@
insert into case_application(
- case_name ,
+
case_num,
case_subject_amount,
register_date,
@@ -400,7 +400,6 @@
import_flag,
create_time
)values(
- #{caseName},
#{caseNum},
#{caseSubjectAmount},
sysdate(),
From 07a3dea9ccc71e7fa8174e07ff84ec4c91e0de55 Mon Sep 17 00:00:00 2001
From: 18792927508 <1322446236@qq.com>
Date: Fri, 3 Nov 2023 10:57:15 +0800
Subject: [PATCH 5/5] =?UTF-8?q?Revert=20"Revert=20"=E5=AF=BC=E5=85=A5?=
=?UTF-8?q?=E6=97=B6=E5=8A=A0=E6=A1=88=E4=BB=B6=E5=90=8D=E7=A7=B0""?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
This reverts commit 9c8bb4b00d089cc54c9da51b5afff2d1d9dd9b5f.
---
.../com/ruoyi/wisdomarbitrate/domain/CaseApplication.java | 6 ++++--
.../service/impl/CaseApplicationServiceImpl.java | 6 ++++++
.../mapper/wisdomarbitrate/CaseApplicationMapper.xml | 3 ++-
3 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/CaseApplication.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/CaseApplication.java
index 355ee58..134caf8 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/CaseApplication.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/CaseApplication.java
@@ -16,6 +16,9 @@ public class CaseApplication extends BaseEntity {
/** ID */
private Long id;
+ /** 案件名称 */
+ @Excel(name = "案件名称")
+ private String caseName;
/** 案件编号 */
// @Excel(name = "案件编号")
private String caseNum;
@@ -127,8 +130,7 @@ public class CaseApplication extends BaseEntity {
/** 仲裁员名称 */
private String arbitratorName;
- /** 案件名称 */
- private String caseName;
+
/** 案件描述 */
private String caseDescribe;
diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseApplicationServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseApplicationServiceImpl.java
index cad7a7e..b70f2ad 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseApplicationServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseApplicationServiceImpl.java
@@ -1472,6 +1472,11 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
* @param failureMsg
*/
private void validBaseColumn(CaseApplication caseApplication, StringBuilder failureMsg) {
+ if( StrUtil.isEmpty(caseApplication.getCaseName())){
+ failureMsg.append("【案件名称】字段不能为空；");
+ }else if(caseApplication.getCaseName().length()>50){
+ failureMsg.append("【案件名称】字段超出指定长度，最大长度为50；");
+ }
BigDecimal caseSubjectAmount = caseApplication.getCaseSubjectAmount();
if(null== caseSubjectAmount){
failureMsg.append("【案件标的】字段不合法；");
@@ -2391,6 +2396,7 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
private void copyCaseApplication(CaseApplication caseApplicationinsertDiffer, CaseApplication caseApplicationNew) {
caseApplicationNew.setArbitratClaims(caseApplicationinsertDiffer.getArbitratClaims());
caseApplicationNew.setCaseNum(caseApplicationinsertDiffer.getCaseNum());
+ caseApplicationNew.setCaseName(caseApplicationinsertDiffer.getCaseName());
caseApplicationNew.setCaseSubjectAmount(caseApplicationinsertDiffer.getCaseSubjectAmount());
caseApplicationNew.setLoanStartDate(caseApplicationinsertDiffer.getLoanStartDate());
caseApplicationNew.setLoanEndDate(caseApplicationinsertDiffer.getLoanEndDate());
diff --git a/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseApplicationMapper.xml b/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseApplicationMapper.xml
index 7bd95db..de4523e 100644
--- a/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseApplicationMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseApplicationMapper.xml
@@ -372,7 +372,7 @@
insert into case_application(
-
+ case_name ,
case_num,
case_subject_amount,
register_date,
@@ -400,6 +400,7 @@
import_flag,
create_time
)values(
+ #{caseName},
#{caseNum},
#{caseSubjectAmount},
sysdate(),