Bladeren bron

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

wangqiong123 2 jaren geleden
bovenliggende
commit
d05a943e66

+ 4
- 0
ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/CaseApplication.java Bestand weergeven

@@ -419,4 +419,8 @@ public class CaseApplication  extends BaseEntity {
419 419
     private Integer pendingStatus;
420 420
    /** e签宝流程id */
421 421
     private String signFlowId;
422
+    /**
423
+     * 登录用户名
424
+     */
425
+    private String userName;
422 426
 }

+ 0
- 1
ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/mapper/CaseApplicationMapper.java Bestand weergeven

@@ -12,7 +12,6 @@ import java.util.List;
12 12
 
13 13
 public interface CaseApplicationMapper {
14 14
     List<CaseApplication> selectCaseApplicationList(CaseApplication caseApplication);
15
-    List<CaseApplication> selectCaseApplicationList1(CaseApplication caseApplication);
16 15
 
17 16
     int selectCaseApplicationCount(CaseApplication caseApplication);
18 17
 

+ 65
- 1
ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseApplicationServiceImpl.java Bestand weergeven

@@ -40,6 +40,8 @@ import org.springframework.beans.factory.annotation.Value;
40 40
 import org.springframework.stereotype.Service;
41 41
 import org.springframework.transaction.annotation.Transactional;
42 42
 import org.springframework.web.multipart.MultipartFile;
43
+import tk.mybatis.mapper.entity.Example;
44
+
43 45
 import java.io.*;
44 46
 import java.math.BigDecimal;
45 47
 import java.math.RoundingMode;
@@ -138,6 +140,68 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
138 140
     // 被申请人字段校验
139 141
     private static final  String[] dectborAffiliateColumns = {"name", "identityNum","contactTelphone","contactAddress","workTelphone","workAddress",
140 142
            "residenAffili","responSex","responBirth","email","nameAgent", "identityNumAgent","contactTelphoneAgent","contactAddressAgent"};
143
+    /**
144
+     * 案件列表查询
145
+     *
146
+     * @param req
147
+     * @return
148
+     */
149
+//    public List<CaseApplication> list(CaseApplication req) {
150
+//            // 查询的案件状态
151
+//    List<String> caseStatusList=new ArrayList<>();
152
+//    // 根据用户查询角色
153
+//        LoginUser loginUser = SecurityUtils.getLoginUser();
154
+//        // 根据id查询用户
155
+//        SysUser sysUser = sysUserMapper.selectUserById(loginUser.getUserId());
156
+//        List<SysRole> roles = sysUser.getRoles();
157
+//        req.setUserName(sysUser.getUserName());
158
+//        if (StrUtil.equals(SecurityUtils.getUsername(), "admin")) {
159
+//            startPage();
160
+//            List<CaseApplication> list = caseApplicationMapper.list(req, null,null);
161
+//            // 设置申请人被申请人及签名按钮限
162
+//         //   setAfflicate(new HashMap<>(),list,loginUser.getUserId(),roles);
163
+//            return list;
164
+//        }
165
+//        if(CollectionUtil.isEmpty(roles) ){
166
+//            throw new RuntimeException("用户未分配角色,请联系管理员");
167
+//        }
168
+//        List<Long> roleIds = roles.stream().map(SysRole::getRoleId).collect(Collectors.toList());
169
+//
170
+//        // 流程名称分组
171
+//        Map<String, Integer> flowNameMap = allCaseFlows.stream().collect(Collectors.toMap(MsCaseFlow::getCaseStatusName, MsCaseFlow::getSort, (k1, k2) -> k2));
172
+//
173
+//        // 是否查询所有
174
+//        boolean isSelectAll = false;
175
+//
176
+//        for (SysRole role : roles) {
177
+//            if(StrUtil.isNotEmpty(role.getRoleName())){
178
+//                if(StrUtil.contains(role.getRoleName(),"财务")
179
+//                        ||StrUtil.contains(role.getRoleName(),"法律顾问")
180
+//                        ||StrUtil.contains(role.getRoleName(),"部门长")
181
+//                ){
182
+//                    isSelectAll=true;
183
+//                    roleIds=null;
184
+//                }
185
+//                if(StrUtil.equals(role.getRoleName(),"调解员")) {
186
+//                    req.setMediatorId(String.valueOf(sysUser.getUserId()));
187
+//                }
188
+//            }
189
+//        }
190
+//        if(!isSelectAll){
191
+//            req.setUserId(String.valueOf(loginUser.getUserId()));
192
+//        }
193
+//        if(req.getMediationMethod()!=null){
194
+//            // 查询视频审理
195
+//            req.setCaseFlowId(9);
196
+//        }
197
+//        startPage();
198
+//
199
+//        // 查询案件列表
200
+//        List<CaseApplication> list = caseApplicationMapper.list(req, caseFlowIds,roleIds);
201
+//        // 设置申请人被申请人及签名按钮限
202
+//      //  setAfflicate(flowNameMap,list,loginUser.getUserId(),roles);
203
+//        return list;
204
+//    }
141 205
 
142 206
     /**
143 207
      * 数据权限:1.每个人不同的角色,而每个角色可以操作不同的案件状态
@@ -261,7 +325,7 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
261 325
 
262 326
             // 根据条件查询申请人,被申请人,仲裁员,法律顾问案件
263 327
 //            return caseApplicationMapper.selectCaseApplicationList(caseApplication);
264
-            List<CaseApplication> caseApplications = caseApplicationMapper.selectCaseApplicationList1(caseApplication);
328
+            List<CaseApplication> caseApplications = caseApplicationMapper.selectCaseApplicationList(caseApplication);
265 329
             if(caseApplications!=null&&caseApplications.size()>0){
266 330
                 for(CaseApplication caseApplicationsel : caseApplications){
267 331
                     Integer caseStatus = caseApplicationsel.getCaseStatus();

+ 14
- 52
ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseZipImportImpl.java Bestand weergeven

@@ -41,6 +41,7 @@ import java.text.SimpleDateFormat;
41 41
 import java.util.*;
42 42
 import java.util.concurrent.ExecutionException;
43 43
 import java.util.concurrent.Future;
44
+import java.util.concurrent.atomic.AtomicInteger;
44 45
 import java.util.function.Function;
45 46
 import java.util.regex.Matcher;
46 47
 import java.util.regex.Pattern;
@@ -97,17 +98,14 @@ public class CaseZipImportImpl {
97 98
 @Transactional
98 99
     public AjaxResult zipImport(MultipartFile file, Long templateId) {
99 100
         UUID uuid = UUID.randomUUID();
100
-        // todo
101
+
101 102
         String targetPath = "/home/ruoyi/uploadPath/upload/unzipFile/" + uuid + "/";
102
-//        String targetPath = "D:/home/ruoyi/uploadPath/upload/unzipFile/"+uuid+ "/";
103 103
         File zipFile = null;
104 104
         InputStream ins = null;
105 105
         try {
106 106
             ins = file.getInputStream();
107 107
             //上传的压缩包保存的路径
108
-            // todo
109 108
             String savePath = "/home/ruoyi/uploadPath/upload/zipFile/";
110
-//           String savePath = "D:/home/ruoyi/uploadPath/upload/zipFile/";
111 109
             String saveName = uuid + "_" + file.getOriginalFilename();
112 110
             zipFile = new File(savePath + saveName);
113 111
             inputChangeToFile(ins, zipFile);
@@ -121,7 +119,6 @@ public class CaseZipImportImpl {
121 119
             throw new ServiceException("解压失败");
122 120
         }
123 121
         // 查询抓取规则
124
-        // todo 批次需要再上传压缩包时用户填写
125 122
         List<FatchRule> fatchRuleList = fatchRuleMapper.listByTemplateId(templateId);
126 123
         if (CollectionUtil.isEmpty(fatchRuleList)) {
127 124
             throw new ServiceException("未设置抓取规则");
@@ -166,18 +163,19 @@ public class CaseZipImportImpl {
166 163
         if (!directory.isDirectory() || directory.listFiles() == null) {
167 164
             throw new ServiceException("未找到文件夹");
168 165
         }
169
-    Integer maxBatchNumber = caseApplicationMapper.selectBatchNumberLike();
170
-    if (maxBatchNumber == null) {
171
-        maxBatchNumber = 1;
166
+    Integer batchNumber = caseApplicationMapper.selectBatchNumberLike();
167
+        AtomicInteger maxBatchNumber = new AtomicInteger();
168
+    if (batchNumber == null) {
169
+        maxBatchNumber.set(1);
172 170
 
173 171
     } else {
174
-        maxBatchNumber = maxBatchNumber + 1;
172
+        maxBatchNumber.set(batchNumber+1);
175 173
 
176 174
     }
177
-        File[] files = directory.listFiles();
175
+    File[] files = directory.listFiles();
178 176
     CaseZipImportTask caseZipImportTask = null;
179 177
     try {
180
-        caseZipImportTask = new CaseZipImportTask(this, templateId, fatchRuleList, fatchMap, fatchRuleMap, userMap, dictDataList, files , deptMap, SecurityUtils.getLoginUser(),maxBatchNumber);
178
+        caseZipImportTask = new CaseZipImportTask(this, templateId, fatchRuleList, fatchMap, fatchRuleMap, userMap, dictDataList, files , deptMap, SecurityUtils.getLoginUser(),maxBatchNumber.get());
181 179
     } catch (Exception e) {
182 180
         return error("导入失败");
183 181
     }
@@ -298,44 +296,7 @@ public class CaseZipImportImpl {
298 296
 //                    Function<List<SysUser>, Integer> function = userMapper::batchSave;
299 297
 //                    execList.add(new MultipleThreadListParam(function, addUsers));
300 298
 //                }
301
-//                if (CollectionUtil.isNotEmpty(userRoleList)) {
302
-//                    Function<List<SysUserRole>, Integer> function = userRoleMapper::batchUserRole;
303
-//                    execList.add(new MultipleThreadListParam(function, userRoleList));
304
-//
305
-//                }
306
-//                if (CollectionUtil.isNotEmpty(sysDepts)) {
307
-//                    Function<List<SysDept>, Integer> function = sysDeptMapper::batchSave;
308
-//                    execList.add(new MultipleThreadListParam(function, sysDepts));
309
-//
310
-//                }
311
-//                if (CollectionUtil.isNotEmpty(caseApplications)) {
312
-//                    Function<List<CaseApplication>, Integer> function = caseApplicationMapper::batchSave;
313
-//                    execList.add(new MultipleThreadListParam(function, caseApplications));
314
-//                    Function<List<CaseApplication>, Integer> functionLog = caseApplicationLogMapper::batchSave;
315
-//                    execList.add(new MultipleThreadListParam(functionLog, caseApplications));
316
-//
317
-//                }
318
-//                if (CollectionUtil.isNotEmpty(caseAffiliates)) {
319
-//                    Function<List<CaseAffiliate>, Integer> function = caseAffiliateMapper::batchCaseAffiliate;
320
-//                    execList.add(new MultipleThreadListParam(function, caseAffiliates));
321
-//                    Function<List<CaseAffiliate>, Integer> functionLog = caseAffiliateLogMapper::batchCaseAffiliate;
322
-//                    execList.add(new MultipleThreadListParam(functionLog, caseAffiliates));
323
-//                }
324
-//                if (CollectionUtil.isNotEmpty(caseAttachs)) {
325
-//                    Function<List<CaseAttach>, Integer> function = caseAttachMapper::batchSave;
326
-//                    execList.add(new MultipleThreadListParam(function, caseAttachs));
327
-//                    Function<List<CaseAttach>, Integer> functionLog = caseAttachLogMapper::batchSave;
328
-//                    execList.add(new MultipleThreadListParam(functionLog, caseAttachs));
329
-//                }
330
-//                if (CollectionUtil.isNotEmpty(columnValueList)) {
331
-//                    Function<List<ColumnValue>, Integer> function = columnValueMapper::batchSave;
332
-//                    execList.add(new MultipleThreadListParam(function, columnValueList));
333
-//                    Function<List<ColumnValue>, Integer> functionLog = columnValueLogMapper::batchSave;
334
-//                    execList.add(new MultipleThreadListParam(functionLog, columnValueList));
335
-//                }
336
-//                if (CollectionUtil.isNotEmpty(execList)) {
337
-//                    MultipleThreadWorkUtil.execListFun(execList.toArray(new MultipleThreadListParam[execList.size()]));
338
-//                }
299
+
339 300
                 // 多线程执行
340 301
                 ThreadPoolUtil.execute(() -> {
341 302
                     try {
@@ -414,6 +375,7 @@ public class CaseZipImportImpl {
414 375
         for (Map.Entry<String, String> entry : andConvertPDF.entrySet()) {
415 376
             if(entry.getKey().contains(mapKey)){
416 377
                 fileURL=entry.getValue();
378
+                break;
417 379
             }
418 380
         }
419 381
         if (StrUtil.isEmpty(fileURL)) {
@@ -808,8 +770,8 @@ public class CaseZipImportImpl {
808 770
                         dept.setOrderNum(1);
809 771
                         dept.setStatus("0");
810 772
                         dept.setDelFlag("0");
811
-                        dept.setCreateBy(getUsername());
812
-                        dept.setUpdateBy(getUsername());
773
+                     //   dept.setCreateBy(getUsername());
774
+                     //   dept.setUpdateBy(getUsername());
813 775
                         dept.setDeptId(Long.valueOf(IdWorkerUtil.getId()));
814 776
                         sysDepts.add(dept);
815 777
                         deptMap.put(dept.getDeptName(), dept.getDeptId());
@@ -897,7 +859,7 @@ public class CaseZipImportImpl {
897 859
                             smsSendRecord.setSendTime(new Date());
898 860
                             String content = "尊敬的" + agentUser.getNickName() + ",您的代理的案件已接入仲裁系统,复制访问https://miniapp-3gpama6l759911ef-1321289474.tcloudbaseapp.com/jump-mp.html 进入小程序进行认证注册。如非本人操作,请忽略本短信";
899 861
                             smsSendRecord.setSendContent(content);
900
-                            smsSendRecord.setCreateBy(getUsername());
862
+                          //  smsSendRecord.setCreateBy(getUsername());
901 863
                             smsSendRecords.add(smsSendRecord);
902 864
                         }
903 865
 

+ 1
- 0
ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/utils/OCRUtils.java Bestand weergeven

@@ -181,6 +181,7 @@ public class OCRUtils {
181 181
             // 开始为空结束不为空
182 182
             int endContIndex = StrUtil.ordinalIndexOf(text, endContent, fatchRule.getEndContentRepeatOrder());
183 183
             if (endContIndex != -1) {
184
+                // todo
184 185
                 String substring = text.substring(0, endContIndex);
185 186
                 fatchMap.put(fatchRule.getColumnName(), trimStr(substring));
186 187
             }

+ 12
- 120
ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseApplicationMapper.xml Bestand weergeven

@@ -4,7 +4,7 @@
4 4
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
5 5
 <mapper namespace="com.ruoyi.wisdomarbitrate.mapper.CaseApplicationMapper">
6 6
 
7
-    <resultMap type="CaseApplication" id="CaseApplicationResult">
7
+    <resultMap type="com.ruoyi.wisdomarbitrate.domain.CaseApplication" id="CaseApplicationResult">
8 8
         <id property="id" column="id"/>
9 9
         <result property="caseNum" column="case_num"/>
10 10
         <result property="caseName" column="case_name"/>
@@ -58,7 +58,7 @@
58 58
     </resultMap>
59 59
 
60 60
 
61
-    <select id="selectCaseApplicationList1" parameterType="CaseApplication" resultMap="CaseApplicationResult">
61
+    <select id="selectCaseApplicationList" parameterType="com.ruoyi.wisdomarbitrate.domain.CaseApplication" resultMap="CaseApplicationResult">
62 62
         select DISTINCT(t1.id),t1.caseLogId,t1.case_num,t1.case_subject_amount,t1.register_date,t1.arbitrat_method,
63 63
         t1.arbitratMethodName,t1.case_status,t1.caseStatusName,t1.hear_date,t1.arbitrat_claims,
64 64
         t1.loan_start_date,t1.loan_end_date,t1.claim_princi_owed,t1.claim_interest_owed,t1.claim_liquid_damag,t1.fee_payable,
@@ -547,115 +547,7 @@
547 547
         </where>
548 548
         order by c.create_time desc,c.case_num desc
549 549
     </select>
550
-    <select id="selectCaseApplicationList" parameterType="CaseApplication" resultMap="CaseApplicationResult">
551
-        select DISTINCT(t1.id),t1.case_num,t1.case_subject_amount,t1.register_date,t1.arbitrat_method,
552
-        t1.arbitratMethodName,t1.case_status,t1.caseStatusName,t1.hear_date,t1.arbitrat_claims,
553
-        t1.loan_start_date,t1.loan_end_date,t1.claim_princi_owed,t1.claim_interest_owed,t1.claim_liquid_damag,t1.fee_payable,
554
-        t1.begin_video_date,t1.online_video_person,t1.contract_number,t1.create_by,t1.create_time,t1.update_by,t1.update_time,
555
-        t1.arbitrator_name,t1.name,t1.application_organ_id,t1.applicantName,t1.arbitrator_id,t1.identity_num,t1.identity_type,
556
-        t1.filearbitra_url,t1.lock_status,t1.version
557
-
558
-        from(
559
-        select t.id,t.case_num ,t.case_subject_amount ,t.register_date ,t.arbitrat_method,
560
-        t.arbitratMethodName,t.case_status,t.caseStatusName,t.hear_date ,t.arbitrat_claims ,
561
-        t.loan_start_date ,t.loan_end_date ,t.claim_princi_owed ,t.claim_interest_owed
562
-        ,t.claim_liquid_damag,t.fee_payable ,
563
-        t.begin_video_date ,t.online_video_person ,t.contract_number ,t.create_by ,t.create_time ,
564
-        t.update_by ,t.update_time , t.arbitrator_name,t.name,t.application_organ_id,t.applicantName,
565
-        t.arbitrator_id,t.identity_num , t.identity_type,t.filearbitra_url,t.lock_status,t.version
566
-        from(
567
-        select c.id ,c.case_num ,c.case_subject_amount ,c.register_date ,c.arbitrat_method ,
568
-        CASE c.arbitrat_method when 1 then '开庭审理' when 2 then '书面审理'
569
-        ELSE '无审理方式'
570
-        END arbitratMethodName,
571
-        c.case_status ,
572
-        CASE c.case_status when 0 then '立案申请' when 1 then '待立案审查' when 2 then '待缴费'
573
-        when 3 then '待缴费确认' when 4 then '待案件质证' when 5 then '待组庭审核'
574
-        when 6 then '待组庭确定' when 7 then '待审核仲裁方式' when 8 then '待开庭审理'
575
-        when 9 then '待书面审理' when 10 then '待生成仲裁文书' when 11 then '待核验仲裁文书'
576
-        when 12 then '待部门长审核仲裁文书' when 13 then '待仲裁文书签名' when 14 then '待仲裁文书用印'
577
-        when 15 then '待仲裁文书送达' when 16 then '待案件归档' when 17 then '已归档'
578
-        when 18 then '待仲裁员审核仲裁文书'
579
-        when 31 then '待修改开庭时间'
580
-        ELSE '无案件状态'
581
-        END caseStatusName,
582
-        c.hear_date ,c.arbitrat_claims ,
583
-        c.loan_start_date ,c.loan_end_date ,c.claim_princi_owed ,c.claim_interest_owed ,c.claim_liquid_damag
584
-        ,c.fee_payable ,
585
-        c.begin_video_date ,c.online_video_person ,c.contract_number ,c.create_by ,c.create_time ,
586
-        c.update_by ,c.update_time , c.arbitrator_name,ca.name,ca.application_organ_id,ca.application_organ_name as
587
-        applicantName,
588
-        c.arbitrator_id,ca.identity_num , ca.identity_type,c.filearbitra_url,c.lock_status,c.version
589
-        from case_application c
590
-        JOIN case_affiliate ca ON ca.case_appli_id = c.id
591
-        <where>
592
-            <if test="caseStatus != null">
593
-                AND c.case_status = #{caseStatus}
594
-            </if>
595
-            <if test="caseNum != null and caseNum != ''">
596
-                AND c.case_num = #{caseNum}
597
-            </if>
598
-            <if test="nameId != null and nameId != ''">
599
-                AND ca.application_organ_id=#{nameId} AND ca.identity_type=1
600
-            </if>
601
-            <if test="caseStatusList != null and caseStatusList.size() > 0">
602
-                and c.case_status in
603
-                <foreach item="caseStatus" collection="caseStatusList" open="(" separator="," close=")">
604
-                    #{caseStatus}
605
-                </foreach>
606
-            </if>
607
-            <if test="lockStatus != null">
608
-                AND c.lock_status = #{lockStatus}
609
-            </if>
610
-        </where>
611
-        ) t
612
-        <where>
613 550
 
614
-            <!--被申请人-->
615
-            <if test="idCard != null and idCard != ''">
616
-                or (t.identity_num=#{idCard} AND t.identity_type=2 and (t.case_status=4 or t.case_status=17))
617
-            </if>
618
-            <!--仲裁员-->
619
-            <if test="userId != null and userId != ''">
620
-                or ( t.identity_type=1 and
621
-                t.case_status in (7,8,9,12,13,17)
622
-                and
623
-                instr (t.arbitrator_id,#{userId})>0)
624
-            </if>
625
-            <!--申请人-->
626
-            <if test="applicationOrganId != null and applicationOrganId != ''">
627
-                or ( t.application_organ_id = #{applicationOrganId} AND t.identity_type=1
628
-                <!--暂时改为可以查询到生成裁决书之前所有的案件状态-->
629
-                and (t.case_status &lt;= 10 or t.case_status=31))
630
-
631
-            </if>
632
-            <!--部门长-->
633
-            <if test="deptHeadStatus != null and deptHeadStatus.size() > 0">
634
-                or (t.identity_type=1 and t.case_status in
635
-                <foreach item="caseStatus" collection="deptHeadStatus" open="(" separator="," close=")">#{caseStatus}
636
-                </foreach>)
637
-            </if>
638
-            <!--财务-->
639
-            <if test="financeStatus != null and financeStatus != ''">
640
-                or (t.identity_type=1 and t.case_status =#{financeStatus})
641
-
642
-
643
-            </if>
644
-            <!--代理人-->
645
-            <if test="agentDeptIds != null and agentDeptIds.size()>0">
646
-                or (
647
-                t.application_organ_id in
648
-                <foreach item="deptId" collection="agentDeptIds" open="(" separator="," close=")">#{deptId}
649
-                </foreach>
650
-                AND t.identity_type=1
651
-                and t.case_status in (0,9))
652
-
653
-            </if>
654
-        </where>
655
-        ) t1
656
-
657
-        order by t1.create_time desc,t1.case_num desc
658
-    </select>
659 551
     <select id="selectTodoCountByRole" resultType="com.ruoyi.wisdomarbitrate.domain.vo.ToDoCount">
660 552
         select sum( case when t1.case_status=0 then 1 else 0 end) caseApply,
661 553
         sum( case when t1.case_status=1 then 1 else 0 end) caseApplyCheck,
@@ -805,7 +697,7 @@
805 697
         ) t1
806 698
     </select>
807 699
 
808
-    <select id="selectAdminCaseApplicationList" parameterType="CaseApplication" resultMap="CaseApplicationResult">
700
+    <select id="selectAdminCaseApplicationList" parameterType="com.ruoyi.wisdomarbitrate.domain.CaseApplication" resultMap="CaseApplicationResult">
809 701
         select DISTINCT(c.id) id,0 as pendingStatus,c.case_num ,c.case_subject_amount ,c.register_date ,c.arbitrat_method ,
810 702
         CASE c.arbitrat_method when 1 then '开庭审理' when 2 then '书面审理'
811 703
         ELSE '无审理方式'
@@ -860,7 +752,7 @@
860 752
         order by c.case_num desc
861 753
     </select>
862 754
 
863
-    <select id="selectAdminCaseApplicationListBatch" parameterType="CaseApplication" resultMap="CaseApplicationResult">
755
+    <select id="selectAdminCaseApplicationListBatch" parameterType="com.ruoyi.wisdomarbitrate.domain.CaseApplication" resultMap="CaseApplicationResult">
864 756
         SELECT DISTINCT c.batch_number ,c.arbitrat_method ,c.arbitrator_name ,
865 757
         c.arbitrator_id  ,a.identity_type ,a.name ,a.application_organ_id as applicationOrganId,
866 758
         a.application_organ_name  as applicantName,
@@ -879,7 +771,7 @@
879 771
         order by  c.batch_number desc
880 772
     </select>
881 773
 
882
-    <select id="selectAdminCaseApplicationListBatch1" parameterType="CaseApplication" resultMap="CaseApplicationResult">
774
+    <select id="selectAdminCaseApplicationListBatch1" parameterType="com.ruoyi.wisdomarbitrate.domain.CaseApplication" resultMap="CaseApplicationResult">
883 775
         SELECT DISTINCT t1.batch_number ,t1.arbitrat_method ,t1.arbitrator_name ,
884 776
         t1.arbitrator_id  ,t1.identity_type ,t1.name ,t1.applicationOrganId ,
885 777
         t1.applicantName,t1.arbitratMethodName
@@ -1039,7 +931,7 @@
1039 931
     </select>
1040 932
 
1041 933
 
1042
-    <select id="selectCaseApplicationCount" parameterType="CaseApplication" resultType="int">
934
+    <select id="selectCaseApplicationCount" parameterType="com.ruoyi.wisdomarbitrate.domain.CaseApplication" resultType="int">
1043 935
         select count(1) from case_application c
1044 936
         <where>
1045 937
             <if test="caseNum != null and caseNum != ''">
@@ -1047,7 +939,7 @@
1047 939
             </if>
1048 940
         </where>
1049 941
     </select>
1050
-    <insert id="insertCaseApplication" parameterType="CaseApplication" useGeneratedKeys="true" keyProperty="id">
942
+    <insert id="insertCaseApplication" parameterType="com.ruoyi.wisdomarbitrate.domain.CaseApplication" useGeneratedKeys="true" keyProperty="id">
1051 943
         insert into case_application(
1052 944
         <if test="id != null">id ,</if>
1053 945
         <if test="caseName != null  and caseName != ''">case_name ,</if>
@@ -1195,7 +1087,7 @@
1195 1087
         </foreach>;
1196 1088
     </insert>
1197 1089
 
1198
-    <update id="updataCaseApplication" parameterType="CaseApplication">
1090
+    <update id="updataCaseApplication" parameterType="com.ruoyi.wisdomarbitrate.domain.CaseApplication">
1199 1091
         update case_application
1200 1092
         <set>
1201 1093
             <if test="caseSubjectAmount != null">case_subject_amount = #{caseSubjectAmount},</if>
@@ -1238,7 +1130,7 @@
1238 1130
         where id = #{id}
1239 1131
     </update>
1240 1132
 
1241
-    <update id="submitCaseApplication" parameterType="CaseApplication">
1133
+    <update id="submitCaseApplication" parameterType="com.ruoyi.wisdomarbitrate.domain.CaseApplication">
1242 1134
         update case_application
1243 1135
         <set>
1244 1136
             <if test="caseStatus != null">case_status = #{caseStatus},</if>
@@ -1290,7 +1182,7 @@
1290 1182
         update case_application set version = #{version} where id = #{id}
1291 1183
     </update>
1292 1184
 
1293
-    <delete id="deletecaseApplication" parameterType="CaseApplication">
1185
+    <delete id="deletecaseApplication" parameterType="com.ruoyi.wisdomarbitrate.domain.CaseApplication">
1294 1186
         delete from case_application where id = #{id}
1295 1187
     </delete>
1296 1188
     <delete id="batchDeletecaseApplication">
@@ -1316,7 +1208,7 @@
1316 1208
         </foreach>;
1317 1209
     </delete>
1318 1210
 
1319
-    <select id="selectCaseApplication" parameterType="CaseApplication" resultMap="CaseApplicationResult">
1211
+    <select id="selectCaseApplication" parameterType="com.ruoyi.wisdomarbitrate.domain.CaseApplication" resultMap="CaseApplicationResult">
1320 1212
         select c.id ,c.case_num ,c.case_subject_amount ,c.register_date ,c.arbitrat_method ,
1321 1213
         CASE c.arbitrat_method when 1 then '开庭审理' when 2 then '书面审理'
1322 1214
         ELSE '无审理方式'
@@ -1394,7 +1286,7 @@
1394 1286
             </if>
1395 1287
         </where>
1396 1288
     </select>
1397
-    <select id="selectCaseApplicationConfirm" parameterType="CaseApplication" resultMap="CaseApplicationResult">
1289
+    <select id="selectCaseApplicationConfirm" parameterType="com.ruoyi.wisdomarbitrate.domain.CaseApplication" resultMap="CaseApplicationResult">
1398 1290
         select c.id ,c.case_num ,c.case_subject_amount ,c.register_date ,c.arbitrat_method ,
1399 1291
                CASE c.arbitrat_method when 1 then '开庭审理' when 2 then '书面审理'
1400 1292
                                       ELSE '无审理方式'