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 93eec6a06..cba98d594 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 @@ -313,7 +313,7 @@ public class fjtEvaluationController { Map userDetailMap = getUserDetailMap(uids); for(UserTradesBo bo : list){ row = sheet.createRow(i++); - if(bo.getRole() == 12){//农行版 + if(bo.getRole() == 12 || bo.getRole() == 16){//农行版 //EvaluationAudit audit = evaluationAuditService.findByEvalutionId(String.valueOf(bo.getEvaluationId())); EvaluationAudit audit = evalAuditMap.get(Long.valueOf(bo.getEvaluationId())); if(audit == null){ @@ -359,7 +359,8 @@ public class fjtEvaluationController { } row.createCell(17).setCellValue(DateUtil.formatByPattern(bo.getEvaluationDate(), "yyyy年MM月dd日")); - + + }else{ row.createCell(0).setCellValue(bo.getReportNum()); row.createCell(1).setCellValue(audit.getCity()); @@ -405,6 +406,11 @@ public class fjtEvaluationController { } row.createCell(21).setCellValue(bo.getArea()); + + FjtEvaluation ev = evalMap.get(Long.valueOf(bo.getEvaluationId())); + if(ev.getCertificateAddress() != null) { + row.createCell(22).setCellValue(ev.getCertificateAddress()); + } }else{ row.createCell(0).setCellValue(bo.getReportNum());