From b5dad7a41b22e4a19e68ab34ca5e28faba870186 Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Wed, 24 Nov 2021 09:19:02 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=20=E6=B7=BB=E5=8A=A0=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/epmet/dto/form/GetListSocietyOrgFormDTO.java     | 4 ++++
 .../java/com/epmet/controller/IcSocietyOrgController.java     | 1 +
 .../java/com/epmet/service/impl/IcSocietyOrgServiceImpl.java  | 2 ++
 .../src/main/resources/mapper/IcSocietyOrgDao.xml             | 3 +++
 .../main/java/com/epmet/dto/form/GetListPlaceOrgFormDTO.java  | 4 ++++
 .../com/epmet/dto/form/GetListPlacePatrolRecordFormDTO.java   | 4 ++++
 .../com/epmet/dto/form/GetListPlacePatrolTeamFormDTO.java     | 4 ++++
 .../main/java/com/epmet/controller/IcPlaceOrgController.java  | 1 +
 .../com/epmet/controller/IcPlacePatrolRecordController.java   | 1 +
 .../com/epmet/controller/IcPlacePatrolTeamController.java     | 1 +
 .../java/com/epmet/service/impl/IcPlaceOrgServiceImpl.java    | 2 ++
 .../epmet/service/impl/IcPlacePatrolRecordServiceImpl.java    | 2 ++
 .../com/epmet/service/impl/IcPlacePatrolTeamServiceImpl.java  | 2 ++
 .../src/main/resources/mapper/IcPlaceOrgDao.xml               | 3 +++
 .../src/main/resources/mapper/IcPlacePatrolRecordDao.xml      | 3 +++
 .../src/main/resources/mapper/IcPlacePatrolTeamDao.xml        | 3 +++
 16 files changed, 40 insertions(+)

diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/GetListSocietyOrgFormDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/GetListSocietyOrgFormDTO.java
index 48272aa6a6..72b328af78 100644
--- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/GetListSocietyOrgFormDTO.java
+++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/GetListSocietyOrgFormDTO.java
@@ -49,5 +49,9 @@ public class GetListSocietyOrgFormDTO implements Serializable {
     private Integer pageSize = 20;
     //token中客户Id
     private String customerId;
+    //token中userId
+    private String staffId;
+    //token中userId所属组织的pid
+    private String pids;
 
 }
\ No newline at end of file
diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcSocietyOrgController.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcSocietyOrgController.java
index 0b97210715..1ee342120d 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcSocietyOrgController.java
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcSocietyOrgController.java
@@ -92,6 +92,7 @@ public class IcSocietyOrgController {
     @PostMapping("getlist")
     public Result<GetListSocietyOrgResultDTO> getList(@LoginUser TokenDto tokenDto, @RequestBody GetListSocietyOrgFormDTO formDTO) {
         formDTO.setCustomerId(tokenDto.getCustomerId());
+        formDTO.setStaffId(tokenDto.getUserId());
         return new Result<GetListSocietyOrgResultDTO>().ok(societyOrgService.getList(formDTO));
     }
 
diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcSocietyOrgServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcSocietyOrgServiceImpl.java
index 2ad6055c20..2c18383a39 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcSocietyOrgServiceImpl.java
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcSocietyOrgServiceImpl.java
@@ -115,6 +115,8 @@ public class IcSocietyOrgServiceImpl extends BaseServiceImpl<IcSocietyOrgDao, Ic
     @Override
     public GetListSocietyOrgResultDTO getList(GetListSocietyOrgFormDTO formDTO) {
         GetListSocietyOrgResultDTO resultDTO = new GetListSocietyOrgResultDTO();
+        CustomerStaffInfoCacheResult staffInfoCache = CustomerStaffRedis.getStaffInfo(formDTO.getCustomerId(), formDTO.getStaffId());
+        formDTO.setPids(staffInfoCache.getAgencyPIds());
         //1.根据查询条件分页查询社会组织数据
         PageInfo<SocietyOrgListResultDTO> result =
                 PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize()).doSelectPageInfo(() -> baseDao.getList(formDTO));
diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcSocietyOrgDao.xml b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcSocietyOrgDao.xml
index a4685af4ce..530744c278 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcSocietyOrgDao.xml
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcSocietyOrgDao.xml
@@ -24,6 +24,9 @@
         <if test="customerId != null and customerId.trim() != ''">
             AND customer_id = #{customerId}
         </if>
+        <if test="pids != null and pids.trim() != ''">
+            AND pids LIKE CONCAT('%', #{pids}, '%')
+        </if>
         <if test="societyName != null and societyName.trim() != ''">
             AND society_name LIKE CONCAT('%', #{societyName}, '%')
         </if>
diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/GetListPlaceOrgFormDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/GetListPlaceOrgFormDTO.java
index c45a197ab8..1e7e26e85f 100644
--- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/GetListPlaceOrgFormDTO.java
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/GetListPlaceOrgFormDTO.java
@@ -52,5 +52,9 @@ public class GetListPlaceOrgFormDTO implements Serializable {
     private String customerId;
     //场所Id
     private String placeOrgId;
+    //token中userId
+    private String staffId;
+    //token中userId所属组织的pid
+    private String pids;
 
 }
\ No newline at end of file
diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/GetListPlacePatrolRecordFormDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/GetListPlacePatrolRecordFormDTO.java
index b839d432b6..479e81969d 100644
--- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/GetListPlacePatrolRecordFormDTO.java
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/GetListPlacePatrolRecordFormDTO.java
@@ -50,5 +50,9 @@ public class GetListPlacePatrolRecordFormDTO implements Serializable {
     private String customerId;
     //巡查记录Id
     private String placePatrolRecordId;
+    //token中userId
+    private String staffId;
+    //token中userId所属组织的pid
+    private String pids;
 
 }
\ No newline at end of file
diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/GetListPlacePatrolTeamFormDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/GetListPlacePatrolTeamFormDTO.java
index 4b01a8b484..c5ee8ceea8 100644
--- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/GetListPlacePatrolTeamFormDTO.java
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/GetListPlacePatrolTeamFormDTO.java
@@ -50,5 +50,9 @@ public class GetListPlacePatrolTeamFormDTO implements Serializable {
     private String customerId;
     //场所Id
     private String teamId;
+    //token中userId
+    private String staffId;
+    //token中userId所属组织的pid
+    private String pids;
 
 }
\ No newline at end of file
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcPlaceOrgController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcPlaceOrgController.java
index 238b6ed595..2d152c21c6 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcPlaceOrgController.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcPlaceOrgController.java
@@ -99,6 +99,7 @@ public class IcPlaceOrgController {
     @PostMapping("getlist")
     public Result<GetListPlaceOrgResultDTO> getList(@LoginUser TokenDto tokenDto, @RequestBody GetListPlaceOrgFormDTO formDTO) {
         formDTO.setCustomerId(tokenDto.getCustomerId());
+        formDTO.setStaffId(tokenDto.getUserId());
         return new Result<GetListPlaceOrgResultDTO>().ok(placeOrgService.getList(formDTO));
     }
 
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcPlacePatrolRecordController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcPlacePatrolRecordController.java
index 9ef1e21e5d..0d2c02a3d6 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcPlacePatrolRecordController.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcPlacePatrolRecordController.java
@@ -88,6 +88,7 @@ public class IcPlacePatrolRecordController {
     @PostMapping("getlist")
     public Result<GetListPlacePatrolRecordResultDTO> getList(@LoginUser TokenDto tokenDto, @RequestBody GetListPlacePatrolRecordFormDTO formDTO) {
         formDTO.setCustomerId(tokenDto.getCustomerId());
+        formDTO.setStaffId(tokenDto.getUserId());
         return new Result<GetListPlacePatrolRecordResultDTO>().ok(placePatrolRecordService.getList(formDTO));
     }
 
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcPlacePatrolTeamController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcPlacePatrolTeamController.java
index 815505c2e9..23013c9f02 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcPlacePatrolTeamController.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcPlacePatrolTeamController.java
@@ -101,6 +101,7 @@ public class IcPlacePatrolTeamController {
     @PostMapping("getlist")
     public Result<GetListPlacePatrolTeamResultDTO> getList(@LoginUser TokenDto tokenDto, @RequestBody GetListPlacePatrolTeamFormDTO formDTO) {
         formDTO.setCustomerId(tokenDto.getCustomerId());
+        formDTO.setStaffId(tokenDto.getUserId());
         return new Result<GetListPlacePatrolTeamResultDTO>().ok(placePatrolTeamService.getList(formDTO));
     }
 
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcPlaceOrgServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcPlaceOrgServiceImpl.java
index f3dbe0bf65..ffe5684be5 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcPlaceOrgServiceImpl.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcPlaceOrgServiceImpl.java
@@ -134,6 +134,8 @@ public class IcPlaceOrgServiceImpl extends BaseServiceImpl<IcPlaceOrgDao, IcPlac
     @Override
     public GetListPlaceOrgResultDTO getList(GetListPlaceOrgFormDTO formDTO) {
         GetListPlaceOrgResultDTO resultDTO = new GetListPlaceOrgResultDTO();
+        CustomerStaffInfoCacheResult staffInfoCache = CustomerStaffRedis.getStaffInfo(formDTO.getCustomerId(), formDTO.getStaffId());
+        formDTO.setPids(staffInfoCache.getAgencyPIds());
         //1.根据查询条件分页查询场所数据
         PageInfo<PlaceOrgDetailResultDTO> result =
                 PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize(), formDTO.getIsPage()).doSelectPageInfo(() -> baseDao.getList(formDTO));
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcPlacePatrolRecordServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcPlacePatrolRecordServiceImpl.java
index 7cbc07b966..2b205e9ae6 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcPlacePatrolRecordServiceImpl.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcPlacePatrolRecordServiceImpl.java
@@ -159,6 +159,8 @@ public class IcPlacePatrolRecordServiceImpl extends BaseServiceImpl<IcPlacePatro
     @Override
     public GetListPlacePatrolRecordResultDTO getList(GetListPlacePatrolRecordFormDTO formDTO) {
         GetListPlacePatrolRecordResultDTO resultDTO = new GetListPlacePatrolRecordResultDTO();
+        CustomerStaffInfoCacheResult staffInfoCache = CustomerStaffRedis.getStaffInfo(formDTO.getCustomerId(), formDTO.getStaffId());
+        formDTO.setPids(staffInfoCache.getAgencyPIds());
         //1.根据条件查询巡查记录数据
         PageInfo<PlacePatrolRecordDetailResultDTO> result =
                 PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize()).doSelectPageInfo(() -> baseDao.getList(formDTO));
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcPlacePatrolTeamServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcPlacePatrolTeamServiceImpl.java
index c3e5ff7fa5..b48d8a1bc2 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcPlacePatrolTeamServiceImpl.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcPlacePatrolTeamServiceImpl.java
@@ -202,6 +202,8 @@ public class IcPlacePatrolTeamServiceImpl extends BaseServiceImpl<IcPlacePatrolT
     @Override
     public GetListPlacePatrolTeamResultDTO getList(GetListPlacePatrolTeamFormDTO formDTO) {
         GetListPlacePatrolTeamResultDTO resultDTO = new GetListPlacePatrolTeamResultDTO();
+        CustomerStaffInfoCacheResult staffInfoCache = CustomerStaffRedis.getStaffInfo(formDTO.getCustomerId(), formDTO.getStaffId());
+        formDTO.setPids(staffInfoCache.getAgencyPIds());
         //1.根据条件查询分队及成员数据
         PageInfo<PlacePatrolTeamDetailResultDTO> result =
                 PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize(), formDTO.getIsPage()).doSelectPageInfo(() -> baseDao.getList(formDTO));
diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcPlaceOrgDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcPlaceOrgDao.xml
index 27514baefe..600a80ee7f 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcPlaceOrgDao.xml
+++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcPlaceOrgDao.xml
@@ -25,6 +25,9 @@
         <if test="customerId != null and customerId.trim() != ''">
             AND a.customer_id = #{customerId}
         </if>
+        <if test="pids != null and pids.trim() != ''">
+            AND a.pids LIKE CONCAT('%', #{pids}, '%')
+        </if>
         <if test="gridId != null and gridId.trim() != ''">
             AND a.grid_id = #{gridId}
         </if>
diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcPlacePatrolRecordDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcPlacePatrolRecordDao.xml
index 597a62e186..d0c33f3471 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcPlacePatrolRecordDao.xml
+++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcPlacePatrolRecordDao.xml
@@ -34,6 +34,9 @@
         <if test="customerId != null and customerId.trim() != ''">
             AND a.customer_id = #{customerId}
         </if>
+        <if test="pids != null and pids.trim() != ''">
+            AND a.pids LIKE CONCAT('%', #{pids}, '%')
+        </if>
         <if test="gridId != null and gridId.trim() != ''">
             AND a.grid_id = #{gridId}
         </if>
diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcPlacePatrolTeamDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcPlacePatrolTeamDao.xml
index a218d4f050..3475fce30b 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcPlacePatrolTeamDao.xml
+++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcPlacePatrolTeamDao.xml
@@ -27,6 +27,9 @@
         <if test="customerId != null and customerId.trim() != ''">
             AND customer_id = #{customerId}
         </if>
+        <if test="pids != null and pids.trim() != ''">
+            AND pids LIKE CONCAT('%', #{pids}, '%')
+        </if>
         <if test="gridId != null and gridId.trim() != ''">
             AND grid_ids LIKE CONCAT('%', #{gridId}, '%')
         </if>

From acf82ec7a26f558d535563d875258487034cab9e Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Wed, 24 Nov 2021 09:37:13 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=9C=8D=E5=8A=A1?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4=E6=A0=BC=E5=BC=8F=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/epmet/dto/result/demand/DemandRecResultDTO.java   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/demand/DemandRecResultDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/demand/DemandRecResultDTO.java
index 454bee4277..c2031ddb5a 100644
--- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/demand/DemandRecResultDTO.java
+++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/demand/DemandRecResultDTO.java
@@ -39,7 +39,7 @@ public class DemandRecResultDTO implements Serializable {
     private String demandUserMobile;
 
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
-    private String wantServiceTime;
+    private Date wantServiceTime;
 
     /**
      * 待处理：pending；已取消canceled；已派单：assigned；已接单：have_order；已完成：finished
@@ -56,6 +56,7 @@ public class DemandRecResultDTO implements Serializable {
     /**
      * 取消时间
      */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
     private Date cancelTime;
 
     /**