Merge remote-tracking branch 'origin/dev_ic_diaodong' into dev_ic_diaodong

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcUserChangeDetailedDTO.java

@@ -0,0 +1,137 @@
+/**
+ * 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.dto;
+
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+
+/**
+ * 变更明细表
+[一条变更记录对应多条人员类别数据]
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-01-14
+ */
+@Data
+public class IcUserChangeDetailedDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 唯一标识
+     */
+	private String id;
+
+    /**
+     * 客户Id
+     */
+	private String customerId;
+
+    /**
+     * 字段名【18类对应的ic_resi_user表字段名】
+     */
+	private String icUserChangeRecordId;
+
+    /**
+     * 组织Id
+     */
+	private String agencyId;
+
+    /**
+     * 网格Id
+     */
+	private String gridId;
+
+    /**
+     * 小区Id
+     */
+	private String neighborHoodId;
+
+    /**
+     * 楼栋Id
+     */
+	private String buildingId;
+
+    /**
+     * 单元Id
+     */
+	private String buildingUnitId;
+
+    /**
+     * 房屋Id
+     */
+	private String houseId;
+
+    /**
+     * 变更人Id
+     */
+	private String icUserId;
+
+    /**
+     * 操作类型【add:新增  category:类别变动   in:迁入 out:迁出】
+     */
+	private String type;
+
+    /**
+     * 操作类型名称【add:新增  category:类别变动   in:迁入 out:迁出】
+     */
+	private String typeName;
+
+    /**
+     * 字段名【18类对应的ic_resi_user表字段名】
+     */
+	private String fieldName;
+
+    /**
+     * 当前类别的值
+     */
+	private Integer value;
+
+    /**
+     * 删除标识
+     */
+	private String delFlag;
+
+    /**
+     * 乐观锁
+     */
+	private Integer revision;
+
+    /**
+     * 创建人
+     */
+	private String createdBy;
+
+    /**
+     * 创建时间
+     */
+	private Date createdTime;
+
+    /**
+     * 更新人
+     */
+	private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+	private Date updatedTime;
+
+}

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcUserChangeRecordDTO.java

@@ -0,0 +1,131 @@
+/**
+ * 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.dto;
+
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+
+/**
+ * 居民变更记录表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-01-14
+ */
+@Data
+public class IcUserChangeRecordDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 唯一标识
+     */
+	private String id;
+
+    /**
+     * 调动表Id【只有调动记录此列才有值】
+     */
+	private String icUserTransferRecordId;
+
+    /**
+     * 当前所属客户Id
+     */
+	private String customerId;
+
+    /**
+     * 操作人Id【customer_staff表userId】
+     */
+	private String operatorId;
+
+    /**
+     * 被操作人Id【ic_resi_user表id】
+     */
+	private String icUserId;
+
+    /**
+     * 操作人名称【customer_staff表real_name】
+     */
+	private String operatorName;
+
+    /**
+     * 被操作人名称【ic_resi_user表name】
+     */
+	private String icUserName;
+
+    /**
+     * 操作类型【add:新增  category:类别变动   transfer】
+     */
+	private String type;
+
+    /**
+     * 操作类型名称【add:新增  category:类别变动  transfer:迁出】
+     */
+	private String typeName;
+
+    /**
+     * 变更前文字描述
+     */
+	private String beforeChangeName;
+
+    /**
+     * 变更后文字描述
+     */
+	private String afterChangeName;
+
+    /**
+     * 调整时间
+     */
+	private Date changeTime;
+
+    /**
+     * 备注说明
+     */
+	private String remark;
+
+    /**
+     * 删除标识
+     */
+	private String delFlag;
+
+    /**
+     * 乐观锁
+     */
+	private Integer revision;
+
+    /**
+     * 创建人
+     */
+	private String createdBy;
+
+    /**
+     * 创建时间
+     */
+	private Date createdTime;
+
+    /**
+     * 更新人
+     */
+	private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+	private Date updatedTime;
+
+}

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcUserTransferRecordDTO.java

@@ -0,0 +1,231 @@
+/**
+ * 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.dto;
+
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+
+/**
+ * 居民调动记录表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-01-14
+ */
+@Data
+public class IcUserTransferRecordDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 唯一标识
+     */
+	private String id;
+
+    /**
+     * 被调动人Id【ic_resi_user表id】
+     */
+	private String icUserId;
+
+    /**
+     * 调动(工作)人员Id【customer_staff表userId】
+     */
+	private String operatorId;
+
+    /**
+     * 被调动人名称【ic_resi_user表name】
+     */
+	private String icUserName;
+
+    /**
+     * 调动(工作)人员名称【customer_staff表real_name】
+     */
+	private String operatorName;
+
+    /**
+     * 调动前客户Id
+     */
+	private String oldCustomerId;
+
+    /**
+     * 调动后客户Id
+     */
+	private String newCustomerId;
+
+    /**
+     * 调动前组织Id
+     */
+	private String oldAgencyId;
+
+    /**
+     * 调动后组织Id
+     */
+	private String newAgencyId;
+
+    /**
+     * 调动前组织名称
+     */
+	private String oldAgencyName;
+
+    /**
+     * 调动后组织名称
+     */
+	private String newAgencyName;
+
+    /**
+     * 调动前网格Id
+     */
+	private String oldGridId;
+
+    /**
+     * 调动后网格Id
+     */
+	private String newGridId;
+
+    /**
+     * 调动前网格名称
+     */
+	private String oldGridName;
+
+    /**
+     * 调动后网格名称
+     */
+	private String newGridName;
+
+    /**
+     * 调动前小区Id
+     */
+	private String oldNeighborHoodId;
+
+    /**
+     * 调动后小区Id
+     */
+	private String newNeighborHoodId;
+
+    /**
+     * 调动前小区名称
+     */
+	private String oldNeighborHoodName;
+
+    /**
+     * 调动后小区名称
+     */
+	private String newNeighborHoodName;
+
+    /**
+     * 调动前楼栋Id
+     */
+	private String oldBuildingId;
+
+    /**
+     * 调动后楼栋Id
+     */
+	private String newBuildingId;
+
+    /**
+     * 调动前楼栋名称
+     */
+	private String oldBuildingName;
+
+    /**
+     * 调动后楼栋名称
+     */
+	private String newBuildingName;
+
+    /**
+     * 调动前单元Id
+     */
+	private String oldBuildingUnitId;
+
+    /**
+     * 调动后单元Id
+     */
+	private String newBuildingUnitId;
+
+    /**
+     * 调动前单元名称
+     */
+	private String oldBuildingUnitName;
+
+    /**
+     * 调动后单元名称
+     */
+	private String newBuildingUnitName;
+
+    /**
+     * 调动前房屋Id
+     */
+	private String oldHouseId;
+
+    /**
+     * 调动后房屋Id
+     */
+	private String newHouseId;
+
+    /**
+     * 调动前房屋名称
+     */
+	private String oldHouseName;
+
+    /**
+     * 调动后房屋名称
+     */
+	private String newHouseName;
+
+    /**
+     * 调动时间
+     */
+	private Date transferTime;
+
+    /**
+     * 备注说明
+     */
+	private String remark;
+
+    /**
+     * 删除标识
+     */
+	private String delFlag;
+
+    /**
+     * 乐观锁
+     */
+	private Integer revision;
+
+    /**
+     * 创建人
+     */
+	private String createdBy;
+
+    /**
+     * 创建时间
+     */
+	private Date createdTime;
+
+    /**
+     * 更新人
+     */
+	private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+	private Date updatedTime;
+
+}

epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcUserChangeDetailedController.java

@@ -0,0 +1,41 @@
+/**
+ * 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.controller;
+
+import com.epmet.service.IcUserChangeDetailedService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+
+/**
+ * 变更明细表
+[一条变更记录对应多条人员类别数据]
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-01-14
+ */
+@RestController
+@RequestMapping("icuserchangedetailed")
+public class IcUserChangeDetailedController {
+    
+    @Autowired
+    private IcUserChangeDetailedService icUserChangeDetailedService;
+
+
+}

epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcUserChangeRecordController.java

@@ -0,0 +1,40 @@
+/**
+ * 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.controller;
+
+import com.epmet.service.IcUserChangeRecordService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+
+/**
+ * 居民变更记录表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-01-14
+ */
+@RestController
+@RequestMapping("icuserchangerecord")
+public class IcUserChangeRecordController {
+    
+    @Autowired
+    private IcUserChangeRecordService icUserChangeRecordService;
+
+
+}

epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcUserTransferRecordController.java

@@ -0,0 +1,40 @@
+/**
+ * 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.controller;
+
+import com.epmet.service.IcUserTransferRecordService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+
+/**
+ * 居民调动记录表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-01-14
+ */
+@RestController
+@RequestMapping("icusertransferrecord")
+public class IcUserTransferRecordController {
+    
+    @Autowired
+    private IcUserTransferRecordService icUserTransferRecordService;
+
+
+}

epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcUserChangeDetailedDao.java

@@ -0,0 +1,34 @@
+/**
+ * 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.dao;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.entity.IcUserChangeDetailedEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 变更明细表
+[一条变更记录对应多条人员类别数据]
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-01-14
+ */
+@Mapper
+public interface IcUserChangeDetailedDao extends BaseDao<IcUserChangeDetailedEntity> {
+	
+}

epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcUserChangeRecordDao.java

@@ -0,0 +1,33 @@
+/**
+ * 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.dao;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.entity.IcUserChangeRecordEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 居民变更记录表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-01-14
+ */
+@Mapper
+public interface IcUserChangeRecordDao extends BaseDao<IcUserChangeRecordEntity> {
+	
+}

epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcUserTransferRecordDao.java

@@ -0,0 +1,33 @@
+/**
+ * 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.dao;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.entity.IcUserTransferRecordEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 居民调动记录表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-01-14
+ */
+@Mapper
+public interface IcUserTransferRecordDao extends BaseDao<IcUserTransferRecordEntity> {
+	
+}

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

@@ -0,0 +1,104 @@
+/**
+ * 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;
+
+/**
+ * 变更明细表
+[一条变更记录对应多条人员类别数据]
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-01-14
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("ic_user_change_detailed")
+public class IcUserChangeDetailedEntity extends BaseEpmetEntity {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 客户Id
+     */
+	private String customerId;
+
+    /**
+     * 字段名【18类对应的ic_resi_user表字段名】
+     */
+	private String icUserChangeRecordId;
+
+    /**
+     * 组织Id
+     */
+	private String agencyId;
+
+    /**
+     * 网格Id
+     */
+	private String gridId;
+
+    /**
+     * 小区Id
+     */
+	private String neighborHoodId;
+
+    /**
+     * 楼栋Id
+     */
+	private String buildingId;
+
+    /**
+     * 单元Id
+     */
+	private String buildingUnitId;
+
+    /**
+     * 房屋Id
+     */
+	private String houseId;
+
+    /**
+     * 变更人Id
+     */
+	private String icUserId;
+
+    /**
+     * 操作类型【add:新增  category:类别变动   in:迁入 out:迁出】
+     */
+	private String type;
+
+    /**
+     * 操作类型名称【add:新增  category:类别变动   in:迁入 out:迁出】
+     */
+	private String typeName;
+
+    /**
+     * 字段名【18类对应的ic_resi_user表字段名】
+     */
+	private String fieldName;
+
+    /**
+     * 当前类别的值
+     */
+	private Integer value;
+
+}

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

@@ -0,0 +1,100 @@
+/**
+ * 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 2022-01-14
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("ic_user_change_record")
+public class IcUserChangeRecordEntity extends BaseEpmetEntity {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 调动表Id【只有调动记录此列才有值】
+     */
+	private String icUserTransferRecordId;
+
+    /**
+     * 当前所属客户Id
+     */
+	private String customerId;
+
+    /**
+     * 操作人Id【customer_staff表userId】
+     */
+	private String operatorId;
+
+    /**
+     * 被操作人Id【ic_resi_user表id】
+     */
+	private String icUserId;
+
+    /**
+     * 操作人名称【customer_staff表real_name】
+     */
+	private String operatorName;
+
+    /**
+     * 被操作人名称【ic_resi_user表name】
+     */
+	private String icUserName;
+
+    /**
+     * 操作类型【add:新增  category:类别变动   transfer】
+     */
+	private String type;
+
+    /**
+     * 操作类型名称【add:新增  category:类别变动  transfer:迁出】
+     */
+	private String typeName;
+
+    /**
+     * 变更前文字描述
+     */
+	private String beforeChangeName;
+
+    /**
+     * 变更后文字描述
+     */
+	private String afterChangeName;
+
+    /**
+     * 调整时间
+     */
+	private Date changeTime;
+
+    /**
+     * 备注说明
+     */
+	private String remark;
+
+}

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

@@ -0,0 +1,200 @@
+/**
+ * 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 2022-01-14
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("ic_user_transfer_record")
+public class IcUserTransferRecordEntity extends BaseEpmetEntity {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 被调动人Id【ic_resi_user表id】
+     */
+	private String icUserId;
+
+    /**
+     * 调动(工作)人员Id【customer_staff表userId】
+     */
+	private String operatorId;
+
+    /**
+     * 被调动人名称【ic_resi_user表name】
+     */
+	private String icUserName;
+
+    /**
+     * 调动(工作)人员名称【customer_staff表real_name】
+     */
+	private String operatorName;
+
+    /**
+     * 调动前客户Id
+     */
+	private String oldCustomerId;
+
+    /**
+     * 调动后客户Id
+     */
+	private String newCustomerId;
+
+    /**
+     * 调动前组织Id
+     */
+	private String oldAgencyId;
+
+    /**
+     * 调动后组织Id
+     */
+	private String newAgencyId;
+
+    /**
+     * 调动前组织名称
+     */
+	private String oldAgencyName;
+
+    /**
+     * 调动后组织名称
+     */
+	private String newAgencyName;
+
+    /**
+     * 调动前网格Id
+     */
+	private String oldGridId;
+
+    /**
+     * 调动后网格Id
+     */
+	private String newGridId;
+
+    /**
+     * 调动前网格名称
+     */
+	private String oldGridName;
+
+    /**
+     * 调动后网格名称
+     */
+	private String newGridName;
+
+    /**
+     * 调动前小区Id
+     */
+	private String oldNeighborHoodId;
+
+    /**
+     * 调动后小区Id
+     */
+	private String newNeighborHoodId;
+
+    /**
+     * 调动前小区名称
+     */
+	private String oldNeighborHoodName;
+
+    /**
+     * 调动后小区名称
+     */
+	private String newNeighborHoodName;
+
+    /**
+     * 调动前楼栋Id
+     */
+	private String oldBuildingId;
+
+    /**
+     * 调动后楼栋Id
+     */
+	private String newBuildingId;
+
+    /**
+     * 调动前楼栋名称
+     */
+	private String oldBuildingName;
+
+    /**
+     * 调动后楼栋名称
+     */
+	private String newBuildingName;
+
+    /**
+     * 调动前单元Id
+     */
+	private String oldBuildingUnitId;
+
+    /**
+     * 调动后单元Id
+     */
+	private String newBuildingUnitId;
+
+    /**
+     * 调动前单元名称
+     */
+	private String oldBuildingUnitName;
+
+    /**
+     * 调动后单元名称
+     */
+	private String newBuildingUnitName;
+
+    /**
+     * 调动前房屋Id
+     */
+	private String oldHouseId;
+
+    /**
+     * 调动后房屋Id
+     */
+	private String newHouseId;
+
+    /**
+     * 调动前房屋名称
+     */
+	private String oldHouseName;
+
+    /**
+     * 调动后房屋名称
+     */
+	private String newHouseName;
+
+    /**
+     * 调动时间
+     */
+	private Date transferTime;
+
+    /**
+     * 备注说明
+     */
+	private String remark;
+
+}

epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcUserChangeDetailedService.java

@@ -0,0 +1,32 @@
+/**
+ * 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.service;
+
+import com.epmet.commons.mybatis.service.BaseService;
+import com.epmet.entity.IcUserChangeDetailedEntity;
+
+/**
+ * 变更明细表
+[一条变更记录对应多条人员类别数据]
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-01-14
+ */
+public interface IcUserChangeDetailedService extends BaseService<IcUserChangeDetailedEntity> {
+
+}

epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcUserChangeRecordService.java

@@ -0,0 +1,31 @@
+/**
+ * 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.service;
+
+import com.epmet.commons.mybatis.service.BaseService;
+import com.epmet.entity.IcUserChangeRecordEntity;
+
+/**
+ * 居民变更记录表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-01-14
+ */
+public interface IcUserChangeRecordService extends BaseService<IcUserChangeRecordEntity> {
+
+}

epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcUserTransferRecordService.java

@@ -0,0 +1,31 @@
+/**
+ * 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.service;
+
+import com.epmet.commons.mybatis.service.BaseService;
+import com.epmet.entity.IcUserTransferRecordEntity;
+
+/**
+ * 居民调动记录表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-01-14
+ */
+public interface IcUserTransferRecordService extends BaseService<IcUserTransferRecordEntity> {
+
+}

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcUserChangeDetailedServiceImpl.java

@@ -0,0 +1,37 @@
+/**
+ * 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.service.impl;
+
+import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.dao.IcUserChangeDetailedDao;
+import com.epmet.entity.IcUserChangeDetailedEntity;
+import com.epmet.service.IcUserChangeDetailedService;
+import org.springframework.stereotype.Service;
+
+/**
+ * 变更明细表
+[一条变更记录对应多条人员类别数据]
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-01-14
+ */
+@Service
+public class IcUserChangeDetailedServiceImpl extends BaseServiceImpl<IcUserChangeDetailedDao, IcUserChangeDetailedEntity> implements IcUserChangeDetailedService {
+
+
+}

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcUserChangeRecordServiceImpl.java

@@ -0,0 +1,36 @@
+/**
+ * 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.service.impl;
+
+import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.dao.IcUserChangeRecordDao;
+import com.epmet.entity.IcUserChangeRecordEntity;
+import com.epmet.service.IcUserChangeRecordService;
+import org.springframework.stereotype.Service;
+
+/**
+ * 居民变更记录表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-01-14
+ */
+@Service
+public class IcUserChangeRecordServiceImpl extends BaseServiceImpl<IcUserChangeRecordDao, IcUserChangeRecordEntity> implements IcUserChangeRecordService {
+
+
+}

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcUserTransferRecordServiceImpl.java

@@ -0,0 +1,36 @@
+/**
+ * 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.service.impl;
+
+import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.dao.IcUserTransferRecordDao;
+import com.epmet.entity.IcUserTransferRecordEntity;
+import com.epmet.service.IcUserTransferRecordService;
+import org.springframework.stereotype.Service;
+
+/**
+ * 居民调动记录表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-01-14
+ */
+@Service
+public class IcUserTransferRecordServiceImpl extends BaseServiceImpl<IcUserTransferRecordDao, IcUserTransferRecordEntity> implements IcUserTransferRecordService {
+
+
+}

epmet-user/epmet-user-server/src/main/resources/mapper/IcUserChangeDetailedDao.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.epmet.dao.IcUserChangeDetailedDao">
+
+
+</mapper>

epmet-user/epmet-user-server/src/main/resources/mapper/IcUserChangeRecordDao.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.epmet.dao.IcUserChangeRecordDao">
+
+
+</mapper>

epmet-user/epmet-user-server/src/main/resources/mapper/IcUserTransferRecordDao.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.epmet.dao.IcUserTransferRecordDao">
+
+
+</mapper>