Browse Source

新冠病毒疫苗接种人员信息台账------审核前信息验证

master
wanggongfeng 3 years ago
parent
commit
71020ef0d2
  1. 31
      epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/CheckHouseInfoFormDTO.java
  2. 38
      epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/CheckHomeInfoResultInfo.java
  3. 20
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcHouseController.java
  4. 9
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcBuildingDao.java
  5. 8
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcBuildingUnitDao.java
  6. 8
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcHouseDao.java
  7. 8
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcNeighborHoodDao.java
  8. 9
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcHouseService.java
  9. 59
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcHouseServiceImpl.java
  10. 11
      epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcBuildingDao.xml
  11. 11
      epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcBuildingUnitDao.xml
  12. 9
      epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml
  13. 10
      epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcNeighborHoodDao.xml
  14. 5
      epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcVaccinePrarmeterController.java
  15. 8
      epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcVaccinePrarmeterDao.java
  16. 7
      epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcVaccinePrarmeterService.java
  17. 12
      epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccinePrarmeterServiceImpl.java
  18. 89
      epmet-user/epmet-user-server/src/main/resources/mapper/IcVaccinePrarmeterDao.xml

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

@ -0,0 +1,31 @@
package com.epmet.dto.form;
import lombok.Data;
import java.io.Serializable;
/**
* @Description 根据小区楼宇单元名称校验是否存在
* @Author wgf
* @Date 2022/8/24 9:03
*/
@Data
public class CheckHouseInfoFormDTO implements Serializable {
private static final long serialVersionUID = 2636608477324780974L;
private String customerId;
private String gridId;
private String gridName;
private String villageId;
private String buildId;
private String unitId;
private String homeId;
private String villageName;
private String buildName;
private String unitName;
private String homeName;
}

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

@ -0,0 +1,38 @@
package com.epmet.dto.result;
import lombok.Data;
import java.io.Serializable;
/**
* 房屋信息
*
* @author wgf
* @date 2022/8/23 20:58
*/
@Data
public class CheckHomeInfoResultInfo implements Serializable {
private static final long serialVersionUID = -2797565581047800011L;
// 0:校验成功;1:校验失败;
private String code;
// 提示信息
private String msg;
// 是否新增房屋:0:否;1:是
private String isAdd;
private String gridId;
private String gridName;
private String villageId;
private String villageName;
private String buildId;
private String buildName;
private String unitId;
private String unitName;
private String homeId;
private String homeName;
}

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

@ -18,11 +18,16 @@
package com.epmet.controller;
import com.epmet.commons.tools.annotation.LoginUser;
import com.epmet.commons.tools.dto.form.PageFormDTO;
import com.epmet.commons.tools.dto.result.OptionResultDTO;
import com.epmet.commons.tools.security.dto.TokenDto;
import com.epmet.commons.tools.utils.Result;
import com.epmet.commons.tools.validator.ValidatorUtils;
import com.epmet.dto.IcHouseDTO;
import com.epmet.dto.IcVaccinePrarmeterDTO;
import com.epmet.dto.form.CheckHouseInfoFormDTO;
import com.epmet.dto.form.HouseFormDTO;
import com.epmet.dto.form.VaccinePrarmeterListFormDTO;
import com.epmet.dto.result.HouseAgencyInfoResultDTO;
import com.epmet.dto.result.HouseInfoDTO;
import com.epmet.dto.result.HouseListResultDTO;
@ -136,4 +141,19 @@ public class IcHouseController {
public Result<List<HouseInfoDTO>> getOwnerHouseList(@RequestBody IcHouseDTO formDTO){
return new Result<List<HouseInfoDTO>>().ok(icHouseService.getOwnerHouseList(formDTO));
}
/**
* Desc: 根据小区楼宇单元名称校验是否存在
* @param formDTO
* @param tokenDto
* @author wgf
* @date 2022/8/24 13:57
*/
@PostMapping("checkHomeInfo")
public Result checkHomeInfo(@RequestBody CheckHouseInfoFormDTO formDTO, @LoginUser TokenDto tokenDto){
ValidatorUtils.validateEntity(formDTO, PageFormDTO.AddUserInternalGroup.class);
formDTO.setCustomerId(tokenDto.getCustomerId());
return icHouseService.checkHomeInfo(formDTO);
}
}

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

@ -20,6 +20,7 @@ package com.epmet.dao;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.epmet.commons.mybatis.dao.BaseDao;
import com.epmet.dto.ImportGeneralDTO;
import com.epmet.dto.form.CheckHouseInfoFormDTO;
import com.epmet.dto.form.IcBuildingListFormDTO;
import com.epmet.dto.result.*;
import com.epmet.entity.CustomerAgencyEntity;
@ -224,4 +225,12 @@ public interface IcBuildingDao extends BaseDao<IcBuildingEntity> {
IcBuildingEntity selectByCoding(@Param("coding") String coding,
@Param("id") String id);
/**
* 根据楼宇名称查询楼宇信息
* @param formDTO
* @return
*/
IcBuildingEntity getBuildingInfoByName(CheckHouseInfoFormDTO formDTO);
}

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

@ -18,6 +18,7 @@
package com.epmet.dao;
import com.epmet.commons.mybatis.dao.BaseDao;
import com.epmet.dto.form.CheckHouseInfoFormDTO;
import com.epmet.dto.result.HouseInfoResultDTO;
import com.epmet.dto.result.OrganizationCommunityDTO;
import com.epmet.entity.IcBuildingUnitEntity;
@ -78,4 +79,11 @@ public interface IcBuildingUnitDao extends BaseDao<IcBuildingUnitEntity> {
* @return com.epmet.dto.result.OrganizationCommunityDTO
*/
OrganizationCommunityDTO selectCommunityByUnitId(@Param("unitId") String unitId);
/**
* 根据单元名称查询单元信息
* @param formDTO
* @return
*/
IcBuildingUnitEntity getbuildingUnitInfoByName(CheckHouseInfoFormDTO formDTO);
}

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

@ -2,6 +2,7 @@ package com.epmet.dao;
import com.epmet.commons.mybatis.dao.BaseDao;
import com.epmet.dto.ImportGeneralDTO;
import com.epmet.dto.form.CheckHouseInfoFormDTO;
import com.epmet.dto.form.GetHouseInfoToCollectFormDTO;
import com.epmet.dto.form.IcHouseListFormDTO;
import com.epmet.dto.result.*;
@ -201,4 +202,11 @@ public interface IcHouseDao extends BaseDao<IcHouseEntity> {
*/
IcHouseInfoCollectResultDTO getHouseInfoToCollect(GetHouseInfoToCollectFormDTO formDTO);
/**
* 校验房屋
* @param formDTO
* @return
*/
IcHouseEntity getHouseInfoByName(CheckHouseInfoFormDTO formDTO);
}

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

@ -21,6 +21,7 @@ import com.epmet.commons.mybatis.dao.BaseDao;
import com.epmet.dto.IcNeighborHoodDTO;
import com.epmet.dto.ImportGeneralDTO;
import com.epmet.dto.NeighborHoodAndManagementDTO;
import com.epmet.dto.form.CheckHouseInfoFormDTO;
import com.epmet.dto.form.HouseInformationFormDTO;
import com.epmet.dto.form.IcNeighborHoodListFormDTO;
import com.epmet.dto.result.*;
@ -211,4 +212,11 @@ public interface IcNeighborHoodDao extends BaseDao<IcNeighborHoodEntity> {
* @Date 2022/6/29 16:48
*/
List<HomeListResultDTO> getHouseList(HouseInformationFormDTO formDTO);
/**
* 根据名称查小区信息
* @param formDTO
* @return
*/
IcNeighborHoodEntity getNeighborHoodInfoByName(CheckHouseInfoFormDTO formDTO);
}

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

@ -3,8 +3,10 @@ package com.epmet.service;
import com.epmet.commons.mybatis.service.BaseService;
import com.epmet.commons.tools.dto.result.OptionResultDTO;
import com.epmet.commons.tools.security.dto.TokenDto;
import com.epmet.commons.tools.utils.Result;
import com.epmet.dto.IcHouseDTO;
import com.epmet.dto.ImportGeneralDTO;
import com.epmet.dto.form.CheckHouseInfoFormDTO;
import com.epmet.dto.form.HouseFormDTO;
import com.epmet.dto.result.HouseAgencyInfoResultDTO;
import com.epmet.dto.result.HouseInfoDTO;
@ -130,4 +132,11 @@ public interface IcHouseService extends BaseService<IcHouseEntity> {
* @Date 2022/7/19 17:41
*/
List<HouseInfoDTO> getOwnerHouseList(IcHouseDTO formDTO);
/**
* 根据小区楼宇单元名称校验是否存在
* @param formDTO
* @return
*/
Result checkHomeInfo(CheckHouseInfoFormDTO formDTO);
}

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

@ -20,12 +20,9 @@ import com.epmet.dto.IcHouseDTO;
import com.epmet.dto.IcResiCategoryStatsConfigDTO;
import com.epmet.dto.IcResiUserDTO;
import com.epmet.dto.ImportGeneralDTO;
import com.epmet.dto.form.CheckHouseInfoFormDTO;
import com.epmet.dto.form.HouseFormDTO;
import com.epmet.dto.result.HouseAgencyInfoResultDTO;
import com.epmet.dto.result.HomeInfoResultDTO;
import com.epmet.dto.result.HouseInfoDTO;
import com.epmet.dto.result.HouseListResultDTO;
import com.epmet.dto.result.HousesNameResultDTO;
import com.epmet.dto.result.*;
import com.epmet.entity.IcBuildingEntity;
import com.epmet.entity.IcBuildingUnitEntity;
import com.epmet.entity.IcHouseEntity;
@ -339,4 +336,56 @@ public class IcHouseServiceImpl extends BaseServiceImpl<IcHouseDao, IcHouseEntit
}
return list.stream().map(item -> icHouseRedis.getHouseInfo(item.getId(), item.getCustomerId())).collect(Collectors.toList());
}
@Override
public Result<CheckHomeInfoResultInfo> checkHomeInfo(CheckHouseInfoFormDTO formDTO) {
CheckHomeInfoResultInfo checkHomeInfoResultInfo = ConvertUtils.sourceToTarget(formDTO, CheckHomeInfoResultInfo.class);
// 校验小区
IcNeighborHoodEntity icNeighborHoodEntity = icNeighborHoodDao.getNeighborHoodInfoByName(formDTO);
if(StringUtils.isNotBlank(icNeighborHoodEntity.getId())){
formDTO.setVillageId(icNeighborHoodEntity.getId());
checkHomeInfoResultInfo.setVillageId(icNeighborHoodEntity.getId());
}else{
checkHomeInfoResultInfo.setCode("1");
checkHomeInfoResultInfo.setMsg("小区名称未匹配到数据");
return new Result<CheckHomeInfoResultInfo>().ok(checkHomeInfoResultInfo);
}
// 校验楼宇
IcBuildingEntity icBuildingEntity = icBuildingDao.getBuildingInfoByName(formDTO);
if(StringUtils.isNotBlank(icBuildingEntity.getId())){
formDTO.setBuildId(icBuildingEntity.getId());
checkHomeInfoResultInfo.setBuildId(icBuildingEntity.getId());
}else{
checkHomeInfoResultInfo.setCode("1");
checkHomeInfoResultInfo.setMsg("楼宇名称未匹配到数据");
return new Result<CheckHomeInfoResultInfo>().ok(checkHomeInfoResultInfo);
}
// 校验单元
IcBuildingUnitEntity icBuildingUnitEntity = buildingUnitDao.getbuildingUnitInfoByName(formDTO);
if(StringUtils.isNotBlank(icBuildingUnitEntity.getId())){
formDTO.setUnitId(icBuildingUnitEntity.getId());
checkHomeInfoResultInfo.setUnitId(icBuildingUnitEntity.getId());
}else{
checkHomeInfoResultInfo.setCode("1");
checkHomeInfoResultInfo.setMsg("单元名称未匹配到数据");
return new Result<CheckHomeInfoResultInfo>().ok(checkHomeInfoResultInfo);
}
// 校验房屋
IcHouseEntity icHouseEntity = baseDao.getHouseInfoByName(formDTO);
checkHomeInfoResultInfo.setCode("0");
if(StringUtils.isNotBlank(icHouseEntity.getId())){
checkHomeInfoResultInfo.setHomeId(icHouseEntity.getId());
checkHomeInfoResultInfo.setMsg("该房屋为已存在房屋");
checkHomeInfoResultInfo.setIsAdd("0");
}else{
checkHomeInfoResultInfo.setMsg("该房屋暂不存在");
checkHomeInfoResultInfo.setIsAdd("1");
}
return new Result<CheckHomeInfoResultInfo>().ok(checkHomeInfoResultInfo);
}
}

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

@ -450,4 +450,15 @@
</if>
</select>
<select id="getBuildingInfoByName" resultType="com.epmet.entity.IcBuildingEntity"
parameterType="com.epmet.dto.form.CheckHouseInfoFormDTO">
select *
from ic_building
where DEL_FLAG = '0'
and CUSTOMER_ID = #{customerId}
and NEIGHBOR_HOOD_ID = #{villageId}
and BUILDING_NAME = #{buildName}
</select>
</mapper>

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

@ -59,5 +59,16 @@
and u.id=#{unitId}
</select>
<select id="getbuildingUnitInfoByName" resultType="com.epmet.entity.IcBuildingUnitEntity"
parameterType="com.epmet.dto.form.CheckHouseInfoFormDTO">
select *
from ic_building_unit
where DEL_FLAG = '0'
and CUSTOMER_ID = #{customerId}
and BUILDING_ID = #{buildId}
and UNIT_NAME = #{unitName}
</select>
</mapper>

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

@ -549,5 +549,14 @@
and DOOR_NAME = #{doorName}
</select>
<select id="getHouseInfoByName" resultType="com.epmet.entity.IcHouseEntity">
select *
from ic_house
where del_flag = '0'
and CUSTOMER_ID = #{customerId}
and BUILDING_UNIT_ID = #{buildingUnitId}
and DOOR_NAME = #{homeName}
</select>
</mapper>

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

@ -662,6 +662,16 @@
ORDER BY
SORT, DOOR_NAME+0
</select>
<select id="getNeighborHoodInfoByName" resultType="com.epmet.entity.IcNeighborHoodEntity"
parameterType="com.epmet.dto.form.CheckHouseInfoFormDTO">
select *
from ic_neighbor_hood
where DEL_FLAG = '0'
and CUSTOMER_ID = #{customerId}
and GRID_ID = #{gridId}
and NEIGHBOR_HOOD_NAME = #{villageName}
</select>
</mapper>

5
epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcVaccinePrarmeterController.java

@ -63,7 +63,8 @@ public class IcVaccinePrarmeterController {
@RequestMapping("page")
public Result<PageData<IcVaccinePrarmeterDTO>> page(@RequestParam Map<String, Object> params){
PageData<IcVaccinePrarmeterDTO> page = icVaccinePrarmeterService.page(params);
// PageData<IcVaccinePrarmeterDTO> page = icVaccinePrarmeterService.page(params);
PageData<IcVaccinePrarmeterDTO> page = icVaccinePrarmeterService.getPhrasePage(params);
return new Result<PageData<IcVaccinePrarmeterDTO>>().ok(page);
}
@ -174,4 +175,6 @@ public class IcVaccinePrarmeterController {
}

8
epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcVaccinePrarmeterDao.java

@ -8,6 +8,7 @@ import com.epmet.entity.IcVaccinePrarmeterEntity;
import org.apache.ibatis.annotations.Mapper;
import java.util.List;
import java.util.Map;
/**
* 新冠病毒疫苗接种人员信息台账
@ -20,4 +21,11 @@ public interface IcVaccinePrarmeterDao extends BaseDao<IcVaccinePrarmeterEntity>
List<IcVaccinePrarmeterDTO> vaccineExport(VaccinePrarmeterListFormDTO formDTO);
/**
* 条件查询
* @param params
* @return
*/
List<IcVaccinePrarmeterDTO> getPhrasePage(Map<String, Object> params);
}

7
epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcVaccinePrarmeterService.java

@ -28,6 +28,13 @@ public interface IcVaccinePrarmeterService extends BaseService<IcVaccinePrarmete
*/
PageData<IcVaccinePrarmeterDTO> page(Map<String, Object> params);
/**
* 分页条件查询
* @param params
* @return
*/
PageData<IcVaccinePrarmeterDTO> getPhrasePage(Map<String, Object> params);
/**
* 默认查询
*

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

@ -83,6 +83,18 @@ public class IcVaccinePrarmeterServiceImpl extends BaseServiceImpl<IcVaccinePrar
return getPageData(page, IcVaccinePrarmeterDTO.class);
}
/**
* 条件查询
* @param params
* @return
*/
@Override
public PageData<IcVaccinePrarmeterDTO> getPhrasePage(Map<String, Object> params) {
IPage<IcVaccinePrarmeterDTO> page = getPage(params);
List<IcVaccinePrarmeterDTO> list = baseDao.getPhrasePage(params);
return new PageData<>(list, page.getTotal());
}
@Override
public List<IcVaccinePrarmeterDTO> list(Map<String, Object> params) {
List<IcVaccinePrarmeterEntity> entityList = baseDao.selectList(getWrapper(params));

89
epmet-user/epmet-user-server/src/main/resources/mapper/IcVaccinePrarmeterDao.xml

@ -82,8 +82,93 @@
<if test="mobile != null and mobile != ''">
and MOBILE like CONCAT('%', #{mobile}, '%')
</if>
<if test="orgId != null and orgId != ''">
and (AGENCY_ID = #{orgId} or PIDS like CONCAT('%',#{orgId},'%'))
<if test="idCard != null and idCard != ''">
and ID_CARD like CONCAT('%', #{idCard}, '%')
</if>
<if test="isVaccination != null and isVaccination != ''">
and (IS_VACCINATION = #{isVaccination}
</if>
<if test="gridId != null and gridId != ''">
and (GRID_ID = #{gridId}
</if>
<if test="villageId != null and villageId != ''">
and (VILLAGE_ID = #{villageId}
</if>
<if test="buildId != null and buildId != ''">
and (BUILD_ID = #{buildId}
</if>
<if test="unitId != null and unitId != ''">
and (UNIT_ID = #{unitId}
</if>
<if test="homeId != null and homeId != ''">
and (HOME_ID = #{homeId}
</if>
order by CREATED_TIME desc
</select>
<select id="getPhrasePage" resultType="com.epmet.dto.IcVaccinePrarmeterDTO">
select
ID,
CUSTOMER_ID,
GRID_ID,
GRID_NAME,
AGENCY_ID,
PIDS,
VILLAGE_ID,
VILLAGE_NAME,
BUILD_ID,
BUILD_NAME,
UNIT_ID,
UNIT_NAME,
HOME_ID,
HOME_NAME,
HOUSEHOLD_TYPE,
NAME,
MOBILE,
ID_CARD,
IS_VACCINATION,
FIRST_VAC_TIME,
FIRST_VAC_SITE,
SECOND_VAC_TIME,
SECOND_VAC_SITE,
THIRD_VAC_TIME,
THIRD_VAC_SITE,
REASON,
NOTE,
DEL_FLAG,
REVISION,
CREATED_BY,
CREATED_TIME,
UPDATED_BY,
UPDATED_TIME
from ic_vaccine_prarmeter
where DEL_FLAG = 0
<if test="name != null and name != ''">
and NAME like CONCAT('%' ,#{name}, '%')
</if>
<if test="mobile != null and mobile != ''">
and MOBILE like CONCAT('%', #{mobile}, '%')
</if>
<if test="idCard != null and idCard != ''">
and ID_CARD like CONCAT('%', #{idCard}, '%')
</if>
<if test="isVaccination != null and isVaccination != ''">
and (IS_VACCINATION = #{isVaccination}
</if>
<if test="gridId != null and gridId != ''">
and (GRID_ID = #{gridId}
</if>
<if test="villageId != null and villageId != ''">
and (VILLAGE_ID = #{villageId}
</if>
<if test="buildId != null and buildId != ''">
and (BUILD_ID = #{buildId}
</if>
<if test="unitId != null and unitId != ''">
and (UNIT_ID = #{unitId}
</if>
<if test="homeId != null and homeId != ''">
and (HOME_ID = #{homeId}
</if>
order by CREATED_TIME desc
</select>

Loading…
Cancel
Save