From 8a00ff6b8c02fe34aee7b40e04ba127817522e86 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Fri, 22 Jul 2022 16:12:15 +0800
Subject: [PATCH] =?UTF-8?q?user=E5=85=88=E6=8F=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/epmet/dto/result/PatrolRoutineWorkResult.java | 2 ++
 .../java/com/epmet/feign/EpmetUserOpenFeignClient.java     | 3 +++
 .../feign/fallback/EpmetUserOpenFeignClientFallback.java   | 5 +++++
 .../com/epmet/controller/PatrolRoutineWorkController.java  | 7 +++++++
 4 files changed, 17 insertions(+)

diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/PatrolRoutineWorkResult.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/PatrolRoutineWorkResult.java
index d0040279cb..ce558ef5c5 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/PatrolRoutineWorkResult.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/PatrolRoutineWorkResult.java
@@ -22,6 +22,8 @@ public class PatrolRoutineWorkResult implements Serializable {
     private String customerId;
 
     private String gridId;
+    private String gridCode;
+    private String gridName;
 
     private String title;
 
diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java
index 58cc398678..ff820d789f 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java
@@ -689,6 +689,9 @@ public interface EpmetUserOpenFeignClient {
     @PostMapping(value = "/epmetuser/patrolroutinework/selectList")
     Result<List<PatrolRoutineWorkResult>> getPatrolRoutineWorkList(@RequestBody PatrolQueryFormDTO patrolQueryFormDTO);
 
+    @PostMapping(value = "/epmetuser/patrolroutinework/selectListV2")
+    Result<List<PatrolRoutineWorkResult>> getPatrolRoutineWorkListV2(@RequestBody PatrolQueryFormDTO patrolQueryFormDTO);
+
     /**
      * 获取ic_resi_user
      * @param icResiUserId
diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java
index 906c1a3e85..3a24118447 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java
@@ -510,6 +510,11 @@ public class EpmetUserOpenFeignClientFallback implements EpmetUserOpenFeignClien
         return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "getPatrolRoutineWorkList", patrolQueryFormDTO);
     }
 
+    @Override
+    public Result<List<PatrolRoutineWorkResult>> getPatrolRoutineWorkListV2(PatrolQueryFormDTO patrolQueryFormDTO) {
+        return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "getPatrolRoutineWorkListV2", patrolQueryFormDTO);
+    }
+
     @Override
     public Result<IcResiUserDTO> getIcResiUserDTO(String icResiUserId) {
         return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "getIcResiUserDTO", icResiUserId);
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/PatrolRoutineWorkController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/PatrolRoutineWorkController.java
index f018a32789..d004630d41 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/PatrolRoutineWorkController.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/PatrolRoutineWorkController.java
@@ -47,6 +47,13 @@ public class PatrolRoutineWorkController {
         Page<PatrolRoutineWorkResult> data = gridUserWorkService.listPage(formDTO);
         return new Result().ok(data.getResult());
     }
+
+    @NoRepeatSubmit
+    @PostMapping("selectListV2")
+    public Result<List<PatrolRoutineWorkResult>> gridUserWorkV2(@RequestBody PatrolQueryFormDTO formDTO){
+        Page<PatrolRoutineWorkResult> data = gridUserWorkService.listPage(formDTO);
+        return new Result().ok(data.getResult());
+    }
     /**
      * @Description  添加例行工作
      * @param formDTO