Przeglądaj źródła

编辑案件资料,修改申请人案件证据bug修改

批量导入案件模板增加申请人仲裁诉求字段
缴费单详情页面返回申请人字段
18792927508 2 lat temu
rodzic
commit
7eb500d071

+ 1
- 0
ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/CaseApplication.java Wyświetl plik

59
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
59
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
60
     private Date hearDate;
60
     private Date hearDate;
61
     /** 申请人仲裁诉求 */
61
     /** 申请人仲裁诉求 */
62
+    @Excel(name = "申请人仲裁诉求")
62
     private String arbitratClaims;
63
     private String arbitratClaims;
63
     /** 借款开始日期 */
64
     /** 借款开始日期 */
64
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
65
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")

+ 30
- 1
ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseApplicationServiceImpl.java Wyświetl plik

92
         List<CaseAffiliate> caseAffiliates = caseApplication.getCaseAffiliates();
92
         List<CaseAffiliate> caseAffiliates = caseApplication.getCaseAffiliates();
93
         if(caseAffiliates!=null&&caseAffiliates.size()>0){
93
         if(caseAffiliates!=null&&caseAffiliates.size()>0){
94
             for (CaseAffiliate caseAffiliate : caseAffiliates){
94
             for (CaseAffiliate caseAffiliate : caseAffiliates){
95
+                caseAffiliate.setCaseAppliId(caseApplication.getId());
95
                 caseAffiliateMapper.updataCaseAffiliate(caseAffiliate);
96
                 caseAffiliateMapper.updataCaseAffiliate(caseAffiliate);
96
             }
97
             }
97
         }
98
         }
99
+        List<CaseAttach> caseAttachList = caseApplication.getCaseAttachList();
100
+        if(caseAttachList!=null&&caseAttachList.size()>0){
101
+            for (CaseAttach caseAttach : caseAttachList){
102
+                caseAttach.setCaseAppliId(caseApplication.getId());
103
+                caseAttachMapper.updateCaseAttach(caseAttach);
104
+            }
105
+
106
+        }
98
 
107
 
99
         return rows;
108
         return rows;
100
     }
109
     }
194
                     caseApplicationListinsert.add(caseApplication);
203
                     caseApplicationListinsert.add(caseApplication);
195
                 }
204
                 }
196
             }
205
             }
206
+            // 编号存在不导入
207
+            if(StringUtils.isNotEmpty(failureMsg)){
208
+                return failureMsg.toString();
209
+            }
197
             if(caseApplicationListinsert!=null&&caseApplicationListinsert.size()>0){
210
             if(caseApplicationListinsert!=null&&caseApplicationListinsert.size()>0){
198
                 List<CaseApplication> caseApplicationListinsertDiffer = caseApplicationListinsert.stream().collect(
211
                 List<CaseApplication> caseApplicationListinsertDiffer = caseApplicationListinsert.stream().collect(
199
                         collectingAndThen(
212
                         collectingAndThen(
203
 
216
 
204
                 //对不重复的立案对象集合的立案对象重新组装对应的案件关联人信息
217
                 //对不重复的立案对象集合的立案对象重新组装对应的案件关联人信息
205
                 if(caseApplicationListinsertDiffer!=null&&caseApplicationListinsertDiffer.size()>0){
218
                 if(caseApplicationListinsertDiffer!=null&&caseApplicationListinsertDiffer.size()>0){
206
-                    List<CaseApplication> caseApplicationNewList = new ArrayList<>();
219
+                    List<CaseApplication> caseApplicationNewList = null;
207
                     for (int i = 0; i < caseApplicationListinsertDiffer.size(); i++){
220
                     for (int i = 0; i < caseApplicationListinsertDiffer.size(); i++){
221
+                        caseApplicationNewList = new ArrayList<>();
208
                         CaseApplication caseApplicationinsertDiffer = caseApplicationListinsertDiffer.get(i);
222
                         CaseApplication caseApplicationinsertDiffer = caseApplicationListinsertDiffer.get(i);
209
                         List<CaseAffiliate> caseAffiliatesnew =  new ArrayList<>();
223
                         List<CaseAffiliate> caseAffiliatesnew =  new ArrayList<>();
210
                         CaseApplication caseApplicationNew = new CaseApplication();
224
                         CaseApplication caseApplicationNew = new CaseApplication();
345
     @Override
359
     @Override
346
     public CaseApplication selectCaseApplicationConfirm(CaseApplication caseApplication) {
360
     public CaseApplication selectCaseApplicationConfirm(CaseApplication caseApplication) {
347
         CaseApplication caseApplicationselect = caseApplicationMapper.selectCaseApplicationConfirm(caseApplication);
361
         CaseApplication caseApplicationselect = caseApplicationMapper.selectCaseApplicationConfirm(caseApplication);
362
+        CaseAffiliate caseAffiliate = new CaseAffiliate();
363
+        caseAffiliate.setCaseAppliId(caseApplication.getId());
364
+        List<CaseAffiliate> caseAffiliatListeselect = caseAffiliateMapper.selectCaseAffiliate(caseAffiliate);
365
+        if(caseAffiliatListeselect!=null){
366
+            StringBuffer applicantName = new StringBuffer();
367
+            for (int i = 0; i < caseAffiliatListeselect.size(); i++){
368
+                CaseAffiliate caseAffiliateselect = caseAffiliatListeselect.get(i);
369
+                int identityType = caseAffiliateselect.getIdentityType();
370
+                if(identityType==1){
371
+                    applicantName.append(caseAffiliateselect.getName()).append(",");;
372
+                }
373
+            }
374
+            caseApplicationselect.setApplicantName(applicantName.toString());
375
+
348
 
376
 
377
+        }
349
         return caseApplicationselect;
378
         return caseApplicationselect;
350
     }
379
     }
351
 
380
 

+ 1
- 0
ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseAffiliateMapper.xml Wyświetl plik

49
     <update id="updataCaseAffiliate" parameterType="CaseAffiliate">
49
     <update id="updataCaseAffiliate" parameterType="CaseAffiliate">
50
         update case_affiliate
50
         update case_affiliate
51
         set
51
         set
52
+        case_appli_id=#{caseAppliId},
52
         identity_type= #{identityType},
53
         identity_type= #{identityType},
53
         name = #{name},
54
         name = #{name},
54
         identity_num = #{identityNum},
55
         identity_num = #{identityNum},