x

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

@@ -195,12 +195,14 @@ public class ExportServiceImpl implements ExportService {
 		columns.put("film_format", "样片规格");
 		columns.put("film_format_url", "样片URL");
 		columns.put("film_format_passw", "样片URL密码");
+		columns.put("reviewText", "审片进度");
 		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", "电影总局审片详情");
+		columns.put("remark", "终审归档");
 		return columns;
 	}
 
@@ -236,6 +238,7 @@ public class ExportServiceImpl implements ExportService {
 					+ "mf.film_format, "
 					+ "mf.film_format_url, "
 					+ "mf.film_format_passw, "
+					+ "mf.remark, "
 					+ "r.id review_id, "
 					+ "r.review_round, "
 					+ "r.review_state, "
@@ -277,6 +280,12 @@ public class ExportServiceImpl implements ExportService {
 			map.put("film_format", ExportConstant.filmFormat.get(String.valueOf(map.get("film_format"))));
 			map.put("play_shanghai", ExportConstant.playShanghai.get(String.valueOf(map.get("play_shanghai"))));
 			
+			Integer reviewRound = (Integer)map.get("review_round");
+			Integer reviewState = (Integer)map.get("review_state");
+			Integer optState = (Integer)map.get("opt_state");
+			String reviewText = ExportConstant.rounds[reviewRound] + (reviewState != null && reviewState != 0 ? ExportConstant.reviewState[reviewState] : ExportConstant.optState[optState]);
+			map.put("reviewText", reviewText);
+			
 			String enroll_type_name = (String)map.get("enroll_type_name");
 			if(StringUtil.isNotBlank(enroll_type_name)) {
 				List<String> enrolls = new ArrayList<String>();
@@ -294,9 +303,8 @@ public class ExportServiceImpl implements ExportService {
 				map.put("enroll_type_name_other", StringUtil.join(",", others));
 			}
 			
-			Integer review_round = ((Number)map.get("review_round")).intValue();
 			Integer review_id = ((Number)map.get("review_id")).intValue();
-			for(int i = 1; i <= 6 && i <= review_round; i++) {
+			for(int i = 1; i <= 6 && i <= reviewRound; i++) {
 				StringBuffer sb = new StringBuffer();
 				List<Map<String, Object>> recordList = recordML.get(review_id + "," + i);
 				if(recordList != null) {

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

@@ -95,7 +95,8 @@ public class ExportConstant {
 	}
 	
 	public static final String[] rounds = new String[] {"", "一选", "二选", "三选", "影片把关", "选片委员会", "电影总局"};
-	public static final String[] reviewState = new String[] {"", "通过", "否决", "参赛", "参赛备选", "参展"};
+	public static final String[] reviewState = new String[] {"未评选", "通过", "否决", "参赛", "参赛备选", "参展"};
+	public static final String[] optState = new String[] {"未评选", "争议", "待分配", "已完成"};
 	
 	
 }