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

ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/CaseApplicationController.java

@@ -296,5 +296,18 @@ public class CaseApplicationController extends BaseController {
     public AjaxResult creatTrialRecord(@Validated @RequestBody ArbitrateRecord arbitrateRecord){
         return caseApplicationService.creatTrialRecord(arbitrateRecord);
     }
+    /**
+     * 案件锁定或者解锁
+     * @param caseApplication
+     * @return
+     */
+    @PostMapping("/updateCaseLockStatus")
+//    @PreAuthorize("@ss.hasPermi('caseManagement:list:creatTrialRecord')")
+    public AjaxResult updateCaseLockStatus(@Validated @RequestBody CaseApplication caseApplication){
+        if(caseApplication.getId()==null || caseApplication.getLockStatus()==null){
+            return error("参数校验失败");
+        }
+        return AjaxResult.success(caseApplicationService.updateCaseLockStatus(caseApplication));
+    }
 
 }

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

@@ -235,6 +235,18 @@ public class CaseApplication  extends BaseEntity {
     private List<CaseAttach> payOrderList;
     // 导入校验失败信息
     private StringBuilder errorMsg;
+    /**
+     * 是否锁定，0-否，1-是
+     */
+    private Integer lockStatus;
+
+    public Integer getLockStatus() {
+        return lockStatus;
+    }
+
+    public void setLockStatus(Integer lockStatus) {
+        this.lockStatus = lockStatus;
+    }
 
     public Integer getPayTypeCode() {
         return payTypeCode;

ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/mapper/CaseApplicationMapper.java

@@ -60,4 +60,12 @@ public interface CaseApplicationMapper {
 
 
     ToDoCount selectTodoCountByRole(CaseApplication caseApplication);
+
+    /**
+     * 修改案件锁定状态
+     * @param id
+     * @param lockStatus
+     * @return
+     */
+    int updateCaseLockStatus(@Param("id")Long id,@Param("lockStatus") Integer lockStatus);
 }

ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/ICaseApplicationService.java

@@ -64,4 +64,11 @@ public interface ICaseApplicationService {
     AjaxResult selectCaseProgress(CaseApplication caseApplication);
 
     int updateHeardate(CaseApplication caseApplication);
+
+    /**
+     * 修改案件锁定状态
+     * @param caseApplication
+     * @return
+     */
+    int updateCaseLockStatus(CaseApplication caseApplication);
 }

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

@@ -241,6 +241,11 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
         return rows;
     }
 
+    @Override
+    public int updateCaseLockStatus(CaseApplication caseApplication) {
+        return caseApplicationMapper.updateCaseLockStatus(caseApplication.getId(),caseApplication.getLockStatus());
+    }
+
     private List<CaseLogRecord> getNofinishCasenode(Integer caseStatus) {
         CaseLogRecord caseLogRecord1 = new CaseLogRecord();
         caseLogRecord1.setCaseNodeName("立案审查");

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

@@ -11,6 +11,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
+import java.util.Optional;
 
 @Service
 public class CaseLogRecordServiceImpl  implements ICaseLogRecordService {
@@ -29,7 +30,7 @@ public class CaseLogRecordServiceImpl  implements ICaseLogRecordService {
                     caseNodeTime= DateUtil.format(record.getCaseNodeTime(), DatePattern.NORM_DATETIME_FORMATTER);
                 }
 
-                contentBuilder.append(record.getCreateNickName()).append("(").append(record.getCreateBy()).append(")").append("于").append(caseNodeTime);
+                contentBuilder.append(Optional.ofNullable(record.getCreateNickName()).orElse("")).append("(").append(record.getCreateBy()).append(")").append("于").append(caseNodeTime);
                 if(StrUtil.isNotEmpty(record.getContent())){
                     contentBuilder.append(record.getContent());
                 }

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

@@ -74,7 +74,7 @@
         c.begin_video_date ,c.online_video_person ,c.contract_number ,c.create_by ,c.create_time ,
         c.update_by ,c.update_time , c.arbitrator_name,ca.name,ca.application_organ_id,ca.application_organ_name as
         applicantName,
-        c.arbitrator_id,ca.identity_num , ca.identity_type,c.filearbitra_url
+        c.arbitrator_id,ca.identity_num , ca.identity_type,c.filearbitra_url,c.lock_status
         from case_application c
         LEFT JOIN case_affiliate ca ON ca.case_appli_id = c.id
         <where>
@@ -90,6 +90,9 @@
                     #{caseStatus}
                 </foreach>
             </if>
+            <if test="lockStatus != null">
+                AND c.lock_status = #{lockStatus}
+            </if>
         </where>
         ) t
         <where>
@@ -238,7 +241,7 @@
         END caseStatusName,
         c.hear_date ,c.arbitrat_claims ,
         c.loan_start_date ,c.loan_end_date ,c.claim_princi_owed ,c.claim_interest_owed ,c.claim_liquid_damag ,c.fee_payable ,
-        c.begin_video_date ,c.online_video_person ,c.contract_number ,c.create_by ,c.create_time ,
+        c.begin_video_date ,c.online_video_person ,c.contract_number ,c.create_by ,c.create_time ,c.lock_status,
         c.update_by ,c.update_time , c.arbitrator_name,ca.application_organ_id applicationOrganId ,ca.application_organ_name as applicantName,c.filearbitra_url
         from case_application c
         LEFT JOIN case_affiliate ca ON ca.case_appli_id = c.id AND ca.identity_type=1
@@ -246,6 +249,9 @@
             <if test="caseStatus != null">
                 AND c.case_status = #{caseStatus}
             </if>
+            <if test="lockStatus != null">
+                AND c.lock_status = #{lockStatus}
+            </if>
             <if test="caseNum != null and caseNum != ''">
                 AND c.case_num = #{caseNum}
             </if>
@@ -438,6 +444,9 @@
     <update id="updatePayType">
         update case_application set pay_type=#{payType} where id = #{caseId}
     </update>
+    <update id="updateCaseLockStatus">
+        update case_application set lock_status=#{lockStatus} where id = #{id}
+    </update>
 
     <delete id="deletecaseApplication" parameterType="CaseApplication">
         delete from case_application where id = #{id}