Procházet zdrojové kódy

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

qtz před 2 roky
rodič
revize
48e502b1a1

+ 11
- 0
ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/ArbitrateRecord.java Zobrazit soubor

28
     /** 裁决书附件id */
28
     /** 裁决书附件id */
29
     private Integer annexId;
29
     private Integer annexId;
30
 
30
 
31
+    /** 被申请人是否缺席 */
32
+    private Integer isAbsence;
33
+    /** 被申请人质证意见 */
34
+    private String responCrossOpin;
35
+    /** 申请人质证意见 */
36
+    private String applicaCrossOpin;
37
+    /** 申请人是否缺席 */
38
+    private Integer appliIsAbsen;
39
+    /** 被申请人质证意见 */
40
+    private String responDefenOpini;
41
+
31
 
42
 
32
 
43
 
33
 
44
 

+ 52
- 4
ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/CaseAffiliate.java Zobrazit soubor

23
      * 申请机构名称
23
      * 申请机构名称
24
      */
24
      */
25
     private String applicationOrganName;
25
     private String applicationOrganName;
26
+
26
     /**
27
     /**
27
-     * 代理人用户id
28
+     * 法定代表人
28
      */
29
      */
29
-    private String applicantAgentUserId;
30
+    private String compLegalPerson;
31
+    /**
32
+     * 法定代表人职位
33
+     */
34
+    private String compLegalperPost;
35
+    /**
36
+     * 被申请人性别
37
+     */
38
+    private String responSex;
39
+    /**
40
+     * 被申请人出生年月日
41
+     */
42
+    private String responBirth;
43
+
44
+    public String getCompLegalPerson() {
45
+        return compLegalPerson;
46
+    }
47
+
48
+    public void setCompLegalPerson(String compLegalPerson) {
49
+        this.compLegalPerson = compLegalPerson;
50
+    }
51
+
52
+    public String getCompLegalperPost() {
53
+        return compLegalperPost;
54
+    }
55
+
56
+    public void setCompLegalperPost(String compLegalperPost) {
57
+        this.compLegalperPost = compLegalperPost;
58
+    }
59
+
60
+    public String getResponSex() {
61
+        return responSex;
62
+    }
63
+
64
+    public void setResponSex(String responSex) {
65
+        this.responSex = responSex;
66
+    }
67
+
68
+    public String getResponBirth() {
69
+        return responBirth;
70
+    }
71
+
72
+    public void setResponBirth(String responBirth) {
73
+        this.responBirth = responBirth;
74
+    }
75
+
30
     /** 身份证号 */
76
     /** 身份证号 */
31
     @Excel(name = "身份证号")
77
     @Excel(name = "身份证号")
32
     private String identityNum;
78
     private String identityNum;
58
 
104
 
59
     /** 送达电子邮件 */
105
     /** 送达电子邮件 */
60
     private String sendEmail;
106
     private String sendEmail;
61
-    /** 快递单号 */
62
-    private String trackNum;
107
+    private String applicantAgentUserId;
63
 
108
 
64
     public String getApplicantAgentUserId() {
109
     public String getApplicantAgentUserId() {
65
         return applicantAgentUserId;
110
         return applicantAgentUserId;
69
         this.applicantAgentUserId = applicantAgentUserId;
114
         this.applicantAgentUserId = applicantAgentUserId;
70
     }
115
     }
71
 
116
 
117
+    /** 快递单号 */
118
+    private String trackNum;
119
+
72
     public String getApplicationOrganId() {
120
     public String getApplicationOrganId() {
73
         return applicationOrganId;
121
         return applicationOrganId;
74
     }
122
     }

+ 57
- 2
ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/CaseApplication.java Zobrazit soubor

79
     /** 申请人主张违约金 */
79
     /** 申请人主张违约金 */
80
     @Excel(name = "申请人主张违约金")
80
     @Excel(name = "申请人主张违约金")
81
     private BigDecimal claimLiquidDamag;
81
     private BigDecimal claimLiquidDamag;
82
-    /** 申请人仲裁诉求 */
83
-    @Excel(name = "申请人仲裁诉求")
82
+    /** 申请人仲裁请求及事实和理由 */
83
+    @Excel(name = "申请人仲裁请求及事实和理由")
84
     private String arbitratClaims;
84
     private String arbitratClaims;
85
     /** 仲裁应缴费用 */
85
     /** 仲裁应缴费用 */
86
     private BigDecimal feePayable;
86
     private BigDecimal feePayable;
121
     private Integer openCourtHear;
121
     private Integer openCourtHear;
122
 
122
 
123
     /** 申请人请求仲裁庭裁决 */
123
     /** 申请人请求仲裁庭裁决 */
124
+    @Excel(name = "申请人请求仲裁庭裁决")
124
     private String requestRule;
125
     private String requestRule;
125
     /** 是否仲裁反请求 */
126
     /** 是否仲裁反请求 */
126
     private Integer adjudicaCounter;
127
     private Integer adjudicaCounter;
134
     private String responCrossOpin;
135
     private String responCrossOpin;
135
     /** 被申请人的答辩意见 */
136
     /** 被申请人的答辩意见 */
136
     private String responDefenOpini;
137
     private String responDefenOpini;
138
+    /** 申请人是否缺席 */
139
+    private Integer appliIsAbsen;
140
+
141
+    public Integer getAppliIsAbsen() {
142
+        return appliIsAbsen;
143
+    }
144
+
145
+    public void setAppliIsAbsen(Integer appliIsAbsen) {
146
+        this.appliIsAbsen = appliIsAbsen;
147
+    }
137
 
148
 
138
     public String getResponDefenOpini() {
149
     public String getResponDefenOpini() {
139
         return responDefenOpini;
150
         return responDefenOpini;
531
     /** 姓名 */
542
     /** 姓名 */
532
     @Excel(name = "申请人主体信息-申请人(机构)",width = 26)
543
     @Excel(name = "申请人主体信息-申请人(机构)",width = 26)
533
     private String name;
544
     private String name;
545
+    /** 申请人主体信息-法定代表人 */
546
+    @Excel(name = "申请人主体信息-法定代表人",width = 26)
547
+    private String compLegalPerson;
548
+    /** 申请人主体信息-法定代表人 */
549
+    @Excel(name = "申请人主体信息-法定代表人职位",width = 26)
550
+    private String compLegalperPost;
534
     /**
551
     /**
535
      * 申请人主体信息-申请人(机构)id
552
      * 申请人主体信息-申请人(机构)id
536
      */
553
      */
573
     /** 身份证号 */
590
     /** 身份证号 */
574
     @Excel(name = "被申请人主体信息-身份证号",width = 26)
591
     @Excel(name = "被申请人主体信息-身份证号",width = 26)
575
     private String debtorIdentityNum;
592
     private String debtorIdentityNum;
593
+    /** 被申请人主体信息-性别 */
594
+    @Excel(name = "被申请人主体信息-性别",width = 26)
595
+    private String responSex;
596
+    /** 被申请人主体信息-出生年月日 */
597
+    @Excel(name = "被申请人主体信息-出生年月日",width = 26)
598
+    private String responBirth;
599
+
600
+    public String getCompLegalPerson() {
601
+        return compLegalPerson;
602
+    }
603
+
604
+    public void setCompLegalPerson(String compLegalPerson) {
605
+        this.compLegalPerson = compLegalPerson;
606
+    }
607
+
608
+    public String getCompLegalperPost() {
609
+        return compLegalperPost;
610
+    }
611
+
612
+    public void setCompLegalperPost(String compLegalperPost) {
613
+        this.compLegalperPost = compLegalperPost;
614
+    }
615
+
616
+    public String getResponSex() {
617
+        return responSex;
618
+    }
619
+
620
+    public void setResponSex(String responSex) {
621
+        this.responSex = responSex;
622
+    }
623
+
624
+    public String getResponBirth() {
625
+        return responBirth;
626
+    }
627
+
628
+    public void setResponBirth(String responBirth) {
629
+        this.responBirth = responBirth;
630
+    }
576
 
631
 
577
     /** 联系电话 */
632
     /** 联系电话 */
578
     @Excel(name = "被申请人主体信息-联系电话",width = 26)
633
     @Excel(name = "被申请人主体信息-联系电话",width = 26)

+ 5
- 0
ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/dto/CaseEvidenceDTO.java Zobrazit soubor

29
      * 是否指派仲裁员,1是,2否
29
      * 是否指派仲裁员,1是,2否
30
      */
30
      */
31
     private Integer pendingAppointArbotrar;
31
     private Integer pendingAppointArbotrar;
32
+    /** 是否仲裁反请求 */
33
+    private Integer adjudicaCounter;
34
+    /** 是否管辖异议申请 */
35
+    private Integer objectiJuris;
36
+
32
 
37
 
33
     /**
38
     /**
34
      * 案件仲裁员
39
      * 案件仲裁员

+ 39
- 2
ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseApplicationServiceImpl.java Zobrazit soubor

1198
         if (createBy!=null){
1198
         if (createBy!=null){
1199
             arbitrateRecordselect.setCreateBy(createBy);
1199
             arbitrateRecordselect.setCreateBy(createBy);
1200
         }
1200
         }
1201
+
1202
+        CaseApplication caseApplicationupdate = new CaseApplication();
1203
+        caseApplicationupdate.setId(arbitrateRecordselect.getCaseAppliId());
1204
+        caseApplicationupdate.setIsAbsence(arbitrateRecordselect.getIsAbsence());
1205
+        caseApplicationupdate.setAppliIsAbsen(arbitrateRecordselect.getAppliIsAbsen());
1206
+        caseApplicationupdate.setResponCrossOpin(arbitrateRecordselect.getResponCrossOpin());
1207
+        caseApplicationupdate.setApplicaCrossOpin(arbitrateRecordselect.getApplicaCrossOpin());
1208
+        caseApplicationupdate.setResponDefenOpini(arbitrateRecordselect.getResponDefenOpini());
1209
+        caseApplicationMapper.submitCaseApplication(caseApplicationupdate);
1210
+
1201
         //先判断案件是否已经提交过仲裁结果
1211
         //先判断案件是否已经提交过仲裁结果
1202
         ArbitrateRecord arbitrateRecordsele = arbitrateRecordMapper.selectArbitrateRecord(arbitrateRecordselect);
1212
         ArbitrateRecord arbitrateRecordsele = arbitrateRecordMapper.selectArbitrateRecord(arbitrateRecordselect);
1203
         if (arbitrateRecordsele!=null){
1213
         if (arbitrateRecordsele!=null){
1490
         CaseAffiliate caseAffiliate = new CaseAffiliate();
1500
         CaseAffiliate caseAffiliate = new CaseAffiliate();
1491
 
1501
 
1492
 //        BeanUtils.copyBeanProp(caseApplication,caseAffiliate);
1502
 //        BeanUtils.copyBeanProp(caseApplication,caseAffiliate);
1493
-        BeanUtils.copyBeanProp(caseAffiliate,caseApplication);
1494
-        caseAffiliate.setIdentityType(1);
1503
+//        BeanUtils.copyBeanProp(caseAffiliate,caseApplication);
1504
+//        caseAffiliate.setIdentityType(1);
1505
+        caseAffiliate = buildApplicaInfo(caseApplication);
1495
         // 申请人(机构),需要判断部门中是否存在,不存在则新增,当身份类型为1的时候,查询时需要根据名称查询组织机构
1506
         // 申请人(机构),需要判断部门中是否存在,不存在则新增,当身份类型为1的时候,查询时需要根据名称查询组织机构
1496
         if(StrUtil.isNotEmpty(caseApplication.getName())){
1507
         if(StrUtil.isNotEmpty(caseApplication.getName())){
1497
             setApplicantOrganization(caseAffiliate, caseApplication, deptMap);
1508
             setApplicantOrganization(caseAffiliate, caseApplication, deptMap);
1512
         caseApplication.setCaseAffiliates(caseAffiliatesnew);
1523
         caseApplication.setCaseAffiliates(caseAffiliatesnew);
1513
     }
1524
     }
1514
 
1525
 
1526
+    private CaseAffiliate buildApplicaInfo(CaseApplication caseApplication) {
1527
+        // 申请人信息
1528
+        CaseAffiliate caseAffiliate = new CaseAffiliate();
1529
+        caseAffiliate.setCaseAppliId(caseApplication.getId());
1530
+        caseAffiliate.setIdentityType(1);
1531
+        caseAffiliate.setName(caseApplication.getName());
1532
+        caseAffiliate.setIdentityNum(caseApplication.getIdentityNum());
1533
+        caseAffiliate.setContactTelphone(caseApplication.getContactTelphone());
1534
+        caseAffiliate.setContactAddress(caseApplication.getContactAddress());
1535
+        caseAffiliate.setWorkTelphone(caseApplication.getWorkTelphone());
1536
+        caseAffiliate.setWorkAddress(caseApplication.getWorkAddress());
1537
+        caseAffiliate.setNameAgent(caseApplication.getNameAgent());
1538
+        caseAffiliate.setIdentityNumAgent(caseApplication.getIdentityNumAgent());
1539
+        caseAffiliate.setContactTelphoneAgent(caseApplication.getContactTelphoneAgent());
1540
+        caseAffiliate.setContactAddressAgent(caseApplication.getContactAddressAgent());
1541
+        caseAffiliate.setCompLegalperPost(caseApplication.getCompLegalperPost());
1542
+        caseAffiliate.setCompLegalPerson(caseApplication.getCompLegalPerson());
1543
+
1544
+        return caseAffiliate;
1545
+
1546
+
1547
+    }
1548
+
1515
     /**
1549
     /**
1516
      * 设置申请人的组织机构
1550
      * 设置申请人的组织机构
1517
      * @param caseAffiliate
1551
      * @param caseAffiliate
1567
         debtorCaseAffiliate.setIdentityNumAgent(caseApplication.getDebtorIdentityNumAgent());
1601
         debtorCaseAffiliate.setIdentityNumAgent(caseApplication.getDebtorIdentityNumAgent());
1568
         debtorCaseAffiliate.setContactTelphoneAgent(caseApplication.getDebtorContactTelphoneAgent());
1602
         debtorCaseAffiliate.setContactTelphoneAgent(caseApplication.getDebtorContactTelphoneAgent());
1569
         debtorCaseAffiliate.setContactAddressAgent(caseApplication.getDebtorContactAddressAgent());
1603
         debtorCaseAffiliate.setContactAddressAgent(caseApplication.getDebtorContactAddressAgent());
1604
+        debtorCaseAffiliate.setResponSex(caseApplication.getResponSex());
1605
+        debtorCaseAffiliate.setResponBirth(caseApplication.getResponBirth());
1606
+
1570
         return debtorCaseAffiliate;
1607
         return debtorCaseAffiliate;
1571
     }
1608
     }
1572
 
1609
 

+ 2
- 0
ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseEvidenceServiceImpl.java Zobrazit soubor

166
             caseApplication1.setObjectionAddEviden(caseEvidenceDTO.getObjectionAddEviden());
166
             caseApplication1.setObjectionAddEviden(caseEvidenceDTO.getObjectionAddEviden());
167
             caseApplication1.setOpenCourtHear(caseEvidenceDTO.getOpenCourtHear());
167
             caseApplication1.setOpenCourtHear(caseEvidenceDTO.getOpenCourtHear());
168
             caseApplication1.setPendingAppointArbotrar(caseEvidenceDTO.getPendingAppointArbotrar());
168
             caseApplication1.setPendingAppointArbotrar(caseEvidenceDTO.getPendingAppointArbotrar());
169
+            caseApplication1.setAdjudicaCounter(caseEvidenceDTO.getAdjudicaCounter());
170
+            caseApplication1.setObjectiJuris(caseEvidenceDTO.getObjectiJuris());
169
             List<Arbitrator> arbitrators = caseEvidenceDTO.getArbitrators();
171
             List<Arbitrator> arbitrators = caseEvidenceDTO.getArbitrators();
170
             if (arbitrators != null && arbitrators.size() > 0) {
172
             if (arbitrators != null && arbitrators.size() > 0) {
171
                 List<Long> ids = arbitrators.stream().map(Arbitrator::getId).collect(Collectors.toList());
173
                 List<Long> ids = arbitrators.stream().map(Arbitrator::getId).collect(Collectors.toList());

+ 11
- 4
ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseAffiliateMapper.xml Zobrazit soubor

22
         <result property="applicationOrganId"    column="application_organ_id"   />
22
         <result property="applicationOrganId"    column="application_organ_id"   />
23
         <result property="applicationOrganName"    column="application_organ_name"   />
23
         <result property="applicationOrganName"    column="application_organ_name"   />
24
 
24
 
25
+        <result property="compLegalPerson"    column="comp_legal_person"   />
26
+        <result property="compLegalperPost"    column="comp_legalper_post"   />
27
+        <result property="responSex"    column="respon_sex"   />
28
+        <result property="responBirth"    column="respon_birth"   />
29
+
25
     </resultMap>
30
     </resultMap>
26
 
31
 
27
     <select id="selectCaseAffiliate" parameterType="CaseAffiliate" resultMap="CaseAffiliateResult">
32
     <select id="selectCaseAffiliate" parameterType="CaseAffiliate" resultMap="CaseAffiliateResult">
28
         select c.id ,c.case_appli_id ,c.identity_type ,c.name ,c.identity_num ,c.contact_telphone ,c.contact_address ,
33
         select c.id ,c.case_appli_id ,c.identity_type ,c.name ,c.identity_num ,c.contact_telphone ,c.contact_address ,
29
         c.work_address ,c.work_telphone ,c.name_agent, c.identity_num_agent ,c.contact_telphone_agent ,c.contact_address_agent,
34
         c.work_address ,c.work_telphone ,c.name_agent, c.identity_num_agent ,c.contact_telphone_agent ,c.contact_address_agent,
35
+        c.comp_legal_person,c.comp_legalper_post,c.respon_sex,c.respon_birth,
30
         c.track_num,c.application_organ_id,c.application_organ_name
36
         c.track_num,c.application_organ_id,c.application_organ_name
31
         from case_affiliate c
37
         from case_affiliate c
32
         <where>
38
         <where>
54
     <insert id="batchCaseAffiliate">
60
     <insert id="batchCaseAffiliate">
55
         insert into case_affiliate(case_appli_id, identity_type,application_organ_id,application_organ_name,name,identity_num,contact_telphone,
61
         insert into case_affiliate(case_appli_id, identity_type,application_organ_id,application_organ_name,name,identity_num,contact_telphone,
56
         contact_address,work_address,work_telphone ,name_agent,identity_num_agent,contact_telphone_agent,
62
         contact_address,work_address,work_telphone ,name_agent,identity_num_agent,contact_telphone_agent,
57
-        contact_address_agent,applicant_agent_user_id ) values
63
+        comp_legal_person,comp_legalper_post,respon_sex ,respon_birth,
64
+        contact_address_agent ) values
58
         <foreach item="item" index="index" collection="list" separator=",">
65
         <foreach item="item" index="index" collection="list" separator=",">
59
             (#{item.caseAppliId},#{item.identityType},#{item.applicationOrganId},#{item.applicationOrganName},#{item.name},#{item.identityNum},#{item.contactTelphone},
66
             (#{item.caseAppliId},#{item.identityType},#{item.applicationOrganId},#{item.applicationOrganName},#{item.name},#{item.identityNum},#{item.contactTelphone},
60
-            #{item.contactAddress},#{item.workAddress},#{item.workTelphone},  #{item.nameAgent},#{item.identityNumAgent},
61
-            #{item.contactTelphoneAgent},#{item.contactAddressAgent},#{item.applicantAgentUserId})
67
+            #{item.contactAddress},#{item.workAddress},#{item.workTelphone},  #{item.nameAgent},#{item.identityNumAgent},#{item.contactTelphoneAgent},
68
+            #{item.compLegalPerson},#{item.compLegalperPost},#{item.responSex},  #{item.responBirth},
69
+            #{item.contactAddressAgent})
62
         </foreach>
70
         </foreach>
63
     </insert>
71
     </insert>
64
 
72
 
71
         identity_type= #{identityType},
79
         identity_type= #{identityType},
72
         application_organ_id= #{applicationOrganId},
80
         application_organ_id= #{applicationOrganId},
73
         application_organ_name= #{applicationOrganName},
81
         application_organ_name= #{applicationOrganName},
74
-        applicant_agent_user_id= #{applicantAgentUserId},
75
         name = #{name},
82
         name = #{name},
76
         identity_num = #{identityNum},
83
         identity_num = #{identityNum},
77
         contact_telphone = #{contactTelphone},
84
         contact_telphone = #{contactTelphone},

+ 24
- 1
ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseApplicationMapper.xml Zobrazit soubor

35
         <result property="paymentStatus"   column="payment_status"  />
35
         <result property="paymentStatus"   column="payment_status"  />
36
         <result property="paymentStatusName"   column="paymentStatusName"  />
36
         <result property="paymentStatusName"   column="paymentStatusName"  />
37
         <result property="filearbitraUrl"   column="filearbitra_url"  />
37
         <result property="filearbitraUrl"   column="filearbitra_url"  />
38
+
39
+        <result property="requestRule"   column="request_rule"  />
40
+        <result property="properPreser"   column="proper_preser"  />
41
+        <result property="adjudicaCounter"   column="adjudica_counter"  />
38
     </resultMap>
42
     </resultMap>
39
 
43
 
40
     <select id="selectCaseApplicationList" parameterType="CaseApplication" resultMap="CaseApplicationResult">
44
     <select id="selectCaseApplicationList" parameterType="CaseApplication" resultMap="CaseApplicationResult">
433
         <if test="caseStatus != null ">case_status,</if>
437
         <if test="caseStatus != null ">case_status,</if>
434
         <if test="hearDate != null ">hear_date,</if>
438
         <if test="hearDate != null ">hear_date,</if>
435
         <if test="arbitratClaims != null and arbitratClaims != ''">arbitrat_claims,</if>
439
         <if test="arbitratClaims != null and arbitratClaims != ''">arbitrat_claims,</if>
440
+        <if test="requestRule != null and requestRule != ''">request_rule,</if>
436
         <if test="loanStartDate != null ">loan_start_date,</if>
441
         <if test="loanStartDate != null ">loan_start_date,</if>
437
         <if test="loanEndDate != null ">loan_end_date,</if>
442
         <if test="loanEndDate != null ">loan_end_date,</if>
438
         <if test="claimPrinciOwed != null ">claim_princi_owed,</if>
443
         <if test="claimPrinciOwed != null ">claim_princi_owed,</if>
444
         <if test="onlineVideoPerson != null  and onlineVideoPerson != ''">online_video_person,</if>
449
         <if test="onlineVideoPerson != null  and onlineVideoPerson != ''">online_video_person,</if>
445
 
450
 
446
         <if test="contractNumber != null  and contractNumber != ''">contract_number,</if>
451
         <if test="contractNumber != null  and contractNumber != ''">contract_number,</if>
452
+
453
+        <if test="adjudicaCounter != null ">adjudica_counter,</if>
454
+        <if test="properPreser != null ">proper_preser,</if>
455
+
447
         <if test="createBy != null  and createBy != ''">create_by,</if>
456
         <if test="createBy != null  and createBy != ''">create_by,</if>
448
         create_time
457
         create_time
449
         )values(
458
         )values(
454
         <if test="caseStatus != null ">#{caseStatus},</if>
463
         <if test="caseStatus != null ">#{caseStatus},</if>
455
         <if test="hearDate != null ">#{hearDate},</if>
464
         <if test="hearDate != null ">#{hearDate},</if>
456
         <if test="arbitratClaims != null and arbitratClaims != ''">#{arbitratClaims},</if>
465
         <if test="arbitratClaims != null and arbitratClaims != ''">#{arbitratClaims},</if>
466
+        <if test="requestRule != null and requestRule != ''">#{requestRule},</if>
457
         <if test="loanStartDate != null ">#{loanStartDate},</if>
467
         <if test="loanStartDate != null ">#{loanStartDate},</if>
458
         <if test="loanEndDate != null ">#{loanEndDate},</if>
468
         <if test="loanEndDate != null ">#{loanEndDate},</if>
459
         <if test="claimPrinciOwed != null ">#{claimPrinciOwed},</if>
469
         <if test="claimPrinciOwed != null ">#{claimPrinciOwed},</if>
465
         <if test="onlineVideoPerson != null  and onlineVideoPerson != ''">#{onlineVideoPerson},</if>
475
         <if test="onlineVideoPerson != null  and onlineVideoPerson != ''">#{onlineVideoPerson},</if>
466
 
476
 
467
         <if test="contractNumber != null  and contractNumber != ''">#{contractNumber},</if>
477
         <if test="contractNumber != null  and contractNumber != ''">#{contractNumber},</if>
478
+
479
+        <if test="adjudicaCounter != null ">#{adjudicaCounter},</if>
480
+        <if test="properPreser != null ">#{properPreser},</if>
481
+
468
         <if test="createBy != null  and createBy != ''">#{createBy},</if>
482
         <if test="createBy != null  and createBy != ''">#{createBy},</if>
469
         sysdate()
483
         sysdate()
470
         )
484
         )
478
             <if test="arbitratMethod != null and arbitratMethod != ''">arbitrat_method = #{arbitratMethod},</if>
492
             <if test="arbitratMethod != null and arbitratMethod != ''">arbitrat_method = #{arbitratMethod},</if>
479
             <if test="hearDate != null ">hear_date = #{hearDate},</if>
493
             <if test="hearDate != null ">hear_date = #{hearDate},</if>
480
             <if test="arbitratClaims != null and arbitratClaims != ''">arbitrat_claims = #{arbitratClaims},</if>
494
             <if test="arbitratClaims != null and arbitratClaims != ''">arbitrat_claims = #{arbitratClaims},</if>
495
+            <if test="requestRule != null and requestRule != ''">request_rule = #{requestRule},</if>
481
             <if test="loanStartDate != null ">loan_start_date = #{loanStartDate},</if>
496
             <if test="loanStartDate != null ">loan_start_date = #{loanStartDate},</if>
482
             <if test="loanEndDate != null ">loan_end_date = #{loanEndDate},</if>
497
             <if test="loanEndDate != null ">loan_end_date = #{loanEndDate},</if>
483
             <if test="loanEndDate != null ">claim_princi_owed = #{claimPrinciOwed},</if>
498
             <if test="loanEndDate != null ">claim_princi_owed = #{claimPrinciOwed},</if>
513
             <if test="caseDescribe != null  and caseDescribe != ''">case_describe = #{caseDescribe},</if>
528
             <if test="caseDescribe != null  and caseDescribe != ''">case_describe = #{caseDescribe},</if>
514
             <if test="caseResult != null  and caseResult != ''">case_result = #{caseResult},</if>
529
             <if test="caseResult != null  and caseResult != ''">case_result = #{caseResult},</if>
515
             <if test="isAgreePendTral != null">is_agree_pend_tral = #{isAgreePendTral},</if>
530
             <if test="isAgreePendTral != null">is_agree_pend_tral = #{isAgreePendTral},</if>
531
+            <if test="adjudicaCounter != null">adjudica_counter = #{adjudicaCounter},</if>
532
+            <if test="objectiJuris != null">objecti_juris = #{objectiJuris},</if>
533
+
534
+            <if test="isAbsence != null">is_absence = #{isAbsence},</if>
535
+            <if test="appliIsAbsen != null">appli_is_absen = #{appliIsAbsen},</if>
536
+            <if test="responCrossOpin != null  and responCrossOpin != ''">respon_cross_opin = #{responCrossOpin},</if>
537
+            <if test="applicaCrossOpin != null  and applicaCrossOpin != ''">applica_cross_opin = #{applicaCrossOpin},</if>
538
+            <if test="responDefenOpini != null  and responDefenOpini != ''">respon_defen_opini = #{responDefenOpini},</if>
516
             <if test="objectionAddEviden != null">objection_add_eviden = #{objectionAddEviden},</if>
539
             <if test="objectionAddEviden != null">objection_add_eviden = #{objectionAddEviden},</if>
517
             <if test="openCourtHear != null">open_court_hear = #{openCourtHear},</if>
540
             <if test="openCourtHear != null">open_court_hear = #{openCourtHear},</if>
518
             <if test="hearDate != null">hear_date = #{hearDate},</if>
541
             <if test="hearDate != null">hear_date = #{hearDate},</if>
544
         END caseStatusName,
567
         END caseStatusName,
545
         c.hear_date ,c.arbitrat_claims ,
568
         c.hear_date ,c.arbitrat_claims ,
546
         c.loan_start_date ,c.loan_end_date ,c.claim_princi_owed ,c.claim_interest_owed ,c.claim_liquid_damag ,c.fee_payable ,
569
         c.loan_start_date ,c.loan_end_date ,c.claim_princi_owed ,c.claim_interest_owed ,c.claim_liquid_damag ,c.fee_payable ,
547
-        c.begin_video_date ,c.online_video_person ,c.contract_number ,c.create_by ,c.create_time ,
570
+        c.begin_video_date ,c.online_video_person ,c.contract_number ,c.create_by ,c.create_time ,c.request_rule,c.adjudica_counter,c.proper_preser,
548
         c.update_by ,c.update_time,c.arbitrator_id,c.arbitrator_name,ca.application_organ_id applicationOrganId ,ca.application_organ_name as applicantName
571
         c.update_by ,c.update_time,c.arbitrator_id,c.arbitrator_name,ca.application_organ_id applicationOrganId ,ca.application_organ_name as applicantName
549
         from case_application c
572
         from case_application c
550
         LEFT JOIN case_affiliate ca ON ca.case_appli_id = c.id and ca.identity_type=1
573
         LEFT JOIN case_affiliate ca ON ca.case_appli_id = c.id and ca.identity_type=1