居民信息采集-详情

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/CollectDetailFormDTO.java

@@ -0,0 +1,20 @@
+package com.epmet.dto.form;
+
+import com.epmet.commons.tools.dto.form.PageFormDTO;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * @program: epmet-cloud
+ * @description:
+ * @author: wangtong
+ * @create: 2022-08-03 14:15
+ **/
+@Data
+public class CollectDetailFormDTO extends PageFormDTO implements Serializable {
+
+    @NotBlank(message = "id不可为空")
+    private String id;
+}

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/CollectDetailResultDTO.java

@@ -0,0 +1,61 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * 收集居民信息入参
+ */
+@Data
+public class CollectDetailResultDTO implements Serializable {
+
+    private String id;
+
+    /**
+     * 所属小区ID
+     */
+    private String villageId;
+    private String villageName;
+
+    /**
+     * 所属楼宇Id
+     */
+    private String buildId;
+    private String buildName;
+
+    /**
+     * 单元id
+     */
+    private String unitId;
+    private String unitName;
+
+    /**
+     * 所属家庭Id
+     */
+    private String homeId;
+    private String homeName;
+
+    /**
+     * 详细地址
+     */
+    private String address;
+
+    /**
+     * 1自有0租住
+     */
+    private String houseType;
+
+    /**
+     * 户主姓名
+     */
+    private String houseHolderName;
+
+    /**
+     * 居住成员人数
+     */
+    private Integer totalResi;
+
+    private List<IcResiCollectMemDetailDTO> memberList;
+}

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/CollectPageFormDTO.java

@@ -15,4 +15,6 @@ import java.io.Serializable;
 public class CollectPageFormDTO extends PageFormDTO implements Serializable {
 
     private String customerId;
+
+    private String userId;
 }

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcResiCollectMemDetailDTO.java

@@ -0,0 +1,88 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 家庭成员信息
+ * 前端做校验
+ */
+@Data
+public class IcResiCollectMemDetailDTO implements Serializable {
+
+    /**
+     * 居住成员1姓名
+     */
+    // @NotBlank(message = "姓名不能为空", groups = {ResiCollectFormDTO.InternalShowGroup.class, IcResiCollectFormDTO.ExternalShowGroup.class})
+    private String name;
+
+    /**
+     * 居住成员1身份证号
+     */
+    // @NotBlank(message = "身份证号不能为空", groups = {ResiCollectFormDTO.InternalShowGroup.class, IcResiCollectFormDTO.ExternalShowGroup.class})
+    private String idNum;
+
+    /**
+     * 居住成员1手机号
+     */
+    // @NotBlank(message = "手机号不能为空", groups = {IcResiCollectFormDTO.InternalShowGroup.class, IcResiCollectFormDTO.ExternalShowGroup.class})
+    private String mobile;
+
+    /**
+     * 居住成员1是否参加几轮全员核算检测，数字1-10
+     */
+    // @NotBlank(message = "核算检测情况不能为空", groups = {IcResiCollectFormDTO.InternalShowGroup.class, IcResiCollectFormDTO.ExternalShowGroup.class})
+    private String heSuanCount;
+
+    /**
+     * 居住成员1新冠疫苗接种情况;1:已全程接种；2：未全程接种；0未接种；
+     */
+    // @NotNull(message = "疫苗接种情况不能为空", groups = {IcResiCollectFormDTO.InternalShowGroup.class, IcResiCollectFormDTO.ExternalShowGroup.class})
+    private Integer ymjz;
+
+    /**
+     * 户籍所在地
+     */
+    private String domicilePlace;
+
+    /**
+     * 户籍所在地行政地区编码
+     */
+    private String domicilePlaceCode;
+
+    /**
+     * 户籍所在地行政地区编码全路径，包含自己,英文逗号隔开例如：37,3702,370203
+     */
+    private String domicilePlaceCodePath;
+
+    /**
+     * 学校或公司
+     */
+    private String workPlace;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 社区居民信息登记-查询返参用
+     */
+    private String id;
+
+    /**
+     * 与房主关系
+     */
+    private String relationship;
+
+    /**
+     * 人脸头像
+     */
+    private String faceImg;
+
+    /**
+     * 是否是党员
+     */
+    private String isParty;
+}

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

@@ -192,6 +192,7 @@ public class IcResiCollectController {
     */
     @PostMapping("getCollectPage")
     public Result<PageData<CollectPageListDTO>> getCollectPage(@LoginUser TokenDto tokenDto,@RequestBody CollectPageFormDTO dto) {
+        dto.setUserId(tokenDto.getUserId());
         dto.setCustomerId(tokenDto.getCustomerId());
         PageData<CollectPageListDTO> page = icResiCollectService.getCollectPage(dto);
         return new Result<PageData<CollectPageListDTO>>().ok(page);
@@ -208,4 +209,17 @@ public class IcResiCollectController {
         return new Result<CollectHouseInfoResultDTO>().ok(icResiCollectService.getHouseDetailByCollect(formDTO));
     }
 
+    /**
+    * @describe: 查看居民采集信息详情
+    * @author wangtong
+    * @date 2022/8/3 15:05
+    * @params [dto]
+    * @return com.epmet.commons.tools.utils.Result
+    */
+    @PostMapping("getCollectDetail")
+    public Result getCollectDetail(@RequestBody CollectDetailFormDTO dto) {
+        ValidatorUtils.validateEntity(dto);
+        return icResiCollectService.getCollectDetail(dto);
+    }
+
 }

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

@@ -54,7 +54,7 @@ public interface IcResiCollectDao extends BaseDao<IcResiCollectEntity> {
     * @params [customerId]
     * @return java.util.List<com.epmet.dto.result.CollectPageListDTO>
     */
-    List<CollectPageListDTO> getCollectPage(@Param("customerId") String customerId);
+    List<CollectPageListDTO> getCollectPage(@Param("customerId") String customerId, @Param("userId") String userId);
 
     /**
      * 获取房屋信息

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

@@ -1,6 +1,7 @@
 package com.epmet.dao;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.dto.form.IcResiCollectMemDetailDTO;
 import com.epmet.dto.form.IcResiCollectMemFormDTO;
 import com.epmet.entity.IcResiMemberEntity;
 import org.apache.ibatis.annotations.Mapper;
@@ -18,4 +19,6 @@ import java.util.List;
 public interface IcResiMemberDao extends BaseDao<IcResiMemberEntity> {
 
     List<IcResiCollectMemFormDTO> selectMySubmit(@Param("latestResiCollectId") String latestResiCollectId, @Param("userId")String userId);
-}
+
+    List<IcResiCollectMemDetailDTO> selectListByCollectId(@Param("collectId") String collectId);
+}

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

@@ -82,6 +82,15 @@ public interface IcResiCollectService extends BaseService<IcResiCollectEntity> {
     */
     PageData<CollectPageListDTO> getCollectPage(CollectPageFormDTO dto);
 
+    /**
+    * @describe: 查看居民采集信息详情
+    * @author wangtong
+    * @date 2022/8/3 15:08
+    * @params [dto]
+    * @return com.epmet.commons.tools.utils.Result
+    */
+    Result getCollectDetail(CollectDetailFormDTO dto);
+
     /**
      * 信息采集-获取房屋信息
      * @param formDTO

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

@@ -23,7 +23,6 @@ import com.epmet.dto.result.CollectListResultDTO;
 import com.epmet.dto.result.IcHouseInfoCollectResultDTO;
 import com.epmet.dto.result.CollectPageListDTO;
 import com.epmet.dto.result.LatestCollectResDTO;
-import com.epmet.dto.result.PartyMemberAgeResultDTO;
 import com.epmet.entity.IcResiCollectEntity;
 import com.epmet.entity.IcResiMemberEntity;
 import com.epmet.feign.GovOrgFeignClient;
@@ -89,7 +88,7 @@ public class IcResiCollectServiceImpl extends BaseServiceImpl<IcResiCollectDao,
             List<IcResiMemberEntity> newMemberList = ConvertUtils.sourceToTarget(formDTO.getMemberList(), IcResiMemberEntity.class);
             //查询之前录入的成员表
             Map<String, IcResiMemberEntity> memMap = queryOriginMem(origin.getId());
-            saveOrUpdateMem(newMemberList, memMap,origin.getId());
+            saveOrUpdateMem(newMemberList, memMap,origin);
         }
     }
 
@@ -158,6 +157,7 @@ public class IcResiCollectServiceImpl extends BaseServiceImpl<IcResiCollectDao,
             memberList.forEach(mem -> {
                 if (StringUtils.isNotBlank(mem.getName()) || StringUtils.isNotBlank(mem.getIdNum())) {
                     //姓名或份身份证号不为空时插入
+                    mem.setCustomerId(neighborHoodDTO.getCustomerId());
                     mem.setIcResiCollectId(entity.getId());
                     icResiMemberDao.insert(mem);
                 }
@@ -168,7 +168,7 @@ public class IcResiCollectServiceImpl extends BaseServiceImpl<IcResiCollectDao,
             List<IcResiMemberEntity> newMemberList = ConvertUtils.sourceToTarget(formDTO.getMemberList(), IcResiMemberEntity.class);
             //查询之前录入的成员表
             Map<String, IcResiMemberEntity> memMap = queryOriginMem(collectInfo.getId());
-            saveOrUpdateMem(newMemberList, memMap,collectInfo.getId());
+            saveOrUpdateMem(newMemberList, memMap,collectInfo);
         }
         return new Result().ok("提交成功");
     }
@@ -176,11 +176,24 @@ public class IcResiCollectServiceImpl extends BaseServiceImpl<IcResiCollectDao,
     @Override
     public PageData<CollectPageListDTO> getCollectPage(CollectPageFormDTO dto) {
         PageHelper.startPage(dto.getPageNo(), dto.getPageSize());
-        List<CollectPageListDTO> list = baseDao.getCollectPage(dto.getCustomerId());
+        List<CollectPageListDTO> list = baseDao.getCollectPage(dto.getCustomerId(),dto.getUserId());
         PageInfo<CollectPageListDTO> pageInfo = new PageInfo<>(list);
         return new PageData<>(list, pageInfo.getTotal());
     }
 
+    @Override
+    public Result getCollectDetail(CollectDetailFormDTO dto) {
+        IcResiCollectEntity entity = baseDao.selectById(dto.getId());
+        if(null == entity){
+            throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "暂无查询到信息","暂无查询到信息");
+        }
+        CollectDetailResultDTO result = ConvertUtils.sourceToTarget(entity, CollectDetailResultDTO.class);
+        //查询成员信息
+        List<IcResiCollectMemDetailDTO> memberList = icResiMemberDao.selectListByCollectId(dto.getId());
+        result.setMemberList(memberList);
+        return new Result().ok(result);
+    }
+
     public IcNeighborHoodDTO queryIcNeighborHood(String villageId) {
         Result<IcNeighborHoodDTO> res = govOrgOpenFeignClient.getIcNeighbordhoodById(villageId);
         if (!res.success() || null == res.getData()) {
@@ -197,11 +210,11 @@ public class IcResiCollectServiceImpl extends BaseServiceImpl<IcResiCollectDao,
         return memMap;
     }
 
-    private void saveOrUpdateMem(List<IcResiMemberEntity> newMemberList, Map<String, IcResiMemberEntity> memMap, String originIcResiCollectId) {
+    private void saveOrUpdateMem(List<IcResiMemberEntity> newMemberList, Map<String, IcResiMemberEntity> memMap, IcResiCollectEntity collectInfo) {
         for (IcResiMemberEntity entity : newMemberList) {
             if(StringUtils.isNotBlank(entity.getIdNum())){
                 if (MapUtils.isNotEmpty(memMap) && memMap.containsKey(entity.getIdNum())) {
-                    entity.setIcResiCollectId(originIcResiCollectId);
+                    entity.setIcResiCollectId(collectInfo.getId());
                     entity.setCustomerId(memMap.get(entity.getIdNum()).getCustomerId());
                     entity.setId(memMap.get(entity.getIdNum()).getId());
                     icResiMemberDao.updateById(entity);
@@ -212,7 +225,8 @@ public class IcResiCollectServiceImpl extends BaseServiceImpl<IcResiCollectDao,
             if (StringUtils.isNotBlank(entity.getName()) || StringUtils.isNotBlank(entity.getIdNum())) {
                 //姓名或份身份证号不为空时插入
                 entity.setId(null);
-                entity.setIcResiCollectId(originIcResiCollectId);
+                entity.setCustomerId(collectInfo.getCustomerId());
+                entity.setIcResiCollectId(collectInfo.getId());
                 icResiMemberDao.insert(entity);
             }
         }
@@ -248,7 +262,7 @@ public class IcResiCollectServiceImpl extends BaseServiceImpl<IcResiCollectDao,
             List<IcResiMemberEntity> newMemberList = ConvertUtils.sourceToTarget(formDTO.getMemberList(), IcResiMemberEntity.class);
             //查询之前录入的成员表
             Map<String, IcResiMemberEntity> memMap = queryOriginMem(origin.getId());
-            saveOrUpdateMem(newMemberList, memMap,origin.getId());
+            saveOrUpdateMem(newMemberList, memMap,origin);
         }
     }
 

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

@@ -122,6 +122,7 @@
 			from ic_resi_collect
 			where DEL_FLAG='0'
 						and CUSTOMER_ID=#{customerId}
+						and ( UPDATED_BY = #{userId} OR UPDATED_BY = #{userId} )
 			union
 			select id,
 						 'visitor' as type,
@@ -132,7 +133,8 @@
 						 CREATED_TIME
 			from ic_resi_collect_visitor
 			where DEL_FLAG='0'
-				  and CUSTOMER_ID=#{customerId})tot
+				  and CUSTOMER_ID=#{customerId}
+				  and ( UPDATED_BY = #{userId} OR UPDATED_BY = #{userId} ))tot
             order by tot.CREATED_TIME desc
     </select>
 

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

@@ -25,4 +25,11 @@
             AND m.DEL_FLAG = '0'
             AND ( m.CREATED_BY = #{userId} OR m.UPDATED_BY = #{userId} )
     </select>
-</mapper>
+    <select id="selectListByCollectId" resultType="com.epmet.dto.form.IcResiCollectMemDetailDTO">
+        select *
+        from ic_resi_member
+        where IC_RESI_COLLECT_ID =#{collectId}
+              and DEL_FLAG = '0'
+        order by CREATED_TIME asc
+    </select>
+</mapper>