x

src/main/java/com/egolm/film/api/service/impl/ExportServiceImpl.java

@@ -186,6 +186,12 @@ public class ExportServiceImpl implements ExportService {
 		columns.put("film_format", "样片规格");
 		columns.put("film_format_url", "样片URL");
 		columns.put("film_format_passw", "样片URL密码");
+		columns.put("round_1_text", "一选审片详情");
+		columns.put("round_2_text", "二选审片详情");
+		columns.put("round_3_text", "三选审片详情");
+		columns.put("round_4_text", "影片把关审片详情");
+		columns.put("round_5_text", "选片委员会审片详情");
+		columns.put("round_6_text", "电影总局审片详情");
 		return columns;
 	}
 
@@ -233,7 +239,7 @@ public class ExportServiceImpl implements ExportService {
 		String sql0 = "select group_concat(fp.playactor_name) text, fp.film_id, fp.playactor_type from fc_member_film_playactor fp group by fp.film_id, fp.playactor_type";
 		String sql1 = "select group_concat(fi.issuer_company) text, fi.film_id from fc_member_film_issuer fi group by fi.film_id";
 		String sql2 = "select rr.*, u.realname from fc_review_record rr left join fc_user u on u.uid = rr.user_id";
-		String sql3 = "select ree.* from fc_review_record_ext rre";
+		String sql3 = "select rre.* from fc_review_record_ext rre";
 		List<Map<String, Object>> playactors = jdbcTemplate.limitAll(sql0, new Page(1L, 1000L));
 		List<Map<String, Object>> issuers = jdbcTemplate.limitAll(sql1, new Page(1L, 1000L));
 		List<Map<String, Object>> records = jdbcTemplate.limitAll(sql2, new Page(1L, 1000L));
@@ -292,10 +298,14 @@ public class ExportServiceImpl implements ExportService {
 						String review_text_3 = (String)recordMap.get("review_text_3");
 						String review_text_4 = (String)recordMap.get("review_text_4");
 						Double review_score = Util.toDouble(recordMap.get("review_score"));
+						Integer review_state = Util.toInt(recordMap.get("review_state"));
 						sb.append("评委:").append(realname).append("\r\n");
 						if(review_score != null) {
 							sb.append("评分:").append(review_score).append("\r\n");
 						}
+						if(review_state != null) {
+							sb.append("结论:").append(ExportConstant.reviewState[Integer.valueOf(review_state)]).append("\r\n");
+						}
 						if(StringUtil.isNotBlank(review_text)) {
 							sb.append("评论:").append(review_text).append("\r\n");
 						}
@@ -311,18 +321,18 @@ public class ExportServiceImpl implements ExportService {
 						if(StringUtil.isNotBlank(review_text_4)) {
 							sb.append("评语4:").append(review_text_4).append("\r\n");
 						}
-						Integer record_id = ((Number)recordMap.get("record_id")).intValue();
+						Integer record_id = ((Number)recordMap.get("id")).intValue();
 						List<Map<String, Object>> extList = extML.get(String.valueOf(record_id));
 						if(extList != null) {
 							for(Map<String, Object> extMap : extList) {
-								sb.append("\t").append("最佳").append(ExportConstant.playactorTypes.get(extMap.get("ext_type"))).append("\t").append(extMap.get("ext_name")).append("\t").append(extMap.get("ext_score"));
+								sb.append("\t").append("奖项:").append("最佳").append(ExportConstant.playactorTypes.get(extMap.get("ext_type"))).append(" ").append(extMap.get("ext_name")).append(", 得分:").append(extMap.get("ext_score")).append("\r\n");
 							}
 						}
 						sb.append("\r\n\r\n");
 					}
 				}
+				map.put("round_" + i + "_text", sb.toString());
 			}
-			
 		}	
 		
 		Map<String, String> columnMap = this.getApplyPassListColumns();

src/main/java/com/egolm/film/api/web/ExportConstant.java

@@ -94,4 +94,8 @@ public class ExportConstant {
 		playShanghai.put("4", "中国首映");
 	}
 	
+	public static final String[] rounds = new String[] {"", "一选", "二选", "三选", "影片把关", "选片委员会", "电影总局"};
+	public static final String[] reviewState = new String[] {"", "通过", "否决", "参赛", "参赛备选", "参展"};
+	
+	
 }