From 5f9b6437da9efe68e75be0df12f8b94bf12f81ac Mon Sep 17 00:00:00 2001
From: chenhc <2369838784@qq.com>
Date: Thu, 9 May 2024 11:46:55 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E8=AE=BE=E5=A4=87=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../glxp/api/controller/dev/DeviceRepairController.java   | 8 ++++----
 .../java/com/glxp/api/entity/dev/DeviceRepairEntity.java  | 6 ++++++
 .../com/glxp/api/service/dev/DeviceRepairService.java     | 4 ++--
 .../api/service/dev/impl/DeviceRepairServiceImpl.java     | 7 ++++++-
 src/main/resources/schemas/schema_v2.4.sql                | 5 +++++
 5 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/glxp/api/controller/dev/DeviceRepairController.java b/src/main/java/com/glxp/api/controller/dev/DeviceRepairController.java
index 9d19c658e..72a95e593 100644
--- a/src/main/java/com/glxp/api/controller/dev/DeviceRepairController.java
+++ b/src/main/java/com/glxp/api/controller/dev/DeviceRepairController.java
@@ -52,14 +52,14 @@ public class DeviceRepairController extends BaseController {
     /**
      * 完成我的维修单
      *
-     * @param repairId 维修单id
+     * @param deviceRepairEntity
      * @return
      */
     @AuthRuleAnnotation("")
-    @GetMapping("/udi/device/repair/finishByUser/{repairId}")
-    public BaseResponse finishByUser(@PathVariable Long repairId) {
+    @PostMapping("/udi/device/repair/finishByUser/repairId")
+    public BaseResponse finishByUser(@RequestBody DeviceRepairEntity deviceRepairEntity) {
         AuthAdmin user = super.getUser();
-        deviceRepairService.finishByUser(repairId, user);
+        deviceRepairService.finishByUser(deviceRepairEntity, user);
         return ResultVOUtils.successMsg("操作成功");
     }
 
diff --git a/src/main/java/com/glxp/api/entity/dev/DeviceRepairEntity.java b/src/main/java/com/glxp/api/entity/dev/DeviceRepairEntity.java
index ef5feb4c4..462497de7 100644
--- a/src/main/java/com/glxp/api/entity/dev/DeviceRepairEntity.java
+++ b/src/main/java/com/glxp/api/entity/dev/DeviceRepairEntity.java
@@ -252,4 +252,10 @@ public class DeviceRepairEntity {
      */
     @TableField(value = "confirmRemark")
     private String confirmRemark;
+
+    /**
+     * 维修内容
+     */
+    @TableField(value = "repairDescription")
+    private String repairDescription;
 }
diff --git a/src/main/java/com/glxp/api/service/dev/DeviceRepairService.java b/src/main/java/com/glxp/api/service/dev/DeviceRepairService.java
index 007bb83b7..1f28dd86b 100644
--- a/src/main/java/com/glxp/api/service/dev/DeviceRepairService.java
+++ b/src/main/java/com/glxp/api/service/dev/DeviceRepairService.java
@@ -26,8 +26,8 @@ public interface DeviceRepairService extends IService<DeviceRepairEntity> {
      * 完成维修
      * 同时改变设备状态
      *
-     * @param repairId 维修单id
+     * @param deviceRepairEntity 维修单id
      * @param user     用户信息
      */
-    void finishByUser(Long repairId, AuthAdmin user);
+    void finishByUser(DeviceRepairEntity deviceRepairEntity, AuthAdmin user);
 }
diff --git a/src/main/java/com/glxp/api/service/dev/impl/DeviceRepairServiceImpl.java b/src/main/java/com/glxp/api/service/dev/impl/DeviceRepairServiceImpl.java
index 034ca23dc..202955bee 100644
--- a/src/main/java/com/glxp/api/service/dev/impl/DeviceRepairServiceImpl.java
+++ b/src/main/java/com/glxp/api/service/dev/impl/DeviceRepairServiceImpl.java
@@ -61,7 +61,11 @@ public class DeviceRepairServiceImpl extends ServiceImpl<DeviceRepairMapper, Dev
 
     @Override
     @Transactional
-    public void finishByUser(Long repairId, AuthAdmin user) {
+    public void finishByUser(DeviceRepairEntity deviceRepairEntity, AuthAdmin user) {
+        Long repairId = deviceRepairEntity.getId();
+        if (repairId == null) {
+            throw new JsonException("未找到维修单");
+        }
         // 获取维修单信息
         DeviceRepairEntity entity = super.getById(repairId);
         if (entity == null) {
@@ -74,6 +78,7 @@ public class DeviceRepairServiceImpl extends ServiceImpl<DeviceRepairMapper, Dev
                 .set(DeviceRepairEntity::getConfirmDeptCode, user.getLocDeptCode())
                 .set(DeviceRepairEntity::getConfirmDeptName, user.getDeptName())
                 .set(DeviceRepairEntity::getConfirmTime, LocalDateTime.now())
+                .set(DeviceRepairEntity::getRepairDescription, deviceRepairEntity.getRepairDescription())
                 .eq(DeviceRepairEntity::getId, repairId)
                 .eq(DeviceRepairEntity::getCreateUserId, user.getId())
                 .eq(DeviceRepairEntity::getFinishFlag, false)
diff --git a/src/main/resources/schemas/schema_v2.4.sql b/src/main/resources/schemas/schema_v2.4.sql
index b8b4bc50a..e60967548 100644
--- a/src/main/resources/schemas/schema_v2.4.sql
+++ b/src/main/resources/schemas/schema_v2.4.sql
@@ -2490,3 +2490,8 @@ UPDATE auth_menu
 SET `menu_name` = '本科室设备', `parent_id` = 1703, `order_num` = 4, `path` = '/dev/deviceInfoSelf', `component` = 'dev/deviceInfoSelf',
     `query_param` = NULL, `is_frame` = 1, `is_cache` = 0, `menu_type` = 'C', `visible` = '0', `status` = '0', `perms` = NULL, `icon` = NULL,
     `create_by` = '超级用户', `create_time` = '2023-11-22 16:16:48', `update_by` = NULL, `update_time` = NULL, `remark` = NULL WHERE `menu_id` = 2021;
+
+
+CALL Pro_Temp_ColumnWork('device_repair', 'repairDescription',
+                         ' varchar(1024) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT''维修内容''',
+                         1);