Просмотр исходного кода

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

hejinbo 2 лет назад
Родитель
Сommit
ba0caceb04

+ 7
- 18
ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/AdjudicationServiceImpl.java Просмотреть файл

31
 import java.nio.file.StandardCopyOption;
31
 import java.nio.file.StandardCopyOption;
32
 import java.text.SimpleDateFormat;
32
 import java.text.SimpleDateFormat;
33
 import java.time.LocalDate;
33
 import java.time.LocalDate;
34
-import java.time.ZoneId;
35
 import java.util.*;
34
 import java.util.*;
36
 
35
 
37
 @Service
36
 @Service
54
     @Autowired
53
     @Autowired
55
     private ICaseLogRecordService caseLogRecordService;
54
     private ICaseLogRecordService caseLogRecordService;
56
     @Autowired
55
     @Autowired
57
-    private CasePaymentRecordMapper casePaymentRecordMapper;
58
-    @Autowired
59
     private RedisCache redisCache;
56
     private RedisCache redisCache;
60
 
57
 
61
     @Override
58
     @Override
88
                         datas.put("appName", affiliate.getName());
85
                         datas.put("appName", affiliate.getName());
89
                         datas.put("appAddress", affiliate.getContactAddress());
86
                         datas.put("appAddress", affiliate.getContactAddress());
90
                         datas.put("appContactAddress", null);
87
                         datas.put("appContactAddress", null);
91
-                        datas.put("appLegalPerson", null);
92
-                        datas.put("appLegalPersonTitle", null);
88
+                        datas.put("appLegalPerson", affiliate.getCompLegalPerson());
89
+                        datas.put("appLegalPersonTitle", affiliate.getCompLegalperPost());
93
                         datas.put("appAgentName", affiliate.getNameAgent());
90
                         datas.put("appAgentName", affiliate.getNameAgent());
94
                         datas.put("appAgentTitle", null);
91
                         datas.put("appAgentTitle", null);
95
                     } else if (identityType == 2) {  //被申请人
92
                     } else if (identityType == 2) {  //被申请人
96
                         datas.put("resName", affiliate.getName());
93
                         datas.put("resName", affiliate.getName());
97
                         datas.put("resAddress", affiliate.getContactAddress());
94
                         datas.put("resAddress", affiliate.getContactAddress());
98
-                        datas.put("resSex", null);
99
-                        datas.put("resDateOfBirth", null);
95
+                        datas.put("resSex", affiliate.getResponSex());
96
+                        datas.put("resDateOfBirth", affiliate.getResponBirth());
100
                         datas.put("resContactAddress", null);
97
                         datas.put("resContactAddress", null);
101
                     }
98
                     }
102
                 }
99
                 }
106
             // 将日期格式化为字符串
103
             // 将日期格式化为字符串
107
             String createTimeStr = sdf.format(createTime);
104
             String createTimeStr = sdf.format(createTime);
108
             datas.put("submissionDate", createTimeStr);
105
             datas.put("submissionDate", createTimeStr);
109
-            datas.put("qutsider", null);
110
-            datas.put("signingDate", null);
111
-            datas.put("agreementNumber", null);
112
-            CasePaymentRecord casePaymentRecord = casePaymentRecordMapper.selectRecordByCaseId(id);
113
-            //受理时间取得是支付时间
114
-            if (casePaymentRecord != null) {
115
-                Date paymentTime = casePaymentRecord.getPaymentTime();
116
-                String paymentTimeStr = sdf.format(paymentTime);
117
-                datas.put("acceptDate",paymentTimeStr);
118
-            }
119
-
106
+            Date registerDate = caseApplication1.getRegisterDate();
107
+            String registerDateStr = sdf.format(registerDate);
108
+            datas.put("acceptDate",registerDateStr);
120
             //反请求
109
             //反请求
121
             Integer adjudicaCounter = caseApplication1.getAdjudicaCounter();
110
             Integer adjudicaCounter = caseApplication1.getAdjudicaCounter();
122
             String counterclaim = "在《2022年版仲裁规则》第十八条第(一)项规定的期限内,被申请人向秘书处提交了" +
111
             String counterclaim = "在《2022年版仲裁规则》第十八条第(一)项规定的期限内,被申请人向秘书处提交了" +