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

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/HouseChangeListFormDTO.java

@@ -0,0 +1,57 @@
+package com.epmet.dto.form;
+
+import com.epmet.commons.tools.dto.form.PageFormDTO;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * @DateTime 2022/5/10 13:34
+ * @DESC
+ */
+@Data
+public class HouseChangeListFormDTO extends PageFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 3650098822228397304L;
+
+    /**
+     * 网格ID
+     */
+    private String gridId;
+
+    /**
+     * 工作人员所属组织ID
+     */
+    private String agencyId;
+
+    /**
+     * 小区ID
+     */
+    private String neighborHoodId;
+
+    /**
+     * 楼栋ID
+     */
+    private String buildingId;
+
+    /**
+     * 楼栋单元ID
+     */
+    private String buildingUnitId;
+
+    /**
+     * 房屋ID
+     */
+    private String houseId;
+
+    /**
+     * 开始日期，eg：20220510
+     */
+    private String startDate;
+
+    /**
+     * 结束日期，eg：20220510
+     */
+    private String endDate;
+}

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/HouseChangeListResultDTO.java

@@ -0,0 +1,41 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * @DateTime 2022/5/10 13:42
+ * @DESC
+ */
+@Data
+public class HouseChangeListResultDTO implements Serializable {
+
+    private static final long serialVersionUID = 4501420202270980751L;
+
+    /**
+     * 所属网格
+     */
+    private String gridName;
+
+    /**
+     * 所属房屋
+     */
+    private String houseName;
+
+    /**
+     * 变更前
+     */
+    private String changeBefore;
+
+    /**
+     * 变更后
+     */
+    private String changeAfter;
+
+    /**
+     * 变更时间
+     */
+    private String changeTime;
+}

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcHouseChangeRecordController.java

@@ -1,7 +1,11 @@
 package com.epmet.controller;
 
+import com.epmet.commons.tools.annotation.LoginUser;
+import com.epmet.commons.tools.annotation.MaskResponse;
 import com.epmet.commons.tools.aop.NoRepeatSubmit;
+import com.epmet.commons.tools.dto.form.PageFormDTO;
 import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.AssertUtils;
 import com.epmet.commons.tools.validator.ValidatorUtils;
@@ -9,6 +13,7 @@ import com.epmet.commons.tools.validator.group.AddGroup;
 import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.commons.tools.validator.group.DefaultGroup;
 import com.epmet.dto.IcHouseChangeRecordDTO;
+import com.epmet.dto.form.HouseChangeListFormDTO;
 import com.epmet.service.IcHouseChangeRecordService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -67,4 +72,16 @@ public class IcHouseChangeRecordController {
         return new Result();
     }
 
+    /**
+     * Desc: 查询房屋变更记录
+     * @param tokenDto
+     * @param formDTO
+     * @author zxc
+     * @date 2022/5/10 14:32
+     */
+    @PostMapping("list")
+    public Result<PageData> list(@LoginUser TokenDto tokenDto,@RequestBody HouseChangeListFormDTO formDTO){
+        ValidatorUtils.validateEntity(formDTO, PageFormDTO.AddUserInternalGroup.class);
+        return new Result<PageData>().ok(icHouseChangeRecordService.list(tokenDto, formDTO));
+    }
 }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcHouseChangeRecordDao.java

@@ -1,9 +1,13 @@
 package com.epmet.dao;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.dto.form.HouseChangeListFormDTO;
+import com.epmet.dto.result.HouseChangeListResultDTO;
 import com.epmet.entity.IcHouseChangeRecordEntity;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 /**
  * 房屋变更记录表
  *
@@ -12,5 +16,13 @@ import org.apache.ibatis.annotations.Mapper;
  */
 @Mapper
 public interface IcHouseChangeRecordDao extends BaseDao<IcHouseChangeRecordEntity> {
-	
+
+    /**
+     * Desc: 获取房屋变更记录
+     * @param formDTO
+     * @author zxc
+     * @date 2022/5/10 14:22
+     */
+    List<HouseChangeListResultDTO> getHouseChangeList(HouseChangeListFormDTO formDTO);
+
 }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcHouseChangeRecordService.java

@@ -2,7 +2,9 @@ package com.epmet.service;
 
 import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.dto.IcHouseChangeRecordDTO;
+import com.epmet.dto.form.HouseChangeListFormDTO;
 import com.epmet.entity.IcHouseChangeRecordEntity;
 
 import java.util.List;
@@ -75,4 +77,13 @@ public interface IcHouseChangeRecordService extends BaseService<IcHouseChangeRec
      * @date 2022-05-09
      */
     void delete(String[] ids);
+
+    /**
+     * Desc: 查询房屋变更记录
+     * @param tokenDto
+     * @param formDTO
+     * @author zxc
+     * @date 2022/5/10 14:32
+     */
+    PageData list(TokenDto tokenDto, HouseChangeListFormDTO formDTO);
 }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcHouseChangeRecordServiceImpl.java

@@ -3,18 +3,28 @@ package com.epmet.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.constant.NumConstant;
+import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult;
+import com.epmet.commons.tools.exception.EpmetException;
 import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.redis.common.CustomerStaffRedis;
+import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.dao.IcHouseChangeRecordDao;
 import com.epmet.dto.IcHouseChangeRecordDTO;
+import com.epmet.dto.form.HouseChangeListFormDTO;
+import com.epmet.dto.result.HouseChangeListResultDTO;
 import com.epmet.entity.IcHouseChangeRecordEntity;
 import com.epmet.service.IcHouseChangeRecordService;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
@@ -80,4 +90,31 @@ public class IcHouseChangeRecordServiceImpl extends BaseServiceImpl<IcHouseChang
         baseDao.deleteBatchIds(Arrays.asList(ids));
     }
 
+    /**
+     * Desc: 查询房屋变更记录
+     * @param tokenDto
+     * @param formDTO
+     * @author zxc
+     * @date 2022/5/10 14:32
+     */
+    @Override
+    public PageData list(TokenDto tokenDto, HouseChangeListFormDTO formDTO) {
+        PageData<HouseChangeListResultDTO> pageData = new PageData<>(new ArrayList<>(), NumConstant.ZERO);
+        CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(tokenDto.getCustomerId(), tokenDto.getUserId());
+        if (null == staffInfo){
+            throw new EpmetException("未查询到此工作人员"+tokenDto.getUserId());
+        }
+        formDTO.setAgencyId(staffInfo.getAgencyId());
+        if (formDTO.getIsPage()){
+            PageInfo<HouseChangeListResultDTO> pageInfo = PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize()).doSelectPageInfo(() -> baseDao.getHouseChangeList(formDTO));
+            pageData.setList(pageInfo.getList());
+            pageData.setTotal(Integer.valueOf(String.valueOf(pageInfo.getTotal())));
+        }else {
+            List<HouseChangeListResultDTO> houseChangeList = baseDao.getHouseChangeList(formDTO);
+            pageData.setList(houseChangeList);
+            pageData.setTotal(houseChangeList.size());
+        }
+        return pageData;
+    }
+
 }

epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.19__house_change_record_and_detail.sql

@@ -0,0 +1,37 @@
+CREATE TABLE `ic_house_change_record` (
+  `ID` varchar(64) NOT NULL COMMENT 'ID',
+  `CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户ID',
+  `AGENCY_ID` varchar(64) NOT NULL COMMENT '组织ID',
+  `GRID_ID` varchar(64) NOT NULL COMMENT '网格ID',
+  `NEIGHBOR_HOOD_ID` varchar(64) NOT NULL COMMENT '小区ID',
+  `BUILDING_ID` varchar(64) NOT NULL COMMENT '楼栋ID',
+  `BUILDING_UNIT_ID` varchar(64) NOT NULL COMMENT '楼栋单元ID',
+  `HOUSE_ID` varchar(64) NOT NULL COMMENT '房屋ID',
+  `CHANGE_BEFORE` varchar(255) NOT NULL COMMENT '变更前',
+  `CHANGE_AFTER` varchar(255) NOT NULL COMMENT '变更后',
+  `PIDS` varchar(255) NOT NULL COMMENT '组织ID的所有上级',
+  `DEL_FLAG` int(11) NOT NULL,
+  `REVISION` int(11) NOT NULL COMMENT '乐观锁',
+  `CREATED_BY` varchar(32) NOT NULL COMMENT '创建人',
+  `CREATED_TIME` datetime NOT NULL COMMENT '创建时间',
+  `UPDATED_BY` varchar(32) NOT NULL COMMENT '更新人',
+  `UPDATED_TIME` datetime NOT NULL COMMENT '更新时间',
+  PRIMARY KEY (`ID`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='房屋变更记录表';
+
+CREATE TABLE `ic_house_change_detail` (
+  `ID` varchar(64) NOT NULL COMMENT 'ID',
+  `CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户id',
+  `RECORD_ID` varchar(64) NOT NULL COMMENT '记录ID',
+  `CHANGE_COL` varchar(64) NOT NULL COMMENT '变更字段，HOUSE_TYPE:房屋类型，PURPOSE:房屋用途，RENT_FLAG:房屋状态，OWNER_NAME:房主姓名，OWNER_PHONE:房主电话，OWNER_ID_CARD:房主身份证',
+  `CHANGE_BEFORE` varchar(255) NOT NULL COMMENT '变更前',
+  `CHANGE_AFTER` varchar(255) NOT NULL COMMENT '变更后',
+  `DEL_FLAG` int(1) NOT NULL,
+  `REVISION` int(11) NOT NULL COMMENT '乐观锁',
+  `CREATED_BY` varchar(32) NOT NULL COMMENT '创建人',
+  `CREATED_TIME` datetime NOT NULL COMMENT '创建时间',
+  `UPDATED_BY` varchar(32) NOT NULL COMMENT '更新人',
+  `UPDATED_TIME` datetime NOT NULL COMMENT '更新时间',
+  PRIMARY KEY (`ID`) USING BTREE,
+  KEY `recordId` (`RECORD_ID`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='房屋变更详情表';

epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseChangeRecordDao.xml

@@ -3,4 +3,44 @@
 
 <mapper namespace="com.epmet.dao.IcHouseChangeRecordDao">
 
+    <!-- 获取房屋变更记录 -->
+    <select id="getHouseChangeList" resultType="com.epmet.dto.result.HouseChangeListResultDTO">
+        SELECT
+            CONCAT(a.ORGANIZATION_NAME,'-',g.GRID_NAME) AS gridName,
+            CONCAT(h.NEIGHBOR_HOOD_NAME,'-',house.HOUSE_NAME) AS houseName,
+            change_after,
+            change_before,
+            DATE_FORMAT(r.CREATED_TIME,'%Y-%m-%d') AS changeTime
+        FROM ic_house_change_record r
+        LEFT JOIN customer_grid g ON (r.GRID_ID = g.ID AND g.DEL_FLAG = 0)
+        LEFT JOIN customer_agency a ON (g.PID = a.ID AND a.DEL_FLAG = '0')
+        INNER JOIN ic_neighbor_hood h ON (r.NEIGHBOR_HOOD_ID = h.ID AND h.DEL_FLAG = '0')
+        INNER JOIN ic_house house ON (house.ID = r.HOUSE_ID AND house.DEL_FLAG = '0')
+        WHERE r.DEL_FLAG = 0
+            <if test='null != startDate and startDate != "" '>
+                AND DATE_FORMAT(r.CREATED_TIME,'%Y%m%d') >= #{startDate}
+            </if>
+            <if test='null != endDate and endDate != "" '>
+                AND DATE_FORMAT(r.CREATED_TIME,'%Y%m%d') <![CDATA[<=]]> #{endDate}
+            </if>
+            <if test='null != houseId and houseId != "" '>
+                AND r.HOUSE_ID = #{houseId}
+            </if>
+            <if test='null != buildingUnitId and buildingUnitId != "" '>
+                AND r.BUILDING_UNIT_ID = #{buildingUnitId}
+            </if>
+            <if test='null != buildingId and buildingId != "" '>
+                AND r.BUILDING_ID = #{buildingId}
+            </if>
+            <if test='null != neighborHoodId and neighborHoodId != "" '>
+                AND r.NEIGHBOR_HOOD_ID = #{neighborHoodId}
+            </if>
+            <if test='null != gridId and gridId != "" '>
+                AND r.GRID_ID = #{gridId}
+            </if>
+            <if test='null != agencyId and agencyId != "" '>
+                AND CONCAT(r.PIDS,':',r.AGENCY_ID) LIKE CONCAT('%',#{agencyId},'%')
+            </if>
+        ORDER BY r.CREATED_TIME DESC,r.HOUSE_ID
+    </select>
 </mapper>