10.17开发

This commit is contained in:
hejinbo
2023-10-17 18:27:21 +08:00
parent fe536eb7b5
commit eff4c740aa
@@ -77,6 +77,7 @@ 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) {
//获取身份类型 //获取身份类型
@@ -89,12 +90,14 @@ public class AdjudicationServiceImpl implements IAdjudicationService {
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", null);
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.getContactAddress());
datas.put("resSex", affiliate.getResponSex()); datas.put("resSex", affiliate.getResponSex());
datas.put("resDateOfBirth", affiliate.getResponBirth()); datas.put("resDateOfBirth", affiliate.getResponBirth());
datas.put("resContactAddress", null); datas.put("resContactAddress", null);
nameAgentList.add(affiliate.getNameAgent());
} }
} }
} }
@@ -163,7 +166,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);
@@ -175,7 +178,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) {
//缺席审理 //缺席审理
@@ -188,11 +193,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 = "申请人的特别授权委托代理人";
@@ -214,6 +220,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日起施行的版本)" +
@@ -243,7 +251,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;