From 7375992f77def8478444570f51b70131f02f1411 Mon Sep 17 00:00:00 2001
From: guoshengxiong <1923636941@qq.com>
Date: Sat, 13 Jul 2024 11:56:53 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../car/service/impl/CarInfoServiceImpl.java  |  2 +-
 .../XzTaskProgressContentController.java      |  2 +-
 .../XzTaskProgressContentServiceImpl.java     | 30 ++++++++-----------
 3 files changed, 15 insertions(+), 19 deletions(-)

diff --git a/src/main/java/com/zhgd/xmgl/modules/car/service/impl/CarInfoServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/car/service/impl/CarInfoServiceImpl.java
index 28077133d..921e5fadf 100644
--- a/src/main/java/com/zhgd/xmgl/modules/car/service/impl/CarInfoServiceImpl.java
+++ b/src/main/java/com/zhgd/xmgl/modules/car/service/impl/CarInfoServiceImpl.java
@@ -123,7 +123,7 @@ public class CarInfoServiceImpl extends ServiceImpl<CarInfoMapper, CarInfo> impl
         c.setSendSuccessStatus(4);
         if (old != null) {
             if (Objects.equals(old.getCarModuleType(), CarInfoCarModuleTypeEnum.GD.getValue())) {
-                throw new OpenAlertException("该车辆已添加，请勿重复添加！");
+                throw new OpenAlertException("该车辆已存在，请勿重复添加！");
             }
             Date now = new Date();
             boolean isHk = projectCarCameraConfigService.isHikvisionConfig(c.getProjectSn());
diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/controller/XzTaskProgressContentController.java b/src/main/java/com/zhgd/xmgl/modules/xz/controller/XzTaskProgressContentController.java
index e3e1f35bd..71a80e798 100644
--- a/src/main/java/com/zhgd/xmgl/modules/xz/controller/XzTaskProgressContentController.java
+++ b/src/main/java/com/zhgd/xmgl/modules/xz/controller/XzTaskProgressContentController.java
@@ -125,7 +125,7 @@ public class XzTaskProgressContentController {
     /**
      * 通过id删除
      *
-     * @param id
+     * @param map
      * @return
      */
     @OperLog(operModul = "进度审批管理", operType = "删除", operDesc = "删除进度审批")
diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/service/impl/XzTaskProgressContentServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/xz/service/impl/XzTaskProgressContentServiceImpl.java
index 5c8498c6c..eeb132644 100644
--- a/src/main/java/com/zhgd/xmgl/modules/xz/service/impl/XzTaskProgressContentServiceImpl.java
+++ b/src/main/java/com/zhgd/xmgl/modules/xz/service/impl/XzTaskProgressContentServiceImpl.java
@@ -4,7 +4,6 @@ import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -53,12 +52,6 @@ public class XzTaskProgressContentServiceImpl extends ServiceImpl<XzTaskProgress
         if (taskProgress == null) {
             throw new OpenAlertException("任务进度不存在");
         }
-        if (taskProgressContent.getProgressRatio().equals(Cts.WORKER_SAFE_MAX_SCORE)) {
-            taskProgress.setStatus(2);
-        } else {
-            taskProgress.setStatus(1);
-        }
-        taskProgressMapper.updateById(taskProgress);
         String projectSn = taskProgress.getProjectSn();
         taskProgressContent.setProjectSn(projectSn);
         UserInfo user = SecurityUtils.getUser();
@@ -86,20 +79,23 @@ public class XzTaskProgressContentServiceImpl extends ServiceImpl<XzTaskProgress
 
     @Override
     public void edit(XzTaskProgressContent taskProgressContent) {
-        XzTaskProgressContent taskProgress = xzTaskProgressContentMapper.selectById(taskProgressContent.getId());
-        if (taskProgress == null) {
+        XzTaskProgressContent content = xzTaskProgressContentMapper.selectById(taskProgressContent.getId());
+        if (content == null) {
             throw new OpenAlertException("任务进度不存在");
         }
         if (Objects.equals(taskProgressContent.getAuditType(), XzTaskProgressContentAuditTypeEnum.PASS.getValue())) {
-            XzTaskProgress xzTaskProgress = taskProgressMapper.selectById(taskProgress.getTaskProgressId());
-            if (xzTaskProgress == null) {
-                throw new OpenAlertException("任务进度不存在.");
+            XzTaskProgress progress = taskProgressMapper.selectById(content.getTaskProgressId());
+            if (progress == null) {
+                throw new OpenAlertException("任务进度不存在");
             }
-            if (NumberUtils.gt(taskProgress.getProgressRatio().toString(), xzTaskProgress.getProgressRatio().toString())) {
-                taskProgressMapper.update(null, new LambdaUpdateWrapper<XzTaskProgress>()
-                        .eq(XzTaskProgress::getId, taskProgress.getTaskProgressId())
-                        .set(XzTaskProgress::getProgressRatio, taskProgress.getProgressRatio())
-                );
+            if (NumberUtils.gt(content.getProgressRatio().toString(), progress.getProgressRatio().toString())) {
+                if (content.getProgressRatio().equals(Cts.WORKER_SAFE_MAX_SCORE)) {
+                    progress.setStatus(2);
+                } else {
+                    progress.setStatus(1);
+                }
+                progress.setProgressRatio(content.getProgressRatio());
+                taskProgressMapper.updateById(progress);
             }
         }
         baseMapper.updateById(taskProgressContent);