From ba2521dd233fbba0af512f2baea9322ea3802bf2 Mon Sep 17 00:00:00 2001
From: gejunhao <1421207006@qq.com>
Date: Mon, 13 Jan 2025 16:36:12 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(cherry picked from commit 6c2978843bdb21db5a7bfc9723ab6620999eac4e)
---
 ruoyi-modules/guoyan-platform/pom.xml          |  9 ++++-----
 .../controller/WorkOrderInfoController.java    | 18 +++++++++---------
 .../dromara/platform/domain/WorkOrderInfo.java |  6 ++++++
 .../service/impl/WorkOrderInfoServiceImpl.java |  2 +-
 4 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/ruoyi-modules/guoyan-platform/pom.xml b/ruoyi-modules/guoyan-platform/pom.xml
index b24aeb9..9edfbae 100644
--- a/ruoyi-modules/guoyan-platform/pom.xml
+++ b/ruoyi-modules/guoyan-platform/pom.xml
@@ -103,12 +103,11 @@
             <groupId>org.dromara</groupId>
             <artifactId>ruoyi-demo</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-system</artifactId>
+        </dependency>
 
     </dependencies>
 
-    <properties>
-        <maven.compiler.source>17</maven.compiler.source>
-        <maven.compiler.target>17</maven.compiler.target>
-    </properties>
-
 </project>
diff --git a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/controller/WorkOrderInfoController.java b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/controller/WorkOrderInfoController.java
index 4c419f3..0bc4dbd 100644
--- a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/controller/WorkOrderInfoController.java
+++ b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/controller/WorkOrderInfoController.java
@@ -31,7 +31,7 @@ import org.dromara.common.mybatis.core.page.TableDataInfo;
 @Validated
 @RequiredArgsConstructor
 @RestController
-@RequestMapping("/platform/workorder")
+@RequestMapping("/platform/workOrder")
 public class WorkOrderInfoController extends BaseController {
 
     private final IWorkOrderInfoService workOrderInfoService;
@@ -39,7 +39,7 @@ public class WorkOrderInfoController extends BaseController {
     /**
      * 查询工单信息列表
      */
-    @SaCheckPermission("platform:workorder:list")
+    @SaCheckPermission("platform:workOrder:list")
     @GetMapping("/list")
     public TableDataInfo<WorkOrderInfoVo> list(WorkOrderInfoBo bo, PageQuery pageQuery) {
         return workOrderInfoService.queryPageList(bo, pageQuery);
@@ -48,7 +48,7 @@ public class WorkOrderInfoController extends BaseController {
     /**
      * 导出工单信息列表
      */
-    @SaCheckPermission("platform:workorder:export")
+    @SaCheckPermission("platform:workOrder:export")
     @Log(title = "工单信息", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(WorkOrderInfoBo bo, HttpServletResponse response) {
@@ -61,7 +61,7 @@ public class WorkOrderInfoController extends BaseController {
      *
      * @param id 主键
      */
-    @SaCheckPermission("platform:workorder:query")
+    @SaCheckPermission("platform:workOrder:query")
     @GetMapping("/{id}")
     public R<WorkOrderInfoVo> getInfo(@NotNull(message = "主键不能为空")
                                       @PathVariable String id) {
@@ -71,7 +71,7 @@ public class WorkOrderInfoController extends BaseController {
     /**
      * 新增工单信息
      */
-    @SaCheckPermission("platform:workorder:add")
+    @SaCheckPermission("platform:workOrder:add")
     @Log(title = "工单信息", businessType = BusinessType.INSERT)
     @RepeatSubmit()
     @PostMapping("/add")
@@ -82,11 +82,11 @@ public class WorkOrderInfoController extends BaseController {
     /**
      * 修改工单信息
      */
-    @SaCheckPermission("platform:workorder:edit")
+    @SaCheckPermission("platform:workOrder:edit")
     @Log(title = "工单信息", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
-    @PutMapping()
-    public R<Void> edit(@Validated(EditGroup.class) @RequestBody WorkOrderInfoBo bo) {
+    @PutMapping("/update")
+    public R<Void> edit(@RequestBody WorkOrderInfoBo bo) {
         return toAjax(workOrderInfoService.updateByBo(bo));
     }
 
@@ -95,7 +95,7 @@ public class WorkOrderInfoController extends BaseController {
      *
      * @param ids 主键串
      */
-    @SaCheckPermission("platform:workorder:remove")
+    @SaCheckPermission("platform:workOrder:remove")
     @Log(title = "工单信息", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
     public R<Void> remove(@NotEmpty(message = "主键不能为空")
diff --git a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/WorkOrderInfo.java b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/WorkOrderInfo.java
index 6c80d0a..e6c7a09 100644
--- a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/WorkOrderInfo.java
+++ b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/WorkOrderInfo.java
@@ -114,5 +114,11 @@ public class WorkOrderInfo extends TenantEntity {
      */
     private String longitude;
 
+    /**
+     * 删除标志（0代表存在 2代表删除）
+     */
+    @TableLogic
+    private String delFlag;
+
 
 }
diff --git a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/service/impl/WorkOrderInfoServiceImpl.java b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/service/impl/WorkOrderInfoServiceImpl.java
index e84e3f8..315990b 100644
--- a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/service/impl/WorkOrderInfoServiceImpl.java
+++ b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/service/impl/WorkOrderInfoServiceImpl.java
@@ -117,7 +117,7 @@ public class WorkOrderInfoServiceImpl implements IWorkOrderInfoService {
     @Override
     public Boolean updateByBo(WorkOrderInfoBo bo) {
         WorkOrderInfo update = MapstructUtils.convert(bo, WorkOrderInfo.class);
-        validEntityBeforeSave(update);
+        //validEntityBeforeSave(update);
         return baseMapper.updateById(update) > 0;
     }