产证地址修改
This commit is contained in:
+16
-4
@@ -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<FjtEvaluation> evaluations = fjtEvaluationService.findAllFjtEvaluationByConditions(eval.getCity(), eval.getRegion(), eval.getAddress(), eval.getHouseNum(), eval.getRoomNum());
|
||||
List<FjtEvaluation> evaluations = fjtEvaluationService.findAllFjtEvaluationByConditions(eval.getCity(), eval.getRegion(), bo.getAddress(), eval.getHouseNum(), eval.getRoomNum());
|
||||
if(evaluations!=null && evaluations.size()>=2){
|
||||
List<String> ids = new ArrayList<String>();
|
||||
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<FjtEvaluation> evaluations = fjtEvaluationService.findAllFjtEvaluationByConditions(eval.getCity(), eval.getRegion(), eval.getAddress(), eval.getHouseNum(), eval.getRoomNum());
|
||||
List<FjtEvaluation> evaluations = fjtEvaluationService.findAllFjtEvaluationByConditions(eval.getCity(), eval.getRegion(), bo.getAddress(), eval.getHouseNum(), eval.getRoomNum());
|
||||
if(evaluations!=null && evaluations.size()>=2){
|
||||
List<String> ids = new ArrayList<String>();
|
||||
for(FjtEvaluation fjtEval : evaluations){
|
||||
|
||||
+3
-1
@@ -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())){
|
||||
|
||||
Reference in New Issue
Block a user