|
|
@@ -54,17 +54,13 @@ public class EstateRepairController {
|
|
|
|
|
|
@PostMapping(value = "/addEstateRepair")
|
|
|
public R addEstateRepair(@RequestBody RepairDTO repairDTO){
|
|
|
+ Assert.hasText(repairDTO.getReportor(), "上报人姓名必传");
|
|
|
+ Assert.hasText(repairDTO.getReportorPhone(), "上报人联系电话必传");
|
|
|
+ Assert.notNull(repairDTO.getResidentialId(), "上报小区必传");
|
|
|
repairDTO.setRepairNo(generateRepairNO());
|
|
|
- Residential searchResidential = new Residential();
|
|
|
- Residential residential = residentialClient.detail(searchResidential);
|
|
|
+ Residential residential = residentialClient.getById(repairDTO.getId());
|
|
|
Assert.notNull(residential, "小区不存在");
|
|
|
repairDTO.setTenantId(residential.getTenantId());
|
|
|
- HouseUser searchHouseUser = new HouseUser();
|
|
|
- HouseUserVO houseUserVO = houseUserClient.detail(searchHouseUser);
|
|
|
- if(houseUserVO != null){
|
|
|
- repairDTO.setReportor(houseUserVO.getName());
|
|
|
- repairDTO.setReportorPhone(houseUserVO.getPhone());
|
|
|
- }
|
|
|
if(StringUtil.isNotBlank(repairDTO.getPic())){
|
|
|
List<String> picList = Func.toStrList(repairDTO.getPic());
|
|
|
List<String> savePicList = new ArrayList<>();
|