From 2f3b5645aaad0a5e055318a9969035a859fc319c Mon Sep 17 00:00:00 2001
From: wangqiong <1322446236@qq.com>
Date: Sun, 28 Apr 2024 13:55:46 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=A1=88=E4=BB=B6=E9=99=84?=
=?UTF-8?q?=E4=BB=B6=E6=9F=A5=E8=AF=A2=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
ruoyi-system/pom.xml | 5 +++++
.../wisdomarbitrate/domain/ArbitrateRecord.java | 2 +-
.../com/ruoyi/wisdomarbitrate/domain/CaseAttach.java | 9 +++++----
.../domain/CaseEvidenceDirectory.java | 2 +-
.../com/ruoyi/wisdomarbitrate/domain/SealManage.java | 2 +-
.../domain/vo/CaseEvidenceDirectoryVO.java | 6 +++---
.../wisdomarbitrate/mapper/CaseAttachMapper.java | 2 +-
.../service/impl/AdjudicationServiceImpl.java | 2 +-
.../service/impl/CaseApplicationServiceImpl.java | 12 ++++++++----
.../service/impl/CaseArbitrateServiceImpl.java | 2 +-
.../service/impl/DeptIdentifyServiceImpl.java | 4 ++--
.../utils/FixSelectFlowDetailUtils.java | 6 +++---
.../wisdomarbitrate/CaseApplicationLogMapper.xml | 2 +-
tkgenerator/pom.xml | 2 +-
.../src/main/resources/generator/config.properties | 6 +++---
15 files changed, 37 insertions(+), 27 deletions(-)
diff --git a/ruoyi-system/pom.xml b/ruoyi-system/pom.xml
index 6e4ef07..5912418 100644
--- a/ruoyi-system/pom.xml
+++ b/ruoyi-system/pom.xml
@@ -39,6 +39,11 @@
mapper-spring-boot-starter
2.1.5
+
+ org.projectlombok
+ lombok
+ 1.18.22
+
\ No newline at end of file
diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/ArbitrateRecord.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/ArbitrateRecord.java
index eed8844..f5c36c5 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/ArbitrateRecord.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/ArbitrateRecord.java
@@ -28,7 +28,7 @@ public class ArbitrateRecord extends BaseEntity {
/** 仲裁员审核裁决书意见 */
private String arbitraCheckOpinion;
/** 裁决书附件id */
- private Integer annexId;
+ private Long annexId;
/** 被申请人是否缺席 */
private Integer isAbsence;
diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/CaseAttach.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/CaseAttach.java
index e39680a..7a3baf2 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/CaseAttach.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/CaseAttach.java
@@ -1,19 +1,20 @@
package com.ruoyi.wisdomarbitrate.domain;
+
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
-@Data
@Builder
+@Data
@AllArgsConstructor
@NoArgsConstructor
-public class CaseAttach {
+public class CaseAttach {
/**
- * 附件id
+ * 附件id
*/
- private Integer annexId;
+ private Long annexId;
/**
* 案件申请id
*/
diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/CaseEvidenceDirectory.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/CaseEvidenceDirectory.java
index 57c29de..a5f3527 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/CaseEvidenceDirectory.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/CaseEvidenceDirectory.java
@@ -34,7 +34,7 @@ public class CaseEvidenceDirectory extends BaseEntity {
/**
* 附件id
*/
- private Integer annexId;
+ private Long annexId;
/**
* 级数
diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/SealManage.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/SealManage.java
index 3b835d8..84371fe 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/SealManage.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/SealManage.java
@@ -29,7 +29,7 @@ public class SealManage extends BaseEntity {
/**
* 附件id
*/
- private Integer annexId;
+ private Long annexId;
/**
* 印章审核状态(0未通过,1通过)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/vo/CaseEvidenceDirectoryVO.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/vo/CaseEvidenceDirectoryVO.java
index 51e0d62..2cc5d1f 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/vo/CaseEvidenceDirectoryVO.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/vo/CaseEvidenceDirectoryVO.java
@@ -30,7 +30,7 @@ public class CaseEvidenceDirectoryVO implements Serializable {
/**
* 附件id
*/
- private Integer annexId;
+ private Long annexId;
/**
* 级数
@@ -105,11 +105,11 @@ public class CaseEvidenceDirectoryVO implements Serializable {
this.evidenceName = evidenceName;
}
- public Integer getAnnexId() {
+ public Long getAnnexId() {
return annexId;
}
- public void setAnnexId(Integer annexId) {
+ public void setAnnexId(Long annexId) {
this.annexId = annexId;
}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/mapper/CaseAttachMapper.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/mapper/CaseAttachMapper.java
index ca3bb75..7e0d475 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/mapper/CaseAttachMapper.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/mapper/CaseAttachMapper.java
@@ -25,7 +25,7 @@ public interface CaseAttachMapper {
List getCaseAttachByCaseIdAndType(CaseAttach caseAttach);
- CaseAttach queryAnnexById(Integer annexId);
+ CaseAttach queryAnnexById(@Param("annexId")Long annexId);
/**
* 根据案件id和附件类型删除和上传类型
diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/AdjudicationServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/AdjudicationServiceImpl.java
index 470221c..b7bf1ed 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/AdjudicationServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/AdjudicationServiceImpl.java
@@ -604,7 +604,7 @@ public class AdjudicationServiceImpl implements IAdjudicationService {
int i = caseAttachMapper.save(caseAttach);
if (i > 0) {
if (arbitrateRecordSelect != null) {
- Integer annexId = caseAttach.getAnnexId();
+ Long annexId = caseAttach.getAnnexId();
//将附件id保存到仲裁记录表里面
arbitrateRecordSelect.setAnnexId(annexId);
arbitrateRecordMapper.updataArbitrateRecord(arbitrateRecordSelect);
diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseApplicationServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseApplicationServiceImpl.java
index 62bc728..ba797cd 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseApplicationServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseApplicationServiceImpl.java
@@ -35,6 +35,7 @@ import com.ruoyi.wisdomarbitrate.utils.UnZipFileUtils;
import com.ruoyi.wisdomarbitrate.utils.ZipFileUtils;
import com.tencentyun.TLSSigAPIv2;
+import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
@@ -593,7 +594,7 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
.annexType(annexType)
.build();
int i = caseAttachMapper.save(caseAttach);
- Integer annexId = caseAttach.getAnnexId();
+ Long annexId = caseAttach.getAnnexId();
//保存到目录表
Long parentId = null;
@@ -1368,9 +1369,12 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
if (CollectionUtil.isNotEmpty(filterList)) {
for (CaseAttach caseAttach : filterList) {
// 查询附件表
- CaseAttach attach = caseAttachMapper.queryAnnexById(caseAttach.getAnnexId());
- attach.setCaseAppliLogId(caseApplication.getCaseLogId());
- caseAttachLogMapper.save(attach);
+ Long annexId = caseAttach.getAnnexId();
+ CaseAttach attach = caseAttachMapper.queryAnnexById(annexId);
+ if(attach!=null){
+ attach.setCaseAppliLogId(caseApplication.getCaseLogId());
+ caseAttachLogMapper.save(attach);
+ }
}
}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseArbitrateServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseArbitrateServiceImpl.java
index 1737806..c4cc76c 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseArbitrateServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseArbitrateServiceImpl.java
@@ -609,7 +609,7 @@ public class CaseArbitrateServiceImpl implements ICaseArbitrateService {
int i = caseAttachMapper.save(caseAttach);
if (i > 0) {
if (arbitrateRecord1 != null) {
- Integer annexId = caseAttach.getAnnexId();
+ Long annexId = caseAttach.getAnnexId();
//将附件id保存到仲裁记录表里面
arbitrateRecord1.setAnnexId(annexId);
arbitrateRecordMapper.updataArbitrateRecord(arbitrateRecord1);
diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/DeptIdentifyServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/DeptIdentifyServiceImpl.java
index 509fce0..8741ab4 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/DeptIdentifyServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/DeptIdentifyServiceImpl.java
@@ -253,7 +253,7 @@ public class DeptIdentifyServiceImpl implements IDeptIdentifyService {
int i1 = caseAttachMapper.save(caseAttach);
if (i1 > 0) {
//将附件id保存到公章管理表里
- Integer annexId1 = caseAttach.getAnnexId();
+ Long annexId1 = caseAttach.getAnnexId();
SealManage sealManage = new SealManage();
sealManage.setSealId(sealId);
List selectSealList = sealManageMapper.selectSealList(sealManage);
@@ -287,7 +287,7 @@ public class DeptIdentifyServiceImpl implements IDeptIdentifyService {
List selectSealList = sealManageMapper.selectSealList(sealManage);
if (selectSealList != null && selectSealList.size() > 0) {
for (SealManage sealManage1 : selectSealList) {
- Integer annexId = sealManage1.getAnnexId();
+ Long annexId = sealManage1.getAnnexId();
if (annexId != null) {
//根据附件id查询路径
CaseAttach caseAttach = caseAttachMapper.queryAnnexById(annexId);
diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/utils/FixSelectFlowDetailUtils.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/utils/FixSelectFlowDetailUtils.java
index c37bcef..f176afc 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/utils/FixSelectFlowDetailUtils.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/utils/FixSelectFlowDetailUtils.java
@@ -243,7 +243,7 @@ public class FixSelectFlowDetailUtils {
//将印章信息保存到公章管理表里
String sealName1 = sealName.substring(1, sealName.length() - 1);
String sealId1 = sealId.substring(1, sealId.length() - 1);
- Integer annexId1 = caseAttach.getAnnexId();
+ Long annexId1 = caseAttach.getAnnexId();
sealManage.setAnnexId(annexId1);
sealManage.setSealId(sealId1);
sealManage.setSealName(sealName1);
@@ -287,7 +287,7 @@ public class FixSelectFlowDetailUtils {
if (sealManageList != null && sealManageList.size() > 0) {
for (SealManage sealManage1 : sealManageList) {
//查询企业内部印章
- Integer annexId = sealManage1.getAnnexId();
+ Long annexId = sealManage1.getAnnexId();
String sealId = sealManage1.getSealId();
DeptIdentify deptIdentify = new DeptIdentify();
deptIdentify.setId(sealManage1.getIdentifyId());
@@ -336,7 +336,7 @@ public class FixSelectFlowDetailUtils {
int i1 = caseAttachMapper.save(caseAttach);
if (i1 > 0) {
//将附件id保存到公章管理表里
- Integer annexId1 = caseAttach.getAnnexId();
+ Long annexId1 = caseAttach.getAnnexId();
sealManage1.setAnnexId(annexId1);
sealManage1.setSealStatus(1);
sealManage1.setIsUse(0);
diff --git a/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseApplicationLogMapper.xml b/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseApplicationLogMapper.xml
index 5aca5c5..78966d3 100644
--- a/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseApplicationLogMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseApplicationLogMapper.xml
@@ -90,7 +90,7 @@
mediation_agreement,
create_time
)values(
- #{id} ,
+ #{caseLogId} ,
#{caseAppliId},
#{caseName},
#{caseNum},
diff --git a/tkgenerator/pom.xml b/tkgenerator/pom.xml
index 46b2da0..ceb1fdb 100644
--- a/tkgenerator/pom.xml
+++ b/tkgenerator/pom.xml
@@ -14,7 +14,7 @@
tkgenerator
tkmappergenerator
- 11
+ 1.8
diff --git a/tkgenerator/src/main/resources/generator/config.properties b/tkgenerator/src/main/resources/generator/config.properties
index e02b6a3..2d91392 100644
--- a/tkgenerator/src/main/resources/generator/config.properties
+++ b/tkgenerator/src/main/resources/generator/config.properties
@@ -5,8 +5,8 @@ jdbc.password=YMzc157#
#目标模块项目路径
targetprojectpath=D:/WorkCode/zhongcai/Arbitrate-Backend/ruoyi-system
#模块名称
-moduleName=flow
+moduleName=attach
#表名
-tableName=gen_table
+tableName=case_attach
#主键
-premaryId=table_id
+premaryId=annex_id
--
2.54.0