From bfc9d5ca46948fbe0623211c030de200df04aba2 Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期五, 28 七月 2023 12:39:05 +0800
Subject: [PATCH] 删除任务查看时间和查看位置 增加任务详情打卡时间

---
 ard-work/src/main/java/com/ruoyi/app/task/controller/ArdAppTaskController.java |   40 ++++++++++++++++++++++++++++++++++------
 1 files changed, 34 insertions(+), 6 deletions(-)

diff --git a/ard-work/src/main/java/com/ruoyi/app/task/controller/ArdAppTaskController.java b/ard-work/src/main/java/com/ruoyi/app/task/controller/ArdAppTaskController.java
index b1cf439..3fc7278 100644
--- a/ard-work/src/main/java/com/ruoyi/app/task/controller/ArdAppTaskController.java
+++ b/ard-work/src/main/java/com/ruoyi/app/task/controller/ArdAppTaskController.java
@@ -6,7 +6,9 @@
 import com.alibaba.fastjson2.JSONObject;
 import com.ruoyi.alarm.steal.domain.ArdAlarmStealelec;
 import com.ruoyi.app.task.domain.ArdAppTaskDetail;
+import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.utils.spring.SpringUtils;
+import com.ruoyi.system.service.ISysUserService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.apache.catalina.security.SecurityUtil;
@@ -35,11 +37,13 @@
 public class ArdAppTaskController extends BaseController {
     @Autowired
     private IArdAppTaskService ardAppTaskService;
+    @Autowired
+    private ISysUserService sysUserService;
 
     /**
      * 鏌ヨapp浠诲姟绠＄悊鍒楄〃
      */
-    @ApiOperation("鏌ヨapp浠诲姟绠＄悊鍒楄〃")
+    @ApiOperation("鎸囨尌绔�-鍘嗗彶浠诲姟鏌ヨ")
     @PreAuthorize("@ss.hasPermi('app:task:list')")
     @GetMapping("/list")
     public TableDataInfo list(ArdAppTask ardAppTask) {
@@ -47,14 +51,23 @@
         List<ArdAppTask> list = ardAppTaskService.selectArdAppTaskList(ardAppTask);
         return getDataTable(list);
     }
-    @ApiOperation("鏌ヨapp浠诲姟绠＄悊鍒楄〃(璇︽儏)")
+
+    @ApiOperation("鍗曞叺绔� - 涓嬪彂缁欐垜鐨勪换鍔″垪琛�")
     @PreAuthorize("@ss.hasPermi('app:task:list')")
     @GetMapping("/listWithDetail")
     public TableDataInfo userlist(ArdAppTask ardAppTask) {
-        startPage();
         List<ArdAppTask> ardAppTasks = ardAppTaskService.selectArdAppTaskListWithDetail(ardAppTask);
         return getDataTable(ardAppTasks);
     }
+
+    @ApiOperation("鍗曞叺绔� - 涓嬪彂缁欐垜鐨勪换鍔¤鎯�")
+    @PreAuthorize("@ss.hasPermi('app:task:list')")
+    @GetMapping("/userDetailById")
+    public AjaxResult userDetail(ArdAppTask ardAppTask) {
+        List<ArdAppTask> ardAppTasks = ardAppTaskService.selectArdAppTaskListWithDetailById(ardAppTask);
+        return AjaxResult.success(ardAppTasks);
+    }
+
     /**
      * 瀵煎嚭app浠诲姟绠＄悊鍒楄〃
      */
@@ -70,7 +83,6 @@
     /**
      * 鑾峰彇app浠诲姟绠＄悊璇︾粏淇℃伅
      */
-    @ApiOperation("鑾峰彇app浠诲姟绠＄悊璇︾粏淇℃伅")
     @PreAuthorize("@ss.hasPermi('app:task:query')")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfoWithPic(@PathVariable("id") String id) {
@@ -80,7 +92,7 @@
     /**
      * 鏂板app浠诲姟绠＄悊
      */
-    @ApiOperation("鏂板app浠诲姟绠＄悊")
+    @ApiOperation("鎸囨尌绔�-涓嬪彂浠诲姟")
     @PreAuthorize("@ss.hasPermi('app:task:add')")
     @Log(title = "app浠诲姟绠＄悊", businessType = BusinessType.INSERT)
     @PostMapping
@@ -111,11 +123,27 @@
     /**
      * 鏇存柊app浠诲姟璇︽儏
      */
-    @ApiOperation("鏇存柊app浠诲姟璇︽儏(鎵撳崱)")
+    @ApiOperation("鍗曞叺绔�-浠诲姟鎵撳崱")
     @PreAuthorize("@ss.hasPermi('app:taskdetail:edit')")
     @Log(title = "鏇存柊app浠诲姟璇︽儏", businessType = BusinessType.UPDATE)
     @PutMapping("/detail")
     public AjaxResult editDetail(@RequestBody ArdAppTaskDetail ardAppTaskDetail) {
         return toAjax(ardAppTaskService.updateArdAppTaskDetail(ardAppTaskDetail));
     }
+    @ApiOperation("鍗曞叺绔�-浠诲姟鏌ョ湅")
+    @PreAuthorize("@ss.hasPermi('app:taskdetail:edit')")
+    @Log(title = "鍗曞叺绔�-浠诲姟鏌ョ湅", businessType = BusinessType.UPDATE)
+    @PutMapping("/detail/view")
+    public AjaxResult editDetailView(@RequestBody ArdAppTaskDetail ardAppTaskDetail) {
+        return toAjax(ardAppTaskService.updateArdAppTaskDetailView(ardAppTaskDetail));
+    }
+    /**
+     * 鑾峰彇app浠诲姟璇︽儏鐨勮缁嗕俊鎭�
+     */
+    @ApiOperation("鍗曞叺绔�-浠诲姟鐐硅鎯�")
+    @PreAuthorize("@ss.hasPermi('app:task:query')")
+    @GetMapping(value = "/detail/{id}")
+    public AjaxResult getTaskDetailInfo(@PathVariable("id") String id) {
+        return success(ardAppTaskService.selectArdAppTaskDetailById(id));
+    }
 }

--
Gitblit v1.9.3