From 56e2dc02ca5f4cf38308f8a1389322639f89e99e Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期四, 17 十一月 2022 16:01:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComSwPatrolRecordApi.java | 6 ++++--
1 files changed, 4 insertions(+), 2 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 7976378..9e0e17e 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
@@ -51,6 +51,7 @@
comSwPatrolRecordPageDTO.setPatrolPerson(String.valueOf(this.getLoginUserInfo().getPhone()));
}
comSwPatrolRecordPageDTO.setCommunityId(communityId);
+ comSwPatrolRecordPageDTO.setAreaCode(this.getAreaCode());
return communityService.pagePatrolRecord(comSwPatrolRecordPageDTO);
}
@@ -124,6 +125,7 @@
public R pageDangerReport(@RequestBody ComSwPatrolRecordPageDTO comSwPatrolRecordPageDTO) {
Long communityId = this.getCommunityId();
comSwPatrolRecordPageDTO.setCommunityId(communityId);
+ comSwPatrolRecordPageDTO.setAreaCode(this.getAreaCode());
return communityService.pageDangerReport(comSwPatrolRecordPageDTO);
}
@@ -174,7 +176,7 @@
@ApiOperation(value = "根据日期查询值班人员")
@GetMapping("/app/getRotaPersonByDate")
public R getRotaPersonByDate(@RequestParam(value = "rotaDate") String rotaDate) {
- return communityService.getRotaPersonByDate(rotaDate);
+ return communityService.getRotaPersonByDate(rotaDate,this.getCommunityId());
}
/**
@@ -185,7 +187,7 @@
@ApiOperation(value = "根据日期查询值班领导")
@GetMapping("/app/getRotaLeaderByDate")
public R getRotaLeaderByDate(@RequestParam(value = "rotaDate") String rotaDate) {
- return communityService.getRotaLeaderByDate(rotaDate);
+ return communityService.getRotaLeaderByDate(rotaDate,this.getCommunityId());
}
/**
--
Gitblit v1.7.1