Merge branch 'develop' into release_temp

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

@@ -68,7 +68,7 @@ public class ImportGeneralDTO implements Serializable {
     /**
      * 单元号、ID
      */
-    private Integer buildingUnit;
+    private String buildingUnit;
     private String buildingUnitId;
 
     /**

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/HouseErrorInfoModel.java

@@ -13,6 +13,9 @@ import org.hibernate.validator.constraints.Length;
 @Data
 public class HouseErrorInfoModel {
 
+    @Excel(name = "行号", width = 10)
+    private Integer num;
+
     @Excel(name = "所属小区", width = 20)
     private String neighborHoodName;
 

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/HouseInfoModel.java

@@ -1,5 +1,6 @@
 package com.epmet.model;
 
+import com.alibaba.excel.annotation.ExcelIgnore;
 import com.alibaba.excel.annotation.ExcelProperty;
 import lombok.Data;
 import org.hibernate.validator.constraints.Length;
@@ -26,7 +27,7 @@ public class HouseInfoModel {
     private String buildingName;
 
     @ExcelProperty(value = "单元号")
-    private Integer buildingUnit;
+    private String buildingUnit;
 
     @ExcelProperty(value = "门牌号")
     private String doorName;
@@ -49,4 +50,7 @@ public class HouseInfoModel {
     @ExcelProperty(value = "房主身份证")
     private String ownerIdCard;
 
+    @ExcelIgnore
+    private Integer num;
+
 }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportHouseInfoListener.java

@@ -96,6 +96,7 @@ public class ImportHouseInfoListener extends AnalysisEventListener<HouseInfoMode
         ImportGeneralDTO dto = ConvertUtils.sourceToTarget(data, ImportGeneralDTO.class);
         dto.setNum(num);
         dto.setCustomerId(formDTO.getCustomerId());
+        info.setNum(num);
         if(StringUtils.isBlank(data.getAgencyName())){
             nums.add(num);
             disposeErrorMsg(info, "所属组织的值未填写");
@@ -136,7 +137,10 @@ public class ImportHouseInfoListener extends AnalysisEventListener<HouseInfoMode
             disposeErrorMsg(info, "门牌号的值未填写");
             return;
         }
-        if(null == data.getBuildingUnit()){
+        /**
+         * 2022-03-29 需求改动，单元号修改 eg 1 改为 1单元
+         */
+        if(StringUtils.isBlank(data.getBuildingUnit())){
             nums.add(num);
             disposeErrorMsg(info, "单元号的值未填写");
             return;

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

@@ -148,7 +148,7 @@ public class IcBuildingUnitServiceImpl extends BaseServiceImpl<IcBuildingUnitDao
     public IcBuildingUnitDTO getUnitInfo(String buildingId, String unitName) {
         LambdaQueryWrapper<IcBuildingUnitEntity> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(IcBuildingUnitEntity::getBuildingId, buildingId);
-        wrapper.eq(IcBuildingUnitEntity::getUnitNum, unitName);
+        wrapper.eq(IcBuildingUnitEntity::getUnitName, unitName);
         IcBuildingUnitEntity entity = baseDao.selectOne(wrapper);
         return ConvertUtils.sourceToTarget(entity, IcBuildingUnitDTO.class);
     }

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

@@ -528,7 +528,7 @@ public class IcNeighborHoodServiceImpl extends BaseServiceImpl<IcNeighborHoodDao
                     item.setBuildingId(buildingId);
                 }
                 //3.获取单元ID，判断单元是否存在，不存在则添加单元，存在则直接获取单元ID
-                if (null != item.getBuildingUnit()) {
+                if (StringUtils.isNotBlank(item.getBuildingUnit())) {
                     String unitId = getUnitId(formDTO.getCustomerId(), item);
                     item.setBuildingUnitId(unitId);
                 }
@@ -537,7 +537,7 @@ public class IcNeighborHoodServiceImpl extends BaseServiceImpl<IcNeighborHoodDao
                 String buildingId = getBuildingId(formDTO.getCustomerId(), item);
                 item.setBuildingId(buildingId);
                 //获取单元ID，判断单元是否存在，不存在则添加单元，存在则直接获取单元ID
-                if (null != item.getBuildingUnit()) {
+                if (StringUtils.isNotBlank(item.getBuildingUnit())) {
                     String unitId = getUnitId(formDTO.getCustomerId(), item);
                     item.setBuildingUnitId(unitId);
                 }
@@ -630,7 +630,10 @@ public class IcNeighborHoodServiceImpl extends BaseServiceImpl<IcNeighborHoodDao
      */
     private String getUnitId(String customerId, ImportGeneralDTO info) {
         //根据楼栋ID和单元名获取单元信息
-        IcBuildingUnitDTO unit = icBuildingUnitService.getUnitInfo(info.getBuildingId(), String.valueOf(info.getBuildingUnit()));
+        /**
+         * 2022-03-29 需求改动，单元号修改 eg 1 改为 1单元
+         */
+        IcBuildingUnitDTO unit = icBuildingUnitService.getUnitInfo(info.getBuildingId(), info.getBuildingUnit());
         if (null != unit) {
             return unit.getId();
         }
@@ -638,8 +641,8 @@ public class IcNeighborHoodServiceImpl extends BaseServiceImpl<IcNeighborHoodDao
         IcBuildingUnitEntity unitEntity = new IcBuildingUnitEntity();
         unitEntity.setCustomerId(customerId);
         unitEntity.setBuildingId(info.getBuildingId());
-        unitEntity.setUnitName(info.getBuildingUnit() +"单元");
-        unitEntity.setUnitNum(String.valueOf(info.getBuildingUnit()));
+        unitEntity.setUnitName(info.getBuildingUnit());
+        unitEntity.setUnitNum(info.getBuildingUnit().replace("单元",""));
         icBuildingUnitService.insert(unitEntity);
 
         return unitEntity.getId();

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

@@ -294,7 +294,7 @@
     <select id="selectAllBuildingUnitByBuildingId" resultType="com.epmet.dto.ImportGeneralDTO">
         SELECT
             u.ID AS buildingUnitId,
-            u.UNIT_NUM AS buildingUnit,
+            u.UNIT_NAME AS buildingUnit,
             u.BUILDING_ID,b.NEIGHBOR_HOOD_ID
         FROM ic_building_unit u
          INNER JOIN ic_building b ON (b.ID = u.BUILDING_ID AND b.DEL_FLAG = '0')

epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.28__ic_nat.sql

@@ -44,4 +44,57 @@ CREATE TABLE `ic_notice` (
   `UPDATED_BY` varchar(32) NOT NULL COMMENT '更新人',
   `UPDATED_TIME` datetime NOT NULL COMMENT '更新时间',
   PRIMARY KEY (`ID`) USING BTREE
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=COMPACT COMMENT='防疫通知';
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=COMPACT COMMENT='防疫通知';
+
+
+
+CREATE TABLE `ic_follow_up_record` (
+  `ID` varchar(64) NOT NULL COMMENT '主键ID',
+  `CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户Id',
+  `NAME` varchar(64) NOT NULL COMMENT '姓名',
+  `MOBILE` varchar(11) NOT NULL COMMENT '手机号',
+  `ID_CARD` varchar(18) NOT NULL COMMENT '身份证号',
+  `ORIGIN` varchar(1) NOT NULL COMMENT '0行程上报，1疫苗接种，2核酸检测',
+  `VISIT_TIME` datetime NOT NULL COMMENT '随访时间',
+  `CONTENT` varchar(1024) NOT NULL COMMENT '随访内容',
+  `DEL_FLAG` varchar(1) NOT NULL DEFAULT '0' COMMENT '删除标识 1删除；0未删除',
+  `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 '更新时间',
+  `AGENCY_ID` varchar(64) NOT NULL COMMENT '工作人员所属组织id',
+  PRIMARY KEY (`ID`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='随访记录表';
+
+-- ----------------------------
+-- Table structure for ic_trip_report_record
+-- ----------------------------
+
+CREATE TABLE `ic_trip_report_record` (
+  `ID` varchar(64) NOT NULL COMMENT '主键ID',
+  `GRID_ID` varchar(64) DEFAULT NULL COMMENT '居民端用户所在网格id,数字社区居民所属网格id',
+  `AGENCY_ID` varchar(32) NOT NULL COMMENT '居民端上报的：存储用户所在网格的组织id;\n从居民信息录入的：存储居民所属网格的组织id;\n单独新增和导入的存储的登录用户所属的组织id;',
+  `PIDS` varchar(255) NOT NULL COMMENT 'agency_id的所有上级',
+  `CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户Id',
+  `NAME` varchar(64) NOT NULL COMMENT '姓名',
+  `MOBILE` varchar(11) NOT NULL COMMENT '手机号',
+  `ID_CARD` varchar(18) NOT NULL COMMENT '身份证号',
+  `USER_ID` varchar(64) DEFAULT NULL COMMENT '居民端小程序的用户id;数字社区的icResiUserId;其他情况暂时不存储',
+  `USER_TYPE` varchar(32) NOT NULL COMMENT '居民端小程序的人：resi;数字社区的居民：icresi;未关联上的：other',
+  `PRESENT_ADDRESS_CODE` varchar(32) NOT NULL COMMENT '现居地编码',
+  `PRESENT_ADDRESS` varchar(255) NOT NULL COMMENT '现居地名称eg:山东省青岛市黄岛区玫瑰山路社区',
+  `DETAIL_ADDRESS` varchar(255) NOT NULL COMMENT '详细地址',
+  `SOURCE_ADDRESS_CODE` varchar(32) NOT NULL COMMENT '来源地区编码',
+  `SOURCE_ADDRESS` varchar(255) NOT NULL COMMENT '来源地区地址',
+  `ARRIVE_DATE` date NOT NULL COMMENT '到达日期',
+  `LEAVE_DATE` date DEFAULT NULL COMMENT '离开日期',
+  `REMARK` varchar(512) DEFAULT NULL COMMENT '备注信息',
+  `DEL_FLAG` varchar(1) NOT NULL DEFAULT '0' COMMENT '删除标识 1删除；0未删除',
+  `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
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='行程上报信息';