소스 검색

优化案件附件查询功能

wangqiong 2 년 전
부모
커밋
2f3b5645aa

+ 5
- 0
ruoyi-system/pom.xml 파일 보기

39
             <artifactId>mapper-spring-boot-starter</artifactId>
39
             <artifactId>mapper-spring-boot-starter</artifactId>
40
             <version>2.1.5</version>
40
             <version>2.1.5</version>
41
         </dependency>
41
         </dependency>
42
+        <dependency>
43
+            <groupId>org.projectlombok</groupId>
44
+            <artifactId>lombok</artifactId>
45
+            <version>1.18.22</version>
46
+        </dependency>
42
     </dependencies>
47
     </dependencies>
43
 
48
 
44
 </project>
49
 </project>

+ 1
- 1
ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/ArbitrateRecord.java 파일 보기

28
     /** 仲裁员审核裁决书意见 */
28
     /** 仲裁员审核裁决书意见 */
29
     private String arbitraCheckOpinion;
29
     private String arbitraCheckOpinion;
30
     /** 裁决书附件id */
30
     /** 裁决书附件id */
31
-    private Integer annexId;
31
+    private Long annexId;
32
 
32
 
33
     /** 被申请人是否缺席 */
33
     /** 被申请人是否缺席 */
34
     private Integer isAbsence;
34
     private Integer isAbsence;

+ 5
- 4
ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/CaseAttach.java 파일 보기

1
 package com.ruoyi.wisdomarbitrate.domain;
1
 package com.ruoyi.wisdomarbitrate.domain;
2
 
2
 
3
+
3
 import lombok.AllArgsConstructor;
4
 import lombok.AllArgsConstructor;
4
 import lombok.Builder;
5
 import lombok.Builder;
5
 import lombok.Data;
6
 import lombok.Data;
6
 import lombok.NoArgsConstructor;
7
 import lombok.NoArgsConstructor;
7
 
8
 
8
-@Data
9
 @Builder
9
 @Builder
10
+@Data
10
 @AllArgsConstructor
11
 @AllArgsConstructor
11
 @NoArgsConstructor
12
 @NoArgsConstructor
12
-public class  CaseAttach {
13
+public class CaseAttach {
13
     /**
14
     /**
14
-     *  附件id
15
+     * 附件id
15
      */
16
      */
16
-    private Integer annexId;
17
+    private Long annexId;
17
     /**
18
     /**
18
      * 案件申请id
19
      * 案件申请id
19
      */
20
      */

+ 1
- 1
ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/CaseEvidenceDirectory.java 파일 보기

34
     /**
34
     /**
35
      * 附件id
35
      * 附件id
36
      */
36
      */
37
-    private Integer annexId;
37
+    private Long annexId;
38
 
38
 
39
     /**
39
     /**
40
      * 级数
40
      * 级数

+ 1
- 1
ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/SealManage.java 파일 보기

29
     /**
29
     /**
30
      * 附件id
30
      * 附件id
31
      */
31
      */
32
-    private Integer annexId;
32
+    private Long annexId;
33
 
33
 
34
     /**
34
     /**
35
      * 印章审核状态(0未通过,1通过)
35
      * 印章审核状态(0未通过,1通过)

+ 3
- 3
ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/vo/CaseEvidenceDirectoryVO.java 파일 보기

30
     /**
30
     /**
31
      * 附件id
31
      * 附件id
32
      */
32
      */
33
-    private Integer annexId;
33
+    private Long annexId;
34
 
34
 
35
     /**
35
     /**
36
      * 级数
36
      * 级数
105
         this.evidenceName = evidenceName;
105
         this.evidenceName = evidenceName;
106
     }
106
     }
107
 
107
 
108
-    public Integer getAnnexId() {
108
+    public Long getAnnexId() {
109
         return annexId;
109
         return annexId;
110
     }
110
     }
111
 
111
 
112
-    public void setAnnexId(Integer annexId) {
112
+    public void setAnnexId(Long annexId) {
113
         this.annexId = annexId;
113
         this.annexId = annexId;
114
     }
114
     }
115
 
115
 

+ 1
- 1
ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/mapper/CaseAttachMapper.java 파일 보기

25
 
25
 
26
     List<CaseAttach> getCaseAttachByCaseIdAndType(CaseAttach caseAttach);
26
     List<CaseAttach> getCaseAttachByCaseIdAndType(CaseAttach caseAttach);
27
 
27
 
28
-    CaseAttach queryAnnexById(Integer annexId);
28
+    CaseAttach queryAnnexById(@Param("annexId")Long annexId);
29
 
29
 
30
     /**
30
     /**
31
      * 根据案件id和附件类型删除和上传类型
31
      * 根据案件id和附件类型删除和上传类型

+ 1
- 1
ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/AdjudicationServiceImpl.java 파일 보기

604
             int i = caseAttachMapper.save(caseAttach);
604
             int i = caseAttachMapper.save(caseAttach);
605
             if (i > 0) {
605
             if (i > 0) {
606
                 if (arbitrateRecordSelect != null) {
606
                 if (arbitrateRecordSelect != null) {
607
-                    Integer annexId = caseAttach.getAnnexId();
607
+                    Long annexId = caseAttach.getAnnexId();
608
                     //将附件id保存到仲裁记录表里面
608
                     //将附件id保存到仲裁记录表里面
609
                     arbitrateRecordSelect.setAnnexId(annexId);
609
                     arbitrateRecordSelect.setAnnexId(annexId);
610
                     arbitrateRecordMapper.updataArbitrateRecord(arbitrateRecordSelect);
610
                     arbitrateRecordMapper.updataArbitrateRecord(arbitrateRecordSelect);

+ 8
- 4
ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseApplicationServiceImpl.java 파일 보기

35
 import com.ruoyi.wisdomarbitrate.utils.ZipFileUtils;
35
 import com.ruoyi.wisdomarbitrate.utils.ZipFileUtils;
36
 import com.tencentyun.TLSSigAPIv2;
36
 import com.tencentyun.TLSSigAPIv2;
37
 
37
 
38
+import org.springframework.beans.BeanUtils;
38
 import org.springframework.beans.factory.annotation.Autowired;
39
 import org.springframework.beans.factory.annotation.Autowired;
39
 import org.springframework.beans.factory.annotation.Value;
40
 import org.springframework.beans.factory.annotation.Value;
40
 import org.springframework.stereotype.Service;
41
 import org.springframework.stereotype.Service;
593
                             .annexType(annexType)
594
                             .annexType(annexType)
594
                             .build();
595
                             .build();
595
                     int i = caseAttachMapper.save(caseAttach);
596
                     int i = caseAttachMapper.save(caseAttach);
596
-                    Integer annexId = caseAttach.getAnnexId();
597
+                    Long annexId = caseAttach.getAnnexId();
597
 
598
 
598
                     //保存到目录表
599
                     //保存到目录表
599
                     Long parentId = null;
600
                     Long parentId = null;
1368
                         if (CollectionUtil.isNotEmpty(filterList)) {
1369
                         if (CollectionUtil.isNotEmpty(filterList)) {
1369
                             for (CaseAttach caseAttach : filterList) {
1370
                             for (CaseAttach caseAttach : filterList) {
1370
                                 // 查询附件表
1371
                                 // 查询附件表
1371
-                                CaseAttach attach = caseAttachMapper.queryAnnexById(caseAttach.getAnnexId());
1372
-                                attach.setCaseAppliLogId(caseApplication.getCaseLogId());
1373
-                                caseAttachLogMapper.save(attach);
1372
+                                Long annexId = caseAttach.getAnnexId();
1373
+                                CaseAttach attach = caseAttachMapper.queryAnnexById(annexId);
1374
+                                if(attach!=null){
1375
+                                    attach.setCaseAppliLogId(caseApplication.getCaseLogId());
1376
+                                    caseAttachLogMapper.save(attach);
1377
+                                }
1374
                             }
1378
                             }
1375
                         }
1379
                         }
1376
 
1380
 

+ 1
- 1
ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseArbitrateServiceImpl.java 파일 보기

609
                 int i = caseAttachMapper.save(caseAttach);
609
                 int i = caseAttachMapper.save(caseAttach);
610
                 if (i > 0) {
610
                 if (i > 0) {
611
                     if (arbitrateRecord1 != null) {
611
                     if (arbitrateRecord1 != null) {
612
-                        Integer annexId = caseAttach.getAnnexId();
612
+                        Long annexId = caseAttach.getAnnexId();
613
                         //将附件id保存到仲裁记录表里面
613
                         //将附件id保存到仲裁记录表里面
614
                         arbitrateRecord1.setAnnexId(annexId);
614
                         arbitrateRecord1.setAnnexId(annexId);
615
                         arbitrateRecordMapper.updataArbitrateRecord(arbitrateRecord1);
615
                         arbitrateRecordMapper.updataArbitrateRecord(arbitrateRecord1);

+ 2
- 2
ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/DeptIdentifyServiceImpl.java 파일 보기

253
                                 int i1 = caseAttachMapper.save(caseAttach);
253
                                 int i1 = caseAttachMapper.save(caseAttach);
254
                                 if (i1 > 0) {
254
                                 if (i1 > 0) {
255
                                     //将附件id保存到公章管理表里
255
                                     //将附件id保存到公章管理表里
256
-                                    Integer annexId1 = caseAttach.getAnnexId();
256
+                                    Long annexId1 = caseAttach.getAnnexId();
257
                                     SealManage sealManage = new SealManage();
257
                                     SealManage sealManage = new SealManage();
258
                                     sealManage.setSealId(sealId);
258
                                     sealManage.setSealId(sealId);
259
                                     List<SealManage> selectSealList = sealManageMapper.selectSealList(sealManage);
259
                                     List<SealManage> selectSealList = sealManageMapper.selectSealList(sealManage);
287
         List<SealManage> selectSealList = sealManageMapper.selectSealList(sealManage);
287
         List<SealManage> selectSealList = sealManageMapper.selectSealList(sealManage);
288
         if (selectSealList != null && selectSealList.size() > 0) {
288
         if (selectSealList != null && selectSealList.size() > 0) {
289
             for (SealManage sealManage1 : selectSealList) {
289
             for (SealManage sealManage1 : selectSealList) {
290
-                Integer annexId = sealManage1.getAnnexId();
290
+                Long annexId = sealManage1.getAnnexId();
291
                 if (annexId != null) {
291
                 if (annexId != null) {
292
                     //根据附件id查询路径
292
                     //根据附件id查询路径
293
                     CaseAttach caseAttach = caseAttachMapper.queryAnnexById(annexId);
293
                     CaseAttach caseAttach = caseAttachMapper.queryAnnexById(annexId);

+ 3
- 3
ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/utils/FixSelectFlowDetailUtils.java 파일 보기

243
                                                     //将印章信息保存到公章管理表里
243
                                                     //将印章信息保存到公章管理表里
244
                                                     String sealName1 = sealName.substring(1, sealName.length() - 1);
244
                                                     String sealName1 = sealName.substring(1, sealName.length() - 1);
245
                                                     String sealId1 = sealId.substring(1, sealId.length() - 1);
245
                                                     String sealId1 = sealId.substring(1, sealId.length() - 1);
246
-                                                    Integer annexId1 = caseAttach.getAnnexId();
246
+                                                    Long annexId1 = caseAttach.getAnnexId();
247
                                                     sealManage.setAnnexId(annexId1);
247
                                                     sealManage.setAnnexId(annexId1);
248
                                                     sealManage.setSealId(sealId1);
248
                                                     sealManage.setSealId(sealId1);
249
                                                     sealManage.setSealName(sealName1);
249
                                                     sealManage.setSealName(sealName1);
287
             if (sealManageList != null && sealManageList.size() > 0) {
287
             if (sealManageList != null && sealManageList.size() > 0) {
288
                 for (SealManage sealManage1 : sealManageList) {
288
                 for (SealManage sealManage1 : sealManageList) {
289
                     //查询企业内部印章
289
                     //查询企业内部印章
290
-                    Integer annexId = sealManage1.getAnnexId();
290
+                    Long annexId = sealManage1.getAnnexId();
291
                     String sealId = sealManage1.getSealId();
291
                     String sealId = sealManage1.getSealId();
292
                     DeptIdentify deptIdentify = new DeptIdentify();
292
                     DeptIdentify deptIdentify = new DeptIdentify();
293
                     deptIdentify.setId(sealManage1.getIdentifyId());
293
                     deptIdentify.setId(sealManage1.getIdentifyId());
336
                                         int i1 = caseAttachMapper.save(caseAttach);
336
                                         int i1 = caseAttachMapper.save(caseAttach);
337
                                         if (i1 > 0) {
337
                                         if (i1 > 0) {
338
                                             //将附件id保存到公章管理表里
338
                                             //将附件id保存到公章管理表里
339
-                                            Integer annexId1 = caseAttach.getAnnexId();
339
+                                            Long annexId1 = caseAttach.getAnnexId();
340
                                             sealManage1.setAnnexId(annexId1);
340
                                             sealManage1.setAnnexId(annexId1);
341
                                             sealManage1.setSealStatus(1);
341
                                             sealManage1.setSealStatus(1);
342
                                             sealManage1.setIsUse(0);
342
                                             sealManage1.setIsUse(0);

+ 1
- 1
ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseApplicationLogMapper.xml 파일 보기

90
         mediation_agreement,
90
         mediation_agreement,
91
         create_time
91
         create_time
92
         )values(
92
         )values(
93
-        <if test="caseLogId != null  ">#{id} ,</if>
93
+        <if test="caseLogId != null  ">#{caseLogId} ,</if>
94
         <if test="caseAppliId != null">#{caseAppliId},</if>
94
         <if test="caseAppliId != null">#{caseAppliId},</if>
95
         <if test="caseName != null and caseName != ''">#{caseName},</if>
95
         <if test="caseName != null and caseName != ''">#{caseName},</if>
96
         <if test="caseNum != null and caseNum != ''">#{caseNum},</if>
96
         <if test="caseNum != null and caseNum != ''">#{caseNum},</if>

+ 1
- 1
tkgenerator/pom.xml 파일 보기

14
     <name>tkgenerator</name>
14
     <name>tkgenerator</name>
15
     <description>tkmappergenerator</description>
15
     <description>tkmappergenerator</description>
16
     <properties>
16
     <properties>
17
-        <java.version>11</java.version>
17
+        <java.version>1.8</java.version>
18
     </properties>
18
     </properties>
19
     <dependencies>
19
     <dependencies>
20
         <dependency>
20
         <dependency>

+ 3
- 3
tkgenerator/src/main/resources/generator/config.properties 파일 보기

5
 #目标模块项目路径
5
 #目标模块项目路径
6
 targetprojectpath=D:/WorkCode/zhongcai/Arbitrate-Backend/ruoyi-system
6
 targetprojectpath=D:/WorkCode/zhongcai/Arbitrate-Backend/ruoyi-system
7
 #模块名称
7
 #模块名称
8
-moduleName=flow
8
+moduleName=attach
9
 #表名
9
 #表名
10
-tableName=gen_table
10
+tableName=case_attach
11
 #主键
11
 #主键
12
-premaryId=table_id
12
+premaryId=annex_id