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

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

@@ -0,0 +1,32 @@
+package com.ruoyi.wisdomarbitrate.domain;
+
+import com.ruoyi.common.core.domain.BaseEntity;
+import lombok.Data;
+
+@Data
+public class ArbitrateRecord     extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+    /** ID */
+    private Long id;
+    /** 案件申请id */
+    private Long caseAppliId;
+    /** 证据认定 */
+    private String evidenDetermi;
+    /** 认定事实 */
+    private String factDetermi;
+    /** 综上所述 */
+    private String caseSketch;
+    /** 本庭认为 */
+    private String arbitrateThink;
+    /** 裁决如下 */
+    private String rulingFollows;
+    /** 核验裁决书意见 */
+    private String verificaOpinion;
+    /** 审核裁决书意见 */
+    private String checkOpinion;
+
+
+
+
+}

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

@@ -54,8 +54,7 @@ public class CaseApplication  extends BaseEntity {
     private BigDecimal claimLiquidDamag;
     /** 仲裁应缴费用 */
     private BigDecimal feePayable;
-    /** 仲裁实缴费用 */
+
-    private BigDecimal paidExpenses;
     /** 开始在线视频时间 */
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date beginVideoDate;
@@ -200,6 +199,17 @@ public class CaseApplication  extends BaseEntity {
     /** 案件仲裁员 */
     private List<Arbitrator> arbitrators;
 
+    /** 仲裁记录 */
+    private ArbitrateRecord arbitrateRecord;
+
+    public ArbitrateRecord getArbitrateRecord() {
+        return arbitrateRecord;
+    }
+
+    public void setArbitrateRecord(ArbitrateRecord arbitrateRecord) {
+        this.arbitrateRecord = arbitrateRecord;
+    }
+
     public List<Arbitrator> getArbitrators() {
         return arbitrators;
     }
@@ -455,13 +465,7 @@ public class CaseApplication  extends BaseEntity {
         this.feePayable = feePayable;
     }
 
-    public BigDecimal getPaidExpenses() {
-        return paidExpenses;
-    }
 
-    public void setPaidExpenses(BigDecimal paidExpenses) {
-        this.paidExpenses = paidExpenses;
-    }
 
     public Date getBeginVideoDate() {
         return beginVideoDate;

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

@@ -0,0 +1,17 @@
+package com.ruoyi.wisdomarbitrate.mapper;
+
+import com.ruoyi.wisdomarbitrate.domain.ArbitrateRecord;
+import com.ruoyi.wisdomarbitrate.domain.CaseAffiliate;
+import com.ruoyi.wisdomarbitrate.domain.CaseApplication;
+
+import java.util.List;
+
+public interface ArbitrateRecordMapper {
+    int insertArbitrateRecord(ArbitrateRecord arbitrateRecord);
+
+    int updataArbitrateRecord(ArbitrateRecord arbitrateRecord);
+
+    ArbitrateRecord  selectArbitrateRecord(ArbitrateRecord arbitrateRecord);
+
+
+}

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

@@ -6,9 +6,11 @@ import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.SmsUtils;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.bean.BeanUtils;
+import com.ruoyi.wisdomarbitrate.domain.ArbitrateRecord;
 import com.ruoyi.wisdomarbitrate.domain.Arbitrator;
 import com.ruoyi.wisdomarbitrate.domain.CaseAffiliate;
 import com.ruoyi.wisdomarbitrate.domain.CaseApplication;
+import com.ruoyi.wisdomarbitrate.mapper.ArbitrateRecordMapper;
 import com.ruoyi.wisdomarbitrate.mapper.ArbitratorMapper;
 import com.ruoyi.wisdomarbitrate.mapper.CaseAffiliateMapper;
 import com.ruoyi.wisdomarbitrate.mapper.CaseApplicationMapper;
@@ -36,6 +38,8 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
 
     @Autowired
     private ArbitratorMapper arbitratorMapper;
+    @Autowired
+    private ArbitrateRecordMapper arbitrateRecordMapper;
 
 
     @Override
@@ -102,6 +106,11 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
         CaseApplication caseApplicationselect = caseApplicationMapper.selectCaseApplication(caseApplication);
         CaseAffiliate caseAffiliate = new CaseAffiliate();
         caseAffiliate.setCaseAppliId(caseApplication.getId());
+
+        ArbitrateRecord arbitrateRecord = new ArbitrateRecord();
+        arbitrateRecord.setCaseAppliId(caseApplication.getId());
+        ArbitrateRecord arbitrateRecordselect = arbitrateRecordMapper.selectArbitrateRecord(arbitrateRecord);
+
         List<CaseAffiliate> caseAffiliatListeselect = caseAffiliateMapper.selectCaseAffiliate(caseAffiliate);
         if(caseAffiliatListeselect!=null){
             StringBuffer applicantName = new StringBuffer();
@@ -118,6 +127,7 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
             caseApplicationselect.setApplicantName(applicantName.toString());
             caseApplicationselect.setRespondentName(respondentName.toString());
             caseApplicationselect.setCaseAffiliates(caseAffiliatListeselect);
+            caseApplicationselect.setArbitrateRecord(arbitrateRecordselect);
         }
         return caseApplicationselect;
     }

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

@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.wisdomarbitrate.mapper.ArbitrateRecordMapper">
+    <resultMap type="ArbitrateRecord" id="ArbitrateRecordResult">
+        <id     property="id"       column="id"      />
+        <result property="caseAppliId"       column="case_appli_id"      />
+        <result property="evidenDetermi"     column="eviden_determi"    />
+        <result property="factDetermi"     column="fact_determi"    />
+        <result property="caseSketch"        column="case_sketch"        />
+        <result property="arbitrateThink"  column="arbitrate_think"  />
+        <result property="rulingFollows"          column="ruling_follows"          />
+        <result property="verificaOpinion"       column="verifica_opinion"       />
+        <result property="checkOpinion"     column="check_opinion"     />
+
+    </resultMap>
+
+    <insert id="insertArbitrateRecord" parameterType="ArbitrateRecord" useGeneratedKeys="true" keyProperty="id">
+        insert into arbitrate_record(
+        <if test="caseAppliId != null">case_appli_id,</if>
+        <if test="evidenDetermi != null and evidenDetermi != ''">eviden_determi,</if>
+        <if test="factDetermi != null and factDetermi != ''">fact_determi,</if>
+        <if test="caseSketch != null and caseSketch != ''">case_sketch,</if>
+        <if test="rulingFollows != null and rulingFollows != ''">ruling_follows,</if>
+        <if test="verifica_opinion != null and verifica_opinion != ''">verificaOpinion,</if>
+        <if test="check_opinion != null and check_opinion != ''">checkOpinion,</if>
+        <if test="createBy != null  and createBy != ''">create_by,</if>
+        create_time
+        )values(
+        <if test="caseAppliId != null ">#{caseAppliId},</if>
+        <if test="evidenDetermi != null and evidenDetermi != ''">#{evidenDetermi},</if>
+        <if test="factDetermi != null and factDetermi != ''">#{factDetermi},</if>
+        <if test="caseSketch != null and caseSketch != ''">#{caseSketch},</if>
+        <if test="rulingFollows != null and rulingFollows != ''">#{rulingFollows},</if>
+        <if test="verifica_opinion != null and verifica_opinion != ''">#{verifica_opinion},</if>
+        <if test="check_opinion != null and check_opinion != ''">#{check_opinion},</if>
+        <if test="createBy != null  and createBy != ''">#{createBy},</if>
+        sysdate()
+        )
+    </insert>
+
+
+    <update id="updataArbitrateRecord" parameterType="ArbitrateRecord">
+        update arbitrate_record
+        <set>
+            <if test="evidenDetermi != null and evidenDetermi != ''">eviden_determi = #{evidenDetermi},</if>
+            <if test="factDetermi != null and factDetermi != ''">fact_determi = #{factDetermi},</if>
+            <if test="caseSketch != null and caseSketch != ''">case_sketch = #{caseSketch},</if>
+            <if test="arbitrateThink != null and arbitrateThink != ''">arbitrate_think = #{arbitrateThink},</if>
+            <if test="rulingFollows != null and rulingFollows != ''">ruling_follows = #{rulingFollows},</if>
+            <if test="verificaOpinion != null and verificaOpinion != ''">verifica_opinion = #{verificaOpinion},</if>
+            <if test="checkOpinion != null and checkOpinion != ''">check_opinion = #{checkOpinion},</if>
+            <if test="updateBy != null  and updateBy != ''">update_by = #{updateBy},</if>
+            update_time = sysdate()
+        </set>
+        where id = #{id}
+    </update>
+
+
+    <select id="selectArbitrateRecord" parameterType="ArbitrateRecord" resultMap="ArbitrateRecordResult">
+        SELECT a.id ,a.case_appli_id ,a.eviden_determi ,a.fact_determi ,a.case_sketch ,a.arbitrate_think ,a.ruling_follows ,
+        a.verifica_opinion ,a.check_opinion
+        from arbitrate_record a
+        <where>
+            <if test="caseAppliId != null ">
+                AND a.case_appli_id  = #{caseAppliId}
+            </if>
+        </where>
+    </select>
+
+
+
+
+
+
+
+
+</mapper>

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

@@ -20,7 +20,6 @@
         <result property="claimLiquidDamag"    column="claim_liquid_damag"   />
 
         <result property="feePayable"          column="fee_payable"          />
-        <result property="paidExpenses"       column="paid_expenses"       />
         <result property="beginVideoDate"     column="begin_video_date"     />
         <result property="onlineVideoPerson"       column="online_video_person"       />
         <result property="contractNumber"      column="contract_number"     />
@@ -45,7 +44,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.paid_expenses ,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.update_by ,c.update_time
         from case_application c
         <where>
@@ -84,7 +83,6 @@
         <if test="claimInterestOwed != null ">claim_interest_owed,</if>
         <if test="claimLiquidDamag != null ">claim_liquid_damag,</if>
         <if test="feePayable != null ">fee_payable,</if>
-        <if test="paidExpenses != null ">paid_expenses,</if>
         <if test="beginVideoDate != null ">begin_video_date,</if>
         <if test="onlineVideoPerson != null  and onlineVideoPerson != ''">online_video_person,</if>
 
@@ -130,7 +128,6 @@
             <if test="claimInterestOwed != null ">claim_interest_owed = #{claimInterestOwed},</if>
             <if test="claimLiquidDamag != null ">claim_liquid_damag = #{claimLiquidDamag},</if>
             <if test="feePayable != null ">fee_payable = #{feePayable},</if>
-            <if test="paidExpenses != null ">paid_expenses = #{paidExpenses},</if>
             <if test="beginVideoDate != null ">begin_video_date = #{beginVideoDate},</if>
             <if test="onlineVideoPerson != null  and onlineVideoPerson != ''">online_video_person = #{onlineVideoPerson},</if>
 
@@ -173,7 +170,7 @@
     <select id="selectCaseApplication" parameterType="CaseApplication" resultMap="CaseApplicationResult">
         select c.id ,c.case_num ,c.case_subject_amount ,c.register_date ,c.arbitrat_method ,c.case_status ,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.paid_expenses ,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.update_by ,c.update_time
         from case_application c
         <where>