From 6d5fc7859473d30a2e4c1f20f748abae652342b8 Mon Sep 17 00:00:00 2001
From: heheng <475597332@qq.com>
Date: 星期五, 28 十一月 2025 13:11:26 +0800
Subject: [PATCH] 功能修改

---
 multi-system/src/main/java/com/gkhy/exam/system/service/impl/DocumentChangesInvalidatedServiceImpl.java |   18 +++++++++++++-----
 1 files changed, 13 insertions(+), 5 deletions(-)

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 6f98b85..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) {
@@ -77,7 +83,7 @@
         if (ObjectUtils.isNotEmpty(delEvaluateIds)){
 
             int update = documentChangesInvalidatedEvaluateMapper.update(new DocumentChangesInvalidatedEvaluate(),
-                    new LambdaUpdateWrapper<DocumentChangesInvalidatedEvaluate>().set(DocumentChangesInvalidatedEvaluate::getDelFlag, UserConstant.DEPT_DISABLE)
+                    new LambdaUpdateWrapper<DocumentChangesInvalidatedEvaluate>().set(DocumentChangesInvalidatedEvaluate::getDelFlag, UserConstant.DISENABLE)
                             .set(DocumentChangesInvalidatedEvaluate::getUpdateTime, LocalDateTime.now()).set(DocumentChangesInvalidatedEvaluate::getUpdateBy, SecurityUtils.getUsername())
                             .in(DocumentChangesInvalidatedEvaluate::getId, delEvaluateIds)
             );
@@ -85,7 +91,7 @@
         if (ObjectUtils.isNotEmpty(delInvalidatedIssueIds)){
 
             int update = documentChangesInvalidatedIssueMapper.update(new DocumentChangesInvalidatedIssue(),
-                    new LambdaUpdateWrapper<DocumentChangesInvalidatedIssue>().set(DocumentChangesInvalidatedIssue::getDelFlag, UserConstant.DEPT_DISABLE)
+                    new LambdaUpdateWrapper<DocumentChangesInvalidatedIssue>().set(DocumentChangesInvalidatedIssue::getDelFlag, UserConstant.DISENABLE)
                             .set(DocumentChangesInvalidatedIssue::getUpdateTime, LocalDateTime.now()).set(DocumentChangesInvalidatedIssue:: getUpdateBy, SecurityUtils.getUsername())
                     .in(DocumentChangesInvalidatedIssue::getId, delInvalidatedIssueIds)
             );
@@ -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)
@@ -141,18 +149,18 @@
     @Transactional
     public CommonResult deletedDocumentChangesInvalidated(Long id) {
         int i = documentChangesInvalidatedMapper.update(new DocumentChangesInvalidated(),
-                new LambdaUpdateWrapper<DocumentChangesInvalidated>().set(DocumentChangesInvalidated::getDelFlag, UserConstant.DEPT_DISABLE)
+                new LambdaUpdateWrapper<DocumentChangesInvalidated>().set(DocumentChangesInvalidated::getDelFlag, UserConstant.DISENABLE)
                         .set(DocumentChangesInvalidated::getUpdateTime, LocalDateTime.now()).set(DocumentChangesInvalidated::getUpdateBy, SecurityUtils.getUsername())
                         .eq(DocumentChangesInvalidated::getId, id)
         );
         if (i > 0){
             documentChangesInvalidatedIssueMapper.update(new DocumentChangesInvalidatedIssue(),
-                    new LambdaUpdateWrapper<DocumentChangesInvalidatedIssue>().set(DocumentChangesInvalidatedIssue::getDelFlag, UserConstant.DEPT_DISABLE)
+                    new LambdaUpdateWrapper<DocumentChangesInvalidatedIssue>().set(DocumentChangesInvalidatedIssue::getDelFlag, UserConstant.DISENABLE)
                             .set(DocumentChangesInvalidatedIssue::getUpdateTime, LocalDateTime.now()).set(DocumentChangesInvalidatedIssue::getUpdateBy, SecurityUtils.getUsername())
                             .eq(DocumentChangesInvalidatedIssue::getDocumentChangesId, id)
             );
             documentChangesInvalidatedEvaluateMapper.update(new DocumentChangesInvalidatedEvaluate(),
-                    new LambdaUpdateWrapper<DocumentChangesInvalidatedEvaluate>().set(DocumentChangesInvalidatedEvaluate::getDelFlag, UserConstant.DEPT_DISABLE)
+                    new LambdaUpdateWrapper<DocumentChangesInvalidatedEvaluate>().set(DocumentChangesInvalidatedEvaluate::getDelFlag, UserConstant.DISENABLE)
                             .set(DocumentChangesInvalidatedEvaluate::getUpdateTime, LocalDateTime.now()).set(DocumentChangesInvalidatedEvaluate::getUpdateBy, SecurityUtils.getUsername())
                             .eq(DocumentChangesInvalidatedEvaluate::getDocumentChangesId, id)
             );

--
Gitblit v1.9.2