Merge branch 'dev_epidemic_situation' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_epidemic_situation

epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/service/impl/ImportTaskServiceImpl.java

@@ -98,7 +98,7 @@ public class ImportTaskServiceImpl implements ImportTaskService {
         LambdaQueryWrapper<ImportTaskEntity> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(ImportTaskEntity::getOperatorId,param.getOperatorId())
                 .orderByDesc(ImportTaskEntity::getStartTime);
-        Page<ImportTaskEntity> page = PageHelper.startPage(param.getPageNo(), param.getPageSize(), param.isPage()).doSelectPage(() -> {
+        Page<ImportTaskEntity> page = PageHelper.startPage(param.getPageNo(), param.getPageSize(), param.getIsPage()).doSelectPage(() -> {
             importRecordDao.selectList(queryWrapper);
         });
         List<ImportTaskCommonResultDTO> list = new ArrayList<>();

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

@@ -169,7 +169,7 @@ public class IcEpidemicSpecialAttentionController {
         ValidatorUtils.validateEntity(formDTO, PageFormDTO.AddUserInternalGroup.class);
         formDTO.setCustomerId(tokenDto.getCustomerId());
         formDTO.setUserId(tokenDto.getUserId());
-        formDTO.setPage(false);
+        formDTO.setIsPage(false);
         PageData pageData = icEpidemicSpecialAttentionService.vaccinationList(formDTO);
         // 关注类型，核酸检测：2，疫苗接种：1，行程上报：0
         if (formDTO.getAttentionType().equals(NumConstant.ONE)){

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

@@ -105,7 +105,7 @@ public class IcFollowUpRecordController {
     public void export(@LoginUser TokenDto tokenDto, @RequestBody PageFollowUpFormDTO formDTO, HttpServletResponse response) {
         formDTO.setCustomerId(tokenDto.getCustomerId());
         //formDTO.setCustomerId("45687aa479955f9d06204d415238f7cc");
-        formDTO.setPage(false);
+        formDTO.setIsPage(false);
 
         ExcelWriter excelWriter = null;
         formDTO.setPageSize(NumConstant.TEN_THOUSAND);

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

@@ -260,7 +260,7 @@ public class IcNatController implements ResultDataResolver {
         //formDTO.setCustomerId("45687aa479955f9d06204d415238f7cc");
         //formDTO.setUserId("73ae6280e46a6653a5605d51d5462725");
 
-        formDTO.setPage(false);
+        formDTO.setIsPage(false);
 
         ExcelWriter excelWriter = null;
         formDTO.setPageSize(NumConstant.TEN_THOUSAND);

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

@@ -92,7 +92,7 @@ public class IcResiCollectController {
         //tokenDto.setCustomerId("45687aa479955f9d06204d415238f7cc");
         formDTO.setUserId(tokenDto.getUserId());
         formDTO.setCustomerId(tokenDto.getCustomerId());
-        formDTO.setPage(false);
+        formDTO.setIsPage(false);
         PageData<CollectListResultDTO> collectList = icResiCollectService.getCollectList(formDTO);
         List<CollectListExcelResultDTO> list =new ArrayList<>();
 

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

@@ -194,7 +194,7 @@ public class IcTripReportRecordController implements ResultDataResolver {
         formDTO.setUserId(tokenDto.getUserId());
         // formDTO.setCustomerId("45687aa479955f9d06204d415238f7cc");
         // formDTO.setUserId("35005df15fb0f7c791344f0b424870b7");
-        formDTO.setPage(false);
+        formDTO.setIsPage(false);
         ExcelWriter excelWriter = null;
         formDTO.setPageSize(NumConstant.TEN_THOUSAND);
         int pageNo = formDTO.getPageNo();

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

@@ -43,7 +43,7 @@ public class PatrolRoutineWorkController {
     @NoRepeatSubmit
     @PostMapping("selectList")
     public Result<List<PatrolRoutineWorkResult>> gridUserWork(@RequestBody PatrolQueryFormDTO formDTO){
-        formDTO.setPage(false);
+        formDTO.setIsPage(false);
         Page<PatrolRoutineWorkResult> data = gridUserWorkService.listPage(formDTO);
         return new Result().ok(data.getResult());
     }

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

@@ -140,7 +140,7 @@ public class IcEpidemicSpecialAttentionServiceImpl extends BaseServiceImpl<IcEpi
         formDTO.setOrgId(staffInfo.getAgencyId());
         // 关注类型，核酸检测：2，疫苗接种：1，行程上报：0
         if (formDTO.getAttentionType().equals(NumConstant.ONE)){
-            if (formDTO.isPage()){
+            if (formDTO.getIsPage()){
                 PageInfo<VaccinationListResultDTO> pageInfo = PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize()).doSelectPageInfo(() -> baseDao.vaccinationList(formDTO));
                 result.setList(pageInfo.getList());
                 result.setTotal(Integer.valueOf(String.valueOf(pageInfo.getTotal())));
@@ -150,7 +150,7 @@ public class IcEpidemicSpecialAttentionServiceImpl extends BaseServiceImpl<IcEpi
                 result.setTotal(list.size());
             }
         }else if (formDTO.getAttentionType().equals(NumConstant.TWO)){
-            if (formDTO.isPage()){
+            if (formDTO.getIsPage()){
                 PageInfo<VaccinationListResultDTO> pageInfo = PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize()).doSelectPageInfo(() -> baseDao.natList(formDTO));
                 result.setList(pageInfo.getList());
                 result.setTotal(Integer.valueOf(String.valueOf(pageInfo.getTotal())));

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

@@ -48,7 +48,7 @@ public class IcFollowUpRecordServiceImpl extends BaseServiceImpl<IcFollowUpRecor
                 .eq(IcFollowUpRecordEntity::getOrigin,formDTO.getOrigin())
                 .eq(IcFollowUpRecordEntity::getCustomerId,formDTO.getCustomerId())
                 .orderByDesc(IcFollowUpRecordEntity::getVisitTime);
-        PageInfo<IcFollowUpRecordEntity> data = PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize(), formDTO.isPage())
+        PageInfo<IcFollowUpRecordEntity> data = PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize(), formDTO.getIsPage())
                 .doSelectPageInfo(() -> baseDao.selectList(wrapper));
         List<IcFollowUpRecordDTO> list=ConvertUtils.sourceToTarget(data.getList(),IcFollowUpRecordDTO.class);
         return new PageData(list,data.getTotal());

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

@@ -161,12 +161,12 @@ public class IcNatServiceImpl extends BaseServiceImpl<IcNatDao, IcNatEntity> imp
             }
             formDTO.setAgencyId(staffInfo.getAgencyId());
             //3.按条件查询业务数据
-            PageInfo<NatListResultDTO> data = PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize(), formDTO.isPage())
+            PageInfo<NatListResultDTO> data = PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize(), formDTO.getIsPage())
                     .doSelectPageInfo(() -> baseDao.getNatList(formDTO));
             return new PageData(data.getList(), data.getTotal());
         } else if ("all".equals(formDTO.getOrgType())) {
             //客户下数据
-            PageInfo<NatListResultDTO> data = PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize(), formDTO.isPage())
+            PageInfo<NatListResultDTO> data = PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize(), formDTO.getIsPage())
                     .doSelectPageInfo(() -> baseDao.getCustomerNatList(formDTO));
             return new PageData(data.getList(), data.getTotal());
         }

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

@@ -102,7 +102,7 @@ public class IcResiCollectServiceImpl extends BaseServiceImpl<IcResiCollectDao,
             }
             formDTO.setOrgId(staffInfo.getAgencyId());
         }
-        if (formDTO.isPage()){
+        if (formDTO.getIsPage()){
             PageInfo<CollectListResultDTO> pageList = PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize()).doSelectPageInfo(() -> baseDao.getCollectList(formDTO));
             result.setList(pageList.getList());
             result.setTotal(Integer.parseInt(String.valueOf(pageList.getTotal())));

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

@@ -93,7 +93,7 @@ public class IcTripReportRecordServiceImpl extends BaseServiceImpl<IcTripReportR
         CustomerStaffInfoCacheResult staffInfo=queryCurrentStaff(formDTO.getCustomerId(),formDTO.getUserId());
         formDTO.setAgencyId(staffInfo.getAgencyId());
         //2.按条件查询业务数据
-        PageInfo<IcTripReportRecordDTO> data = PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize(), formDTO.isPage())
+        PageInfo<IcTripReportRecordDTO> data = PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize(), formDTO.getIsPage())
                 .doSelectPageInfo(() -> baseDao.pageList(formDTO));
         List<IcTripReportRecordDTO> list = data.getList();
         //3.查询最近一次通知时间、核算检测关注名单

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

@@ -172,7 +172,7 @@ public class PatrolRoutineWorkServiceImpl extends BaseServiceImpl<PatrolRoutineW
 
     @Override
     public Page<PatrolRoutineWorkResult> listPage(PatrolQueryFormDTO formDTO) {
-      return PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize(), formDTO.isPage())
+      return PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize(), formDTO.getIsPage())
               .doSelectPage(() -> baseDao.selectList(formDTO));
     }
 

epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.35__new_ic_nat.sql

@@ -0,0 +1,46 @@
+-- ----------------------------
+-- Table structure for ic_nat
+-- ----------------------------
+DROP TABLE IF EXISTS `ic_nat`;
+CREATE TABLE `ic_nat` (
+  `ID` varchar(64) NOT NULL COMMENT 'ID',
+  `CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户Id',
+  `IS_RESI_USER` varchar(1) NOT NULL DEFAULT '0' COMMENT '是否客户下居民(0:否  1:是)',
+  `USER_ID` varchar(64) DEFAULT NULL COMMENT '居民端小程序的用户id、数字社区的icResiUserId、其他情况无值',
+  `USER_TYPE` varchar(32) NOT NULL COMMENT '数据来源【居民端小程序的人：resi;\r\n数字社区的居民：icresi;\r\n导入的：import;\r\n同步的：synchro】',
+  `NAME` varchar(64) NOT NULL COMMENT '人员姓名',
+  `MOBILE` varchar(11) NOT NULL COMMENT '手机号',
+  `ID_CARD` varchar(18) NOT NULL COMMENT '身份证号',
+  `NAT_TIME` datetime NOT NULL COMMENT '检测时间，精确到分钟',
+  `NAT_RESULT` varchar(1) DEFAULT NULL COMMENT '检测结果(0:阴性  1:阳性)',
+  `NAT_ADDRESS` varchar(128) DEFAULT NULL COMMENT '检测地点',
+  `FILE_NAME` varchar(255) DEFAULT NULL COMMENT '文件名',
+  `ATTACHMENT_TYPE` varchar(64) NOT NULL COMMENT '附件类型（（图片 - image、 视频 - video、 语音 - voice、 文档 - doc））',
+  `ATTACHMENT_URL` varchar(255) NOT NULL COMMENT '附件地址',
+  `DEL_FLAG` int(11) NOT NULL COMMENT '删除标识',
+  `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 ROW_FORMAT=COMPACT COMMENT='核酸记录基础信息表';
+
+-- ----------------------------
+-- Table structure for ic_nat_relation
+-- ----------------------------
+CREATE TABLE `ic_nat_relation` (
+  `ID` varchar(64) NOT NULL COMMENT 'ID',
+  `CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户Id',
+  `AGENCY_ID` varchar(64) NOT NULL COMMENT '居民端上报时存储用户所在网格的组织id.居民信息的人存储居民所在组织id.单个新增或者导入的存储登录用户所属的组织id',
+  `PIDS` varchar(255) NOT NULL COMMENT '组织pids,包含当前agencyId值',
+  `IC_NAT_ID` varchar(64) NOT NULL COMMENT '核酸记录表Id(ic_nat.id)',
+  `USER_TYPE` varchar(32) NOT NULL COMMENT '关系数据的绑定途径【居民端录入：resi;\r\n数字社区录入：icresi;\r\n导入的：import;\r\n同步的：synchro】',
+  `DEL_FLAG` int(11) NOT NULL COMMENT '删除标识',
+  `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 ROW_FORMAT=COMPACT COMMENT='核酸记录关系表';