From c7450a8e1724528046af3683d49eaf0a06785130 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期五, 30 七月 2021 14:02:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test

---
 springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComSwPatrolRecordApi.java |  100 +++++++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 95 insertions(+), 5 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComSwPatrolRecordApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComSwPatrolRecordApi.java
index 89e57a2..025af16 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComSwPatrolRecordApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComSwPatrolRecordApi.java
@@ -1,17 +1,18 @@
 package com.panzhihua.applets.api;
 
 import com.panzhihua.common.controller.BaseController;
+import com.panzhihua.common.model.dtos.community.ComSwDangerReportRectifyDTO;
 import com.panzhihua.common.model.dtos.community.ComSwPatrolRecordAddDTO;
 import com.panzhihua.common.model.dtos.community.ComSwPatrolRecordPageDTO;
 import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.community.ComSwDangerReportVO;
+import com.panzhihua.common.model.vos.community.ComSwPatrolRecordVO;
+import com.panzhihua.common.model.vos.community.ComSwSafetyWorkRecordVO;
 import com.panzhihua.common.service.community.CommunityService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 
@@ -34,10 +35,13 @@
      * @param comSwPatrolRecordPageDTO 查询参数
      * @return 分页集合
      */
-    @ApiOperation(value = "分页查询巡查记录")
+    @ApiOperation(value = "分页查询巡查记录", response = ComSwPatrolRecordVO.class)
     @PostMapping("/pagePatrolRecord")
     public R pagePatrolRecord(@RequestBody ComSwPatrolRecordPageDTO comSwPatrolRecordPageDTO){
         Long communityId = this.getCommunityId();
+        if (comSwPatrolRecordPageDTO.getSelectPerson().equals(1)) {
+            comSwPatrolRecordPageDTO.setPatrolPerson(String.valueOf(this.getLoginUserInfo().getUserId()));
+        }
         comSwPatrolRecordPageDTO.setCommunityId(communityId);
         return communityService.pagePatrolRecord(comSwPatrolRecordPageDTO);
     }
@@ -55,5 +59,91 @@
         return communityService.addPatrolRecord(comSwPatrolRecordAddDTO);
     }
 
+    /**
+     * 根据巡查记录id查询详情
+     *
+     * @param patrolRecordId 巡查记录id
+     * @return 巡查记录详情查询结果
+     */
+    @ApiOperation(value = "根据巡查记录id查询详情", response = ComSwPatrolRecordVO.class)
+    @PostMapping("/detailPatrolRecord")
+    public R detailPatrolRecord(@RequestParam(value = "patrolRecordId") Long patrolRecordId) {
+        return communityService.detailPatrolRecord(patrolRecordId);
+    }
+
+    /**
+     * 分页查询安全工作记录
+     * @param comSwPatrolRecordPageDTO 查询参数
+     * @return 安全工作记录分页集合
+     */
+    @ApiOperation(value = "分页查询安全工作记录", response = ComSwSafetyWorkRecordVO.class)
+    @PostMapping("/pageSafetyWorkRecord")
+    public R pageSafetyWorkRecord(@RequestBody ComSwPatrolRecordPageDTO comSwPatrolRecordPageDTO){
+        Long communityId = this.getCommunityId();
+        comSwPatrolRecordPageDTO.setCommunityId(communityId);
+        return communityService.pageSafetyWorkRecord(comSwPatrolRecordPageDTO);
+    }
+
+    /**
+     * 根据安全工作记录id查询详情
+     *
+     * @param safetyWorkRecordId 安全工作记录
+     * @return 安全工作记录详情查询结果
+     */
+    @ApiOperation(value = "根据安全工作记录id查询详情", response = ComSwSafetyWorkRecordVO.class)
+    @PostMapping("/detailSafetyWorkRecord")
+    public R detailSafetyWorkRecord(@RequestParam(value = "safetyWorkRecordId") Long safetyWorkRecordId) {
+        return communityService.detailSafetyWorkRecord(safetyWorkRecordId);
+    }
+
+    /**
+     * 分页查询隐患报告
+     * @param comSwPatrolRecordPageDTO 查询参数
+     * @return 隐患报告分页集合
+     */
+    @ApiOperation(value = "分页查询隐患报告", response = ComSwDangerReportVO.class)
+    @PostMapping("/pageDangerReport")
+    public R pageDangerReport(@RequestBody ComSwPatrolRecordPageDTO comSwPatrolRecordPageDTO){
+        Long communityId = this.getCommunityId();
+        comSwPatrolRecordPageDTO.setCommunityId(communityId);
+        return communityService.pageDangerReport(comSwPatrolRecordPageDTO);
+    }
+
+    /**
+     * 根据隐患报告id查询详情
+     *
+     * @param dangerReportId 隐患报告id
+     * @return 隐患报告详情查询结果
+     */
+    @ApiOperation(value = "根据隐患报告id查询详情", response = ComSwDangerReportVO.class)
+    @PostMapping("/detailDangerReport")
+    public R detailDangerReport(@RequestParam(value = "dangerReportId") Long dangerReportId) {
+        return communityService.detailDangerReport(dangerReportId);
+    }
+
+    /**
+     * 根据巡查记录id查询隐患报告详情
+     *
+     * @param patrolRecordId 巡查记录id
+     * @return 隐患报告详情查询结果
+     */
+    @ApiOperation(value = "根据巡查记录id查询隐患报告详情", response = ComSwDangerReportVO.class)
+    @PostMapping("/detailDangerReportByPrId")
+    public R detailDangerReportByPrId(@RequestParam(value = "patrolRecordId") Long patrolRecordId) {
+        return communityService.detailDangerReportByPrId(patrolRecordId);
+    }
+
+    /**
+     * 整改隐患报告
+     *
+     * @param comSwDangerReportRectifyDTO 隐患报告整改参数
+     * @return 整改结果
+     */
+    @ApiOperation(value = "整改隐患报告")
+    @PostMapping("/rectifyDangerReport")
+    public R rectifyDangerReport(@RequestBody ComSwDangerReportRectifyDTO comSwDangerReportRectifyDTO){
+        return communityService.rectifyDangerReport(comSwDangerReportRectifyDTO);
+    }
+
 }
 

--
Gitblit v1.7.1