Merge remote-tracking branch 'origin/dev_epidemic_situation' into develop

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

@@ -122,6 +122,9 @@ public class AddPlacePatrolRecordFormDTO implements Serializable {
     //token中userId
     private String staffId;
 
-    public interface Add {}
+    @NotBlank(message = "placePatrolRecordId不能为空", groups = {Update.class})
+    private String placePatrolRecordId;
 
+    public interface Add {}
+    public interface Update {}
 }

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

@@ -60,6 +60,19 @@ public class IcPlacePatrolRecordController {
         return new Result();
     }
 
+    /**
+     * @Author sun
+     * @Description 新增场所巡查记录
+     **/
+    @PostMapping("update")
+    public Result update(@LoginUser TokenDto tokenDto, @RequestBody AddPlacePatrolRecordFormDTO formDTO) {
+        ValidatorUtils.validateEntity(formDTO, AddPlacePatrolRecordFormDTO.Add.class,AddPlacePatrolRecordFormDTO.Update.class);
+        formDTO.setCustomerId(tokenDto.getCustomerId());
+        formDTO.setStaffId(tokenDto.getUserId());
+        placePatrolRecordService.update(formDTO);
+        return new Result();
+    }
+
     /**
      * @Author sun
      * @Description 删除场所巡查记录

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

@@ -38,6 +38,8 @@ public interface IcPlacePatrolRecordService extends BaseService<IcPlacePatrolRec
      **/
     void add(AddPlacePatrolRecordFormDTO formDTO);
 
+    void update(AddPlacePatrolRecordFormDTO formDTO);
+
     /**
      * @Author sun
      * @Description 删除场所巡查记录

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

@@ -17,7 +17,6 @@
 
 package com.epmet.service.impl;
 
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult;
@@ -28,24 +27,17 @@ import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dao.IcPlacePatrolRecordDao;
 import com.epmet.dao.IcPlacePatrolTeamStaffDao;
-import com.epmet.dto.CustomerGridDTO;
 import com.epmet.dto.IcPlacePatrolTeamStaffDTO;
 import com.epmet.dto.form.AddPlacePatrolRecordFormDTO;
 import com.epmet.dto.form.GetListPlacePatrolRecordFormDTO;
-import com.epmet.dto.form.GetListPlacePatrolTeamFormDTO;
-import com.epmet.dto.result.*;
-import com.epmet.entity.IcHouseEntity;
+import com.epmet.dto.result.GetListPlacePatrolRecordResultDTO;
+import com.epmet.dto.result.PlacePatrolRecordDetailResultDTO;
 import com.epmet.entity.IcPlacePatrolRecordEntity;
-import com.epmet.entity.IcPlacePatrolTeamEntity;
-import com.epmet.entity.IcPlacePatrolTeamStaffEntity;
 import com.epmet.feign.EpmetAdminOpenFeignClient;
 import com.epmet.service.IcPlacePatrolRecordService;
 import com.epmet.service.IcPlacePatrolReviewRecordService;
-import com.epmet.service.IcPlacePatrolTeamService;
-import com.epmet.service.IcPlacePatrolTeamStaffService;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
-import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -90,6 +82,23 @@ public class IcPlacePatrolRecordServiceImpl extends BaseServiceImpl<IcPlacePatro
         insert(entity);
     }
 
+    /**
+     * @Author sun
+     * @Description 修改场所巡查记录
+     **/
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void update(AddPlacePatrolRecordFormDTO formDTO) {
+        IcPlacePatrolRecordEntity entity = ConvertUtils.sourceToTarget(formDTO, IcPlacePatrolRecordEntity.class);
+        CustomerStaffInfoCacheResult staffInfoCache = CustomerStaffRedis.getStaffInfo(formDTO.getCustomerId(), formDTO.getStaffId());
+        entity.setAgencyId(staffInfoCache.getAgencyId());
+        entity.setPids(staffInfoCache.getAgencyPIds());
+        entity.setFinalResult(entity.getFirstResult());
+        entity.setFinalTime(entity.getFirstTime());
+        entity.setId(formDTO.getPlacePatrolRecordId());
+        updateById(entity);
+    }
+
     /**
      * @Author sun
      * @Description 删除场所巡查记录

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='核酸记录关系表';