x

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

@@ -134,7 +134,7 @@ public class ReviewServiceImpl implements ReviewService {
 	@Override
 	public List<Map<String, Object>> queryBestMvListByGroup(String keyword, Integer user_group_id, Integer review_round, String ext_type, Page page) {
 		XRException.assertNotBlank("选片轮数不能为空", review_round);
-		String sql = "select r.* from fc_review r left join fc_ where r.enroll_type_id = 2 and review_round >= " + review_round;
+		String sql = "select r.* from fc_review r, fc_review_record rr, fc_review_record_ext rre where rre.record_id = rr.id and rr.review_id = r.id and r.enroll_type_id = 2 and review_round >= " + review_round + " group by rr.review_id, rre.record_id, ";
 		//TODO
 		return null;
 	}
@@ -344,11 +344,6 @@ public class ReviewServiceImpl implements ReviewService {
 		return null;
 	}
 	
-	/**
-	 * 1金爵 2亚新 4展映
-	 * 1通过 2否决 3参赛 4参赛备选 5参展
-	 * 0未评选 1有争议 2管理员分配 3审片完成
-	 */
 	@Override
 	@Transactional
 	public void tryNextRound(Integer review_id) {
@@ -366,6 +361,9 @@ public class ReviewServiceImpl implements ReviewService {
 			jdbcTemplate.executeUpdate("update fc_review set opt_state = 1, allot_state = 0 where id = ?", review.getId());
 		} else {
 			jdbcTemplate.executeUpdate("update fc_review set opt_state = 2, review_state = ? where id = ?", review_state, review.getId());
+			if(enroll_type_id.intValue() == 2 && (review_round.intValue() == 2 || review_round.intValue() == 3)) {
+				this.createAsiaNewReport(review.getId());
+			}
 		}
 		Integer opt_state = jdbcTemplate.queryForInt("select opt_state from fc_review where id = ?", review.getId());
 		Fc_review_history history = new Fc_review_history();
@@ -379,6 +377,11 @@ public class ReviewServiceImpl implements ReviewService {
 		jdbcTemplate.save(history);
 	}
 	
+	public void createAsiaNewReport(Integer review_id) {
+		Fc_review review = jdbcTemplate.queryForBean("select * from fc_review where id = ?", Fc_review.class, review_id);
+		
+	}
+	
 	public void save(Object obj) {
 		jdbcTemplate.save(obj);
 	}

src/main/java/com/egolm/film/api/web/admin/WebUtilController.java

@@ -162,7 +162,7 @@ public class WebUtilController {
             	String value = apiOperation.value();
             	for (String url : p.getPatterns()) {  
                     Fc_logs_ext logsExt = new Fc_logs_ext();
-                    logsExt.setExt(value);
+                    logsExt.setExt(StringUtil.isNotBlank(value) ? value : method.getName());
                     logsExt.setPath(url);
                     list.add(logsExt);
                 }