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

ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/CaseApplication.java

@@ -50,6 +50,7 @@ public class CaseApplication  extends BaseEntity {
 
     /** 案件状态 */
     private Integer caseStatus;
+    private String caseStatusstr;
 
     /** 申请人是否书面审理 */
     private Integer applicantIsWrittenHear;

ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/AdjudicationServiceImpl.java

@@ -610,6 +610,7 @@ public class AdjudicationServiceImpl implements IAdjudicationService {
         }
         //修改案件状态
         caseApplicationById.setCaseStatus(CaseApplicationConstants.VERPRIF_ARBITRATION);
+        caseApplicationById.setLockStatus(1);
         caseApplicationMapper.submitCaseApplication(caseApplicationById);
     }
 

ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseApplicationServiceImpl.java

@@ -409,6 +409,7 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
     public int updateHeardate(CaseApplication caseApplication) {
 //        caseApplication.setCaseStatus(CaseApplicationConstants.PENDING_OPENCOURT_HEAR);
         caseApplication.setCaseStatus(CaseApplicationConstants.PENDING_OPENCOURT_HEAR);
+        caseApplication.setLockStatus(1);
         int rows = caseApplicationMapper.submitCaseApplication(caseApplication);
         //1975139	修改开庭时间通知 尊敬的{1}用户，您的{2}仲裁案件，开庭日期已改为{3}，请知晓，如非本人操作，请忽略本短信
         //发送短信通知
@@ -1706,6 +1707,7 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
                 String arbitratorNamestr = arbitratorNames.stream().map(Object::toString).collect(Collectors.joining(","));
                 caseApplication.setArbitratorId(idstr);
                 caseApplication.setArbitratorName(arbitratorNamestr);
+                caseApplication.setLockStatus(1);
                 rows = caseApplicationMapper.submitCaseApplication(caseApplication);
             }
         } else {
@@ -1718,6 +1720,7 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
                 String arbitratorNamestr = arbitratorNames.stream().map(Object::toString).collect(Collectors.joining(","));
                 caseApplication.setArbitratorId(idstr);
                 caseApplication.setArbitratorName(arbitratorNamestr);
+                caseApplication.setLockStatus(1);
                 rows = caseApplicationMapper.submitCaseApplication(caseApplication);
             }
         }
@@ -2571,7 +2574,9 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
                     List<Integer> caseStatussnew = caseStatuss.stream().distinct().collect(Collectors.toList());
                     List<String> caseStatusNamesnew = caseStatusNames.stream().distinct().collect(Collectors.toList());
                     String caseStatusName = caseStatusNamesnew.stream().map(Object::toString).collect(Collectors.joining(","));
+                    String caseStatusstr = caseStatussnew.stream().map(Object::toString).collect(Collectors.joining(","));
                     caseApplicationselect.setCaseStatusName(caseStatusName);
+                    caseApplicationselect.setCaseStatusstr(caseStatusstr);
                 }
             }
         }
@@ -3253,6 +3258,7 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
 //        caseApplication.setCaseStatus(CaseApplicationConstants.CHECK_ARBITRATION_METHOD);
 
         caseApplication.setCaseStatus(CaseApplicationConstants.CHECK_ARBITRATION_METHOD);
+        caseApplication.setLockStatus(1);
         Integer isAgreePendTral = caseApplication.getIsAgreePendTral();
         int rows = 0;
         //同意组庭

ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseArbitrateServiceImpl.java

@@ -123,6 +123,7 @@ public class CaseArbitrateServiceImpl implements ICaseArbitrateService {
 
             }
         }
+        caseApplication1.setLockStatus(1);
         int i = caseApplicationMapper.submitCaseApplication(caseApplication1);
         if (i > 0) {
             String arbitratMethodStr = caseApplication1.getArbitratMethod() == 1 ? "开庭审理" : "书面审理";

ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseApplicationMapper.xml

@@ -492,6 +492,9 @@
             <if test="caseNum != null and caseNum != ''">
                 AND t1.case_num = #{caseNum}
             </if>
+            <if test="batchNumber != null">
+                AND t1.batch_number = #{batchNumber}
+            </if>
             <if test="nameId != null and nameId != ''">
                 AND t1.application_organ_id=#{nameId} AND t1.identity_type=1
             </if>
@@ -841,6 +844,9 @@
             <if test="caseNum != null and caseNum != ''">
                 AND c.case_num = #{caseNum}
             </if>
+            <if test="batchNumber != null">
+                AND c.batch_number = #{batchNumber}
+            </if>
             <if test="nameId != null and nameId != ''">
                 AND ca.application_organ_id=#{nameId} AND ca.identity_type=1
             </if>
@@ -1141,6 +1147,7 @@
             <if test="objectiJuris != null">objecti_juris = #{objectiJuris},</if>
 
             <if test="isAbsence != null">is_absence = #{isAbsence},</if>
+            <if test="lockStatus != null">lock_status = #{lockStatus},</if>
             <if test="appliIsAbsen != null">appli_is_absen = #{appliIsAbsen},</if>
             <if test="responCrossOpin != null  and responCrossOpin != ''">respon_cross_opin = #{responCrossOpin},</if>
             <if test="applicaCrossOpin != null  and applicaCrossOpin != ''">applica_cross_opin = #{applicaCrossOpin},