Просмотр исходного кода

修改生成庭审笔录功能

qitz 2 лет назад
Родитель
Сommit
1a8403423e

+ 23
- 0
ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/CaseAffiliate.java Просмотреть файл

@@ -85,6 +85,29 @@ public class CaseAffiliate   extends BaseEntity {
85 85
     /** 联系地址 */
86 86
     @Excel(name = "联系地址")
87 87
     private String contactAddress;
88
+    /** 住所 */
89
+    @Excel(name = "住所")
90
+    private String residenAffili;
91
+    /** 申请人代理人职称 */
92
+    @Excel(name = "申请人代理人职称")
93
+    private String appliAgentTitle;
94
+
95
+    public String getResidenAffili() {
96
+        return residenAffili;
97
+    }
98
+
99
+    public void setResidenAffili(String residenAffili) {
100
+        this.residenAffili = residenAffili;
101
+    }
102
+
103
+    public String getAppliAgentTitle() {
104
+        return appliAgentTitle;
105
+    }
106
+
107
+    public void setAppliAgentTitle(String appliAgentTitle) {
108
+        this.appliAgentTitle = appliAgentTitle;
109
+    }
110
+
88 111
     /** 单位地址 */
89 112
     @Excel(name = "单位地址")
90 113
     private String workAddress;

+ 37
- 3
ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/CaseApplication.java Просмотреть файл

@@ -80,7 +80,7 @@ public class CaseApplication  extends BaseEntity {
80 80
     @Excel(name = "申请人主张违约金")
81 81
     private BigDecimal claimLiquidDamag;
82 82
     /** 申请人仲裁请求及事实和理由 */
83
-    @Excel(name = "申请人仲裁请求及事实和理由")
83
+    @Excel(name = "申请人仲裁请求及事实和理由",width = 36)
84 84
     private String arbitratClaims;
85 85
     /** 仲裁应缴费用 */
86 86
     private BigDecimal feePayable;
@@ -121,7 +121,7 @@ public class CaseApplication  extends BaseEntity {
121 121
     private Integer openCourtHear;
122 122
 
123 123
     /** 申请人请求仲裁庭裁决 */
124
-    @Excel(name = "申请人请求仲裁庭裁决")
124
+    @Excel(name = "申请人请求仲裁庭裁决",width = 36)
125 125
     private String requestRule;
126 126
     /** 是否仲裁反请求 */
127 127
     private Integer adjudicaCounter;
@@ -562,6 +562,9 @@ public class CaseApplication  extends BaseEntity {
562 562
     /** 联系地址 */
563 563
     @Excel(name = "申请人主体信息-联系地址",width = 26)
564 564
     private String contactAddress;
565
+    /** 申请人住所 */
566
+    @Excel(name = "申请人主体信息-住所",width = 26)
567
+    private String residenAffiliAppli;
565 568
     /** 单位电话 */
566 569
     @Excel(name = "申请人主体信息-单位电话",width = 26)
567 570
     private String workTelphone;
@@ -575,13 +578,41 @@ public class CaseApplication  extends BaseEntity {
575 578
     /** 身份证号 */
576 579
     @Excel(name = "申请人主体信息-代理人身份证号",width = 26)
577 580
     private String identityNumAgent;
581
+
578 582
     /** 联系电话 */
579 583
     @Excel(name = "申请人主体信息-代理人联系电话",width = 26)
580 584
     private String contactTelphoneAgent;
581 585
     /** 联系地址 */
582 586
     @Excel(name = "申请人主体信息-代理人联系地址",width = 26)
583 587
     private String contactAddressAgent;
584
-    /**
588
+    /** 申请人代理人职称 */
589
+    @Excel(name = "申请人主体信息-代理人职称",width = 26)
590
+    private String appliAgentTitle;
591
+
592
+    public String getResidenAffiliAppli() {
593
+        return residenAffiliAppli;
594
+    }
595
+
596
+    public void setResidenAffiliAppli(String residenAffiliAppli) {
597
+        this.residenAffiliAppli = residenAffiliAppli;
598
+    }
599
+
600
+    public String getAppliAgentTitle() {
601
+        return appliAgentTitle;
602
+    }
603
+
604
+    public void setAppliAgentTitle(String appliAgentTitle) {
605
+        this.appliAgentTitle = appliAgentTitle;
606
+    }
607
+
608
+    public String getResidenAffiliRespon() {
609
+        return residenAffiliRespon;
610
+    }
611
+
612
+    public void setResidenAffiliRespon(String residenAffiliRespon) {
613
+        this.residenAffiliRespon = residenAffiliRespon;
614
+    }
615
+/**
585 616
      * 被申请人主体信息
586 617
      */
587 618
     /** 姓名 */
@@ -635,6 +666,9 @@ public class CaseApplication  extends BaseEntity {
635 666
     /** 联系地址 */
636 667
     @Excel(name = "被申请人主体信息-联系地址",width = 26)
637 668
     private String debtorContactAddress;
669
+    /** 被申请人住所 */
670
+    @Excel(name = "被申请人主体信息-住所",width = 26)
671
+    private String residenAffiliRespon;
638 672
     /** 单位电话 */
639 673
     @Excel(name = "被申请人主体信息-单位电话",width = 26)
640 674
     private String debtorWorkTelphone;

+ 3
- 0
ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseApplicationServiceImpl.java Просмотреть файл

@@ -1541,6 +1541,8 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
1541 1541
         caseAffiliate.setCompLegalperPost(caseApplication.getCompLegalperPost());
1542 1542
         caseAffiliate.setCompLegalPerson(caseApplication.getCompLegalPerson());
1543 1543
 
1544
+        caseAffiliate.setResidenAffili(caseApplication.getResidenAffiliAppli());
1545
+        caseAffiliate.setAppliAgentTitle(caseApplication.getAppliAgentTitle());
1544 1546
         return caseAffiliate;
1545 1547
 
1546 1548
 
@@ -1603,6 +1605,7 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
1603 1605
         debtorCaseAffiliate.setContactAddressAgent(caseApplication.getDebtorContactAddressAgent());
1604 1606
         debtorCaseAffiliate.setResponSex(caseApplication.getResponSex());
1605 1607
         debtorCaseAffiliate.setResponBirth(caseApplication.getResponBirth());
1608
+        debtorCaseAffiliate.setResidenAffili(caseApplication.getResidenAffiliRespon());
1606 1609
 
1607 1610
         return debtorCaseAffiliate;
1608 1611
     }

+ 6
- 0
ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseAffiliateMapper.xml Просмотреть файл

@@ -27,12 +27,16 @@
27 27
         <result property="responSex"    column="respon_sex"   />
28 28
         <result property="responBirth"    column="respon_birth"   />
29 29
 
30
+        <result property="residenAffili"    column="residen_affili"   />
31
+        <result property="appliAgentTitle"    column="appli_agent_title"   />
32
+
30 33
     </resultMap>
31 34
 
32 35
     <select id="selectCaseAffiliate" parameterType="CaseAffiliate" resultMap="CaseAffiliateResult">
33 36
         select c.id ,c.case_appli_id ,c.identity_type ,c.name ,c.identity_num ,c.contact_telphone ,c.contact_address ,
34 37
         c.work_address ,c.work_telphone ,c.name_agent, c.identity_num_agent ,c.contact_telphone_agent ,c.contact_address_agent,
35 38
         c.comp_legal_person,c.comp_legalper_post,c.respon_sex,c.respon_birth,
39
+        c.residen_affili,c.appli_agent_title,
36 40
         c.track_num,c.application_organ_id,c.application_organ_name
37 41
         from case_affiliate c
38 42
         <where>
@@ -61,11 +65,13 @@
61 65
         insert into case_affiliate(case_appli_id, identity_type,application_organ_id,application_organ_name,name,identity_num,contact_telphone,
62 66
         contact_address,work_address,work_telphone ,name_agent,identity_num_agent,contact_telphone_agent,
63 67
         comp_legal_person,comp_legalper_post,respon_sex ,respon_birth,
68
+        residen_affili,appli_agent_title,
64 69
         contact_address_agent ) values
65 70
         <foreach item="item" index="index" collection="list" separator=",">
66 71
             (#{item.caseAppliId},#{item.identityType},#{item.applicationOrganId},#{item.applicationOrganName},#{item.name},#{item.identityNum},#{item.contactTelphone},
67 72
             #{item.contactAddress},#{item.workAddress},#{item.workTelphone},  #{item.nameAgent},#{item.identityNumAgent},#{item.contactTelphoneAgent},
68 73
             #{item.compLegalPerson},#{item.compLegalperPost},#{item.responSex},  #{item.responBirth},
74
+            #{item.residenAffili},#{item.appliAgentTitle},
69 75
             #{item.contactAddressAgent})
70 76
         </foreach>
71 77
     </insert>

+ 6
- 0
ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseApplicationMapper.xml Просмотреть файл

@@ -30,6 +30,11 @@
30 30
         <result property="updateTime"   column="update_time"  />
31 31
         <result property="arbitratMethodName"   column="arbitratMethodName"  />
32 32
 
33
+        <result property="isAbsence"   column="is_absence"  />
34
+        <result property="responCrossOpin"   column="respon_cross_opin"  />
35
+        <result property="applicaCrossOpin"   column="applica_cross_opin"  />
36
+        <result property="responDefenOpini"   column="respon_defen_opini"  />
37
+
33 38
         <result property="arbitratorId"   column="arbitrator_id"  />
34 39
         <result property="arbitratorName"   column="arbitrator_name"  />
35 40
         <result property="paymentStatus"   column="payment_status"  />
@@ -568,6 +573,7 @@
568 573
         c.hear_date ,c.arbitrat_claims ,
569 574
         c.loan_start_date ,c.loan_end_date ,c.claim_princi_owed ,c.claim_interest_owed ,c.claim_liquid_damag ,c.fee_payable ,
570 575
         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,
576
+        c.is_absence ,c.respon_cross_opin ,c.applica_cross_opin ,c.respon_defen_opini ,
571 577
         c.update_by ,c.update_time,c.arbitrator_id,c.arbitrator_name,ca.application_organ_id applicationOrganId ,ca.application_organ_name as applicantName
572 578
         from case_application c
573 579
         LEFT JOIN case_affiliate ca ON ca.case_appli_id = c.id and ca.identity_type=1