|
|
@ -810,6 +810,8 @@ public class EpidemicBuildingUnitServiceImpl extends CrudServiceImpl<EpidemicBui |
|
|
|
if (StringUtils.isBlank(buildingCode)) { |
|
|
|
return ""; |
|
|
|
} |
|
|
|
// 20220712删掉12位社区规划编码
|
|
|
|
buildingCode=buildingCode.replace("370124001000",""); |
|
|
|
return buildingCode.concat(getRoomMaCode(unit, roomNo)); |
|
|
|
} |
|
|
|
|
|
|
@ -825,10 +827,10 @@ public class EpidemicBuildingUnitServiceImpl extends CrudServiceImpl<EpidemicBui |
|
|
|
roomNum = "0"; |
|
|
|
} |
|
|
|
|
|
|
|
if (unitNum.length() < NumConstant.THREE) { |
|
|
|
unitCode = String.format("%03d", Integer.parseInt(unitNum)); |
|
|
|
if (unitNum.length() < NumConstant.TWO) { |
|
|
|
unitCode = String.format("%02d", Integer.parseInt(unitNum)); |
|
|
|
} else { |
|
|
|
unitCode = unitNum.substring(unitNum.length() - 3); |
|
|
|
unitCode = unitNum.substring(unitNum.length() - 2); |
|
|
|
} |
|
|
|
if (roomNum.length() < NumConstant.FOUR) { |
|
|
|
roomCode = String.format("%04d", Integer.parseInt(roomNum)); |
|
|
|