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

Merge branch 'dev' of http://git.xayunmei.com/SH-Arbitrate/Arbitrate-Backend into qtz3

Browse Source
This commit is contained in:
qitz
2023-10-18 14:32:25 +08:00
parent 732d426d72 61f24aeefc
commit 4a2dc3a2ec
2 changed files with 23 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/CaseAffiliate.java
+2
View File
@@ -53,6 +53,7 @@ public class CaseAffiliate extends BaseEntity {
this.responBirth = responBirth; this.responBirth = responBirth;
} }
public String getCompLegalPerson() { public String getCompLegalPerson() {
return compLegalPerson; return compLegalPerson;
} }
@@ -79,6 +80,7 @@ public class CaseAffiliate extends BaseEntity {
/** 身份证号 */ /** 身份证号 */
@Excel(name = "身份证号") @Excel(name = "身份证号")
private String identityNum; private String identityNum;
ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/AdjudicationServiceImpl.java
+21 -10
View File
@@ -78,24 +78,30 @@ public class AdjudicationServiceImpl implements IAdjudicationService {
CaseAffiliate caseAffiliate = new CaseAffiliate(); CaseAffiliate caseAffiliate = new CaseAffiliate();
caseAffiliate.setCaseAppliId(id); caseAffiliate.setCaseAppliId(id);
List<CaseAffiliate> caseAffiliates = caseAffiliateMapper.selectCaseAffiliate(caseAffiliate); List<CaseAffiliate> caseAffiliates = caseAffiliateMapper.selectCaseAffiliate(caseAffiliate);
List<String> nameAgentList = new ArrayList<>();
if (caseAffiliates != null && caseAffiliates.size() > 0) { if (caseAffiliates != null && caseAffiliates.size() > 0) {
for (CaseAffiliate affiliate : caseAffiliates) { for (CaseAffiliate affiliate : caseAffiliates) {
//获取身份类型 //获取身份类型
int identityType = affiliate.getIdentityType(); int identityType = affiliate.getIdentityType();
if (identityType == 1) { //申请人 if (identityType == 1) { //申请人
datas.put("appName", affiliate.getName()); datas.put("appName", affiliate.getName());
datas.put("appAddress", affiliate.getContactAddress()); datas.put("appAddress", affiliate.getResidenAffili());
datas.put("appContactAddress", null); datas.put("appContactAddress", affiliate.getContactAddress());
datas.put("appLegalPerson", affiliate.getCompLegalPerson()); datas.put("appLegalPerson", affiliate.getCompLegalPerson());
datas.put("appLegalPersonTitle", affiliate.getCompLegalperPost()); datas.put("appLegalPersonTitle", affiliate.getCompLegalperPost());
datas.put("appAgentName", affiliate.getNameAgent()); datas.put("appAgentName", affiliate.getNameAgent());
datas.put("appAgentTitle", null); datas.put("appAgentTitle", affiliate.getAppliAgentTitle());
nameAgentList.add(affiliate.getNameAgent());
} else if (identityType == 2) { //被申请人 } else if (identityType == 2) { //被申请人
datas.put("resName", affiliate.getName()); datas.put("resName", affiliate.getName());
datas.put("resAddress", affiliate.getContactAddress()); datas.put("resAddress", affiliate.getResidenAffili());
datas.put("resSex", affiliate.getResponSex()); datas.put("resSex", affiliate.getResponSex());
datas.put("resDateOfBirth", affiliate.getResponBirth()); Date responBirth = affiliate.getResponBirth();
datas.put("resContactAddress", null); SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
String responBirthStr = sdf.format(responBirth);
datas.put("resDateOfBirth",responBirthStr);
datas.put("resContactAddress", affiliate.getContactAddress());
nameAgentList.add(affiliate.getNameAgent());
} }
} }
} }
@@ -164,7 +170,7 @@ public class AdjudicationServiceImpl implements IAdjudicationService {
} }
Integer isAbsence = caseApplication1.getIsAbsence(); Integer isAbsence = caseApplication1.getIsAbsence();
if (isAbsence==null){ if (isAbsence==null){
datas.put("onLine1", null); datas.put("absent1", null);
datas.put("absent2", null); datas.put("absent2", null);
datas.put("absent3", null); datas.put("absent3", null);
datas.put("absent4", null); datas.put("absent4", null);
@@ -176,7 +182,9 @@ public class AdjudicationServiceImpl implements IAdjudicationService {
datas.put("attend5", null); datas.put("attend5", null);
datas.put("attend6", null); datas.put("attend6", null);
datas.put("attend7", null); datas.put("attend7", null);
datas.put("responCrossOpin", null); datas.put("appAgentName1", null);
datas.put("appAgentName2", null);
datas.put("resAgentName", null);
} }
else if (isAbsence == 1) { else if (isAbsence == 1) {
//缺席审理 //缺席审理
@@ -189,11 +197,12 @@ public class AdjudicationServiceImpl implements IAdjudicationService {
"申请人为证明其主张的事实和理由，向仲裁庭提交了如下证据材料："; "申请人为证明其主张的事实和理由，向仲裁庭提交了如下证据材料：";
String absent5 = "综上，仲裁庭依据《上海仲裁委员会仲裁规则》（2022年7月1日起施行的版本）" + String absent5 = "综上，仲裁庭依据《上海仲裁委员会仲裁规则》（2022年7月1日起施行的版本）" +
"第四十条第（二）项、第五十一条的规定，缺席裁决如下："; "第四十条第（二）项、第五十一条的规定，缺席裁决如下：";
datas.put("onLine1", absent1); datas.put("absent1", absent1);
datas.put("absent2", absent2); datas.put("absent2", absent2);
datas.put("absent3", absent3); datas.put("absent3", absent3);
datas.put("absent4", absent4); datas.put("absent4", absent4);
datas.put("absent5", absent5); datas.put("absent5", absent5);
datas.put("appAgentName1", nameAgentList.get(0));
} else { } else {
//出席审理 //出席审理
String attend1 = "申请人的特别授权委托代理人"; String attend1 = "申请人的特别授权委托代理人";
@@ -215,6 +224,8 @@ public class AdjudicationServiceImpl implements IAdjudicationService {
datas.put("attend6", attend6); datas.put("attend6", attend6);
datas.put("attend7", attend7); datas.put("attend7", attend7);
datas.put("responCrossOpin", caseApplication1.getResponCrossOpin()); datas.put("responCrossOpin", caseApplication1.getResponCrossOpin());
datas.put("appAgentName2", nameAgentList.get(0));
datas.put("resAgentName", nameAgentList.get(1));
if (arbitratMethod == 1) { if (arbitratMethod == 1) {
//被申出席+开庭 //被申出席+开庭
String attend8 = "综上，仲裁庭依据《上海仲裁委员会仲裁规则》（2022年7月1日起施行的版本）" + String attend8 = "综上，仲裁庭依据《上海仲裁委员会仲裁规则》（2022年7月1日起施行的版本）" +
@@ -244,7 +255,7 @@ public class AdjudicationServiceImpl implements IAdjudicationService {
datas.put("year", year); datas.put("year", year);
String month = String.format("%02d", now.getMonthValue()); String month = String.format("%02d", now.getMonthValue());
String day = String.format("%02d", now.getDayOfMonth()); String day = String.format("%02d", now.getDayOfMonth());
String modalFilePath = "/data/arbitrate-document/template/新裁决书模板.docx"; String modalFilePath = "/data/arbitrate-document/template/新裁决书模板.docx";
//String modalFilePath = "D:/develop/新裁决书模板.docx"; //String modalFilePath = "D:/develop/新裁决书模板.docx";
String saveFolderPath = "/home/ruoyi/uploadPath/upload/" + year + "/" + month + "/" + day; String saveFolderPath = "/home/ruoyi/uploadPath/upload/" + year + "/" + month + "/" + day;
//String saveFolderPath = "D:/data/" + year + "/" + month + "/" + day; //String saveFolderPath = "D:/data/" + year + "/" + month + "/" + day;