Merge remote-tracking branch 'remotes/origin/dev'

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;
@@ -155,19 +152,14 @@ public class BaseGridDailyworkServiceImpl extends BaseServiceImpl<BaseGridDailyw
 
         Integer isKeyPeopleLocate = record.getIsKeyPeopleLocate();
         if (isKeyPeopleLocate != null){
-            String value = "";
+            entity.setIsKeyPeopleLocate(isKeyPeopleLocate == NumConstant.ONE ?"Y":"N");
-            if (NumConstant.ONE == isKeyPeopleLocate){
-                value = "Y";
-            }else if (NumConstant.ZERO == isKeyPeopleLocate){
-                value = "N";
-            }
-            entity.setIsKeyPeopleLocate(value);
         }
 
         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());

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.setUserId("loginUserUtil.getLoginUserId()");
-            entity.setCustomerId("45687aa479955f9d06204d415238f7cc");
+            //entity.setCustomerId("45687aa479955f9d06204d415238f7cc");
             baseDao.insert(entity);
 
             Result<List<DictTreeResultDTO>> mapResult = adminOpenFeignClient.dictTree(DictTypeEnum.PATROL_WORK_TYPE.getCode());