Commit 874075db authored by licc's avatar licc

修改方案查询记录

parent 67a15c47
...@@ -65,7 +65,7 @@ public class R<T> implements Serializable { ...@@ -65,7 +65,7 @@ public class R<T> implements Serializable {
* @return R * @return R
*/ */
public static <T> R<T> ok(String msg, T data) { public static <T> R<T> ok(String msg, T data) {
return new R<>(0, data); return new R<>(data,msg);
} }
/** /**
......
...@@ -2,7 +2,7 @@ package cn.wisenergy.mapper; ...@@ -2,7 +2,7 @@ package cn.wisenergy.mapper;
import cn.wisenergy.model.app.SchemeQueryRecord; import cn.wisenergy.model.app.SchemeQueryRecord;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Param; import io.lettuce.core.dynamic.annotation.Param;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
...@@ -38,7 +38,7 @@ public interface SchemeRecordMapper extends BaseMapper<SchemeQueryRecord> { ...@@ -38,7 +38,7 @@ public interface SchemeRecordMapper extends BaseMapper<SchemeQueryRecord> {
* @param map 统计条件 * @param map 统计条件
* @return 记录条数 * @return 记录条数
*/ */
int count(@Param("map") Map<String, Object> map); int count(Map<String, Object> map);
List<SchemeQueryRecord> getList(@Param("map") Map<String, Object> map); List<SchemeQueryRecord> getList(Map<String, Object> map);
} }
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="cn.wisenergy.mapper.SchemeRecordMapper"> <mapper namespace="cn.wisenergy.mapper.SchemeRecordMapper">
<resultMap id="userMap" type="cn.wisenergy.model.app.SchemeQueryRecord"> <resultMap id="recordMap" type="cn.wisenergy.model.app.SchemeQueryRecord">
<id column="id" property="id"/> <id column="id" property="id"/>
<result column="user_id" property="userId"/> <result column="user_id" property="userId"/>
<result column="major_name" property="majorName"/> <result column="major_name" property="majorName"/>
...@@ -82,24 +82,24 @@ ...@@ -82,24 +82,24 @@
<include refid="table"/> <include refid="table"/>
<where> <where>
is_delete=0 is_delete=0
<if test=" userId != null"> <if test="userId != null">
and user_id=#{userId} and user_id=#{userId}
</if> </if>
</where> </where>
</select> </select>
<select id="getList" parameterType="map" resultType="cn.wisenergy.model.app.SchemeQueryRecord"> <select id="getList" resultType="cn.wisenergy.model.app.SchemeQueryRecord">
select select
<include refid="cols_all"/> <include refid="cols_all"/>
from from
<include refid="table"/> <include refid="table"/>
<where> <where>
is_delete=0 is_delete=0
<if test=" userId != null"> <if test="userId != null">
user_id=#{userId} and user_id=#{userId}
</if> </if>
order by create_time
limit #{startNum},#{endNum} limit #{startNum},#{endNum}
order by create_time desc
</where> </where>
</select> </select>
......
...@@ -119,8 +119,8 @@ ...@@ -119,8 +119,8 @@
#{id} #{id}
</foreach> </foreach>
</if> </if>
limit #{number}
order by lowest_mark desc order by lowest_mark desc
limit #{number}
</where> </where>
</select> </select>
......
...@@ -6,15 +6,17 @@ import io.swagger.annotations.ApiModelProperty; ...@@ -6,15 +6,17 @@ import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import java.io.Serializable; import java.io.Serializable;
import java.util.Date;
/** /**
* @ Description: 方案查询记录 * @ Description: 方案查询记录
* @ Author : 86187 * @ Author : 86187
* @ Date : 2021/1/8 10:22 * @ Date : 2021/1/8 10:22
* @author 86187
*/ */
@Data @Data
@ApiModel(value = "SchemeQueryRecord") @ApiModel(value = "SchemeQueryRecord")
public class SchemeQueryRecord extends BaseEntity implements Serializable { public class SchemeQueryRecord implements Serializable {
private static final long serialVersionUID = 6600452699328342752L; private static final long serialVersionUID = 6600452699328342752L;
...@@ -47,4 +49,23 @@ public class SchemeQueryRecord extends BaseEntity implements Serializable { ...@@ -47,4 +49,23 @@ public class SchemeQueryRecord extends BaseEntity implements Serializable {
*/ */
@ApiModelProperty(value = "考生分数", name = "score") @ApiModelProperty(value = "考生分数", name = "score")
private String score; private String score;
/**
* 创建时间
*/
@ApiModelProperty("创建时间")
private Date createTime;
/**
* 修改时间
*/
@ApiModelProperty("修改时间")
private Date updateTime;
/**
* 删除标记
*/
@ApiModelProperty("是否删除 1,删除;0,未删除")
private Integer isDelete;
} }
...@@ -11,7 +11,8 @@ import java.util.Date; ...@@ -11,7 +11,8 @@ import java.util.Date;
*@ Description: 方案查询记录分页Vo *@ Description: 方案查询记录分页Vo
*@ Author : 86187 *@ Author : 86187
*@ Date : 2021/1/13 9:34 *@ Date : 2021/1/13 9:34
*/ * @author 86187
*/
@Data @Data
@ApiModel(value = "SchemeRecordQueryVo") @ApiModel(value = "SchemeRecordQueryVo")
public class SchemeRecordQueryVo implements Serializable { public class SchemeRecordQueryVo implements Serializable {
......
...@@ -68,13 +68,13 @@ public class SchemeRecordServiceImpl extends ServiceImpl<SchemeRecordMapper, Sch ...@@ -68,13 +68,13 @@ public class SchemeRecordServiceImpl extends ServiceImpl<SchemeRecordMapper, Sch
//统计数据总条数 //统计数据总条数
Map<String, Object> map = new HashMap<>(8); Map<String, Object> map = new HashMap<>(8);
map.put("user_id", queryVo.getUserId()); map.put("userId", queryVo.getUserId());
int total = schemeRecordMapper.count(map); int total = schemeRecordMapper.count(map);
//根据用户id,查询方案记录列表 //根据用户id,查询方案记录列表
map.put("startNum", queryVo.getPageSize()); map.put("startNum", queryVo.getPageSize());
map.put("endNUm", queryVo.getEndNum()); map.put("endNum", queryVo.getEndNum());
List<SchemeQueryRecord> list = schemeRecordMapper.getList(map); List<SchemeQueryRecord> list = schemeRecordMapper.getList(map);
PageInfo<SchemeQueryRecord> info = new PageInfo<>(); PageInfo<SchemeQueryRecord> info = new PageInfo<>();
info.setPageSize(queryVo.getPageSize()); info.setPageSize(queryVo.getPageSize());
......
...@@ -371,12 +371,19 @@ public class SchemeServiceImpl extends ServiceImpl<SchemeMapper, SchemeInfo> imp ...@@ -371,12 +371,19 @@ public class SchemeServiceImpl extends ServiceImpl<SchemeMapper, SchemeInfo> imp
downGrade = firstCulture - firstRule.getDownMark(); downGrade = firstCulture - firstRule.getDownMark();
map.put("downGrade", downGrade); map.put("downGrade", downGrade);
list = volunteerMapper.getVolunteerList(map); list = volunteerMapper.getVolunteerList(map);
if (list.size() < firstRule.getNumber()) {
List<Integer> volunteerIds = list.stream().map(Volunteer::getId).collect(Collectors.toList());
int total = firstRule.getNumber() - list.size();
List<Volunteer> fillList = fillUpVolunteer(volunteerIds, total, upGrade, downGrade);
list.addAll(fillList);
}
} }
} else { } else {
//考生的分数是在专科一批中 //考生的分数是在专科一批中
//判断分数是否小于对低分与向下浮动分数之和 //判断分数是否小于对低分与向下浮动分数之和
double upMark = secondRule.getUpMark(); double upMark = secondRule.getUpMark();
double upGrade = secondCulture + upMark; double upGrade = secondCulture + upMark;
double secondCultureMin=secondRule.getCultureMin();
if (upGrade > secondRule.getCultureMax()) { if (upGrade > secondRule.getCultureMax()) {
upGrade = secondRule.getCultureMax(); upGrade = secondRule.getCultureMax();
} }
...@@ -385,15 +392,15 @@ public class SchemeServiceImpl extends ServiceImpl<SchemeMapper, SchemeInfo> imp ...@@ -385,15 +392,15 @@ public class SchemeServiceImpl extends ServiceImpl<SchemeMapper, SchemeInfo> imp
map.put("type", SchemeTypeEnums.JUNIOR_COLLEGE_MAJOR.getCode()); map.put("type", SchemeTypeEnums.JUNIOR_COLLEGE_MAJOR.getCode());
double downGrade; double downGrade;
if (secondCulture < cultureMin + downMark) { if (secondCulture < secondCultureMin + downMark) {
downGrade = cultureMin; downGrade = secondCultureMin;
map.put("downGrade", downGrade); map.put("downGrade", downGrade);
list = volunteerMapper.getVolunteerList(map); list = volunteerMapper.getVolunteerList(map);
//如果数据不满足最大数量,取不限专业最低分补充 //如果数据不满足最大数量,取不限专业最低分补充
if (list.size() < firstRule.getNumber()) { if (list.size() < secondRule.getNumber()) {
List<Integer> volunteerIds = list.stream().map(Volunteer::getId).collect(Collectors.toList()); List<Integer> volunteerIds = list.stream().map(Volunteer::getId).collect(Collectors.toList());
int total = firstRule.getNumber() - list.size(); int total = secondRule.getNumber() - list.size();
List<Volunteer> fillList = fillUpVolunteer(volunteerIds, total, upGrade, downGrade); List<Volunteer> fillList = fillUpVolunteer(volunteerIds, total, upGrade, downGrade);
list.addAll(fillList); list.addAll(fillList);
} }
...@@ -401,6 +408,14 @@ public class SchemeServiceImpl extends ServiceImpl<SchemeMapper, SchemeInfo> imp ...@@ -401,6 +408,14 @@ public class SchemeServiceImpl extends ServiceImpl<SchemeMapper, SchemeInfo> imp
downGrade = secondCulture - secondRule.getDownMark(); downGrade = secondCulture - secondRule.getDownMark();
map.put("downGrade", downGrade); map.put("downGrade", downGrade);
list = volunteerMapper.getVolunteerList(map); list = volunteerMapper.getVolunteerList(map);
//如果数据不满足最大数量,取不限专业最低分补充
if (list.size() < secondRule.getNumber()) {
List<Integer> volunteerIds = list.stream().map(Volunteer::getId).collect(Collectors.toList());
int total = secondRule.getNumber() - list.size();
List<Volunteer> fillList = fillUpVolunteer(volunteerIds, total, upGrade, downGrade);
list.addAll(fillList);
}
} }
} }
return list; return list;
......
...@@ -90,8 +90,8 @@ public class VolunteerServiceImpl extends ServiceImpl<VolunteerMapper, Volunteer ...@@ -90,8 +90,8 @@ public class VolunteerServiceImpl extends ServiceImpl<VolunteerMapper, Volunteer
//3、保存方案和志愿信息 //3、保存方案和志愿信息
SchemeInfo schemeInfo = new SchemeInfo(); SchemeInfo schemeInfo = new SchemeInfo();
schemeInfo.setSchemeName("本科一批"); schemeInfo.setSchemeName("专科文学编导一批");
schemeInfo.setType(1); schemeInfo.setType(7);
schemeInfo.setUploadTime(new Date()); schemeInfo.setUploadTime(new Date());
schemeInfo.setIsDelete(0); schemeInfo.setIsDelete(0);
......
...@@ -78,22 +78,10 @@ public class VolunteerListener extends AnalysisEventListener<Volunteer> { ...@@ -78,22 +78,10 @@ public class VolunteerListener extends AnalysisEventListener<Volunteer> {
throw new RuntimeException("计划数数不能为空!"); throw new RuntimeException("计划数数不能为空!");
} }
if (null == volunteer.getCastArchivesNum()) {
throw new RuntimeException("计划投档数不能为空!");
}
if (null == volunteer.getLaunchNum()) {
throw new RuntimeException("投出数不能为空!");
}
if (StringUtils.isEmpty(volunteer.getLowestMark())) { if (StringUtils.isEmpty(volunteer.getLowestMark())) {
throw new RuntimeException("最低分不能为空!"); throw new RuntimeException("最低分不能为空!");
} }
if (StringUtils.isEmpty(volunteer.getLowestRank())) {
throw new RuntimeException("最低位次不能为空!");
}
list.add(volunteer); list.add(volunteer);
} }
} }
......
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