diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/ArbitrateRecord.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/ArbitrateRecord.java index 967f9b4..6c4282b 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/ArbitrateRecord.java +++ b/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; + diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/CaseAffiliate.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/CaseAffiliate.java index d93e8cf..0f572f8 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/CaseAffiliate.java +++ b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/CaseAffiliate.java @@ -23,6 +23,56 @@ public class CaseAffiliate extends BaseEntity { * 申请机构名称 */ private String applicationOrganName; + + /** + * 法定代表人 + */ + 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; diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/CaseApplication.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/CaseApplication.java index d674678..733ee70 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/CaseApplication.java +++ b/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; @@ -507,6 +518,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 */ @@ -549,6 +566,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) diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/dto/CaseEvidenceDTO.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/dto/CaseEvidenceDTO.java index 142b68f..bd65a9a 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/dto/CaseEvidenceDTO.java +++ b/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; + /** * 案件仲裁员 diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseApplicationServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseApplicationServiceImpl.java index 9bd6271..df5feb8 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseApplicationServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseApplicationServiceImpl.java @@ -1031,6 +1031,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){ @@ -1321,8 +1331,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); @@ -1334,6 +1345,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 @@ -1389,6 +1423,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; } diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseEvidenceServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseEvidenceServiceImpl.java index 59fad16..c83db9f 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseEvidenceServiceImpl.java +++ b/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 arbitrators = caseEvidenceDTO.getArbitrators(); if (arbitrators != null && arbitrators.size() > 0) { List ids = arbitrators.stream().map(Arbitrator::getId).collect(Collectors.toList()); diff --git a/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseAffiliateMapper.xml b/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseAffiliateMapper.xml index 33bbab7..cfc1053 100644 --- a/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseAffiliateMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseAffiliateMapper.xml @@ -22,11 +22,17 @@ + + + + + @@ -163,6 +167,7 @@ select t1.* from( case_status, hear_date, arbitrat_claims, + request_rule, loan_start_date, loan_end_date, claim_princi_owed, @@ -174,6 +179,10 @@ select t1.* from( online_video_person, contract_number, + + adjudica_counter, + proper_preser, + create_by, create_time )values( @@ -184,6 +193,7 @@ select t1.* from( #{caseStatus}, #{hearDate}, #{arbitratClaims}, + #{requestRule}, #{loanStartDate}, #{loanEndDate}, #{claimPrinciOwed}, @@ -195,6 +205,10 @@ select t1.* from( #{onlineVideoPerson}, #{contractNumber}, + + #{adjudicaCounter}, + #{properPreser}, + #{createBy}, sysdate() ) @@ -208,6 +222,7 @@ select t1.* from( arbitrat_method = #{arbitratMethod}, hear_date = #{hearDate}, arbitrat_claims = #{arbitratClaims}, + request_rule = #{requestRule}, loan_start_date = #{loanStartDate}, loan_end_date = #{loanEndDate}, claim_princi_owed = #{claimPrinciOwed}, @@ -243,6 +258,14 @@ select t1.* from( case_describe = #{caseDescribe}, case_result = #{caseResult}, is_agree_pend_tral = #{isAgreePendTral}, + adjudica_counter = #{adjudicaCounter}, + objecti_juris = #{objectiJuris}, + + is_absence = #{isAbsence}, + appli_is_absen = #{appliIsAbsen}, + respon_cross_opin = #{responCrossOpin}, + applica_cross_opin = #{applicaCrossOpin}, + respon_defen_opini = #{responDefenOpini}, objection_add_eviden = #{objectionAddEviden}, open_court_hear = #{openCourtHear}, hear_date = #{hearDate}, @@ -274,7 +297,7 @@ select t1.* from( 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