Skip to content

K
kaoshi-java
Commit 3645f391 authored by 法拉51246's avatar 法拉51246
Browse files
Options

1

parent a82db8a2
Show whitespace changes
Inline Side-by-side
Showing with 26 additions and 14 deletions
ruoyi-system/src/main/java/com/ruoyi/hezhi/service/impl/TbExamRegistrationServiceImpl.java
View file @ 3645f391
......@@ -1269,6 +1269,15 @@ public class TbExamRegistrationServiceImpl implements ITbExamRegistrationService
erreList.put(item.getContactInformation(), "生日格式有误，正确格式：1999-09-09");
continue;
}
//校验手机号必须11位纯数字
if(item.getContactInformation().length() != 11||!item.getContactInformation().matches("^[0-9]*$")){
erreList.put(item.getContactInformation(), "手机号格式有误，应为11位纯数字");
continue;
}
//校验身份证号必须18位
if(item.getIdentityCard().length() != 18){
erreList.put(item.getContactInformation(), "身份证号格式有误，应为18位");
}
TbExamRegistration tbExamRegistration = new TbExamRegistration();
BeanUtils.copyProperties(item, tbExamRegistration);
//毕业证书有最多三张图，需要合并url
......
ruoyi-system/src/main/java/com/ruoyi/hezhi/service/impl/TbMemberOrderServiceImpl.java
View file @ 3645f391
......@@ -152,14 +152,14 @@ public class TbMemberOrderServiceImpl implements ITbMemberOrderService
log.info("开始清理过期未支付报名订单，数量：{}，订单号列表：{}", orderNos.size(), orderNos);
// 2. 删除订单记录
int deletedOrders = tbMemberOrderMapper.deleteMemberOrderByOrderNos(orderNos);
log.info("已删除订单记录数量：{}", deletedOrders);
// 3.将考试报名信息的支付状态改为已取消
// 2.将考试报名信息的支付状态改为已取消
int updateRegistrations = tbExamRegistrationMapper.updateTbExamRegistrationByOrderNos(orderNos);
log.info("已取消考试报名订单数量：{}", updateRegistrations);
// 3. 删除订单记录
int deletedOrders = tbMemberOrderMapper.deleteMemberOrderByOrderNos(orderNos);
log.info("已删除订单记录数量：{}", deletedOrders);
return deletedOrders;
}
......
ruoyi-system/src/main/resources/mapper/hezhi/TbExamRegistrationMapper.xml
View file @ 3645f391
......@@ -887,16 +887,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
ter.is_pay AS isPay,
ter.pay_type AS payType,
CONVERT(IFNULL(te.name, ''), CHAR) AS examName,
ter.pay_price AS payPrice,
tmo.pay_price AS payPrice,
CONVERT(IFNULL(ter.registration_batch, ''), CHAR) AS registrationBatch,
CONVERT(IFNULL(DATE_FORMAT(teb.exam_start_time,'%Y-%m-%d %H:%i:%s'), ''), CHAR) AS examStartTime,
CONVERT(IFNULL(DATE_FORMAT(teb.exam_end_time,'%Y-%m-%d %H:%i:%s'), ''), CHAR) AS examEndTime,
CASE
<if test="examStatus != null and examStatus != ''">
WHEN #{examStatus} is not null AND #{examStatus} = 1 and ter.is_pay = 0 THEN '未支付'
WHEN #{examStatus} is not null AND #{examStatus} = 1 and ter.is_pay = 0 and tmo.order_id is not null THEN '未支付'
WHEN #{examStatus} is not null AND #{examStatus} = 1 and ter.is_pay = -1 THEN '已取消'
WHEN #{examStatus} is not null AND #{examStatus} = 1 THEN '已报名'
WHEN #{examStatus} is not null AND #{examStatus} = 1 and ter.is_pay = 1 and tmo.order_id is not null THEN '已报名'
WHEN #{examStatus} is not null AND #{examStatus} = 2 THEN '待开考'
WHEN #{examStatus} is not null AND #{examStatus} = 3 AND 1 > (select count(*) from tb_exam_simulate_info tesi where ter.exam_id = tesi.exam_id and tesi.member_user_id = ter.member_user_id) THEN '待开考'
WHEN #{examStatus} is not null AND #{examStatus} = 3 AND 1 = (select count(*) from tb_exam_simulate_info tesi where ter.exam_id = tesi.exam_id and tesi.member_user_id = ter.member_user_id and tesi.complete_status=1) THEN '考试中'
......@@ -1094,7 +1094,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
ter.pay_type AS payType,
CONVERT(IFNULL(te.name, ''), CHAR) AS examName,
ter.pay_price AS payPrice,
tmo.pay_price AS payPrice,
CONVERT(IFNULL(ter.registration_batch, ''), CHAR) AS registrationBatch,
CONVERT(IFNULL(DATE_FORMAT(teb.exam_start_time,'%Y-%m-%d %H:%i:%s'), ''), CHAR) AS examStartTime,
CONVERT(IFNULL(DATE_FORMAT(teb.exam_end_time,'%Y-%m-%d %H:%i:%s'), ''), CHAR) AS examEndTime,
......
ruoyi-system/src/main/resources/mapper/hezhi/TbStudyCenterMapper.xml
View file @ 3645f391
......@@ -106,6 +106,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="deleteBy != null and deleteBy != ''"> and delete_by = #{deleteBy}</if>
<if test="delFlag != null "> and del_flag = #{delFlag}</if>
</where>
order by study_center_id desc
</select>
<select id="getAllStudyCenterList" resultType="StudyCenterVO">
......
ruoyi-ui/src/views/hezhi/course/index.vue
View file @ 3645f391
......@@ -13,8 +13,8 @@
<el-option v-for="(item, index) in classTypeOptions" :key="index" :label="item.label" :value="item.value" />
</el-select>
</el-form-item>
<el-form-item label="课程名" prop="courseName">
<el-input v-model="queryParams.courseName" placeholder="请输入课程名" clearable @keyup.enter.native="handleQuery" />
<el-form-item label="职业名称" prop="courseName">
<el-input v-model="queryParams.courseName" placeholder="请输入职业名称" clearable @keyup.enter.native="handleQuery" />
</el-form-item>
<el-form-item label="学时安排" prop="courseArrange">
<el-input v-model="queryParams.courseArrange" placeholder="请输入学时安排" clearable
......@@ -209,8 +209,8 @@
<el-form-item label="封面图" prop="coverImage">
<image-upload v-model="form.coverImage" />
</el-form-item>
<el-form-item label="课程名" prop="courseName">
<el-input v-model="form.courseName" placeholder="请输入课程名" />
<el-form-item label="职业名称" prop="courseName">
<el-input v-model="form.courseName" placeholder="请输入职业名称" />
</el-form-item>
<el-form-item label="课程标题" prop="courseTitle">
<el-input v-model="form.courseTitle" placeholder="请输入内容" />
......@@ -381,7 +381,7 @@ export default {
{ required: true, trigger: "blur", message: "评价机构不能为空" },
],
courseName: [
{ required: true, trigger: "blur", message: "请输入课程名" },
{ required: true, trigger: "blur", message: "请输入职业名称" },
],
},
classTypeOptions: [
......
ruoyi-ui/src/views/hezhi/studyCenter/index.vue
View file @ 3645f391
......@@ -504,6 +504,7 @@ export default {
deleteTime: null,
deleteBy: null,
delFlag: null,
schoolName: null,
},
// 表单参数
form: {},
......@@ -630,6 +631,7 @@ export default {
deleteTime: null,
deleteBy: null,
delFlag: null,
schoolName: null,
examCourseList: [],
studyCenterTeacherList: [],
};
......
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