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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Renpc-kilig 2021-05-12 10:44:09 +08:00
commit da5131b414
4 changed files with 31 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/cn/com/tenlion/service/apply/IApplyService.java
View File

@ -234,7 +234,7 @@ public interface IApplyService {
/**
* 统计机构星期的报名信息
* @param week
* @param weekTime
* @param applyInstitutionId
* @param applyClassId
* @return

30
src/main/java/cn/com/tenlion/service/apply/impl/ApplyServiceImpl.java
View File

@ -175,7 +175,7 @@ public class ApplyServiceImpl extends DefaultBaseService implements IApplyServic
@Override
public String saveReturnId(String token, ApplyVO applyVO) {
//检查报名数据
checkSaveData(applyVO.getApplyCardNumber(),applyVO.getApplyClassId());
checkSaveData(token,applyVO.getApplyCardNumber(),applyVO.getApplyClassId());
String applyId = UUIDUtil.getUUID();
Map<String, Object> params = HashMapUtil.beanToMap(applyVO);
params.put("applyId", applyId);
@ -196,11 +196,16 @@ public class ApplyServiceImpl extends DefaultBaseService implements IApplyServic
return applyId;
}
public void checkSaveData(String applyCardNumber,String ApplyClassId){
if(countApplyCardNumber(applyCardNumber,ApplyClassId) != 0){
public void checkSaveData(String token,String applyCardNumber,String ApplyClassId){
// if(countApplyCardNumber(applyCardNumber,ApplyClassId) != 0){
// throw new SaveException("您以报名过该项目");
// }
if(countApplyCreator(token,ApplyClassId) != 0){
throw new SaveException("您以报名过该项目");
}
ClassPlanDTO classPlanDTO = classPlanService.get(ApplyClassId);
if(classPlanDTO == null){
throw new ParamsException("未查询到计划信息");
@ -352,6 +357,25 @@ public class ApplyServiceImpl extends DefaultBaseService implements IApplyServic
return new SuccessResultList<>(applyDTOs, pageInfo.getPageNum(), pageInfo.getTotal());
}
/**
* 统计当前登录账号 报名的培训计划的次数（不包括撤回）
*/
public Integer countApplyCreator(String creator,String applyClassId){
Map<String, Object> params = new HashMap<>();
params.put("creator",creator);
params.put("applyClassId",applyClassId);
List<String> applyAuditStates = new ArrayList<>();
applyAuditStates.add("0");
applyAuditStates.add("2");
applyAuditStates.add("3");
applyAuditStates.add("-1");
params.put("applyAuditStates",applyAuditStates);
return count(params);
}
/**
* 统计证件号码 报名的培训计划的次数（不包括撤回）
*/

3
src/main/resources/mybatis/mapper/apply/apply-mapper.xml
View File

@ -614,6 +614,9 @@
<if test="applyInstitutionId != null and applyInstitutionId != ''">
AND t1.apply_institution_id = #{applyInstitutionId}
</if>
<if test="creator != null and creator != ''">
AND t1.creator = #{creator}
</if>
<if test="applyAuditStates != null and applyAuditStates != ''">
AND t1.apply_audit_state IN
<foreach collection="applyAuditStates" index="index" open="(" separator="," close=")">

2
src/main/resources/templates/index1.html
View File

@ -273,8 +273,6 @@
});
},
initTeacherEChart: function(){
top.restAjax.get('api/indexcount/count-teacher-num', {}, null, function(code, data) {
var dataList = [];