From 177249c76aeea0b4bf8d8816d4994e3b445b45ce Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期四, 02 九月 2021 10:39:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/zzj' into zzj
---
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComSwPatrolRecordApi.java | 64 ++++++++++++++++++++-----------
1 files changed, 41 insertions(+), 23 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 47e348a..7976378 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,5 +1,9 @@
package com.panzhihua.applets.api;
+import javax.annotation.Resource;
+
+import org.springframework.web.bind.annotation.*;
+
import com.panzhihua.common.controller.BaseController;
import com.panzhihua.common.model.dtos.community.ComSwDangerReportRectifyDTO;
import com.panzhihua.common.model.dtos.community.ComSwPatrolRecordAddDTO;
@@ -10,12 +14,10 @@
import com.panzhihua.common.model.vos.community.ComSwSafetyWorkRecordVO;
import com.panzhihua.common.service.community.CommunityService;
import com.panzhihua.common.service.partybuilding.PartyBuildingService;
+
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
/**
* @auther txb
@@ -36,12 +38,14 @@
/**
* 分页查询巡查记录
- * @param comSwPatrolRecordPageDTO 查询参数
+ *
+ * @param comSwPatrolRecordPageDTO
+ * 查询参数
* @return 分页集合
*/
@ApiOperation(value = "分页查询巡查记录", response = ComSwPatrolRecordVO.class)
@PostMapping("/app/pagePatrolRecord")
- public R pagePatrolRecord(@RequestBody ComSwPatrolRecordPageDTO comSwPatrolRecordPageDTO){
+ public R pagePatrolRecord(@RequestBody ComSwPatrolRecordPageDTO comSwPatrolRecordPageDTO) {
Long communityId = this.getCommunityId();
if (!comSwPatrolRecordPageDTO.getSelectPerson().equals(1)) {
comSwPatrolRecordPageDTO.setPatrolPerson(String.valueOf(this.getLoginUserInfo().getPhone()));
@@ -52,12 +56,14 @@
/**
* 新增巡查记录
- * @param comSwPatrolRecordAddDTO 新增参数
+ *
+ * @param comSwPatrolRecordAddDTO
+ * 新增参数
* @return 新增结果
*/
@ApiOperation(value = "新增巡查记录")
@PostMapping("/app/addPatrolRecord")
- public R addPatrolRecord(@RequestBody ComSwPatrolRecordAddDTO comSwPatrolRecordAddDTO){
+ public R addPatrolRecord(@RequestBody ComSwPatrolRecordAddDTO comSwPatrolRecordAddDTO) {
Long communityId = this.getCommunityId();
comSwPatrolRecordAddDTO.setCommunityId(communityId);
comSwPatrolRecordAddDTO.setCreateBy(this.getUserId());
@@ -67,7 +73,8 @@
/**
* 根据巡查记录id查询详情
*
- * @param patrolRecordId 巡查记录id
+ * @param patrolRecordId
+ * 巡查记录id
* @return 巡查记录详情查询结果
*/
@ApiOperation(value = "根据巡查记录id查询详情", response = ComSwPatrolRecordVO.class)
@@ -78,12 +85,14 @@
/**
* 分页查询安全工作记录
- * @param comSwPatrolRecordPageDTO 查询参数
+ *
+ * @param comSwPatrolRecordPageDTO
+ * 查询参数
* @return 安全工作记录分页集合
*/
@ApiOperation(value = "分页查询安全工作记录", response = ComSwSafetyWorkRecordVO.class)
@PostMapping("/app/pageSafetyWorkRecord")
- public R pageSafetyWorkRecord(@RequestBody ComSwPatrolRecordPageDTO comSwPatrolRecordPageDTO){
+ public R pageSafetyWorkRecord(@RequestBody ComSwPatrolRecordPageDTO comSwPatrolRecordPageDTO) {
Long communityId = this.getCommunityId();
comSwPatrolRecordPageDTO.setCommunityId(communityId);
return communityService.pageSafetyWorkRecord(comSwPatrolRecordPageDTO);
@@ -92,7 +101,8 @@
/**
* 根据安全工作记录id查询详情
*
- * @param safetyWorkRecordId 安全工作记录
+ * @param safetyWorkRecordId
+ * 安全工作记录
* @return 安全工作记录详情查询结果
*/
@ApiOperation(value = "根据安全工作记录id查询详情", response = ComSwSafetyWorkRecordVO.class)
@@ -104,12 +114,14 @@
/**
* 分页查询隐患报告
- * @param comSwPatrolRecordPageDTO 查询参数
+ *
+ * @param comSwPatrolRecordPageDTO
+ * 查询参数
* @return 隐患报告分页集合
*/
@ApiOperation(value = "分页查询隐患报告", response = ComSwDangerReportVO.class)
@PostMapping("/app/pageDangerReport")
- public R pageDangerReport(@RequestBody ComSwPatrolRecordPageDTO comSwPatrolRecordPageDTO){
+ public R pageDangerReport(@RequestBody ComSwPatrolRecordPageDTO comSwPatrolRecordPageDTO) {
Long communityId = this.getCommunityId();
comSwPatrolRecordPageDTO.setCommunityId(communityId);
return communityService.pageDangerReport(comSwPatrolRecordPageDTO);
@@ -118,7 +130,8 @@
/**
* 根据隐患报告id查询详情
*
- * @param dangerReportId 隐患报告id
+ * @param dangerReportId
+ * 隐患报告id
* @return 隐患报告详情查询结果
*/
@ApiOperation(value = "根据隐患报告id查询详情", response = ComSwDangerReportVO.class)
@@ -130,7 +143,8 @@
/**
* 根据巡查记录id查询隐患报告详情
*
- * @param patrolRecordId 巡查记录id
+ * @param patrolRecordId
+ * 巡查记录id
* @return 隐患报告详情查询结果
*/
@ApiOperation(value = "根据巡查记录id查询隐患报告详情", response = ComSwDangerReportVO.class)
@@ -142,46 +156,50 @@
/**
* 整改隐患报告
*
- * @param comSwDangerReportRectifyDTO 隐患报告整改参数
+ * @param comSwDangerReportRectifyDTO
+ * 隐患报告整改参数
* @return 整改结果
*/
@ApiOperation(value = "整改隐患报告")
@PostMapping("/app/rectifyDangerReport")
- public R rectifyDangerReport(@RequestBody ComSwDangerReportRectifyDTO comSwDangerReportRectifyDTO){
+ public R rectifyDangerReport(@RequestBody ComSwDangerReportRectifyDTO comSwDangerReportRectifyDTO) {
return communityService.rectifyDangerReport(comSwDangerReportRectifyDTO);
}
/**
* 根据日期查询值班人员
+ *
* @return 查询结果
*/
@ApiOperation(value = "根据日期查询值班人员")
@GetMapping("/app/getRotaPersonByDate")
- public R getRotaPersonByDate(@RequestParam(value = "rotaDate") String rotaDate){
+ public R getRotaPersonByDate(@RequestParam(value = "rotaDate") String rotaDate) {
return communityService.getRotaPersonByDate(rotaDate);
}
/**
* 根据日期查询值班领导
+ *
* @return 查询结果
*/
@ApiOperation(value = "根据日期查询值班领导")
@GetMapping("/app/getRotaLeaderByDate")
- public R getRotaLeaderByDate(@RequestParam(value = "rotaDate") String rotaDate){
+ public R getRotaLeaderByDate(@RequestParam(value = "rotaDate") String rotaDate) {
return communityService.getRotaLeaderByDate(rotaDate);
}
/**
* 选择人员
- * @param param 查询条件
+ *
+ * @param param
+ * 查询条件
* @return 查询结果
*/
@ApiOperation(value = "选择人员")
@PostMapping("/app/getTotlePerson")
- public R getTotlePerson(@RequestParam(value = "param", required = false) String param){
+ public R getTotlePerson(@RequestParam(value = "param", required = false) String param) {
Long communityId = this.getLoginUserInfo().getCommunityId();
- return partyBuildingService.getTotlePerson(param,communityId);
+ return partyBuildingService.getTotlePerson(param, communityId);
}
}
-
--
Gitblit v1.7.1