From 5205fab4f9bd8b8481c6f1c9c78f488df2adafbe Mon Sep 17 00:00:00 2001
From: wws <18630710203@163.com>
Date: Tue, 10 Oct 2023 14:51:23 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E7=AE=A1=E7=90=86-=E6=A3=80?=
 =?UTF-8?q?=E6=9F=A5=E9=A1=B9=E7=BB=B4=E6=8A=A4(=E4=BF=AE=E6=94=B9)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/EquCheckItemController.java    |  4 +-
 .../device/service/IEquCheckItemService.java  |  5 ++-
 .../service/impl/EquCheckItemServiceImpl.java | 43 ++++++++++++++++---
 3 files changed, 43 insertions(+), 9 deletions(-)

diff --git a/op-modules/op-device/src/main/java/com/op/device/controller/EquCheckItemController.java b/op-modules/op-device/src/main/java/com/op/device/controller/EquCheckItemController.java
index 45548939..31d8a3c3 100644
--- a/op-modules/op-device/src/main/java/com/op/device/controller/EquCheckItemController.java
+++ b/op-modules/op-device/src/main/java/com/op/device/controller/EquCheckItemController.java
@@ -83,8 +83,8 @@ public class EquCheckItemController extends BaseController {
     @RequiresPermissions("device:item:edit")
     @Log(title = "检查项维护", businessType = BusinessType.UPDATE)
     @PutMapping
-    public AjaxResult edit(@RequestBody EquCheckItem equCheckItem) {
-        return toAjax(equCheckItemService.updateEquCheckItem(equCheckItem));
+    public AjaxResult edit(@RequestBody EquCheckItemDTO equCheckItemDTO) {
+        return equCheckItemService.updateEquCheckItem(equCheckItemDTO);
     }
 
     /**
diff --git a/op-modules/op-device/src/main/java/com/op/device/service/IEquCheckItemService.java b/op-modules/op-device/src/main/java/com/op/device/service/IEquCheckItemService.java
index 8c04b4bd..b093e800 100644
--- a/op-modules/op-device/src/main/java/com/op/device/service/IEquCheckItemService.java
+++ b/op-modules/op-device/src/main/java/com/op/device/service/IEquCheckItemService.java
@@ -5,6 +5,7 @@ import java.util.List;
 import com.op.common.core.web.domain.AjaxResult;
 import com.op.device.domain.EquCheckItem;
 import com.op.device.domain.dto.EquCheckItemDTO;
+import com.op.device.domain.vo.EquCheckItemVO;
 
 /**
  * 检查项维护Service接口
@@ -19,7 +20,7 @@ public interface IEquCheckItemService {
 	 * @param itemId 检查项维护主键
 	 * @return 检查项维护
 	 */
-	public EquCheckItem selectEquCheckItemByItemId(String itemId);
+	public EquCheckItemVO selectEquCheckItemByItemId(String itemId);
 
 	/**
 	 * 查询检查项维护列表
@@ -43,7 +44,7 @@ public interface IEquCheckItemService {
 	 * @param equCheckItem 检查项维护
 	 * @return 结果
 	 */
-	public int updateEquCheckItem(EquCheckItem equCheckItem);
+	public AjaxResult updateEquCheckItem(EquCheckItemDTO equCheckItemDTO);
 
 	/**
 	 * 批量删除检查项维护
diff --git a/op-modules/op-device/src/main/java/com/op/device/service/impl/EquCheckItemServiceImpl.java b/op-modules/op-device/src/main/java/com/op/device/service/impl/EquCheckItemServiceImpl.java
index bb483d10..0f8114bd 100644
--- a/op-modules/op-device/src/main/java/com/op/device/service/impl/EquCheckItemServiceImpl.java
+++ b/op-modules/op-device/src/main/java/com/op/device/service/impl/EquCheckItemServiceImpl.java
@@ -1,5 +1,6 @@
 package com.op.device.service.impl;
 
+import java.text.Format;
 import java.text.SimpleDateFormat;
 import java.util.List;
 
@@ -12,6 +13,7 @@ import com.op.common.core.web.domain.AjaxResult;
 import com.op.common.log.annotation.Log;
 import com.op.device.domain.EquCheckItemDetail;
 import com.op.device.domain.dto.EquCheckItemDTO;
+import com.op.device.domain.vo.EquCheckItemVO;
 import com.op.device.mapper.EquCheckItemDetailMapper;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -48,8 +50,16 @@ public class EquCheckItemServiceImpl implements IEquCheckItemService {
 	 */
 	@Override
 	@DS("#header.poolName")
-	public EquCheckItem selectEquCheckItemByItemId(String itemId) {
-		return equCheckItemMapper.selectEquCheckItemByItemId(itemId);
+	public EquCheckItemVO selectEquCheckItemByItemId(String itemId) {
+		EquCheckItem equCheckItem = equCheckItemMapper.selectEquCheckItemByItemId(itemId);
+
+		// 创建返回对象
+		EquCheckItemVO equCheckItemVO = new EquCheckItemVO();
+		BeanUtils.copyProperties(equCheckItem,equCheckItemVO);
+
+		equCheckItemVO.setFormStandard(equCheckItemDetailMapper.selectEquCheckItemDetailByParentCode(equCheckItem.getItemCode()));
+
+		return equCheckItemVO;
 	}
 
 	/**
@@ -154,13 +164,36 @@ public class EquCheckItemServiceImpl implements IEquCheckItemService {
 	/**
 	 * 修改检查项维护
 	 * 
-	 * @param equCheckItem 检查项维护
+	 * @param equCheckItemDTO 检查项维护
 	 * @return 结果
 	 */
 	@Override
 	@DS("#header.poolName")
-	public int updateEquCheckItem(EquCheckItem equCheckItem) {
-		return equCheckItemMapper.updateEquCheckItem(equCheckItem);
+	public AjaxResult updateEquCheckItem(EquCheckItemDTO equCheckItemDTO) {
+		EquCheckItem equCheckItem = new EquCheckItem();
+		BeanUtils.copyProperties(equCheckItemDTO,equCheckItem);
+
+		// 处理检查项信息
+		equCheckItem.setUpdatedBy(SecurityContextHolder.getUserName());
+		equCheckItem.setUpdatedTime(DateUtils.getNowDate());
+		if (equCheckItem.getItemType().equals("spotInspection")) {
+			equCheckItem.setItemTypeName("点检");
+		}
+		if (equCheckItem.getItemType().equals("inspection")) {
+			equCheckItem.setItemTypeName("巡检");
+		}
+		if (equCheckItem.getItemType().equals("maintenance")) {
+			equCheckItem.setItemTypeName("保养");
+		}
+
+		equCheckItemMapper.updateEquCheckItem(equCheckItem);
+
+		for (EquCheckItemDetail detail : equCheckItemDTO.getFormStandard()) {
+			detail.setUpdatedBy(SecurityContextHolder.getUserName());
+			detail.setUpdatedTime(DateUtils.getNowDate());
+			equCheckItemDetailMapper.updateEquCheckItemDetail(detail);
+		}
+		return success("修改成功");
 	}
 
 	/**