diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/EvaluationAuditController.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/EvaluationAuditController.java index 29ee2de45..52b1ecb2d 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/EvaluationAuditController.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/EvaluationAuditController.java @@ -106,7 +106,13 @@ public class EvaluationAuditController { if(eval!=null){ bo.setHouseArea(eval.getHouseArea()); bo.setDistrictName(eval.getDistrictName()); - bo.setAddress(eval.getAddress()); + String address = ""; + if(StringUtils.isNotBlank(eval.getCertificateAddress())){ + address = eval.getCertificateAddress(); + }else{ + address = eval.getAddress(); + } + bo.setAddress(address); bo.setHouseNum(eval.getHouseNum()); bo.setRoomNum(eval.getRoomNum()); bo.setEvaluationDate(eval.getLastUpdated()); @@ -115,7 +121,7 @@ public class EvaluationAuditController { bo.setFloorDesc(eval.getFloorDesc()); bos.add(bo); - List evaluations = fjtEvaluationService.findAllFjtEvaluationByConditions(eval.getCity(), eval.getRegion(), eval.getAddress(), eval.getHouseNum(), eval.getRoomNum()); + List evaluations = fjtEvaluationService.findAllFjtEvaluationByConditions(eval.getCity(), eval.getRegion(), bo.getAddress(), eval.getHouseNum(), eval.getRoomNum()); if(evaluations!=null && evaluations.size()>=2){ List ids = new ArrayList(); for(FjtEvaluation fjtEval : evaluations){ @@ -148,7 +154,13 @@ public class EvaluationAuditController { BeanUtils.copyProperties(audit, bo); bo.setHouseArea(eval.getHouseArea()); bo.setDistrictName(eval.getDistrictName()); - bo.setAddress(eval.getAddress()); + String address = ""; + if(StringUtils.isNotBlank(eval.getCertificateAddress())){ + address = eval.getCertificateAddress(); + }else{ + address = eval.getAddress(); + } + bo.setAddress(address); bo.setHouseNum(eval.getHouseNum()); bo.setRoomNum(eval.getRoomNum()); bo.setEvaluationDate(eval.getLastUpdated()); @@ -157,7 +169,7 @@ public class EvaluationAuditController { bo.setFloorDesc(eval.getFloorDesc()); bos.add(bo); //根据地址,楼栋号判断是否是同一套房 - List evaluations = fjtEvaluationService.findAllFjtEvaluationByConditions(eval.getCity(), eval.getRegion(), eval.getAddress(), eval.getHouseNum(), eval.getRoomNum()); + List evaluations = fjtEvaluationService.findAllFjtEvaluationByConditions(eval.getCity(), eval.getRegion(), bo.getAddress(), eval.getHouseNum(), eval.getRoomNum()); if(evaluations!=null && evaluations.size()>=2){ List ids = new ArrayList(); for(FjtEvaluation fjtEval : evaluations){ diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/fjtEvaluationController.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/fjtEvaluationController.java index 18e5f75ed..93eec6a06 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/fjtEvaluationController.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/fjtEvaluationController.java @@ -113,7 +113,9 @@ public class fjtEvaluationController { FjtEvaluation evaluation = fjtEvaluationService.findEvaluationById(Integer.parseInt(bo.getEvaluationId())); if(evaluation != null){ String addr = ""; - if(evaluation.getAddress() != null){ + if(StringUtils.isNotBlank(evaluation.getCertificateAddress())){ + addr += evaluation.getCertificateAddress(); + }else if(evaluation.getAddress() != null){ addr += evaluation.getAddress(); } if(StringUtils.isNotBlank(evaluation.getHouseNum())){