Ver código fonte

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

wangqiong123 2 anos atrás
pai
commit
96113abc00

+ 20
- 17
ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/CaseApplication.java Ver arquivo

103
     /** 申请人主张违约金 */
103
     /** 申请人主张违约金 */
104
     @Excel(name = "申请人主张违约金")
104
     @Excel(name = "申请人主张违约金")
105
     private BigDecimal claimLiquidDamag;
105
     private BigDecimal claimLiquidDamag;
106
+    /** 申请人请求仲裁庭裁决 */
107
+    @Excel(name = "申请人请求仲裁庭裁决",width = 36)
108
+    private String requestRule;
109
+
110
+    /** 是否财产保全申请 */
111
+    @Excel(name = "是否财产保全申请",width = 26,combo= {"是","否"},readConverterExp = "0=否,1=是")
112
+    private Integer properPreser;
106
     /** 申请人仲裁请求及事实和理由 */
113
     /** 申请人仲裁请求及事实和理由 */
107
     @Excel(name = "申请人仲裁请求及事实和理由",width = 36)
114
     @Excel(name = "申请人仲裁请求及事实和理由",width = 36)
108
     private String arbitratClaims;
115
     private String arbitratClaims;
144
     /** 是否需要开庭审理 */
151
     /** 是否需要开庭审理 */
145
     private Integer openCourtHear;
152
     private Integer openCourtHear;
146
 
153
 
147
-    /** 申请人请求仲裁庭裁决 */
148
-    @Excel(name = "申请人请求仲裁庭裁决",width = 36)
149
-    private String requestRule;
154
+
150
     /** 是否仲裁反请求 */
155
     /** 是否仲裁反请求 */
151
     private Integer adjudicaCounter;
156
     private Integer adjudicaCounter;
152
-    /** 是否财产保全申请 */
153
-    private Integer properPreser;
157
+
154
     /** 被申请人是否缺席 */
158
     /** 被申请人是否缺席 */
155
     private Integer isAbsence;
159
     private Integer isAbsence;
156
     /** 是否管辖异议申请 */
160
     /** 是否管辖异议申请 */
594
     /** 姓名 */
598
     /** 姓名 */
595
     @Excel(name = "申请人主体信息-申请人(机构)",width = 26)
599
     @Excel(name = "申请人主体信息-申请人(机构)",width = 26)
596
     private String name;
600
     private String name;
597
-
601
+    /** 身份证号 */
602
+    @Excel(name = "申请人主体信息-代码",width = 26)
603
+    private String identityNum;
604
+    /** 申请人主体信息-法定代表人 */
605
+    @Excel(name = "申请人主体信息-法定代表人",width = 26)
606
+    private String compLegalPerson;
607
+    /** 申请人主体信息-法定代表人 */
608
+    @Excel(name = "申请人主体信息-法定代表人职位",width = 26)
609
+    private String compLegalperPost;
598
     /**
610
     /**
599
      * 申请人主体信息-申请人(机构)id
611
      * 申请人主体信息-申请人(机构)id
600
      */
612
      */
601
     private String nameId;
613
     private String nameId;
602
-    /** 身份证号 */
603
-    @Excel(name = "申请人主体信息-代码",width = 26)
604
-    private String identityNum;
605
 
614
 
606
     /** 联系电话 */
615
     /** 联系电话 */
607
     @Excel(name = "申请人主体信息-联系电话",width = 26)
616
     @Excel(name = "申请人主体信息-联系电话",width = 26)
609
     /** 联系地址 */
618
     /** 联系地址 */
610
     @Excel(name = "申请人主体信息-联系地址",width = 26)
619
     @Excel(name = "申请人主体信息-联系地址",width = 26)
611
     private String contactAddress;
620
     private String contactAddress;
612
-
613
     /** 单位电话 */
621
     /** 单位电话 */
614
     @Excel(name = "申请人主体信息-单位电话",width = 26)
622
     @Excel(name = "申请人主体信息-单位电话",width = 26)
615
     private String workTelphone;
623
     private String workTelphone;
616
     /** 单位地址 */
624
     /** 单位地址 */
617
     @Excel(name = "申请人主体信息-单位地址",width = 26)
625
     @Excel(name = "申请人主体信息-单位地址",width = 26)
618
     private String workAddress;
626
     private String workAddress;
619
-    /** 申请人主体信息-法定代表人 */
620
-    @Excel(name = "申请人主体信息-法定代表人",width = 26)
621
-    private String compLegalPerson;
622
-    /** 申请人主体信息-法定代表人 */
623
-    @Excel(name = "申请人主体信息-法定代表人职位",width = 26)
624
-    private String compLegalperPost;
627
+
625
     /** 申请人住所 */
628
     /** 申请人住所 */
626
     @Excel(name = "申请人主体信息-住所",width = 26)
629
     @Excel(name = "申请人主体信息-住所",width = 26)
627
     private String residenAffiliAppli;
630
     private String residenAffiliAppli;
677
     @Excel(name = "被申请人主体信息-身份证号",width = 26)
680
     @Excel(name = "被申请人主体信息-身份证号",width = 26)
678
     private String debtorIdentityNum;
681
     private String debtorIdentityNum;
679
     /** 被申请人主体信息-性别 */
682
     /** 被申请人主体信息-性别 */
680
-    @Excel(name = "被申请人主体信息-性别",width = 26)
683
+    @Excel(name = "被申请人主体信息-性别",width = 26,combo= {"男","女"},readConverterExp = "0=男,女=1")
681
     private String responSex;
684
     private String responSex;
682
 
685
 
683
     public Date getResponBirth() {
686
     public Date getResponBirth() {

+ 1
- 0
ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseApplicationMapper.xml Ver arquivo

458
             <if test="caseDescribe != null  and caseDescribe != ''">case_describe = #{caseDescribe},</if>
458
             <if test="caseDescribe != null  and caseDescribe != ''">case_describe = #{caseDescribe},</if>
459
             <if test="caseResult != null  and caseResult != ''">case_result = #{caseResult},</if>
459
             <if test="caseResult != null  and caseResult != ''">case_result = #{caseResult},</if>
460
             <if test="caseStatus != null">case_status = #{caseStatus},</if>
460
             <if test="caseStatus != null">case_status = #{caseStatus},</if>
461
+            <if test="properPreser != null">proper_preser = #{properPreser},</if>
461
 
462
 
462
             <if test="updateBy != null  and updateBy != ''">update_by = #{updateBy},</if>
463
             <if test="updateBy != null  and updateBy != ''">update_by = #{updateBy},</if>
463
             <if test="caseNum != null and caseNum != ''">case_num = #{caseNum},</if>
464
             <if test="caseNum != null and caseNum != ''">case_num = #{caseNum},</if>