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

ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/AdjudicationServiceImpl.java

@@ -31,7 +31,6 @@ import java.nio.file.Path;
 import java.nio.file.StandardCopyOption;
 import java.text.SimpleDateFormat;
 import java.time.LocalDate;
-import java.time.ZoneId;
 import java.util.*;
 
 @Service
@@ -54,8 +53,6 @@ public class AdjudicationServiceImpl implements IAdjudicationService {
     @Autowired
     private ICaseLogRecordService caseLogRecordService;
     @Autowired
-    private CasePaymentRecordMapper casePaymentRecordMapper;
-    @Autowired
     private RedisCache redisCache;
 
     @Override
@@ -88,15 +85,15 @@ public class AdjudicationServiceImpl implements IAdjudicationService {
                         datas.put("appName", affiliate.getName());
                         datas.put("appAddress", affiliate.getContactAddress());
                         datas.put("appContactAddress", null);
-                        datas.put("appLegalPerson", null);
-                        datas.put("appLegalPersonTitle", null);
+                        datas.put("appLegalPerson", affiliate.getCompLegalPerson());
+                        datas.put("appLegalPersonTitle", affiliate.getCompLegalperPost());
                         datas.put("appAgentName", affiliate.getNameAgent());
                         datas.put("appAgentTitle", null);
                     } else if (identityType == 2) {  //被申请人
                         datas.put("resName", affiliate.getName());
                         datas.put("resAddress", affiliate.getContactAddress());
-                        datas.put("resSex", null);
-                        datas.put("resDateOfBirth", null);
+                        datas.put("resSex", affiliate.getResponSex());
+                        datas.put("resDateOfBirth", affiliate.getResponBirth());
                         datas.put("resContactAddress", null);
                     }
                 }
@@ -106,17 +103,9 @@ public class AdjudicationServiceImpl implements IAdjudicationService {
             // 将日期格式化为字符串
             String createTimeStr = sdf.format(createTime);
             datas.put("submissionDate", createTimeStr);
-            datas.put("qutsider", null);
-            datas.put("signingDate", null);
-            datas.put("agreementNumber", null);
-            CasePaymentRecord casePaymentRecord = casePaymentRecordMapper.selectRecordByCaseId(id);
-            //受理时间取得是支付时间
-            if (casePaymentRecord != null) {
-                Date paymentTime = casePaymentRecord.getPaymentTime();
-                String paymentTimeStr = sdf.format(paymentTime);
-                datas.put("acceptDate",paymentTimeStr);
-            }
-
+            Date registerDate = caseApplication1.getRegisterDate();
+            String registerDateStr = sdf.format(registerDate);
+            datas.put("acceptDate",registerDateStr);
             //反请求
             Integer adjudicaCounter = caseApplication1.getAdjudicaCounter();
             String counterclaim = "在《2022年版仲裁规则》第十八条第（一）项规定的期限内，被申请人向秘书处提交了" +