Tenlion/bt-yjj-system-examination-signup
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

考试计划字段新增。

Browse Source
This commit is contained in:
Renpc-kilig 2021-06-17 17:59:16 +08:00
parent 9f84f9204e
commit b4344d623b
9 changed files with 122 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/cn/com/tenlion/pojo/bos/examplan/ExamPlanBO.java
View File

@ -34,6 +34,7 @@ public class ExamPlanBO {
private String site; private String site;
private String roomName; private String roomName;
private String siteName; private String siteName;
private String signupTime;
private String creator; private String creator;
private String gmtCreate; private String gmtCreate;
private String modifier; private String modifier;
@ -232,6 +233,14 @@ public class ExamPlanBO {
this.siteName = siteName; this.siteName = siteName;
} }
public String getSignupTime() {
return signupTime;
}
public void setSignupTime(String signupTime) {
this.signupTime = signupTime;
}
public String getCreator() { public String getCreator() {
return creator == null ? "" : creator.trim(); return creator == null ? "" : creator.trim();
} }

10
src/main/java/cn/com/tenlion/pojo/dtos/examplan/ExamPlanDTO.java
View File

@ -80,6 +80,8 @@ public class ExamPlanDTO {
private Integer surplusCount; private Integer surplusCount;
@ApiModelProperty(name = "btnStatus", value = "按钮状态") @ApiModelProperty(name = "btnStatus", value = "按钮状态")
private String btnStatus; private String btnStatus;
@ApiModelProperty(name = "signupTime", value = "报名截止时间")
private String signupTime;
public String getExamPlanId() { public String getExamPlanId() {
return examPlanId == null ? "" : examPlanId.trim(); return examPlanId == null ? "" : examPlanId.trim();
@ -344,4 +346,12 @@ public class ExamPlanDTO {
public void setBtnStatus(String btnStatus) { public void setBtnStatus(String btnStatus) {
this.btnStatus = btnStatus; this.btnStatus = btnStatus;
} }
public String getSignupTime() {
return signupTime;
}
public void setSignupTime(String signupTime) {
this.signupTime = signupTime;
}
} }

9
src/main/java/cn/com/tenlion/pojo/pos/examplan/ExamPlanPO.java
View File

@ -34,6 +34,7 @@ public class ExamPlanPO {
private String site; private String site;
private String roomName; private String roomName;
private String siteName; private String siteName;
private String signupTime;
private String creator; private String creator;
private String gmtCreate; private String gmtCreate;
private String modifier; private String modifier;
@ -232,6 +233,14 @@ public class ExamPlanPO {
this.siteName = siteName; this.siteName = siteName;
} }
public String getSignupTime() {
return signupTime;
}
public void setSignupTime(String signupTime) {
this.signupTime = signupTime;
}
public String getCreator() { public String getCreator() {
return creator == null ? "" : creator.trim(); return creator == null ? "" : creator.trim();
} }

14
src/main/java/cn/com/tenlion/pojo/vos/examplan/ExamPlanVO.java
View File

@ -28,10 +28,10 @@ public class ExamPlanVO {
@CheckNumberAnnotation(name = "1:知识；2:实操；3:补考") @CheckNumberAnnotation(name = "1:知识；2:实操；3:补考")
private Integer examType; private Integer examType;
@ApiModelProperty(name = "startTime", value = "考试开始时间") @ApiModelProperty(name = "startTime", value = "考试开始时间")
@CheckEmptyAnnotation(name = "考试开始时间", verifyType = "datetime") // @CheckEmptyAnnotation(name = "考试开始时间", verifyType = "datetime")
private String startTime; private String startTime;
@ApiModelProperty(name = "endTime", value = "考试结束时间") @ApiModelProperty(name = "endTime", value = "考试结束时间")
@CheckEmptyAnnotation(name = "考试结束时间", verifyType = "datetime") // @CheckEmptyAnnotation(name = "考试结束时间", verifyType = "datetime")
private String endTime; private String endTime;
@ApiModelProperty(name = "examCount", value = "考试人数") @ApiModelProperty(name = "examCount", value = "考试人数")
private String examCount; private String examCount;
@ -65,6 +65,8 @@ public class ExamPlanVO {
private String roomName; private String roomName;
@ApiModelProperty(name = "siteName", value = "考点名称") @ApiModelProperty(name = "siteName", value = "考点名称")
private String siteName; private String siteName;
@ApiModelProperty(name = "signupTime", value = "报名截止时间")
private String signupTime;
public String getName() { public String getName() {
return name == null ? "" : name.trim(); return name == null ? "" : name.trim();
@ -249,4 +251,12 @@ public class ExamPlanVO {
public void setSiteName(String siteName) { public void setSiteName(String siteName) {
this.siteName = siteName; this.siteName = siteName;
} }
public String getSignupTime() {
return signupTime;
}
public void setSignupTime(String signupTime) {
this.signupTime = signupTime;
}
} }

15
src/main/java/cn/com/tenlion/service/examination/distribution/impl/DistributionServiceImpl.java
View File

@ -125,10 +125,11 @@ public class DistributionServiceImpl extends DefaultBaseService implements IDist
} }
/** /**
* 判断考试时间是否为空 * 判断考试时间是否为空
* renpc2021-06-17注释掉此段内容
*/ */
if (StringUtils.isEmpty(dDistributionSaveVO.getDistributionTime())) { /*if (StringUtils.isEmpty(dDistributionSaveVO.getDistributionTime())) {
throw new SaveException("考试时间不能为空"); throw new SaveException("考试时间不能为空");
} }*/
/** /**
* 判断计划名称是否为空 * 判断计划名称是否为空
*/ */
@ -143,10 +144,11 @@ public class DistributionServiceImpl extends DefaultBaseService implements IDist
} }
/** /**
* 判断考试人数是否为空 * 判断考试人数是否为空
* renpc2021-06-17注释掉此段内容
*/ */
if (dDistributionSaveVO.getDistributionNumber() == null || dDistributionSaveVO.getDistributionNumber() < 1) { /*if (dDistributionSaveVO.getDistributionNumber() == null || dDistributionSaveVO.getDistributionNumber() < 1) {
throw new SaveException("考试人数不合法"); throw new SaveException("考试人数不合法");
} }*/
/** /**
* 判断预计考试时间是否为空是否大于今天 * 判断预计考试时间是否为空是否大于今天
*/ */
@ -166,9 +168,10 @@ public class DistributionServiceImpl extends DefaultBaseService implements IDist
for (OrganizationDTO dto : orgList) { for (OrganizationDTO dto : orgList) {
totalNumber = totalNumber + dto.getOrganizationUserNum(); totalNumber = totalNumber + dto.getOrganizationUserNum();
} }
if(totalNumber < dDistributionSaveVO.getDistributionNumber()) { // renpc2021-06-17注释掉此段内容
/*if(totalNumber < dDistributionSaveVO.getDistributionNumber()) {
throw new SaveException("该考点无法容纳本次考试的人数"); throw new SaveException("该考点无法容纳本次考试的人数");
} }*/
Map<String, Object> save = HashMapUtil.beanToMap(dDistributionSaveVO); Map<String, Object> save = HashMapUtil.beanToMap(dDistributionSaveVO);
save.put("distributionAllotTime", ""); save.put("distributionAllotTime", "");
save.put("distributionFields", ""); save.put("distributionFields", "");

37
src/main/java/cn/com/tenlion/service/examplan/impl/ExamPlanServiceImpl.java
View File

@ -151,7 +151,7 @@ public class ExamPlanServiceImpl extends DefaultBaseService implements IExamPlan
distributionSaveVO.setPlanName(examPlanVO.getName()); distributionSaveVO.setPlanName(examPlanVO.getName());
distributionSaveVO.setDistributionTime(examPlanVO.getStartTime()); distributionSaveVO.setDistributionTime(examPlanVO.getStartTime());
distributionSaveVO.setDistributionEndTime(examPlanVO.getEndTime()); distributionSaveVO.setDistributionEndTime(examPlanVO.getEndTime());
distributionSaveVO.setDistributionNumber(Integer.valueOf(examPlanVO.getExamCount())); // distributionSaveVO.setDistributionNumber(Integer.valueOf(examPlanVO.getExamCount()));
distributionSaveVO.setStationId(examPlanVO.getSite()); distributionSaveVO.setStationId(examPlanVO.getSite());
distributionService.saveReturnId(distributionSaveVO); distributionService.saveReturnId(distributionSaveVO);
} }
@ -245,7 +245,7 @@ public class ExamPlanServiceImpl extends DefaultBaseService implements IExamPlan
String nowTime = simpleDateFormat.format(new Date()); String nowTime = simpleDateFormat.format(new Date());
for(ExamPlanDTO examPlanDTO: list) { for(ExamPlanDTO examPlanDTO: list) {
examPlanDTO.setBtnStatus("确认报考"); examPlanDTO.setBtnStatus("确认报考");
Integer count = Integer.valueOf(examPlanDTO.getExamCount()); // Integer count = Integer.valueOf(examPlanDTO.getExamCount());
params = new HashMap<>(1); params = new HashMap<>(1);
params.put("classPlanId", examPlanDTO.getExamPlanId()); params.put("classPlanId", examPlanDTO.getExamPlanId());
// 查找并判断当前用户是否可以报考 // 查找并判断当前用户是否可以报考
@ -270,9 +270,9 @@ public class ExamPlanServiceImpl extends DefaultBaseService implements IExamPlan
Integer overCount = applyStudentsNewDTOList1.size(); Integer overCount = applyStudentsNewDTOList1.size();
examPlanDTO.setOverCount(overCount); examPlanDTO.setOverCount(overCount);
// 是否可以继续申报按钮控制 // 是否可以继续申报按钮控制
if(overCount >= count) { /*if(overCount >= count) {
examPlanDTO.setBtnStatus("暂停申报"); examPlanDTO.setBtnStatus("暂停申报");
} }*/
} }
// 查找审核通过人数 // 查找审核通过人数
params.put("checkStatus", 1); params.put("checkStatus", 1);
@ -281,24 +281,25 @@ public class ExamPlanServiceImpl extends DefaultBaseService implements IExamPlan
Integer passCount = applyStudentsNewDTOList2.size(); Integer passCount = applyStudentsNewDTOList2.size();
examPlanDTO.setPassCount(passCount); examPlanDTO.setPassCount(passCount);
// 计算剩余未报人数 // 计算剩余未报人数
examPlanDTO.setSurplusCount(count - passCount); // examPlanDTO.setSurplusCount(count - passCount);
// 是否可以继续申报按钮控制 // 是否可以继续申报按钮控制
if(passCount >= count) { /*if(passCount >= count) {
examPlanDTO.setBtnStatus("暂停申报"); examPlanDTO.setBtnStatus("暂停申报");
}*/
}
String endTime = examPlanDTO.getSignupTime();
if(!StringUtils.isEmpty(endTime)) {
try{
// 时间比较
Date nowDate = simpleDateFormat.parse(nowTime);
Date endDate = simpleDateFormat.parse(endTime);
if(nowDate.getTime() >= endDate.getTime()) {
examPlanDTO.setBtnStatus("报名截止");
}
}catch (Exception e){
e.printStackTrace();
} }
} }
String endTime = examPlanDTO.getStartTime();
try{
// 时间比较
Date nowDate = simpleDateFormat.parse(nowTime);
Date endDate = simpleDateFormat.parse(endTime);
if(nowDate.getTime() >= endDate.getTime()) {
examPlanDTO.setBtnStatus("报名截止");
}
}catch (Exception e){
e.printStackTrace();
}
} }
} }
return list; return list;

14
src/main/resources/mybatis/mapper/examplan/exam-plan-mapper.xml
View File

@ -27,6 +27,7 @@
<result column="site" property="site"/> <result column="site" property="site"/>
<result column="room_name" property="roomName"/> <result column="room_name" property="roomName"/>
<result column="site_name" property="siteName"/> <result column="site_name" property="siteName"/>
<result column="signup_time" property="signupTime"/>
<result column="creator" property="creator"/> <result column="creator" property="creator"/>
<result column="gmt_create" property="gmtCreate"/> <result column="gmt_create" property="gmtCreate"/>
<result column="modifier" property="modifier"/> <result column="modifier" property="modifier"/>
@ -59,6 +60,7 @@
<result column="site" property="site"/> <result column="site" property="site"/>
<result column="room_name" property="roomName"/> <result column="room_name" property="roomName"/>
<result column="site_name" property="siteName"/> <result column="site_name" property="siteName"/>
<result column="signup_time" property="signupTime"/>
<result column="creator" property="creator"/> <result column="creator" property="creator"/>
<result column="gmt_create" property="gmtCreate"/> <result column="gmt_create" property="gmtCreate"/>
<result column="modifier" property="modifier"/> <result column="modifier" property="modifier"/>
@ -91,6 +93,7 @@
<result column="site" property="site"/> <result column="site" property="site"/>
<result column="room_name" property="roomName"/> <result column="room_name" property="roomName"/>
<result column="site_name" property="siteName"/> <result column="site_name" property="siteName"/>
<result column="signup_time" property="signupTime"/>
<result column="creator" property="creator"/> <result column="creator" property="creator"/>
<result column="gmt_create" property="gmtCreate"/> <result column="gmt_create" property="gmtCreate"/>
<result column="modifier" property="modifier"/> <result column="modifier" property="modifier"/>
@ -125,6 +128,7 @@
site, site,
room_name, room_name,
site_name, site_name,
signup_time,
creator, creator,
gmt_create, gmt_create,
modifier, modifier,
@ -155,6 +159,7 @@
#{site}, #{site},
#{roomName}, #{roomName},
#{siteName}, #{siteName},
#{signupTime},
#{creator}, #{creator},
#{gmtCreate}, #{gmtCreate},
#{modifier}, #{modifier},
@ -262,6 +267,9 @@
</if> </if>
<if test="siteName != null and siteName != ''"> <if test="siteName != null and siteName != ''">
site_name = #{siteName}, site_name = #{siteName},
</if>
<if test="signupTime != null and signupTime != ''">
signup_time = #{signupTime},
</if> </if>
gmt_modified = #{gmtModified}, gmt_modified = #{gmtModified},
modifier = #{modifier}, modifier = #{modifier},
@ -296,6 +304,7 @@
t1.site, t1.site,
t1.room_name, t1.room_name,
t1.site_name, t1.site_name,
t1.signup_time,
t1.exam_plan_id t1.exam_plan_id
FROM FROM
e_exam_plan t1 e_exam_plan t1
@ -338,6 +347,7 @@
t1.site, t1.site,
t1.room_name, t1.room_name,
t1.site_name, t1.site_name,
t1.signup_time,
t1.creator, t1.creator,
t1.gmt_create, t1.gmt_create,
t1.modifier, t1.modifier,
@ -380,6 +390,7 @@
t1.site, t1.site,
t1.room_name, t1.room_name,
t1.site_name, t1.site_name,
t1.signup_time,
t1.creator, t1.creator,
t1.gmt_create, t1.gmt_create,
t1.modifier, t1.modifier,
@ -422,6 +433,7 @@
t1.site, t1.site,
t1.room_name, t1.room_name,
t1.site_name, t1.site_name,
t1.signup_time,
1 1
FROM FROM
e_exam_plan t1 e_exam_plan t1
@ -489,6 +501,7 @@
t1.site, t1.site,
t1.room_name, t1.room_name,
t1.site_name, t1.site_name,
t1.signup_time,
t1.creator, t1.creator,
t1.gmt_create, t1.gmt_create,
t1.modifier, t1.modifier,
@ -548,6 +561,7 @@
t1.site, t1.site,
t1.room_name, t1.room_name,
t1.site_name, t1.site_name,
t1.signup_time,
t1.creator, t1.creator,
t1.gmt_create, t1.gmt_create,
t1.modifier, t1.modifier,

23
src/main/resources/static/route/examplan/save.html
View File

@ -77,7 +77,7 @@
<input type="radio" name="examType" value="3" title="补考"> <input type="radio" name="examType" value="3" title="补考">
</div> </div>
</div> </div>
<div class="layui-form-item layui-row"> <!--<div class="layui-form-item layui-row">
<div class="layui-col-lg6"> <div class="layui-col-lg6">
<label class="layui-form-label" style="width: 120px;">考试开始时间</label> <label class="layui-form-label" style="width: 120px;">考试开始时间</label>
<div class="layui-input-block" style="margin-left: 120px;"> <div class="layui-input-block" style="margin-left: 120px;">
@ -90,13 +90,19 @@
<input type="text" id="endTime" name="endTime" class="layui-input" value="" placeholder="请选择考试结束时间" readonly style="cursor: pointer;"> <input type="text" id="endTime" name="endTime" class="layui-input" value="" placeholder="请选择考试结束时间" readonly style="cursor: pointer;">
</div> </div>
</div> </div>
</div> </div>-->
<div class="layui-form-item layui-row"> <div class="layui-form-item layui-row">
<div class="layui-col-lg6"> <!--<div class="layui-col-lg6">
<label class="layui-form-label">考试人数<span style="color: red;vertical-align: middle;">*</span></label> <label class="layui-form-label">考试人数<span style="color: red;vertical-align: middle;">*</span></label>
<div class="layui-input-block"> <div class="layui-input-block">
<input type="number" id="examCount" name="examCount" class="layui-input" value="" placeholder="请输入考试人数" maxlength="10" lay-verify="required"> <input type="number" id="examCount" name="examCount" class="layui-input" value="" placeholder="请输入考试人数" maxlength="10" lay-verify="required">
</div> </div>
</div>-->
<div class="layui-col-lg6" pane>
<label class="layui-form-label" style="width: 120px;">报名截止时间</label>
<div class="layui-input-block" style="margin-left: 120px;">
<input type="text" id="signupTime" name="signupTime" class="layui-input" value="" placeholder="请选择考试开始时间" readonly style="cursor: pointer;">
</div>
</div> </div>
<div class="layui-col-lg6"> <div class="layui-col-lg6">
<label class="layui-form-label">考试等级</label> <label class="layui-form-label">考试等级</label>
@ -418,6 +424,16 @@
} }
} }
// 报名截止时间
function initSignupTimeDateTime() {
laydate.render({
elem: '#signupTime',
type: 'datetime',
value: new Date(),
trigger: 'click'
});
}
// 初始化考试开始时间时间戳 // 初始化考试开始时间时间戳
function initStartTimeDateTime() { function initStartTimeDateTime() {
laydate.render({ laydate.render({
@ -537,6 +553,7 @@
// 初始化内容 // 初始化内容
function initData() { function initData() {
initSignupTimeDateTime();
initStartTimeDateTime(); initStartTimeDateTime();
initEndTimeDateTime(); initEndTimeDateTime();
initPictureUploadFile(); initPictureUploadFile();

23
src/main/resources/static/route/examplan/update.html
View File

@ -77,7 +77,7 @@
<input type="radio" name="examType" value="3" title="补考"> <input type="radio" name="examType" value="3" title="补考">
</div> </div>
</div> </div>
<div class="layui-form-item layui-row"> <!--<div class="layui-form-item layui-row">
<div class="layui-col-lg6"> <div class="layui-col-lg6">
<label class="layui-form-label" style="width: 120px;">考试开始时间</label> <label class="layui-form-label" style="width: 120px;">考试开始时间</label>
<div class="layui-input-block" style="margin-left: 120px;"> <div class="layui-input-block" style="margin-left: 120px;">
@ -90,13 +90,19 @@
<input type="text" id="endTime" name="endTime" class="layui-input" value="" placeholder="请选择考试结束时间" readonly style="cursor: pointer;"> <input type="text" id="endTime" name="endTime" class="layui-input" value="" placeholder="请选择考试结束时间" readonly style="cursor: pointer;">
</div> </div>
</div> </div>
</div> </div>-->
<div class="layui-form-item layui-row"> <div class="layui-form-item layui-row">
<div class="layui-col-lg6"> <!--<div class="layui-col-lg6">
<label class="layui-form-label">考试人数<span style="color: red;vertical-align: middle;">*</span></label> <label class="layui-form-label">考试人数<span style="color: red;vertical-align: middle;">*</span></label>
<div class="layui-input-block"> <div class="layui-input-block">
<input type="number" id="examCount" name="examCount" class="layui-input" value="" placeholder="请输入考试人数" maxlength="10" lay-verify="required"> <input type="number" id="examCount" name="examCount" class="layui-input" value="" placeholder="请输入考试人数" maxlength="10" lay-verify="required">
</div> </div>
</div>-->
<div class="layui-col-lg6" pane>
<label class="layui-form-label" style="width: 120px;">报名截止时间</label>
<div class="layui-input-block" style="margin-left: 120px;">
<input type="text" id="signupTime" name="signupTime" class="layui-input" value="" placeholder="请选择考试开始时间" readonly style="cursor: pointer;">
</div>
</div> </div>
<div class="layui-col-lg6"> <div class="layui-col-lg6">
<label class="layui-form-label">考试等级</label> <label class="layui-form-label">考试等级</label>
@ -442,6 +448,16 @@
} }
} }
// 初始化考试开始时间时间戳
function initSignupTimeDateTime() {
laydate.render({
elem: '#signupTime',
type: 'datetime',
value: new Date(),
trigger: 'click'
});
}
// 初始化考试开始时间时间戳 // 初始化考试开始时间时间戳
function initStartTimeDateTime() { function initStartTimeDateTime() {
laydate.render({ laydate.render({
@ -569,6 +585,7 @@
} }
form.val('dataForm', dataFormData); form.val('dataForm', dataFormData);
form.render(null, 'dataForm'); form.render(null, 'dataForm');
initSignupTimeDateTime();
initStartTimeDateTime(); initStartTimeDateTime();
initEndTimeDateTime(); initEndTimeDateTime();
initPictureUploadFile(); initPictureUploadFile();