From 79c8c8c3bf1d818bd5cc80437452c91ecf9c054f Mon Sep 17 00:00:00 2001
From: guo <guo@guo>
Date: Thu, 9 Nov 2023 17:54:56 +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/controller/CarVideoAirtightDataController.java   | 1 +
 .../controller/HangBasketAlarmDataController.java        | 9 +++++++++
 .../modules/hangbasket/entity/HangBasketAlarmData.java   | 2 +-
 .../service/impl/TaskProgressContentServiceImpl.java     | 2 ++
 .../service/impl/TaskProgressServiceImpl.java            | 4 ++++
 5 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/zhgd/xmgl/modules/car/controller/CarVideoAirtightDataController.java b/src/main/java/com/zhgd/xmgl/modules/car/controller/CarVideoAirtightDataController.java
index ac27a19cb..e6cd651d6 100644
--- a/src/main/java/com/zhgd/xmgl/modules/car/controller/CarVideoAirtightDataController.java
+++ b/src/main/java/com/zhgd/xmgl/modules/car/controller/CarVideoAirtightDataController.java
@@ -149,5 +149,6 @@ public class CarVideoAirtightDataController {
         carVideoAirtightDataService.saveCarVideoAnalyAirtightResult(json);
         return Result.ok();
     }
+//to do
 
 }
diff --git a/src/main/java/com/zhgd/xmgl/modules/hangbasket/controller/HangBasketAlarmDataController.java b/src/main/java/com/zhgd/xmgl/modules/hangbasket/controller/HangBasketAlarmDataController.java
index e972d61db..18f9447a4 100644
--- a/src/main/java/com/zhgd/xmgl/modules/hangbasket/controller/HangBasketAlarmDataController.java
+++ b/src/main/java/com/zhgd/xmgl/modules/hangbasket/controller/HangBasketAlarmDataController.java
@@ -2,11 +2,14 @@ package com.zhgd.xmgl.modules.hangbasket.controller;
 
 import com.zhgd.xmgl.modules.hangbasket.entity.HangBasketAlarmData;
 import com.zhgd.xmgl.modules.hangbasket.service.IHangBasketAlarmDataService;
+import com.zhgd.xmgl.security.entity.UserInfo;
+import com.zhgd.xmgl.security.util.SecurityUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiImplicitParams;
 
+import java.util.Date;
 import java.util.HashMap;
 
 import springfox.documentation.annotations.ApiIgnore;
@@ -14,6 +17,7 @@ import springfox.documentation.annotations.ApiIgnore;
 import java.util.List;
 import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
+import java.util.Objects;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
@@ -99,6 +103,11 @@ public class HangBasketAlarmDataController {
 	@ApiOperation(value = "编辑挂篮告警数据信息", notes = "编辑挂篮告警数据信息", httpMethod = "POST")
 	@PostMapping(value = "/edit")
 	public Result<HangBasketAlarmData> edit(@RequestBody HangBasketAlarmData hangBasketAlarmData) {
+		if (Objects.equals(hangBasketAlarmData.getHandleDone(), 1)) {
+			UserInfo userInfo = SecurityUtils.getUser();
+			hangBasketAlarmData.setOperateId(userInfo.getUserId());
+			hangBasketAlarmData.setOperateTime(new Date());
+		}
 		hangBasketAlarmDataService.updateById(hangBasketAlarmData);
 		return Result.ok();
 	}
diff --git a/src/main/java/com/zhgd/xmgl/modules/hangbasket/entity/HangBasketAlarmData.java b/src/main/java/com/zhgd/xmgl/modules/hangbasket/entity/HangBasketAlarmData.java
index 76d88ccc2..b55b07098 100644
--- a/src/main/java/com/zhgd/xmgl/modules/hangbasket/entity/HangBasketAlarmData.java
+++ b/src/main/java/com/zhgd/xmgl/modules/hangbasket/entity/HangBasketAlarmData.java
@@ -100,7 +100,7 @@ public class HangBasketAlarmData implements Serializable {
 	 */
 	@Excel(name = "操作人id", width = 15)
 	@ApiModelProperty(value = "操作人id")
-	private java.lang.Integer operateId;
+	private java.lang.Long operateId;
 	/**
 	 * 操作时间
 	 */
diff --git a/src/main/java/com/zhgd/xmgl/modules/taskprogress/service/impl/TaskProgressContentServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/taskprogress/service/impl/TaskProgressContentServiceImpl.java
index a1d41f201..d23969e7a 100644
--- a/src/main/java/com/zhgd/xmgl/modules/taskprogress/service/impl/TaskProgressContentServiceImpl.java
+++ b/src/main/java/com/zhgd/xmgl/modules/taskprogress/service/impl/TaskProgressContentServiceImpl.java
@@ -16,6 +16,7 @@ import com.zhgd.xmgl.security.util.SecurityUtils;
 import com.zhgd.xmgl.util.RefUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import javax.servlet.http.HttpServletRequest;
 import java.util.List;
@@ -29,6 +30,7 @@ import java.util.stream.Collectors;
  * @version： V1.0
  */
 @Service
+@Transactional(rollbackFor = Exception.class)
 public class TaskProgressContentServiceImpl extends ServiceImpl<TaskProgressContentMapper, TaskProgressContent> implements ITaskProgressContentService {
     @Autowired
     TaskProgressMaterialRelMapper taskProgressMaterialRelMapper;
diff --git a/src/main/java/com/zhgd/xmgl/modules/taskprogress/service/impl/TaskProgressServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/taskprogress/service/impl/TaskProgressServiceImpl.java
index 374c8543c..19680322c 100644
--- a/src/main/java/com/zhgd/xmgl/modules/taskprogress/service/impl/TaskProgressServiceImpl.java
+++ b/src/main/java/com/zhgd/xmgl/modules/taskprogress/service/impl/TaskProgressServiceImpl.java
@@ -449,6 +449,10 @@ public class TaskProgressServiceImpl extends ServiceImpl<TaskProgressMapper, Tas
 
     @Override
     public void edit(TaskProgress taskProgress) {
+        TaskProgress tp = baseMapper.selectById(taskProgress.getId());
+        if (Objects.equals(tp.getProgressRatio(), 100D) && !Objects.equals(taskProgress.getProgressRatio(), 100D)) {
+            throw new OpenAlertException("进度100%不能再次修改");
+        }
         setStatusRel(taskProgress);
         baseMapper.updateByPrimaryId(taskProgress);
         addWarning(taskProgress);