From 69a561066510031ecfd0a3a9d09604934e5c16fd Mon Sep 17 00:00:00 2001
From: jianjun <jianjun4833@163.com>
Date: Fri, 24 Dec 2021 23:12:40 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=86=B0=E5=B1=B1=E4=B8=80=E8=A7=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/BaseGridDailyworkServiceImpl.java       | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/BaseGridDailyworkServiceImpl.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/BaseGridDailyworkServiceImpl.java
index 2f29c8d240..a5abd04f86 100644
--- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/BaseGridDailyworkServiceImpl.java
+++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/BaseGridDailyworkServiceImpl.java
@@ -155,19 +155,14 @@ public class BaseGridDailyworkServiceImpl extends BaseServiceImpl<BaseGridDailyw
 
         Integer isKeyPeopleLocate = record.getIsKeyPeopleLocate();
         if (isKeyPeopleLocate != null){
-            String value = "";
-            if (NumConstant.ONE == isKeyPeopleLocate){
-                value = "Y";
-            }else if (NumConstant.ZERO == isKeyPeopleLocate){
-                value = "N";
-            }
-            entity.setIsKeyPeopleLocate(value);
+            entity.setIsKeyPeopleLocate(isKeyPeopleLocate == NumConstant.ONE ?"Y":"N");
         }
 
         entity.setKeyPeopleStatus(record.getKeyPeopleStatus());
         entity.setHappenPlace(record.getAddress());
         entity.setLng(record.getLongitude());
         entity.setLat(record.getLatitude());
+        //即使是更新也不修改他们的状态
         //entity.setFlag(NumConstant.ZERO_STR);
         Integer userId = userMap.getOrDefault(record.getCreatedBy(), new ExUserDTO()).getUserId();
         entity.setCreateBy(userId == null?record.getCreatedBy():userId.toString());

From 83a5074c3f6555fcfd08ff3bec7cd0c17e115c28 Mon Sep 17 00:00:00 2001
From: jianjun <jianjun4833@163.com>
Date: Mon, 27 Dec 2021 15:38:30 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E9=94=99=E8=AF=AF=E9=94=99=E8=AF=AF=20?=
 =?UTF-8?q?=E7=AB=8B=E5=8D=B3=E4=B8=8A=E7=BA=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../opendata/service/impl/BaseGridDailyworkServiceImpl.java   | 3 ---
 .../com/epmet/service/impl/PatrolRoutineWorkServiceImpl.java  | 4 ++--
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/BaseGridDailyworkServiceImpl.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/BaseGridDailyworkServiceImpl.java
index a5abd04f86..b435a3ccc8 100644
--- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/BaseGridDailyworkServiceImpl.java
+++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/BaseGridDailyworkServiceImpl.java
@@ -35,7 +35,6 @@ import com.epmet.opendata.entity.BaseGridDailyworkEntity;
 import com.epmet.opendata.service.BaseGridDailyworkService;
 import com.epmet.opendata.service.ExDeptService;
 import com.epmet.opendata.service.ExUserService;
-import com.epmet.opendata.service.UserPatrolDetailService;
 import lombok.extern.slf4j.Slf4j;
 import org.jetbrains.annotations.NotNull;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -60,8 +59,6 @@ public class BaseGridDailyworkServiceImpl extends BaseServiceImpl<BaseGridDailyw
     @Autowired
     private EpmetUserOpenFeignClient epmetUserOpenFeignClient;
     @Autowired
-    private UserPatrolDetailService userPatrolDetailService;
-    @Autowired
     private ExDeptService exDeptService;
     @Autowired
     private ExUserService exUserService;
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/PatrolRoutineWorkServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/PatrolRoutineWorkServiceImpl.java
index f431272c8e..5512389278 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/PatrolRoutineWorkServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/PatrolRoutineWorkServiceImpl.java
@@ -107,8 +107,8 @@ public class PatrolRoutineWorkServiceImpl extends BaseServiceImpl<PatrolRoutineW
             entity.setUserId(loginUserUtil.getLoginUserId());
             entity.setCustomerId(loginUserUtil.getLoginUserCustomerId());
 
-            entity.setUserId("loginUserUtil.getLoginUserId()");
-            entity.setCustomerId("45687aa479955f9d06204d415238f7cc");
+            //entity.setUserId("loginUserUtil.getLoginUserId()");
+            //entity.setCustomerId("45687aa479955f9d06204d415238f7cc");
             baseDao.insert(entity);
 
             Result<List<DictTreeResultDTO>> mapResult = adminOpenFeignClient.dictTree(DictTypeEnum.PATROL_WORK_TYPE.getCode());