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

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

Browse Source
This commit was merged in pull request #112.
This commit is contained in:
hejinbo
2023-10-17 16:52:56 +08:00
committed by Gitea
parent a3c3c6608f fe536eb7b5
commit ba0caceb04
1 changed files with 7 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/AdjudicationServiceImpl.java
+7 -18
View File
@@ -31,7 +31,6 @@ import java.nio.file.Path;
import java.nio.file.StandardCopyOption; import java.nio.file.StandardCopyOption;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.time.LocalDate; import java.time.LocalDate;
import java.time.ZoneId;
import java.util.*; import java.util.*;
@Service @Service
@@ -54,8 +53,6 @@ public class AdjudicationServiceImpl implements IAdjudicationService {
@Autowired @Autowired
private ICaseLogRecordService caseLogRecordService; private ICaseLogRecordService caseLogRecordService;
@Autowired @Autowired
private CasePaymentRecordMapper casePaymentRecordMapper;
@Autowired
private RedisCache redisCache; private RedisCache redisCache;
@Override @Override
@@ -88,15 +85,15 @@ public class AdjudicationServiceImpl implements IAdjudicationService {
datas.put("appName", affiliate.getName()); datas.put("appName", affiliate.getName());
datas.put("appAddress", affiliate.getContactAddress()); datas.put("appAddress", affiliate.getContactAddress());
datas.put("appContactAddress", null); datas.put("appContactAddress", null);
datas.put("appLegalPerson", null); datas.put("appLegalPerson", affiliate.getCompLegalPerson());
datas.put("appLegalPersonTitle", null); datas.put("appLegalPersonTitle", affiliate.getCompLegalperPost());
datas.put("appAgentName", affiliate.getNameAgent()); datas.put("appAgentName", affiliate.getNameAgent());
datas.put("appAgentTitle", null); datas.put("appAgentTitle", null);
} 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", null); datas.put("resSex", affiliate.getResponSex());
datas.put("resDateOfBirth", null); datas.put("resDateOfBirth", affiliate.getResponBirth());
datas.put("resContactAddress", null); datas.put("resContactAddress", null);
} }
} }
@@ -106,17 +103,9 @@ public class AdjudicationServiceImpl implements IAdjudicationService {
// 将日期格式化为字符串 // 将日期格式化为字符串
String createTimeStr = sdf.format(createTime); String createTimeStr = sdf.format(createTime);
datas.put("submissionDate", createTimeStr); datas.put("submissionDate", createTimeStr);
datas.put("qutsider", null); Date registerDate = caseApplication1.getRegisterDate();
datas.put("signingDate", null); String registerDateStr = sdf.format(registerDate);
datas.put("agreementNumber", null); datas.put("acceptDate",registerDateStr);
CasePaymentRecord casePaymentRecord = casePaymentRecordMapper.selectRecordByCaseId(id);
//受理时间取得是支付时间
if (casePaymentRecord != null) {
Date paymentTime = casePaymentRecord.getPaymentTime();
String paymentTimeStr = sdf.format(paymentTime);
datas.put("acceptDate",paymentTimeStr);
}
//反请求 //反请求
Integer adjudicaCounter = caseApplication1.getAdjudicaCounter(); Integer adjudicaCounter = caseApplication1.getAdjudicaCounter();
String counterclaim = "在《2022年版仲裁规则》第十八条第（一）项规定的期限内，被申请人向秘书处提交了" + String counterclaim = "在《2022年版仲裁规则》第十八条第（一）项规定的期限内，被申请人向秘书处提交了" +