Explorar el Código

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

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

+ 1
- 0
ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/CaseApplication.java Ver fichero

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

+ 30
- 1
ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseApplicationServiceImpl.java Ver fichero

@@ -92,9 +92,18 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
92 92
         List<CaseAffiliate> caseAffiliates = caseApplication.getCaseAffiliates();
93 93
         if(caseAffiliates!=null&&caseAffiliates.size()>0){
94 94
             for (CaseAffiliate caseAffiliate : caseAffiliates){
95
+                caseAffiliate.setCaseAppliId(caseApplication.getId());
95 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 108
         return rows;
100 109
     }
@@ -194,6 +203,10 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
194 203
                     caseApplicationListinsert.add(caseApplication);
195 204
                 }
196 205
             }
206
+            // 编号存在不导入
207
+            if(StringUtils.isNotEmpty(failureMsg)){
208
+                return failureMsg.toString();
209
+            }
197 210
             if(caseApplicationListinsert!=null&&caseApplicationListinsert.size()>0){
198 211
                 List<CaseApplication> caseApplicationListinsertDiffer = caseApplicationListinsert.stream().collect(
199 212
                         collectingAndThen(
@@ -203,8 +216,9 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
203 216
 
204 217
                 //对不重复的立案对象集合的立案对象重新组装对应的案件关联人信息
205 218
                 if(caseApplicationListinsertDiffer!=null&&caseApplicationListinsertDiffer.size()>0){
206
-                    List<CaseApplication> caseApplicationNewList = new ArrayList<>();
219
+                    List<CaseApplication> caseApplicationNewList = null;
207 220
                     for (int i = 0; i < caseApplicationListinsertDiffer.size(); i++){
221
+                        caseApplicationNewList = new ArrayList<>();
208 222
                         CaseApplication caseApplicationinsertDiffer = caseApplicationListinsertDiffer.get(i);
209 223
                         List<CaseAffiliate> caseAffiliatesnew =  new ArrayList<>();
210 224
                         CaseApplication caseApplicationNew = new CaseApplication();
@@ -345,7 +359,22 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
345 359
     @Override
346 360
     public CaseApplication selectCaseApplicationConfirm(CaseApplication caseApplication) {
347 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 378
         return caseApplicationselect;
350 379
     }
351 380
 

+ 1
- 0
ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseAffiliateMapper.xml Ver fichero

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