Merge branch 'dev' of http://git.xayunmei.com/SH-Arbitrate/Arbitrate-Backend into hjb

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

@@ -108,6 +108,27 @@ public class CaseApplication  extends BaseEntity {
     /** 是否需要开庭审理 */
     private Integer openCourtHear;
 
+    /** 支付状态 */
+    private Integer paymentStatus;
+    /** 支付状态描述 */
+    private String paymentStatusName;
+
+    public Integer getPaymentStatus() {
+        return paymentStatus;
+    }
+
+    public void setPaymentStatus(Integer paymentStatus) {
+        this.paymentStatus = paymentStatus;
+    }
+
+    public String getPaymentStatusName() {
+        return paymentStatusName;
+    }
+
+    public void setPaymentStatusName(String paymentStatusName) {
+        this.paymentStatusName = paymentStatusName;
+    }
+
     public Integer getIsAgreePendTral() {
         return isAgreePendTral;
     }

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

@@ -20,4 +20,6 @@ public interface CaseApplicationMapper {
     int deletecaseApplication(CaseApplication caseApplication);
 
     CaseApplication selectCaseApplication(CaseApplication caseApplication);
+
+    CaseApplication selectCaseApplicationConfirm(CaseApplication caseApplication);
 }

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

@@ -35,4 +35,6 @@ public interface ICaseApplicationService {
     int checkArbitrateRecord(CaseApplication caseApplication);
 
     int submitCaseApplicationCheck(CaseApplication caseApplication);
+
+    CaseApplication selectCaseApplicationConfirm(CaseApplication caseApplication);
 }

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

@@ -310,6 +310,13 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
         return rows;
     }
 
+    @Override
+    public CaseApplication selectCaseApplicationConfirm(CaseApplication caseApplication) {
+        CaseApplication caseApplicationselect = caseApplicationMapper.selectCaseApplicationConfirm(caseApplication);
+
+        return caseApplicationselect;
+    }
+
     @Override
     @Transactional
     public int pendTralSure(CaseApplication caseApplication) {

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

@@ -32,6 +32,8 @@
 
         <result property="arbitratorId"   column="arbitrator_id"  />
         <result property="arbitratorName"   column="arbitrator_name"  />
+        <result property="paymentStatus"   column="payment_status"  />
+        <result property="paymentStatusName"   column="paymentStatusName"  />
     </resultMap>
 
 
@@ -153,6 +155,7 @@
             <if test="caseStatus != null">case_status = #{caseStatus},</if>
 
             <if test="updateBy != null  and updateBy != ''">update_by = #{updateBy},</if>
+            <if test="caseNum != null and caseNum != ''">case_num = #{caseNum},</if>
             update_time = sysdate()
         </set>
         where id = #{id}
@@ -207,6 +210,34 @@
         </where>
     </select>
 
+    <select id="selectCaseApplicationConfirm" parameterType="CaseApplication" resultMap="CaseApplicationResult">
+        select c.id ,c.case_num ,c.case_subject_amount ,c.register_date ,c.arbitrat_method ,
+        CASE c.arbitrat_method when 1 then '开庭审理' when 2 then '书面审理'
+        ELSE '无审理方式'
+        END arbitratMethodName,
+        c.case_status ,
+        CASE c.case_status when 0 then '立案申请' when 1 then '待立案审查' when 2 then '待缴费'
+        when 3 then '待缴费确认' when 4 then '待案件质证' when 5 then '待组庭审核'
+        when 6 then '待组庭确定' when 7 then '待审核仲裁方式' when 8 then '待开庭审理'
+        when 9 then '待书面审理' when 10 then '待生成仲裁文书' when 11 then '待核验仲裁文书'
+        when 12 then '待审核仲裁文书' when 13 then '待仲裁文书签名' when 14 then '待仲裁文书用印'
+        when 15 then '待仲裁文书送达' when 16 then '待案件归档'
+        ELSE '无案件状态'
+        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.update_by ,c.update_time,c.arbitrator_id,c.arbitrator_name,
+        p.payment_status ,
+        CASE p.payment_status when 1 then '已支付' when 0 then '未支付'
+        ELSE '无支付状态'
+        END paymentStatusName
+        from case_application c left join case_payment_record p on c.id  = p.case_id
+        where c.case_status  = 3 and p.payment_status  = 1
+            AND c.id = #{id}
+
+    </select>
+