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

epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/BaseGridDailyworkEntity.java

@@ -103,12 +103,12 @@ public class BaseGridDailyworkEntity implements Serializable {
     /**
      * 重点人员是否在当地-当事件类型为【特殊人群服务与管理】时必填
      */
-	private String isKeyPeopleLocate;
+	private String isKeypeopleLocate;
 
     /**
      * 重点人员现状
      */
-	private String keyPeopleStatus;
+	private String keypeopleStatus;
 
     /**
      * 发生地

epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/BaseGridDailyworkServiceImpl.java

@@ -152,10 +152,10 @@ public class BaseGridDailyworkServiceImpl extends BaseServiceImpl<BaseGridDailyw
 
         Integer isKeyPeopleLocate = record.getIsKeyPeopleLocate();
         if (isKeyPeopleLocate != null){
-            entity.setIsKeyPeopleLocate(isKeyPeopleLocate == NumConstant.ONE ?"Y":"N");
+            entity.setIsKeypeopleLocate(isKeyPeopleLocate == NumConstant.ONE ?"Y":"N");
         }
 
-        entity.setKeyPeopleStatus(record.getKeyPeopleStatus());
+        entity.setKeypeopleStatus(record.getKeyPeopleStatus());
         entity.setHappenPlace(record.getAddress());
         entity.setLng(record.getLongitude());
         entity.setLat(record.getLatitude());

epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/BaseGridDailyworkDao.xml

@@ -17,8 +17,8 @@
         <result property="keyAreaType" column="KEY_AREA_TYPE"/>
         <result property="regionScale" column="REGION_SCALE"/>
         <result property="isKeyareaState" column="IS_KEYAREA_STATE"/>
-        <result property="isKeyPeopleLocate" column="IS_KEY_PEOPLE_LOCATE"/>
+        <result property="isKeypeopleLocate" column="IS_KEY_PEOPLE_LOCATE"/>
-        <result property="keyPeopleStatus" column="KEY_PEOPLE_STATUS"/>
+        <result property="keypeopleStatus" column="KEY_PEOPLE_STATUS"/>
         <result property="happenPlace" column="HAPPEN_PLACE"/>
         <result property="lng" column="LNG"/>
         <result property="lat" column="LAT"/>

epmet-user/epmet-user-server/src/main/java/com/epmet/entity/GridUserWorkEntity.java

@@ -1,90 +0,0 @@
-/**
- * Copyright 2018 人人开源 https://www.renren.io
- * <p>
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * <p>
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * <p>
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package com.epmet.entity;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-
-import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.util.Date;
-
-/**
- * 网格员例行工作
- *
- * @author generator generator@elink-cn.com
- * @since v1.0.0 2021-10-19
- */
-@Data
-@EqualsAndHashCode(callSuper=false)
-@TableName("patrol_routine_work")
-public class GridUserWorkEntity extends BaseEpmetEntity {
-
-	private static final long serialVersionUID = 1L;
-
-    /**
-     * 客户ID
-     */
-	private String customerId;
-
-    /**
-     * 网格ID
-     */
-	private String gridId;
-
-    /**
-     * gridId的PID
-     */
-	private String pids;
-
-	/**
-	 * 用户Id user.id 谁创建的
-	 */
-	private String userId;
-
-	/**
-	 * 事项名称
-	 */
-	private String title;
-
-    /**
-     * 发生日期 格式为“YYYY-MM-DD”
-     */
-	private Date happenTime;
-
-    /**
-     * 有无变动（异常）1：是、0：否
-     */
-	private Integer isNormal;
-
-    /**
-     * 备注说明
-     */
-	private String workContent;
-
-	/**
-	 * 经度
-	 */
-	private String longitude;
-	/**
-	 * 纬度
-	 */
-	private String latitude;
-
-}