Explorar el Código

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

qtz hace 2 años
padre
commit
5d2fdedfcf

+ 23
- 0
ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/CaseAffiliate.java Ver fichero

85
     /** 联系地址 */
85
     /** 联系地址 */
86
     @Excel(name = "联系地址")
86
     @Excel(name = "联系地址")
87
     private String contactAddress;
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
     @Excel(name = "单位地址")
112
     @Excel(name = "单位地址")
90
     private String workAddress;
113
     private String workAddress;

+ 37
- 3
ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/CaseApplication.java Ver fichero

80
     @Excel(name = "申请人主张违约金")
80
     @Excel(name = "申请人主张违约金")
81
     private BigDecimal claimLiquidDamag;
81
     private BigDecimal claimLiquidDamag;
82
     /** 申请人仲裁请求及事实和理由 */
82
     /** 申请人仲裁请求及事实和理由 */
83
-    @Excel(name = "申请人仲裁请求及事实和理由")
83
+    @Excel(name = "申请人仲裁请求及事实和理由",width = 36)
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
+    @Excel(name = "申请人请求仲裁庭裁决",width = 36)
125
     private String requestRule;
125
     private String requestRule;
126
     /** 是否仲裁反请求 */
126
     /** 是否仲裁反请求 */
127
     private Integer adjudicaCounter;
127
     private Integer adjudicaCounter;
562
     /** 联系地址 */
562
     /** 联系地址 */
563
     @Excel(name = "申请人主体信息-联系地址",width = 26)
563
     @Excel(name = "申请人主体信息-联系地址",width = 26)
564
     private String contactAddress;
564
     private String contactAddress;
565
+    /** 申请人住所 */
566
+    @Excel(name = "申请人主体信息-住所",width = 26)
567
+    private String residenAffiliAppli;
565
     /** 单位电话 */
568
     /** 单位电话 */
566
     @Excel(name = "申请人主体信息-单位电话",width = 26)
569
     @Excel(name = "申请人主体信息-单位电话",width = 26)
567
     private String workTelphone;
570
     private String workTelphone;
575
     /** 身份证号 */
578
     /** 身份证号 */
576
     @Excel(name = "申请人主体信息-代理人身份证号",width = 26)
579
     @Excel(name = "申请人主体信息-代理人身份证号",width = 26)
577
     private String identityNumAgent;
580
     private String identityNumAgent;
581
+
578
     /** 联系电话 */
582
     /** 联系电话 */
579
     @Excel(name = "申请人主体信息-代理人联系电话",width = 26)
583
     @Excel(name = "申请人主体信息-代理人联系电话",width = 26)
580
     private String contactTelphoneAgent;
584
     private String contactTelphoneAgent;
581
     /** 联系地址 */
585
     /** 联系地址 */
582
     @Excel(name = "申请人主体信息-代理人联系地址",width = 26)
586
     @Excel(name = "申请人主体信息-代理人联系地址",width = 26)
583
     private String contactAddressAgent;
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
     /** 联系地址 */
666
     /** 联系地址 */
636
     @Excel(name = "被申请人主体信息-联系地址",width = 26)
667
     @Excel(name = "被申请人主体信息-联系地址",width = 26)
637
     private String debtorContactAddress;
668
     private String debtorContactAddress;
669
+    /** 被申请人住所 */
670
+    @Excel(name = "被申请人主体信息-住所",width = 26)
671
+    private String residenAffiliRespon;
638
     /** 单位电话 */
672
     /** 单位电话 */
639
     @Excel(name = "被申请人主体信息-单位电话",width = 26)
673
     @Excel(name = "被申请人主体信息-单位电话",width = 26)
640
     private String debtorWorkTelphone;
674
     private String debtorWorkTelphone;

+ 3
- 0
ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseApplicationServiceImpl.java Ver fichero

1546
         caseAffiliate.setCompLegalperPost(caseApplication.getCompLegalperPost());
1546
         caseAffiliate.setCompLegalperPost(caseApplication.getCompLegalperPost());
1547
         caseAffiliate.setCompLegalPerson(caseApplication.getCompLegalPerson());
1547
         caseAffiliate.setCompLegalPerson(caseApplication.getCompLegalPerson());
1548
 
1548
 
1549
+        caseAffiliate.setResidenAffili(caseApplication.getResidenAffiliAppli());
1550
+        caseAffiliate.setAppliAgentTitle(caseApplication.getAppliAgentTitle());
1549
         return caseAffiliate;
1551
         return caseAffiliate;
1550
 
1552
 
1551
 
1553
 
1608
         debtorCaseAffiliate.setContactAddressAgent(caseApplication.getDebtorContactAddressAgent());
1610
         debtorCaseAffiliate.setContactAddressAgent(caseApplication.getDebtorContactAddressAgent());
1609
         debtorCaseAffiliate.setResponSex(caseApplication.getResponSex());
1611
         debtorCaseAffiliate.setResponSex(caseApplication.getResponSex());
1610
         debtorCaseAffiliate.setResponBirth(caseApplication.getResponBirth());
1612
         debtorCaseAffiliate.setResponBirth(caseApplication.getResponBirth());
1613
+        debtorCaseAffiliate.setResidenAffili(caseApplication.getResidenAffiliRespon());
1611
 
1614
 
1612
         return debtorCaseAffiliate;
1615
         return debtorCaseAffiliate;
1613
     }
1616
     }

+ 6
- 0
ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseAffiliateMapper.xml Ver fichero

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

+ 6
- 0
ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseApplicationMapper.xml Ver fichero

30
         <result property="updateTime"   column="update_time"  />
30
         <result property="updateTime"   column="update_time"  />
31
         <result property="arbitratMethodName"   column="arbitratMethodName"  />
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
         <result property="arbitratorId"   column="arbitrator_id"  />
38
         <result property="arbitratorId"   column="arbitrator_id"  />
34
         <result property="arbitratorName"   column="arbitrator_name"  />
39
         <result property="arbitratorName"   column="arbitrator_name"  />
35
         <result property="paymentStatus"   column="payment_status"  />
40
         <result property="paymentStatus"   column="payment_status"  />
568
         c.hear_date ,c.arbitrat_claims ,
573
         c.hear_date ,c.arbitrat_claims ,
569
         c.loan_start_date ,c.loan_end_date ,c.claim_princi_owed ,c.claim_interest_owed ,c.claim_liquid_damag ,c.fee_payable ,
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
         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,
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
         c.update_by ,c.update_time,c.arbitrator_id,c.arbitrator_name,ca.application_organ_id applicationOrganId ,ca.application_organ_name as applicantName
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
         from case_application c
578
         from case_application c
573
         LEFT JOIN case_affiliate ca ON ca.case_appli_id = c.id and ca.identity_type=1
579
         LEFT JOIN case_affiliate ca ON ca.case_appli_id = c.id and ca.identity_type=1