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

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

@@ -28,6 +28,17 @@ public class ArbitrateRecord     extends BaseEntity {
     /** 裁决书附件id */
     private Integer annexId;
 
+    /** 被申请人是否缺席 */
+    private Integer isAbsence;
+    /** 被申请人质证意见 */
+    private String responCrossOpin;
+    /** 申请人质证意见 */
+    private String applicaCrossOpin;
+    /** 申请人是否缺席 */
+    private Integer appliIsAbsen;
+    /** 被申请人质证意见 */
+    private String responDefenOpini;
+
 
 
 

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

@@ -23,10 +23,56 @@ public class CaseAffiliate   extends BaseEntity {
      * 申请机构名称
      */
     private String applicationOrganName;
+
     /**
-     * 代理人用户id
+     * 法定代表人
      */
-    private String applicantAgentUserId;
+    private String compLegalPerson;
+    /**
+     * 法定代表人职位
+     */
+    private String compLegalperPost;
+    /**
+     * 被申请人性别
+     */
+    private String responSex;
+    /**
+     * 被申请人出生年月日
+     */
+    private String responBirth;
+
+    public String getCompLegalPerson() {
+        return compLegalPerson;
+    }
+
+    public void setCompLegalPerson(String compLegalPerson) {
+        this.compLegalPerson = compLegalPerson;
+    }
+
+    public String getCompLegalperPost() {
+        return compLegalperPost;
+    }
+
+    public void setCompLegalperPost(String compLegalperPost) {
+        this.compLegalperPost = compLegalperPost;
+    }
+
+    public String getResponSex() {
+        return responSex;
+    }
+
+    public void setResponSex(String responSex) {
+        this.responSex = responSex;
+    }
+
+    public String getResponBirth() {
+        return responBirth;
+    }
+
+    public void setResponBirth(String responBirth) {
+        this.responBirth = responBirth;
+    }
+
     /** 身份证号 */
     @Excel(name = "身份证号")
     private String identityNum;
@@ -58,8 +104,7 @@ public class CaseAffiliate   extends BaseEntity {
 
     /** 送达电子邮件 */
     private String sendEmail;
-    /** 快递单号 */
-    private String trackNum;
+    private String applicantAgentUserId;
 
     public String getApplicantAgentUserId() {
         return applicantAgentUserId;
@@ -69,6 +114,9 @@ public class CaseAffiliate   extends BaseEntity {
         this.applicantAgentUserId = applicantAgentUserId;
     }
 
+    /** 快递单号 */
+    private String trackNum;
+
     public String getApplicationOrganId() {
         return applicationOrganId;
     }

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

@@ -79,8 +79,8 @@ public class CaseApplication  extends BaseEntity {
     /** 申请人主张违约金 */
     @Excel(name = "申请人主张违约金")
     private BigDecimal claimLiquidDamag;
-    /** 申请人仲裁诉求 */
-    @Excel(name = "申请人仲裁诉求")
+    /** 申请人仲裁请求及事实和理由 */
+    @Excel(name = "申请人仲裁请求及事实和理由")
     private String arbitratClaims;
     /** 仲裁应缴费用 */
     private BigDecimal feePayable;
@@ -121,6 +121,7 @@ public class CaseApplication  extends BaseEntity {
     private Integer openCourtHear;
 
     /** 申请人请求仲裁庭裁决 */
+    @Excel(name = "申请人请求仲裁庭裁决")
     private String requestRule;
     /** 是否仲裁反请求 */
     private Integer adjudicaCounter;
@@ -134,6 +135,16 @@ public class CaseApplication  extends BaseEntity {
     private String responCrossOpin;
     /** 被申请人的答辩意见 */
     private String responDefenOpini;
+    /** 申请人是否缺席 */
+    private Integer appliIsAbsen;
+
+    public Integer getAppliIsAbsen() {
+        return appliIsAbsen;
+    }
+
+    public void setAppliIsAbsen(Integer appliIsAbsen) {
+        this.appliIsAbsen = appliIsAbsen;
+    }
 
     public String getResponDefenOpini() {
         return responDefenOpini;
@@ -531,6 +542,12 @@ public class CaseApplication  extends BaseEntity {
     /** 姓名 */
     @Excel(name = "申请人主体信息-申请人(机构)",width = 26)
     private String name;
+    /** 申请人主体信息-法定代表人 */
+    @Excel(name = "申请人主体信息-法定代表人",width = 26)
+    private String compLegalPerson;
+    /** 申请人主体信息-法定代表人 */
+    @Excel(name = "申请人主体信息-法定代表人职位",width = 26)
+    private String compLegalperPost;
     /**
      * 申请人主体信息-申请人(机构)id
      */
@@ -573,6 +590,44 @@ public class CaseApplication  extends BaseEntity {
     /** 身份证号 */
     @Excel(name = "被申请人主体信息-身份证号",width = 26)
     private String debtorIdentityNum;
+    /** 被申请人主体信息-性别 */
+    @Excel(name = "被申请人主体信息-性别",width = 26)
+    private String responSex;
+    /** 被申请人主体信息-出生年月日 */
+    @Excel(name = "被申请人主体信息-出生年月日",width = 26)
+    private String responBirth;
+
+    public String getCompLegalPerson() {
+        return compLegalPerson;
+    }
+
+    public void setCompLegalPerson(String compLegalPerson) {
+        this.compLegalPerson = compLegalPerson;
+    }
+
+    public String getCompLegalperPost() {
+        return compLegalperPost;
+    }
+
+    public void setCompLegalperPost(String compLegalperPost) {
+        this.compLegalperPost = compLegalperPost;
+    }
+
+    public String getResponSex() {
+        return responSex;
+    }
+
+    public void setResponSex(String responSex) {
+        this.responSex = responSex;
+    }
+
+    public String getResponBirth() {
+        return responBirth;
+    }
+
+    public void setResponBirth(String responBirth) {
+        this.responBirth = responBirth;
+    }
 
     /** 联系电话 */
     @Excel(name = "被申请人主体信息-联系电话",width = 26)

ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/dto/CaseEvidenceDTO.java

@@ -29,6 +29,11 @@ public class CaseEvidenceDTO {
      * 是否指派仲裁员,1是，2否
      */
     private Integer pendingAppointArbotrar;
+    /** 是否仲裁反请求 */
+    private Integer adjudicaCounter;
+    /** 是否管辖异议申请 */
+    private Integer objectiJuris;
+
 
     /**
      * 案件仲裁员

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

@@ -1198,6 +1198,16 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
         if (createBy!=null){
             arbitrateRecordselect.setCreateBy(createBy);
         }
+
+        CaseApplication caseApplicationupdate = new CaseApplication();
+        caseApplicationupdate.setId(arbitrateRecordselect.getCaseAppliId());
+        caseApplicationupdate.setIsAbsence(arbitrateRecordselect.getIsAbsence());
+        caseApplicationupdate.setAppliIsAbsen(arbitrateRecordselect.getAppliIsAbsen());
+        caseApplicationupdate.setResponCrossOpin(arbitrateRecordselect.getResponCrossOpin());
+        caseApplicationupdate.setApplicaCrossOpin(arbitrateRecordselect.getApplicaCrossOpin());
+        caseApplicationupdate.setResponDefenOpini(arbitrateRecordselect.getResponDefenOpini());
+        caseApplicationMapper.submitCaseApplication(caseApplicationupdate);
+
         //先判断案件是否已经提交过仲裁结果
         ArbitrateRecord arbitrateRecordsele = arbitrateRecordMapper.selectArbitrateRecord(arbitrateRecordselect);
         if (arbitrateRecordsele!=null){
@@ -1490,8 +1500,9 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
         CaseAffiliate caseAffiliate = new CaseAffiliate();
 
 //        BeanUtils.copyBeanProp(caseApplication,caseAffiliate);
-        BeanUtils.copyBeanProp(caseAffiliate,caseApplication);
-        caseAffiliate.setIdentityType(1);
+//        BeanUtils.copyBeanProp(caseAffiliate,caseApplication);
+//        caseAffiliate.setIdentityType(1);
+        caseAffiliate = buildApplicaInfo(caseApplication);
         // 申请人（机构），需要判断部门中是否存在，不存在则新增，当身份类型为1的时候，查询时需要根据名称查询组织机构
         if(StrUtil.isNotEmpty(caseApplication.getName())){
             setApplicantOrganization(caseAffiliate, caseApplication, deptMap);
@@ -1512,6 +1523,29 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
         caseApplication.setCaseAffiliates(caseAffiliatesnew);
     }
 
+    private CaseAffiliate buildApplicaInfo(CaseApplication caseApplication) {
+        // 申请人信息
+        CaseAffiliate caseAffiliate = new CaseAffiliate();
+        caseAffiliate.setCaseAppliId(caseApplication.getId());
+        caseAffiliate.setIdentityType(1);
+        caseAffiliate.setName(caseApplication.getName());
+        caseAffiliate.setIdentityNum(caseApplication.getIdentityNum());
+        caseAffiliate.setContactTelphone(caseApplication.getContactTelphone());
+        caseAffiliate.setContactAddress(caseApplication.getContactAddress());
+        caseAffiliate.setWorkTelphone(caseApplication.getWorkTelphone());
+        caseAffiliate.setWorkAddress(caseApplication.getWorkAddress());
+        caseAffiliate.setNameAgent(caseApplication.getNameAgent());
+        caseAffiliate.setIdentityNumAgent(caseApplication.getIdentityNumAgent());
+        caseAffiliate.setContactTelphoneAgent(caseApplication.getContactTelphoneAgent());
+        caseAffiliate.setContactAddressAgent(caseApplication.getContactAddressAgent());
+        caseAffiliate.setCompLegalperPost(caseApplication.getCompLegalperPost());
+        caseAffiliate.setCompLegalPerson(caseApplication.getCompLegalPerson());
+
+        return caseAffiliate;
+
+
+    }
+
     /**
      * 设置申请人的组织机构
      * @param caseAffiliate
@@ -1567,6 +1601,9 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
         debtorCaseAffiliate.setIdentityNumAgent(caseApplication.getDebtorIdentityNumAgent());
         debtorCaseAffiliate.setContactTelphoneAgent(caseApplication.getDebtorContactTelphoneAgent());
         debtorCaseAffiliate.setContactAddressAgent(caseApplication.getDebtorContactAddressAgent());
+        debtorCaseAffiliate.setResponSex(caseApplication.getResponSex());
+        debtorCaseAffiliate.setResponBirth(caseApplication.getResponBirth());
+
         return debtorCaseAffiliate;
     }
 

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

@@ -166,6 +166,8 @@ IdentityAuthenticationMapper identityAuthenticationMapper;
             caseApplication1.setObjectionAddEviden(caseEvidenceDTO.getObjectionAddEviden());
             caseApplication1.setOpenCourtHear(caseEvidenceDTO.getOpenCourtHear());
             caseApplication1.setPendingAppointArbotrar(caseEvidenceDTO.getPendingAppointArbotrar());
+            caseApplication1.setAdjudicaCounter(caseEvidenceDTO.getAdjudicaCounter());
+            caseApplication1.setObjectiJuris(caseEvidenceDTO.getObjectiJuris());
             List<Arbitrator> arbitrators = caseEvidenceDTO.getArbitrators();
             if (arbitrators != null && arbitrators.size() > 0) {
                 List<Long> ids = arbitrators.stream().map(Arbitrator::getId).collect(Collectors.toList());

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

@@ -22,11 +22,17 @@
         <result property="applicationOrganId"    column="application_organ_id"   />
         <result property="applicationOrganName"    column="application_organ_name"   />
 
+        <result property="compLegalPerson"    column="comp_legal_person"   />
+        <result property="compLegalperPost"    column="comp_legalper_post"   />
+        <result property="responSex"    column="respon_sex"   />
+        <result property="responBirth"    column="respon_birth"   />
+
     </resultMap>
 
     <select id="selectCaseAffiliate" parameterType="CaseAffiliate" resultMap="CaseAffiliateResult">
         select c.id ,c.case_appli_id ,c.identity_type ,c.name ,c.identity_num ,c.contact_telphone ,c.contact_address ,
         c.work_address ,c.work_telphone ,c.name_agent, c.identity_num_agent ,c.contact_telphone_agent ,c.contact_address_agent,
+        c.comp_legal_person,c.comp_legalper_post,c.respon_sex,c.respon_birth,
         c.track_num,c.application_organ_id,c.application_organ_name
         from case_affiliate c
         <where>
@@ -54,11 +60,13 @@
     <insert id="batchCaseAffiliate">
         insert into case_affiliate(case_appli_id, identity_type,application_organ_id,application_organ_name,name,identity_num,contact_telphone,
         contact_address,work_address,work_telphone ,name_agent,identity_num_agent,contact_telphone_agent,
-        contact_address_agent,applicant_agent_user_id ) values
+        comp_legal_person,comp_legalper_post,respon_sex ,respon_birth,
+        contact_address_agent ) values
         <foreach item="item" index="index" collection="list" separator=",">
             (#{item.caseAppliId},#{item.identityType},#{item.applicationOrganId},#{item.applicationOrganName},#{item.name},#{item.identityNum},#{item.contactTelphone},
-            #{item.contactAddress},#{item.workAddress},#{item.workTelphone},  #{item.nameAgent},#{item.identityNumAgent},
-            #{item.contactTelphoneAgent},#{item.contactAddressAgent},#{item.applicantAgentUserId})
+            #{item.contactAddress},#{item.workAddress},#{item.workTelphone},  #{item.nameAgent},#{item.identityNumAgent},#{item.contactTelphoneAgent},
+            #{item.compLegalPerson},#{item.compLegalperPost},#{item.responSex},  #{item.responBirth},
+            #{item.contactAddressAgent})
         </foreach>
     </insert>
 
@@ -71,7 +79,6 @@
         identity_type= #{identityType},
         application_organ_id= #{applicationOrganId},
         application_organ_name= #{applicationOrganName},
-        applicant_agent_user_id= #{applicantAgentUserId},
         name = #{name},
         identity_num = #{identityNum},
         contact_telphone = #{contactTelphone},

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

@@ -35,6 +35,10 @@
         <result property="paymentStatus"   column="payment_status"  />
         <result property="paymentStatusName"   column="paymentStatusName"  />
         <result property="filearbitraUrl"   column="filearbitra_url"  />
+
+        <result property="requestRule"   column="request_rule"  />
+        <result property="properPreser"   column="proper_preser"  />
+        <result property="adjudicaCounter"   column="adjudica_counter"  />
     </resultMap>
 
     <select id="selectCaseApplicationList" parameterType="CaseApplication" resultMap="CaseApplicationResult">
@@ -433,6 +437,7 @@
         <if test="caseStatus != null ">case_status,</if>
         <if test="hearDate != null ">hear_date,</if>
         <if test="arbitratClaims != null and arbitratClaims != ''">arbitrat_claims,</if>
+        <if test="requestRule != null and requestRule != ''">request_rule,</if>
         <if test="loanStartDate != null ">loan_start_date,</if>
         <if test="loanEndDate != null ">loan_end_date,</if>
         <if test="claimPrinciOwed != null ">claim_princi_owed,</if>
@@ -444,6 +449,10 @@
         <if test="onlineVideoPerson != null  and onlineVideoPerson != ''">online_video_person,</if>
 
         <if test="contractNumber != null  and contractNumber != ''">contract_number,</if>
+
+        <if test="adjudicaCounter != null ">adjudica_counter,</if>
+        <if test="properPreser != null ">proper_preser,</if>
+
         <if test="createBy != null  and createBy != ''">create_by,</if>
         create_time
         )values(
@@ -454,6 +463,7 @@
         <if test="caseStatus != null ">#{caseStatus},</if>
         <if test="hearDate != null ">#{hearDate},</if>
         <if test="arbitratClaims != null and arbitratClaims != ''">#{arbitratClaims},</if>
+        <if test="requestRule != null and requestRule != ''">#{requestRule},</if>
         <if test="loanStartDate != null ">#{loanStartDate},</if>
         <if test="loanEndDate != null ">#{loanEndDate},</if>
         <if test="claimPrinciOwed != null ">#{claimPrinciOwed},</if>
@@ -465,6 +475,10 @@
         <if test="onlineVideoPerson != null  and onlineVideoPerson != ''">#{onlineVideoPerson},</if>
 
         <if test="contractNumber != null  and contractNumber != ''">#{contractNumber},</if>
+
+        <if test="adjudicaCounter != null ">#{adjudicaCounter},</if>
+        <if test="properPreser != null ">#{properPreser},</if>
+
         <if test="createBy != null  and createBy != ''">#{createBy},</if>
         sysdate()
         )
@@ -478,6 +492,7 @@
             <if test="arbitratMethod != null and arbitratMethod != ''">arbitrat_method = #{arbitratMethod},</if>
             <if test="hearDate != null ">hear_date = #{hearDate},</if>
             <if test="arbitratClaims != null and arbitratClaims != ''">arbitrat_claims = #{arbitratClaims},</if>
+            <if test="requestRule != null and requestRule != ''">request_rule = #{requestRule},</if>
             <if test="loanStartDate != null ">loan_start_date = #{loanStartDate},</if>
             <if test="loanEndDate != null ">loan_end_date = #{loanEndDate},</if>
             <if test="loanEndDate != null ">claim_princi_owed = #{claimPrinciOwed},</if>
@@ -513,6 +528,14 @@
             <if test="caseDescribe != null  and caseDescribe != ''">case_describe = #{caseDescribe},</if>
             <if test="caseResult != null  and caseResult != ''">case_result = #{caseResult},</if>
             <if test="isAgreePendTral != null">is_agree_pend_tral = #{isAgreePendTral},</if>
+            <if test="adjudicaCounter != null">adjudica_counter = #{adjudicaCounter},</if>
+            <if test="objectiJuris != null">objecti_juris = #{objectiJuris},</if>
+
+            <if test="isAbsence != null">is_absence = #{isAbsence},</if>
+            <if test="appliIsAbsen != null">appli_is_absen = #{appliIsAbsen},</if>
+            <if test="responCrossOpin != null  and responCrossOpin != ''">respon_cross_opin = #{responCrossOpin},</if>
+            <if test="applicaCrossOpin != null  and applicaCrossOpin != ''">applica_cross_opin = #{applicaCrossOpin},</if>
+            <if test="responDefenOpini != null  and responDefenOpini != ''">respon_defen_opini = #{responDefenOpini},</if>
             <if test="objectionAddEviden != null">objection_add_eviden = #{objectionAddEviden},</if>
             <if test="openCourtHear != null">open_court_hear = #{openCourtHear},</if>
             <if test="hearDate != null">hear_date = #{hearDate},</if>
@@ -544,7 +567,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.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.request_rule,c.adjudica_counter,c.proper_preser,
         c.update_by ,c.update_time,c.arbitrator_id,c.arbitrator_name,ca.application_organ_id applicationOrganId ,ca.application_organ_name as applicantName
         from case_application c
         LEFT JOIN case_affiliate ca ON ca.case_appli_id = c.id and ca.identity_type=1