From 6faa8da685a95b1fce5f432f5bd41a870ccb5ade Mon Sep 17 00:00:00 2001
From: heheng <475597332@qq.com>
Date: 星期五, 29 八月 2025 11:08:13 +0800
Subject: [PATCH] 部分新功能

---
 multi-system/src/main/java/com/gkhy/exam/system/service/impl/DocumentBorrowCopyServiceImpl.java             |    6 +++---
 multi-system/src/main/java/com/gkhy/exam/system/service/impl/InternalKnowledgeServiceImpl.java              |    2 +-
 multi-system/src/main/java/com/gkhy/exam/system/service/impl/DocumentDestructionApplyServiceImpl.java       |    2 +-
 multi-system/src/main/java/com/gkhy/exam/system/service/impl/SixInspectionServiceImpl.java                  |   10 +++++-----
 multi-system/src/main/java/com/gkhy/exam/system/service/impl/CalibrationMonitoringEquipmentServiceImpl.java |    2 +-
 multi-system/src/main/java/com/gkhy/exam/system/service/impl/DocumentChangesInvalidatedServiceImpl.java     |   10 +++++-----
 multi-system/src/main/java/com/gkhy/exam/system/service/impl/AnnualVerificationPlanServiceImpl.java         |    6 +++---
 multi-system/src/main/java/com/gkhy/exam/system/service/impl/DocumentDistributionCollectionServiceImpl.java |    6 +++---
 8 files changed, 22 insertions(+), 22 deletions(-)

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 748a0a8..5d17d42 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
@@ -74,7 +74,7 @@
     private void batchSave(Long id, List<AnnualVerificationDevice> annualVerificationDevices, List<Long> delData) {
         if (ObjectUtils.isNotEmpty(delData)){
             int update = annualVerificationDeviceMapper.update(new AnnualVerificationDevice(),
-                    new LambdaUpdateWrapper<AnnualVerificationDevice>().set(AnnualVerificationDevice::getDelFlag, UserConstant.DEPT_DISABLE)
+                    new LambdaUpdateWrapper<AnnualVerificationDevice>().set(AnnualVerificationDevice::getDelFlag, UserConstant.DISENABLE)
                             .set(AnnualVerificationDevice::getUpdateTime, LocalDateTime.now()).set(AnnualVerificationDevice::getUpdateBy, SecurityUtils.getUsername())
                             .in(AnnualVerificationDevice::getId, delData)
             );
@@ -115,13 +115,13 @@
     public CommonResult deletedAnnualVerificationPlan(Long id) {
 
         int i = annualVerificationPlanMapper.update(new AnnualVerificationPlan(),
-                new LambdaUpdateWrapper<AnnualVerificationPlan>().eq(AnnualVerificationPlan::getId, id).set(AnnualVerificationPlan::getDelFlag, UserConstant.DEPT_DISABLE)
+                new LambdaUpdateWrapper<AnnualVerificationPlan>().eq(AnnualVerificationPlan::getId, id).set(AnnualVerificationPlan::getDelFlag, UserConstant.DISENABLE)
                         .set(AnnualVerificationPlan::getUpdateTime, LocalDateTime.now()).set(AnnualVerificationPlan::getUpdateBy, SecurityUtils.getUsername())
         );
         if (i > 0) {
             annualVerificationDeviceMapper.update(new AnnualVerificationDevice(),
                     new LambdaUpdateWrapper<AnnualVerificationDevice>().eq(AnnualVerificationDevice::getAnnualVerificationId, id)
-                            .set(AnnualVerificationDevice::getDelFlag, UserConstant.DEPT_DISABLE)
+                            .set(AnnualVerificationDevice::getDelFlag, UserConstant.DISENABLE)
                             .set(AnnualVerificationDevice::getUpdateTime, LocalDateTime.now())
                             .set(AnnualVerificationDevice::getUpdateBy, SecurityUtils.getUsername()));
         }
diff --git a/multi-system/src/main/java/com/gkhy/exam/system/service/impl/CalibrationMonitoringEquipmentServiceImpl.java b/multi-system/src/main/java/com/gkhy/exam/system/service/impl/CalibrationMonitoringEquipmentServiceImpl.java
index cbf0ea0..f237e34 100644
--- a/multi-system/src/main/java/com/gkhy/exam/system/service/impl/CalibrationMonitoringEquipmentServiceImpl.java
+++ b/multi-system/src/main/java/com/gkhy/exam/system/service/impl/CalibrationMonitoringEquipmentServiceImpl.java
@@ -57,7 +57,7 @@
     @Override
     public CommonResult deletedCalibrationMonitoringEquipment(Long id) {
         int i = calibrationMonitoringEquipmentMapper.update(new CalibrationMonitoringEquipment(),
-                new LambdaUpdateWrapper<CalibrationMonitoringEquipment>().eq(CalibrationMonitoringEquipment::getId, id).set(CalibrationMonitoringEquipment::getDelFlag, UserConstant.DEPT_DISABLE)
+                new LambdaUpdateWrapper<CalibrationMonitoringEquipment>().eq(CalibrationMonitoringEquipment::getId, id).set(CalibrationMonitoringEquipment::getDelFlag, UserConstant.DISENABLE)
                         .set(CalibrationMonitoringEquipment::getUpdateTime, LocalDateTime.now()).set(CalibrationMonitoringEquipment::getUpdateBy, SecurityUtils.getUsername())
         );
 
diff --git a/multi-system/src/main/java/com/gkhy/exam/system/service/impl/DocumentBorrowCopyServiceImpl.java b/multi-system/src/main/java/com/gkhy/exam/system/service/impl/DocumentBorrowCopyServiceImpl.java
index 60656f6..34299ce 100644
--- a/multi-system/src/main/java/com/gkhy/exam/system/service/impl/DocumentBorrowCopyServiceImpl.java
+++ b/multi-system/src/main/java/com/gkhy/exam/system/service/impl/DocumentBorrowCopyServiceImpl.java
@@ -72,7 +72,7 @@
     private void batchSave(Long id, List<DocumentBorrowCopyRecord> documentBorrowCopyRecordList,List<Long> delIds) {
         if (ObjectUtils.isNotEmpty(delIds)) {
             int update = documentBorrowCopyRecordMapper.update(new DocumentBorrowCopyRecord(),
-                    new LambdaUpdateWrapper<DocumentBorrowCopyRecord>().set(DocumentBorrowCopyRecord::getDelFlag, UserConstant.DEPT_DISABLE)
+                    new LambdaUpdateWrapper<DocumentBorrowCopyRecord>().set(DocumentBorrowCopyRecord::getDelFlag, UserConstant.DISENABLE)
                             .set(DocumentBorrowCopyRecord::getUpdateTime, LocalDateTime.now())
                             .set(DocumentBorrowCopyRecord::getUpdateBy, SecurityUtils.getUsername()).in(DocumentBorrowCopyRecord::getId, delIds)
             );
@@ -111,13 +111,13 @@
     @Transactional
     public CommonResult deletedDocumentBorrowCopy(Long id) {
         int i = documentBorrowCopyMapper.update(new DocumentBorrowCopy(),
-                new LambdaUpdateWrapper<DocumentBorrowCopy>().set(DocumentBorrowCopy::getDelFlag, UserConstant.DEPT_DISABLE)
+                new LambdaUpdateWrapper<DocumentBorrowCopy>().set(DocumentBorrowCopy::getDelFlag, UserConstant.DISENABLE)
                         .set(DocumentBorrowCopy::getUpdateTime, LocalDateTime.now())
                         .set(DocumentBorrowCopy::getUpdateBy, SecurityUtils.getUsername()).eq(DocumentBorrowCopy::getId, id)
         );
         if (i > 0){
             documentBorrowCopyRecordMapper.update(new DocumentBorrowCopyRecord(),
-                    new LambdaUpdateWrapper<DocumentBorrowCopyRecord>().set(DocumentBorrowCopyRecord::getDelFlag, UserConstant.DEPT_DISABLE)
+                    new LambdaUpdateWrapper<DocumentBorrowCopyRecord>().set(DocumentBorrowCopyRecord::getDelFlag, UserConstant.DISENABLE)
                             .set(DocumentBorrowCopyRecord::getUpdateTime, LocalDateTime.now()).set(DocumentBorrowCopyRecord::getUpdateBy, SecurityUtils.getUsername())
                             .eq(DocumentBorrowCopyRecord::getDocumentBorrowId, id));
         }
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..4be7a50 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
@@ -77,7 +77,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 +85,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)
             );
@@ -141,18 +141,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)
             );
diff --git a/multi-system/src/main/java/com/gkhy/exam/system/service/impl/DocumentDestructionApplyServiceImpl.java b/multi-system/src/main/java/com/gkhy/exam/system/service/impl/DocumentDestructionApplyServiceImpl.java
index 7d84ea7..f806d8b 100644
--- a/multi-system/src/main/java/com/gkhy/exam/system/service/impl/DocumentDestructionApplyServiceImpl.java
+++ b/multi-system/src/main/java/com/gkhy/exam/system/service/impl/DocumentDestructionApplyServiceImpl.java
@@ -57,7 +57,7 @@
     @Override
     public CommonResult deletedDocumentDestructionApply(Long id) {
         destructionApplyMapper.update(new DocumentDestructionApply(), new LambdaUpdateWrapper<DocumentDestructionApply>().eq(DocumentDestructionApply::getId, id)
-                .set(DocumentDestructionApply::getDelFlag, UserConstant.DEPT_DISABLE).set(DocumentDestructionApply::getUpdateTime, LocalDateTime.now())
+                .set(DocumentDestructionApply::getDelFlag, UserConstant.DISENABLE).set(DocumentDestructionApply::getUpdateTime, LocalDateTime.now())
                 .set(DocumentDestructionApply::getUpdateBy, SecurityUtils.getUsername()));
         return CommonResult.success();
     }
diff --git a/multi-system/src/main/java/com/gkhy/exam/system/service/impl/DocumentDistributionCollectionServiceImpl.java b/multi-system/src/main/java/com/gkhy/exam/system/service/impl/DocumentDistributionCollectionServiceImpl.java
index e6017e2..a2d3511 100644
--- a/multi-system/src/main/java/com/gkhy/exam/system/service/impl/DocumentDistributionCollectionServiceImpl.java
+++ b/multi-system/src/main/java/com/gkhy/exam/system/service/impl/DocumentDistributionCollectionServiceImpl.java
@@ -71,7 +71,7 @@
     private void batchSave(Long id, List<DocumentDistributionCollectionRecord> documentDistributionCollectionRecordList,List<Long> delIds) {
         if (ObjectUtils.isNotEmpty(delIds)) {
             int update = documentDistributionCollectionRecordMapper.update(new DocumentDistributionCollectionRecord(),
-                    new LambdaUpdateWrapper<DocumentDistributionCollectionRecord>().set(DocumentDistributionCollectionRecord::getDelFlag, UserConstant.DEPT_DISABLE)
+                    new LambdaUpdateWrapper<DocumentDistributionCollectionRecord>().set(DocumentDistributionCollectionRecord::getDelFlag, UserConstant.DISENABLE)
                             .set(DocumentDistributionCollectionRecord::getUpdateTime, LocalDateTime.now())
                             .set(DocumentDistributionCollectionRecord::getUpdateBy, SecurityUtils.getUsername()).in(DocumentDistributionCollectionRecord::getId, delIds)
             );
@@ -112,13 +112,13 @@
     @Transactional
     public CommonResult deletedDocumentDistributionCollection(Long id) {
         int i = documentDistributionCollectionMapper.update(new DocumentDistributionCollection(),
-                new LambdaUpdateWrapper<DocumentDistributionCollection>().set(DocumentDistributionCollection::getDelFlag, UserConstant.DEPT_DISABLE)
+                new LambdaUpdateWrapper<DocumentDistributionCollection>().set(DocumentDistributionCollection::getDelFlag, UserConstant.DISENABLE)
                         .set(DocumentDistributionCollection::getUpdateTime, LocalDateTime.now())
                         .set(DocumentDistributionCollection::getUpdateBy, SecurityUtils.getUsername()).eq(DocumentDistributionCollection::getId, id)
         );
         if (i > 0){
             documentDistributionCollectionRecordMapper.update(new DocumentDistributionCollectionRecord(),
-                    new LambdaUpdateWrapper<DocumentDistributionCollectionRecord>().set(DocumentDistributionCollectionRecord::getDelFlag, UserConstant.DEPT_DISABLE)
+                    new LambdaUpdateWrapper<DocumentDistributionCollectionRecord>().set(DocumentDistributionCollectionRecord::getDelFlag, UserConstant.DISENABLE)
                             .set(DocumentDistributionCollectionRecord::getUpdateTime, LocalDateTime.now()).set(DocumentDistributionCollectionRecord::getUpdateBy, SecurityUtils.getUsername())
                             .eq(DocumentDistributionCollectionRecord::getDocumentId, id));
         }
diff --git a/multi-system/src/main/java/com/gkhy/exam/system/service/impl/InternalKnowledgeServiceImpl.java b/multi-system/src/main/java/com/gkhy/exam/system/service/impl/InternalKnowledgeServiceImpl.java
index 52ec25e..34fa348 100644
--- a/multi-system/src/main/java/com/gkhy/exam/system/service/impl/InternalKnowledgeServiceImpl.java
+++ b/multi-system/src/main/java/com/gkhy/exam/system/service/impl/InternalKnowledgeServiceImpl.java
@@ -56,7 +56,7 @@
     public CommonResult deletedInternalKnowledge(Integer id) {
         internalKnowledgeMapper.update(new InternalKnowledge(),
                 new LambdaUpdateWrapper<InternalKnowledge>().eq(InternalKnowledge::getId, id)
-                        .set(InternalKnowledge::getDelFlag, UserConstant.DEPT_DISABLE)
+                        .set(InternalKnowledge::getDelFlag, UserConstant.DISENABLE)
                         .set(InternalKnowledge::getUpdateTime, LocalDateTime.now())
                         .set(InternalKnowledge::getUpdateBy, SecurityUtils.getUsername()));
         return CommonResult.success();
diff --git a/multi-system/src/main/java/com/gkhy/exam/system/service/impl/SixInspectionServiceImpl.java b/multi-system/src/main/java/com/gkhy/exam/system/service/impl/SixInspectionServiceImpl.java
index a33843a..ead4a28 100644
--- a/multi-system/src/main/java/com/gkhy/exam/system/service/impl/SixInspectionServiceImpl.java
+++ b/multi-system/src/main/java/com/gkhy/exam/system/service/impl/SixInspectionServiceImpl.java
@@ -79,14 +79,14 @@
                            List<Long> delProblemIds, List<Long> delContentIds, List<SixInspectionProblem> sixInspectionProblemList) {
         if (ObjectUtils.isNotEmpty(delProblemIds)) {
             int update = sixInspectionProblemMapper.update(new SixInspectionProblem(),
-                    new LambdaUpdateWrapper<SixInspectionProblem>().set(SixInspectionProblem::getDelFlag, UserConstant.DEPT_DISABLE)
+                    new LambdaUpdateWrapper<SixInspectionProblem>().set(SixInspectionProblem::getDelFlag, UserConstant.DISENABLE)
                             .set(SixInspectionProblem::getUpdateTime, LocalDateTime.now()).set(SixInspectionProblem::getUpdateBy, SecurityUtils.getUsername())
                             .in(SixInspectionProblem::getId, delProblemIds)
             );
         }
         if (ObjectUtils.isNotEmpty(delContentIds)) {
             int update = sixInspectionContentMapper.update(new SixInspectionContent(),
-                    new LambdaUpdateWrapper<SixInspectionContent>().set(SixInspectionContent::getDelFlag, UserConstant.DEPT_DISABLE)
+                    new LambdaUpdateWrapper<SixInspectionContent>().set(SixInspectionContent::getDelFlag, UserConstant.DISENABLE)
                             .set(SixInspectionContent::getUpdateTime, LocalDateTime.now()).set(SixInspectionContent::getUpdateBy, SecurityUtils.getUsername())
                             .in(SixInspectionContent::getId, delContentIds)
             );
@@ -142,17 +142,17 @@
     public CommonResult deletedSixInspection(Long id) {
         int update = sixInspectionMapper.update(new SixInspection(),
                 new LambdaUpdateWrapper<SixInspection>().eq(SixInspection::getId, id)
-                        .set(SixInspection::getDelFlag, UserConstant.DEPT_DISABLE).set(SixInspection::getUpdateTime, LocalDateTime.now())
+                        .set(SixInspection::getDelFlag, UserConstant.DISENABLE).set(SixInspection::getUpdateTime, LocalDateTime.now())
                         .set(SixInspection::getUpdateBy, SecurityUtils.getUsername()));
         if (update > 0) {
             sixInspectionContentMapper.update(new SixInspectionContent(),
                     new LambdaUpdateWrapper<SixInspectionContent>().eq(SixInspectionContent::getSixInspectionId, id)
-                            .set(SixInspectionContent::getDelFlag, UserConstant.DEPT_DISABLE).set(SixInspectionContent::getUpdateTime, LocalDateTime.now())
+                            .set(SixInspectionContent::getDelFlag, UserConstant.DISENABLE).set(SixInspectionContent::getUpdateTime, LocalDateTime.now())
                             .set(SixInspectionContent::getUpdateBy, SecurityUtils.getUsername())
             );
             sixInspectionProblemMapper.update(new SixInspectionProblem(),
                     new LambdaUpdateWrapper<SixInspectionProblem>().eq(SixInspectionProblem::getSixInspectionId, id)
-                            .set(SixInspectionProblem::getDelFlag, UserConstant.DEPT_DISABLE).set(SixInspectionProblem::getUpdateTime, LocalDateTime.now())
+                            .set(SixInspectionProblem::getDelFlag, UserConstant.DISENABLE).set(SixInspectionProblem::getUpdateTime, LocalDateTime.now())
                             .set(SixInspectionProblem::getUpdateBy, SecurityUtils.getUsername())
             );
         }

--
Gitblit v1.9.2