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 1/3] =?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 id="insertCaseApplication" parameterType="CaseApplication" useGeneratedKeys="true" keyProperty="id">
         insert into case_application(
-
+        <if test="caseName != null  and caseName != ''">case_name ,</if>
         <if test="caseNum != null and caseNum != ''">case_num,</if>
         <if test="caseSubjectAmount != null">case_subject_amount,</if>
         register_date,
@@ -400,6 +400,7 @@
         <if test="importFlag != null ">import_flag,</if>
         create_time
         )values(
+        <if test="caseName != null and caseName != ''">#{caseName},</if>
         <if test="caseNum != null and caseNum != ''">#{caseNum},</if>
         <if test="caseSubjectAmount != null">#{caseSubjectAmount},</if>
         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 2/3] =?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 id="insertCaseApplication" parameterType="CaseApplication" useGeneratedKeys="true" keyProperty="id">
         insert into case_application(
-        <if test="caseName != null  and caseName != ''">case_name ,</if>
+
         <if test="caseNum != null and caseNum != ''">case_num,</if>
         <if test="caseSubjectAmount != null">case_subject_amount,</if>
         register_date,
@@ -400,7 +400,6 @@
         <if test="importFlag != null ">import_flag,</if>
         create_time
         )values(
-        <if test="caseName != null and caseName != ''">#{caseName},</if>
         <if test="caseNum != null and caseNum != ''">#{caseNum},</if>
         <if test="caseSubjectAmount != null">#{caseSubjectAmount},</if>
         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 3/3] =?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 id="insertCaseApplication" parameterType="CaseApplication" useGeneratedKeys="true" keyProperty="id">
         insert into case_application(
-
+        <if test="caseName != null  and caseName != ''">case_name ,</if>
         <if test="caseNum != null and caseNum != ''">case_num,</if>
         <if test="caseSubjectAmount != null">case_subject_amount,</if>
         register_date,
@@ -400,6 +400,7 @@
         <if test="importFlag != null ">import_flag,</if>
         create_time
         )values(
+        <if test="caseName != null and caseName != ''">#{caseName},</if>
         <if test="caseNum != null and caseNum != ''">#{caseNum},</if>
         <if test="caseSubjectAmount != null">#{caseSubjectAmount},</if>
         sysdate(),