This commit is contained in:
2023-03-17 15:32:02 +08:00
@@ -313,7 +313,7 @@ public class fjtEvaluationController {
Map<Long, UsersDetail> userDetailMap = getUserDetailMap(uids); Map<Long, UsersDetail> userDetailMap = getUserDetailMap(uids);
for(UserTradesBo bo : list){ for(UserTradesBo bo : list){
row = sheet.createRow(i++); 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 = evaluationAuditService.findByEvalutionId(String.valueOf(bo.getEvaluationId()));
EvaluationAudit audit = evalAuditMap.get(Long.valueOf(bo.getEvaluationId())); EvaluationAudit audit = evalAuditMap.get(Long.valueOf(bo.getEvaluationId()));
if(audit == null){ if(audit == null){
@@ -360,6 +360,7 @@ public class fjtEvaluationController {
row.createCell(17).setCellValue(DateUtil.formatByPattern(bo.getEvaluationDate(), "yyyy年MM月dd日")); row.createCell(17).setCellValue(DateUtil.formatByPattern(bo.getEvaluationDate(), "yyyy年MM月dd日"));
}else{ }else{
row.createCell(0).setCellValue(bo.getReportNum()); row.createCell(0).setCellValue(bo.getReportNum());
row.createCell(1).setCellValue(audit.getCity()); row.createCell(1).setCellValue(audit.getCity());
@@ -406,6 +407,11 @@ public class fjtEvaluationController {
} }
row.createCell(21).setCellValue(bo.getArea()); 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{ }else{
row.createCell(0).setCellValue(bo.getReportNum()); row.createCell(0).setCellValue(bo.getReportNum());
row.createCell(1).setCellValue(bo.getCity()); row.createCell(1).setCellValue(bo.getCity());