SH-Arbitrate/Arbitrate-Backend
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

优化立案申请功能

Browse Source
This commit is contained in:
qitz
2023-10-17 15:30:21 +08:00
parent 8a9eb6198d
commit 6ace1d3102
8 changed files with 198 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/ArbitrateRecord.java
+11
View File
@@ -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
+50
View File
@@ -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;
ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/CaseApplication.java
+57 -2
View File
@@ -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)
ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/dto/CaseEvidenceDTO.java
+5
View File
@@ -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
+39 -2
View File
@@ -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;
}
ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseEvidenceServiceImpl.java
+2
View File
@@ -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());