Commit 2264d609 authored by Quxl's avatar Quxl

x

parent bff61c61
...@@ -115,5 +115,7 @@ public interface ReviewService { ...@@ -115,5 +115,7 @@ public interface ReviewService {
List<Map<String, Object>> queryExhibitionList(String keyword, Integer enroll_type_id, Integer film_type_name, List<Map<String, Object>> queryExhibitionList(String keyword, Integer enroll_type_id, Integer film_type_name,
Integer film_type_name_short, String film_country, Integer from_round, Page page); Integer film_type_name_short, String film_country, Integer from_round, Page page);
void allotShowFilmUser(Integer review_id, Integer[] user_id);
} }
\ No newline at end of file
package com.egolm.film.api.service.impl; package com.egolm.film.api.service.impl;
import java.util.ArrayList;
import java.util.Collection; import java.util.Collection;
import java.util.Date; import java.util.Date;
import java.util.HashMap; import java.util.HashMap;
...@@ -24,6 +25,7 @@ import com.egolm.film.bean.Fc_review_history; ...@@ -24,6 +25,7 @@ import com.egolm.film.bean.Fc_review_history;
import com.egolm.film.bean.Fc_review_record; import com.egolm.film.bean.Fc_review_record;
import com.egolm.film.bean.Fc_review_record_ext; import com.egolm.film.bean.Fc_review_record_ext;
import com.egolm.film.bean.Fc_user; import com.egolm.film.bean.Fc_user;
import com.egolm.film.bean.Fc_user_film;
import com.egolm.film.config.XRException; import com.egolm.film.config.XRException;
import com.egolm.film.util.SqlWhere; import com.egolm.film.util.SqlWhere;
...@@ -575,5 +577,19 @@ public class ReviewServiceImpl implements ReviewService { ...@@ -575,5 +577,19 @@ public class ReviewServiceImpl implements ReviewService {
sql = "select t.* from (" + sql + ") t " + StringUtil.join(" and ", " where ", "", where.getStringList()) + " order by t.film_id desc"; sql = "select t.* from (" + sql + ") t " + StringUtil.join(" and ", " where ", "", where.getStringList()) + " order by t.film_id desc";
return jdbcTemplate.limit(sql, page, where.getObjectArray()); return jdbcTemplate.limit(sql, page, where.getObjectArray());
} }
@Override
@Transactional
public void allotShowFilmUser(Integer review_id, Integer[] user_id) {
this.jdbcTemplate.executeUpdate("delete * from fc_user_film where review_id = ?", review_id);
List<Fc_user_film> ufs = new ArrayList<Fc_user_film>();
for(Integer uid : user_id) {
Fc_user_film uf = new Fc_user_film();
uf.setReview_id(review_id);
uf.setUser_id(uid);
ufs.add(uf);
}
this.jdbcTemplate.batchSave(ufs);
}
} }
\ No newline at end of file
...@@ -269,7 +269,7 @@ public class AdminReviewController { ...@@ -269,7 +269,7 @@ public class AdminReviewController {
@ApiOperation("分配审片评委") @ApiOperation("分配审片评委")
@ApiImplicitParams({ @ApiImplicitParams({
@ApiImplicitParam(paramType="query", dataType="int", required=true, name="review_id", value="审片主表ID"), @ApiImplicitParam(paramType="query", dataType="int", required=true, name="review_id", value="审片主表ID"),
@ApiImplicitParam(paramType="query", dataType="int", required=true, name="review_round", value="分配评委的审片环节"), @ApiImplicitParam(paramType="query", dataType="int", required=true, name="review_round", value="分配评委的审片环节, 分配看片评委时为0或不传此参数"),
@ApiImplicitParam(paramType="query", dataType="string", required=true, name="is_cancel", value="是否取消分配 true|false 或 1|0", allowMultiple=true), @ApiImplicitParam(paramType="query", dataType="string", required=true, name="is_cancel", value="是否取消分配 true|false 或 1|0", allowMultiple=true),
@ApiImplicitParam(paramType="query", dataType="int", required=true, name="user_id", value="审片评委ID", allowMultiple=true), @ApiImplicitParam(paramType="query", dataType="int", required=true, name="user_id", value="审片评委ID", allowMultiple=true),
}) })
...@@ -316,6 +316,21 @@ public class AdminReviewController { ...@@ -316,6 +316,21 @@ public class AdminReviewController {
return Rjx.jsonOk(); return Rjx.jsonOk();
} }
@ResponseBody
@Transactional
@PostMapping("allot_show_user")
@ApiOperation("分配看片评委")
@ApiImplicitParams({
@ApiImplicitParam(paramType="query", dataType="int", required=true, name="review_id", value="审片主表ID"),
@ApiImplicitParam(paramType="query", dataType="int", required=true, name="user_id", value="审片评委ID", allowMultiple=true),
})
public Object allot_show_user(
Integer review_id,
Integer[] user_id) {
reviewService.allotShowFilmUser(review_id, user_id);
return Rjx.jsonOk();
}
@ResponseBody @ResponseBody
@PostMapping("allot_list") @PostMapping("allot_list")
@ApiOperation("查询审片评委") @ApiOperation("查询审片评委")
......
...@@ -29,13 +29,13 @@ public class Fc_review implements java.io.Serializable { ...@@ -29,13 +29,13 @@ public class Fc_review implements java.io.Serializable {
@Column(columnDefinition="int(11) COMMENT '评委分配状态 0未分配评委 1已分配评委评选中'") @Column(columnDefinition="int(11) COMMENT '评委分配状态 0未分配评委 1已分配评委评选中'")
private Integer allot_state; private Integer allot_state;
@Column(columnDefinition="int(11) COMMENT '审片结论 0未评选 1通过 2否决 3参赛 4参赛备选 5参展'") @Column(columnDefinition="int(11) COMMENT '审片结论 0未评选 1已通过 2已否决 3参赛 4参赛备选 5参展'")
private Integer review_state; private Integer review_state;
@Column(columnDefinition="int(11) COMMENT '评选状态 0未评选 1有争议 2管理员分配 3审片完成'") @Column(columnDefinition="int(11) COMMENT '评选状态 0未评选 1有争议 2待晋级 3完成'")
private Integer opt_state; private Integer opt_state;
@Column(columnDefinition="int(11) COMMENT '0原始 2二选 3三选'") @Column(columnDefinition="int(11) COMMENT '流程来源 0原始 2二选 3三选 5选片委员会'")
private Integer from_round; private Integer from_round;
@Column(columnDefinition="datetime COMMENT '推送时间'") @Column(columnDefinition="datetime COMMENT '推送时间'")
......
package com.egolm.film.bean;
import javax.persistence.Entity;
import javax.persistence.Column;
import javax.persistence.Id;
@Entity(name="fc_user_film")
public class Fc_user_film implements java.io.Serializable {
private static final long serialVersionUID = 1L;
@Id
@Column(columnDefinition="int(11)")
private Integer id;
@Column(columnDefinition="int(11)")
private Integer user_id;
@Column(columnDefinition="int(11)")
private Integer review_id;
public void setId(Integer id) {
this.id = id;
}
public Integer getId() {
return id;
}
public void setUser_id(Integer user_id) {
this.user_id = user_id;
}
public Integer getUser_id() {
return user_id;
}
public void setReview_id(Integer review_id) {
this.review_id = review_id;
}
public Integer getReview_id() {
return review_id;
}
}
...@@ -11,7 +11,7 @@ public class DBUtil { ...@@ -11,7 +11,7 @@ public class DBUtil {
"D:\\eclipse-workspace\\egolm.com\\default\\siff-film-api\\src\\main\\java", "D:\\eclipse-workspace\\egolm.com\\default\\siff-film-api\\src\\main\\java",
"com.egolm.film.bean", "com.egolm.film.bean",
"曲欣亮", "10.10.0.111", "曲欣亮", "10.10.0.111",
"film_new", "mv",
"root", "root",
"egolm#2018"); "egolm#2018");
mysqlTo.execute(); mysqlTo.execute();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment