elink-star
/
epdc-cloud-custom-yushan
12
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge remote-tracking branch 'origin/feature/user_house_import' into feature/user_house_import 

# Conflicts:
#	epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/service/EpidemicBuildingUnitService.java
feature/user_house_import
wanggongfeng 3 years ago
parent
c73b3512e0 2dd0f9021c
commit
d34a9652a4
10 changed files with 143 additions and 51 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/controller/BuildingUnitController.java
  2. 6
      epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/controller/PlotBuildingController.java
  3. 2
      epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/dao/EpidemicBuildingUnitDao.java
  4. 2
      epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/dao/EpidemicPlotBuildingDao.java
  5. 19
      epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/service/EpidemicBuildingUnitService.java
  6. 20
      epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/service/EpidemicPlotBuildingService.java
  7. 110
      epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/service/impl/EpidemicBuildingUnitServiceImpl.java
  8. 23
      epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/service/impl/EpidemicPlotBuildingServiceImpl.java
  9. 3
      epdc-cloud-vim-yushan/src/main/resources/mapper/personroom/EpidemicBuildingUnitDao.xml
  10. 3
      epdc-cloud-vim-yushan/src/main/resources/mapper/personroom/EpidemicPlotBuildingDao.xml

6
epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/controller/BuildingUnitController.java
View File

@ -121,6 +121,12 @@ public class BuildingUnitController {
return epidemicBuildingUnitService.importEpidemicHouse(file, gridId);
}
@PostMapping("updateMaCode")
public Result updateMaCode() {
epidemicBuildingUnitService.updateMaCode();
return new Result();
}
/**
* @return void
* @describe: 下载房屋编码

6
epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/controller/PlotBuildingController.java
View File

@ -120,4 +120,10 @@ public class PlotBuildingController {
public Result importBuilding(@RequestParam("file") MultipartFile file) {
return epidemicPlotBuildingService.importBuilding(file);
}
@PostMapping("updateMaCode")
public Result updateMaCode() {
epidemicPlotBuildingService.updateMaCode();
return new Result();
}
}

2
epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/dao/EpidemicBuildingUnitDao.java
View File

@ -89,7 +89,7 @@ public interface EpidemicBuildingUnitDao extends BaseDao<EpidemicBuildingUnitEnt
* @author zhy
* @date 2022/6/2 15:38
*/
List<EpidemicUnitInfoResultDTO> listAllUnitInfo();
List<EpidemicUnitInfoResultDTO> listAllUnitInfo(@Param("gridId") String gridId);
Integer getMaxCode();

2
epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/dao/EpidemicPlotBuildingDao.java
View File

@ -140,7 +140,7 @@ public interface EpidemicPlotBuildingDao extends BaseDao<EpidemicPlotBuildingEnt
* @author zhy
* @date 2022/6/2 15:13
*/
List<EpidemicPlotBuildingResultDTO> listAllBuildingInfo();
List<EpidemicPlotBuildingResultDTO> listAllBuildingInfo(@Param("gridId") String gridId);
Integer getMaxCode();

19
epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/service/EpidemicBuildingUnitService.java
View File

@ -97,7 +97,7 @@ public interface EpidemicBuildingUnitService extends CrudService<EpidemicBuildin
* @author zhy
* @date 2022/6/2 15:38
*/
List<EpidemicUnitInfoResultDTO> listAllUnitInfo();
List<EpidemicUnitInfoResultDTO> listAllUnitInfo(String gridId);
/**
* 导入房屋
@ -110,8 +110,25 @@ public interface EpidemicBuildingUnitService extends CrudService<EpidemicBuildin
*/
Result importEpidemicHouse(MultipartFile file, String gridId);
/**
* 获取最大编码
*
* @param
* @return int
* @author zhy
* @date 2022/6/9 17:24
*/
int getMaxCode();
/**
* 更新编码
*
* @param
* @return void
* @author zhy
* @date 2022/6/9 17:24
*/
void updateMaCode();
/**
* 单元列表下拉框
*

20
epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/service/EpidemicPlotBuildingService.java
View File

@ -82,7 +82,25 @@ public interface EpidemicPlotBuildingService extends CrudService<EpidemicPlotBui
* @author zhy
* @date 2022/6/2 15:11
*/
List<EpidemicPlotBuildingResultDTO> listAllBuildingInfo();
List<EpidemicPlotBuildingResultDTO> listAllBuildingInfo(String gridId);
/**
* 获取最大编码
*
* @param
* @return int
* @author zhy
* @date 2022/6/9 17:24
*/
int getMaxCode();
/**
* 更新编码
*
* @param
* @return void
* @author zhy
* @date 2022/6/9 17:24
*/
void updateMaCode();
}

110
epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/service/impl/EpidemicBuildingUnitServiceImpl.java
View File

@ -46,11 +46,13 @@ import com.elink.esua.epdc.vaccine.house.excel.BaseResidentInformationUpdateExce
import com.elink.esua.epdc.vaccine.personroom.dao.EpidemicBuildingUnitDao;
import com.elink.esua.epdc.vaccine.personroom.dao.EpidemicUnitOwnerDao;
import com.elink.esua.epdc.vaccine.personroom.entity.EpidemicBuildingUnitEntity;
import com.elink.esua.epdc.vaccine.personroom.entity.EpidemicPlotBuildingEntity;
import com.elink.esua.epdc.vaccine.personroom.entity.EpidemicUnitOwnerEntity;
import com.elink.esua.epdc.vaccine.personroom.redis.EpidemicBuildingUnitRedis;
import com.elink.esua.epdc.vaccine.personroom.service.EpidemicBuildingUnitService;
import com.elink.esua.epdc.vaccine.personroom.service.EpidemicPlotBuildingService;
import com.elink.esua.epdc.vaccine.personroom.service.EpidemicUnitOwnerService;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@ -67,6 +69,7 @@ import java.util.stream.Collectors;
* @author zhy qu@elink-cn.com
* @since v1.0.0 2022-02-15
*/
@Slf4j
@Service
public class EpidemicBuildingUnitServiceImpl extends CrudServiceImpl<EpidemicBuildingUnitDao, EpidemicBuildingUnitEntity, EpidemicBuildingUnitDTO> implements EpidemicBuildingUnitService {
@ -112,6 +115,7 @@ public class EpidemicBuildingUnitServiceImpl extends CrudServiceImpl<EpidemicBui
String type = (String) params.get("roomType");
String owner = (String) params.get("ownerName");
String mobile = (String) params.get("mobile");
String roomMaCode = (String) params.get("roomMaCode");
QueryWrapper<EpidemicBuildingUnitEntity> wrapper = new QueryWrapper<>();
wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
@ -119,6 +123,7 @@ public class EpidemicBuildingUnitServiceImpl extends CrudServiceImpl<EpidemicBui
wrapper.eq(StringUtils.isNotBlank(type), "ROOM_TYPE", type);
wrapper.eq(StringUtils.isNotBlank(owner), "OWNER_NAME", owner);
wrapper.eq(StringUtils.isNotBlank(mobile), "MOBILE", mobile);
wrapper.eq(StringUtils.isNotBlank(roomMaCode), "ROOM_MA_CODE", roomMaCode);
return wrapper;
}
@ -193,8 +198,8 @@ public class EpidemicBuildingUnitServiceImpl extends CrudServiceImpl<EpidemicBui
}
@Override
public List<EpidemicUnitInfoResultDTO> listAllUnitInfo() {
return baseDao.listAllUnitInfo();
public List<EpidemicUnitInfoResultDTO> listAllUnitInfo(String gridId) {
return baseDao.listAllUnitInfo(gridId);
}
private void checkData(EpidemicBuildingUnitDTO dto) {
@ -235,7 +240,7 @@ public class EpidemicBuildingUnitServiceImpl extends CrudServiceImpl<EpidemicBui
public Result importEpidemicHouse(MultipartFile file, String gridId) {
CompleteDeptDTO parentAndAllDeptDTO = null;
if (StringUtils.isNotBlank(gridId)) {
Result<CompleteDeptDTO> parentAndAllDept = adminVimFeignClient.getCompleteDept(parentAndAllDeptDTO.getGridId().toString());
Result<CompleteDeptDTO> parentAndAllDept = adminVimFeignClient.getCompleteDept(gridId);
if (!parentAndAllDept.success() || parentAndAllDept.getData() == null) {
return new Result().error("获取归属部门信息失败");
}
@ -245,8 +250,6 @@ public class EpidemicBuildingUnitServiceImpl extends CrudServiceImpl<EpidemicBui
File f = StreamUtils.conversionFile(file);
ImportParams importParams = new ImportParams();
try {
//户主身份证和插入的ID，便于保存居住人信息时匹配户主信息
Map<String, String> populationIdNoAndIdMap = new HashMap<>();
//居民导入数据
List<BaseResidentInformationUpdateExcel> excelData;
// 处理错误数据使用
@ -263,10 +266,10 @@ public class EpidemicBuildingUnitServiceImpl extends CrudServiceImpl<EpidemicBui
excelData = ExcelImportUtil.importExcel(f, BaseResidentInformationUpdateExcel.class, importParams);
excelErrorData = ExcelImportUtil.importExcel(f, BaseResidentInformationUpdateExcel.class, importParams);
List<EpidemicPlotBuildingResultDTO> buildingList = epidemicPlotBuildingService.listAllBuildingInfo();
List<EpidemicPlotBuildingResultDTO> buildingList = epidemicPlotBuildingService.listAllBuildingInfo(gridId);
// 校验数据
errorInfo = this.checkResidentsExcel(excelData, excelErrorData, buildingList, addList, addErrorList, gridId);
errorInfo = this.checkResidentsExcel(excelData, excelErrorData, buildingList, addList, addErrorList);
// 保存居住人信息
if (addList.size() > 0) {
@ -301,6 +304,19 @@ public class EpidemicBuildingUnitServiceImpl extends CrudServiceImpl<EpidemicBui
return maxCode;
}
@Override
public void updateMaCode() {
Map<String, Object> params = new HashMap<>(4);
params.put("roomMaCode", "0");
List<EpidemicBuildingUnitEntity> list = baseDao.selectList(getWrapper(params));
if (!list.isEmpty()) {
for (int i = 0; i < list.size(); i++) {
list.get(i).setRoomMaCode(i + 1);
}
updateBatchById(list);
}
}
private void saveOrUpdateOwners(List<EpidemicUnitOwnerDTO> owners, Long unitId) {
List<EpidemicUnitOwnerDTO> dtoList = owners.stream().filter(item -> StringUtils.isNotBlank(item.getIdCard())).collect(Collectors.toList());
List<EpidemicUnitOwnerEntity> list = ConvertUtils.sourceToTarget(dtoList, EpidemicUnitOwnerEntity.class);
@ -322,7 +338,7 @@ public class EpidemicBuildingUnitServiceImpl extends CrudServiceImpl<EpidemicBui
List<BaseResidentInformationUpdateExcel> excelErrorData,
List<EpidemicPlotBuildingResultDTO> buildingList,
List<BaseResidentInformationUpdateExcel> addList,
List<BaseResidentInformationUpdateExcel> addErrorList, String gridId) {
List<BaseResidentInformationUpdateExcel> addErrorList) {
// 不匹配信息
List<EpdcPopulationErrorResultDTO> errorLineInfoList = new ArrayList<>();
EpdcPopulationErrorResultDTO errorLineInfoDto;
@ -353,7 +369,7 @@ public class EpidemicBuildingUnitServiceImpl extends CrudServiceImpl<EpidemicBui
if (StringUtils.isBlank(plot) || StringUtils.isBlank(buildingNo) || StringUtils.isBlank(unit) || StringUtils.isBlank(roomNo)) {
errorInfo += "房屋信息不完整";
} else {
Optional<EpidemicPlotBuildingResultDTO> buildingOptional = buildingList.stream().filter(build -> build.getPlotName().equals(plot) && build.getBuildingName().equals(buildingNo) && build.getGridId().equals(gridId)).findFirst();
Optional<EpidemicPlotBuildingResultDTO> buildingOptional = buildingList.stream().filter(build -> build.getPlotName().equals(plot) && build.getBuildingName().equals(buildingNo)).findFirst();
if (!buildingOptional.isPresent()) {
errorInfo += "网格内无楼栋信息;";
}
@ -419,50 +435,54 @@ public class EpidemicBuildingUnitServiceImpl extends CrudServiceImpl<EpidemicBui
if (!updateList.isEmpty()) {
epidemicUserInfoService.updateBatchById(updateList);
}
log.info(">>>>>>>>>>>>>>>>>>>>>>>>>>>A");
// 补充人房关系
int roomCode = getMaxCode();
List<EpidemicUnitInfoResultDTO> unitList = listAllUnitInfo();
log.info(">>>>>>>>>>>>>>>>>>>>>>>>>>>B" + roomCode);
List<EpidemicUnitInfoResultDTO> unitList = listAllUnitInfo(parentAndAllDeptDTO.getGrid());
List<EpidemicUnitOwnerEntity> addOwner = new ArrayList<>();
for (EpidemicUserInfoEntity item : addList) {
log.info(">>>>>>>>>>>>>>>>>>>>>>>>>>>C");
// 只有信息完整的才进行匹配
if (StringUtils.isNotBlank(item.getPlot()) && StringUtils.isNotBlank(item.getBuildingNo()) && StringUtils.isNotBlank(item.getUnit())) {
Optional<EpidemicUnitInfoResultDTO> unitOptional = unitList.stream().filter(unit -> unit.getPlotName().equals(item.getPlot()) && unit.getBuildingName().equals(item.getBuildingNo()) && unit.getUnit().equals(item.getUnit()) && unit.getRoomNo().equals(item.getRoomNo()) && unit.getGridId().equals(parentAndAllDeptDTO.getGrid())).findFirst();
if (unitOptional.isPresent()) {
Optional<EpidemicUnitInfoResultDTO> unitOptional = unitList.stream().filter(unit -> unit.getPlotName().equals(item.getPlot()) && unit.getBuildingName().equals(item.getBuildingNo()) && unit.getUnit().equals(item.getUnit()) && unit.getRoomNo().equals(item.getRoomNo())).findFirst();
if (unitOptional.isPresent()) {
log.info(">>>>>>>>>>>>>>>>>>>>>>>>>>>D");
EpidemicUnitOwnerEntity entity = new EpidemicUnitOwnerEntity();
entity.setIdCard(item.getIdCard());
entity.setUnitId(unitOptional.get().getUnitId());
entity.setOwnerName(item.getUserName());
entity.setMobile(item.getMobile());
addOwner.add(entity);
} else {
log.info(">>>>>>>>>>>>>>>>>>>>>>>>>>>E" + buildingList.toString());
Optional<EpidemicPlotBuildingResultDTO> buildingOptional = buildingList.stream().filter(build -> build.getPlotName().equals(item.getPlot()) && build.getBuildingName().equals(item.getBuildingNo())).findFirst();
if (buildingOptional.isPresent()) {
log.info(">>>>>>>>>>>>>>>>>>>>>>>>>>>F" + buildingOptional.get());
EpidemicBuildingUnitEntity unitEntity = new EpidemicBuildingUnitEntity();
unitEntity.setBuildingId(buildingOptional.get().getId());
unitEntity.setUnit(item.getUnit().trim().toUpperCase());
unitEntity.setRoomNo(item.getRoomNo().trim().toUpperCase());
unitEntity.setIdCard(item.getIdCard());
unitEntity.setOwnerName(item.getUserName());
unitEntity.setMobile(item.getMobile());
unitEntity.setRoomType(NumConstant.ONE_STR);
roomCode = roomCode + 1;
unitEntity.setRoomMaCode(roomCode);
unitEntity.setRoomCode(getRoomCode(buildingOptional.get().getBuildingMaCode(), roomCode));
unitEntity.setGridId(parentAndAllDeptDTO.getGridId().toString());
unitEntity.setGridName(parentAndAllDeptDTO.getGrid());
unitEntity.setCommunityId(parentAndAllDeptDTO.getCommunityId().toString());
unitEntity.setCommunityName(parentAndAllDeptDTO.getCommunity());
unitEntity.setStreetId(parentAndAllDeptDTO.getStreetId().toString());
unitEntity.setStreetName(parentAndAllDeptDTO.getStreet());
insert(unitEntity);
EpidemicUnitOwnerEntity entity = new EpidemicUnitOwnerEntity();
entity.setIdCard(item.getIdCard());
entity.setUnitId(unitOptional.get().getUnitId());
entity.setUnitId(unitEntity.getId());
entity.setOwnerName(item.getUserName());
entity.setMobile(item.getMobile());
addOwner.add(entity);
} else {
Optional<EpidemicPlotBuildingResultDTO> buildingOptional = buildingList.stream().filter(build -> build.getPlotName().equals(item.getPlot()) && build.getBuildingName().equals(item.getBuildingNo()) && build.getGridId().equals(parentAndAllDeptDTO.getGrid())).findFirst();
if (buildingOptional.isPresent()) {
EpidemicBuildingUnitEntity unitEntity = new EpidemicBuildingUnitEntity();
unitEntity.setBuildingId(buildingOptional.get().getId());
unitEntity.setUnit(item.getUnit());
unitEntity.setRoomNo(item.getRoomNo());
unitEntity.setIdCard(item.getIdCard());
unitEntity.setOwnerName(item.getUserName());
unitEntity.setMobile(item.getMobile());
unitEntity.setRoomType(NumConstant.ONE_STR);
roomCode = roomCode + 1;
unitEntity.setRoomMaCode(roomCode);
unitEntity.setRoomCode(getRoomCode(buildingOptional.get().getBuildingMaCode(), roomCode));
unitEntity.setGridId(parentAndAllDeptDTO.getGridId().toString());
unitEntity.setGridName(parentAndAllDeptDTO.getGrid());
unitEntity.setCommunityId(parentAndAllDeptDTO.getCommunityId().toString());
unitEntity.setCommunityName(parentAndAllDeptDTO.getCommunity());
unitEntity.setStreetId(parentAndAllDeptDTO.getStreetId().toString());
unitEntity.setStreetName(parentAndAllDeptDTO.getStreet());
insert(unitEntity);
EpidemicUnitOwnerEntity entity = new EpidemicUnitOwnerEntity();
entity.setIdCard(item.getIdCard());
entity.setUnitId(unitEntity.getId());
entity.setOwnerName(item.getUserName());
entity.setMobile(item.getMobile());
addOwner.add(entity);
}
}
}
}
@ -470,7 +490,7 @@ public class EpidemicBuildingUnitServiceImpl extends CrudServiceImpl<EpidemicBui
for (EpidemicUserInfoEntity item : updateList) {
// 只有信息完整的才进行匹配
if (StringUtils.isNotBlank(item.getPlot()) && StringUtils.isNotBlank(item.getBuildingNo()) && StringUtils.isNotBlank(item.getUnit())) {
Optional<EpidemicUnitInfoResultDTO> unitOptional = unitList.stream().filter(unit -> unit.getPlotName().equals(item.getPlot()) && unit.getBuildingName().equals(item.getBuildingNo()) && unit.getUnit().equals(item.getUnit()) && unit.getRoomNo().equals(item.getRoomNo()) && unit.getGridId().equals(parentAndAllDeptDTO.getGrid())).findFirst();
Optional<EpidemicUnitInfoResultDTO> unitOptional = unitList.stream().filter(unit -> unit.getPlotName().equals(item.getPlot()) && unit.getBuildingName().equals(item.getBuildingNo()) && unit.getUnit().equals(item.getUnit()) && unit.getRoomNo().equals(item.getRoomNo())).findFirst();
if (unitOptional.isPresent()) {
EpidemicUnitOwnerEntity entity = new EpidemicUnitOwnerEntity();
entity.setIdCard(item.getIdCard());
@ -480,7 +500,7 @@ public class EpidemicBuildingUnitServiceImpl extends CrudServiceImpl<EpidemicBui
epidemicUnitOwnerService.deleteByIdCard(item.getIdCard());
addOwner.add(entity);
} else {
Optional<EpidemicPlotBuildingResultDTO> buildingOptional = buildingList.stream().filter(build -> build.getPlotName().equals(item.getPlot()) && build.getBuildingName().equals(item.getBuildingNo()) && build.getGridId().equals(parentAndAllDeptDTO.getGrid())).findFirst();
Optional<EpidemicPlotBuildingResultDTO> buildingOptional = buildingList.stream().filter(build -> build.getPlotName().equals(item.getPlot()) && build.getBuildingName().equals(item.getBuildingNo())).findFirst();
if (buildingOptional.isPresent()) {
EpidemicBuildingUnitEntity unitEntity = new EpidemicBuildingUnitEntity();
unitEntity.setBuildingId(buildingOptional.get().getId());

23
epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/service/impl/EpidemicPlotBuildingServiceImpl.java
View File

@ -105,11 +105,13 @@ public class EpidemicPlotBuildingServiceImpl extends CrudServiceImpl<EpidemicPlo
String id = (String) params.get(FieldConstant.ID_HUMP);
String name = (String) params.get("buildingName");
String type = (String) params.get("buildingType");
String buildingMaCode = (String) params.get("buildingMaCode");
QueryWrapper<EpidemicPlotBuildingEntity> wrapper = new QueryWrapper<>();
wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
wrapper.eq(StringUtils.isNotBlank(name), "BUILDING_NAME", name);
wrapper.eq(StringUtils.isNotBlank(type), "BUILDING_TYPE", type);
wrapper.eq(StringUtils.isNotBlank(buildingMaCode), "BUILDING_MA_CODE", buildingMaCode);
return wrapper;
}
@ -137,6 +139,8 @@ public class EpidemicPlotBuildingServiceImpl extends CrudServiceImpl<EpidemicPlo
entity.setBuildingLongitudeDsf(BigDecimal.valueOf(coordinates[1]));
entity.setBuildingLatitudeDsf(BigDecimal.valueOf(coordinates[0]));
}
int code = getMaxCode();
entity.setBuildingMaCode(code);
insert(entity);
}
@ -336,6 +340,8 @@ public class EpidemicPlotBuildingServiceImpl extends CrudServiceImpl<EpidemicPlo
//保存楼栋唯一编码
// entity.setBuildingCode(allDeptInfo.getGridId()+getNewMaxIndex(newMaxIndex));
// newMaxIndex++;
int code = getMaxCode();
entity.setBuildingMaCode(code);
baseDao.insert(entity);
} else {//更新
// isExist = ConvertUtils.sourceToTarget(record, EpidemicPlotBuildingEntity.class);
@ -403,8 +409,8 @@ public class EpidemicPlotBuildingServiceImpl extends CrudServiceImpl<EpidemicPlo
}
@Override
public List<EpidemicPlotBuildingResultDTO> listAllBuildingInfo() {
return baseDao.listAllBuildingInfo();
public List<EpidemicPlotBuildingResultDTO> listAllBuildingInfo(String gridId) {
return baseDao.listAllBuildingInfo(gridId);
}
@Override
@ -416,6 +422,19 @@ public class EpidemicPlotBuildingServiceImpl extends CrudServiceImpl<EpidemicPlo
return maxCode;
}
@Override
public void updateMaCode() {
Map<String, Object> params = new HashMap<>(4);
params.put("buildingMaCode", "0");
List<EpidemicPlotBuildingEntity> list = baseDao.selectList(getWrapper(params));
if (!list.isEmpty()) {
for (int i = 0; i < list.size(); i++) {
list.get(i).setBuildingMaCode(i + 1);
}
updateBatchById(list);
}
}
/**
* @return void
* @describe: 创建数据库里不存在的小区

3
epdc-cloud-vim-yushan/src/main/resources/mapper/personroom/EpidemicBuildingUnitDao.xml
View File

@ -143,6 +143,9 @@
u.DEL_FLAG = '0'
AND b.DEL_FLAG = '0'
AND p.DEL_FLAG = '0'
<if test="gridId != null and gridId !=''">
AND u.GRID_ID = #{gridId}
</if>
</select>
<select id="getMaxCode" resultType="java.lang.Integer">

3
epdc-cloud-vim-yushan/src/main/resources/mapper/personroom/EpidemicPlotBuildingDao.xml
View File

@ -186,6 +186,9 @@
WHERE
b.DEL_FLAG = '0'
AND p.DEL_FLAG = '0'
<if test="gridId != null and gridId !=''">
AND b.GRID_ID = #{gridId}
</if>
</select>
<select id="getMaxCode" resultType="java.lang.Integer">
SELECT

Write Preview
Loading…
Cancel
Save