Tenlion/btxtgxq-system-population
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/upgrade' into upgrade

Browse Source
This commit is contained in:
java_cuibaocheng@163.com 2023-12-18 16:20:48 +08:00
commit a63dfbaa23
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/cm/population/controller/api/residential/ResidentialController.java
View File

@ -190,7 +190,7 @@ public class ResidentialController extends AbstractController {
@ApiOperation(value = "新增小区管理", notes = "新增小区管理接口") @ApiOperation(value = "新增小区管理", notes = "新增小区管理接口")
@GetMapping("excel") @GetMapping("excel")
public SuccessResult excel() { public SuccessResult excel() {
String fileName = "C:\\Users\\29492\\Desktop\\民族东路社区(1).xlsx"; String fileName = "C:\\Users\\29492\\Desktop\\万泉佳苑底店楼宇批量导入.xlsx";
List<Object> list = EasyExcel.read(fileName, ReadExcelResidentialModel.class, List<Object> list = EasyExcel.read(fileName, ReadExcelResidentialModel.class,
new AnalysisEventListener<ReadExcelResidentialModel>() { new AnalysisEventListener<ReadExcelResidentialModel>() {

8
src/main/java/com/cm/population/service/house/impl/HouseServiceImpl.java
View File

@ -515,7 +515,13 @@ public class HouseServiceImpl extends AbstractService implements IHouseService {
flagNum += 1; flagNum += 1;
} }
houseNum = floor + "0" + flagNum; if(flagNum < 10) {
houseNum = floor + "0" + flagNum;
}else {
houseNum = floor + "" + flagNum;
}
HouseVO houseVO = new HouseVO(); HouseVO houseVO = new HouseVO();
// 基本信息：街道、社区、小区、楼栋 // 基本信息：街道、社区、小区、楼栋