From 32a308be351a040d6c68fe5d4f482537e1884b75 Mon Sep 17 00:00:00 2001
From: “djh” <“3298565835@qq.com”>
Date: 星期一, 08 九月 2025 08:28:08 +0800
Subject: [PATCH] 修改
---
multi-system/src/main/java/com/gkhy/exam/system/domain/AnnualVerificationPlan.java | 4 ++++
multi-system/src/main/java/com/gkhy/exam/system/service/impl/DocumentChangesInvalidatedServiceImpl.java | 8 ++++++++
multi-system/src/main/java/com/gkhy/exam/system/service/impl/AnnualVerificationPlanServiceImpl.java | 2 +-
multi-system/src/main/java/com/gkhy/exam/system/domain/DocumentChangesInvalidated.java | 3 +++
4 files changed, 16 insertions(+), 1 deletions(-)
diff --git a/multi-system/src/main/java/com/gkhy/exam/system/domain/AnnualVerificationPlan.java b/multi-system/src/main/java/com/gkhy/exam/system/domain/AnnualVerificationPlan.java
index 59d263a..1bdbb8c 100644
--- a/multi-system/src/main/java/com/gkhy/exam/system/domain/AnnualVerificationPlan.java
+++ b/multi-system/src/main/java/com/gkhy/exam/system/domain/AnnualVerificationPlan.java
@@ -82,6 +82,10 @@
@TableField("certificate")
private String certificate;
+ @ApiModelProperty("检定证书名称")
+ @TableField("certificate_name")
+ private String certificateName;
+
@ApiModelProperty("删除标志(0为删除，1删除，默认0)")
@TableField("del_flag")
private Integer delFlag;
diff --git a/multi-system/src/main/java/com/gkhy/exam/system/domain/DocumentChangesInvalidated.java b/multi-system/src/main/java/com/gkhy/exam/system/domain/DocumentChangesInvalidated.java
index d59f61a..ddeeb21 100644
--- a/multi-system/src/main/java/com/gkhy/exam/system/domain/DocumentChangesInvalidated.java
+++ b/multi-system/src/main/java/com/gkhy/exam/system/domain/DocumentChangesInvalidated.java
@@ -55,6 +55,9 @@
@NotNull(message = "提出部门不能为空")
private Long deptId;
+ @TableField(exist = false)
+ private String deptName;
+
@ApiModelProperty(value ="更改人",required = true)
@TableField("modifier_id")
@NotNull(message = "更改人不能为空")
diff --git a/multi-system/src/main/java/com/gkhy/exam/system/service/impl/AnnualVerificationPlanServiceImpl.java b/multi-system/src/main/java/com/gkhy/exam/system/service/impl/AnnualVerificationPlanServiceImpl.java
index 5d17d42..78e0109 100644
--- a/multi-system/src/main/java/com/gkhy/exam/system/service/impl/AnnualVerificationPlanServiceImpl.java
+++ b/multi-system/src/main/java/com/gkhy/exam/system/service/impl/AnnualVerificationPlanServiceImpl.java
@@ -78,7 +78,7 @@
.set(AnnualVerificationDevice::getUpdateTime, LocalDateTime.now()).set(AnnualVerificationDevice::getUpdateBy, SecurityUtils.getUsername())
.in(AnnualVerificationDevice::getId, delData)
);
- if (update >= 0){
+ if (update <= 0){
throw new RuntimeException("操作失败");
}
}
diff --git a/multi-system/src/main/java/com/gkhy/exam/system/service/impl/DocumentChangesInvalidatedServiceImpl.java b/multi-system/src/main/java/com/gkhy/exam/system/service/impl/DocumentChangesInvalidatedServiceImpl.java
index 4be7a50..5a35e92 100644
--- a/multi-system/src/main/java/com/gkhy/exam/system/service/impl/DocumentChangesInvalidatedServiceImpl.java
+++ b/multi-system/src/main/java/com/gkhy/exam/system/service/impl/DocumentChangesInvalidatedServiceImpl.java
@@ -6,6 +6,7 @@
import com.gkhy.exam.common.api.CommonPage;
import com.gkhy.exam.common.api.CommonResult;
import com.gkhy.exam.common.constant.UserConstant;
+import com.gkhy.exam.common.domain.entity.SysDept;
import com.gkhy.exam.common.utils.PageUtils;
import com.gkhy.exam.common.utils.SecurityUtils;
import com.gkhy.exam.system.domain.AnnualVerificationPlan;
@@ -15,6 +16,7 @@
import com.gkhy.exam.system.mapper.DocumentChangesInvalidatedEvaluateMapper;
import com.gkhy.exam.system.mapper.DocumentChangesInvalidatedIssueMapper;
import com.gkhy.exam.system.mapper.DocumentChangesInvalidatedMapper;
+import com.gkhy.exam.system.mapper.SysDeptMapper;
import com.gkhy.exam.system.service.DocumentChangesInvalidatedService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.beans.factory.annotation.Autowired;
@@ -43,6 +45,10 @@
@Autowired
private DocumentChangesInvalidatedEvaluateMapper documentChangesInvalidatedEvaluateMapper;
+
+
+ @Autowired
+ private SysDeptMapper sysDeptMapper;
@Override
public CommonPage selectDocumentChangesInvalidatedList(DocumentChangesInvalidated documentChangesInvalidated) {
@@ -126,6 +132,8 @@
public CommonResult getDocumentChangesInvalidated(Long id) {
DocumentChangesInvalidated documentChangesInvalidated = documentChangesInvalidatedMapper.selectById(id);
if (documentChangesInvalidated != null){
+ SysDept sysDept = sysDeptMapper.selectDeptById(documentChangesInvalidated.getDeptId());
+ documentChangesInvalidated.setDeptName(sysDept.getDeptName());
List<DocumentChangesInvalidatedIssue> documentChangesInvalidatedIssues = documentChangesInvalidatedIssueMapper.selectList(new LambdaQueryWrapper<>(DocumentChangesInvalidatedIssue.class)
.eq(DocumentChangesInvalidatedIssue::getDocumentChangesId, id)
--
Gitblit v1.9.2