diff --git a/src/main/java/cn/com/tenlion/pojo/bos/examapply/ExamApplyBO.java b/src/main/java/cn/com/tenlion/pojo/bos/examapply/ExamApplyBO.java index 5962d5b..06c0bc4 100644 --- a/src/main/java/cn/com/tenlion/pojo/bos/examapply/ExamApplyBO.java +++ b/src/main/java/cn/com/tenlion/pojo/bos/examapply/ExamApplyBO.java @@ -32,6 +32,7 @@ public class ExamApplyBO { private String nextCommitTime; private String workTypeId; private String orgId; + private Integer nextNum; public String getExamApplyId() { return examApplyId; @@ -192,4 +193,12 @@ public class ExamApplyBO { public void setOrgId(String orgId) { this.orgId = orgId; } + + public Integer getNextNum() { + return nextNum; + } + + public void setNextNum(Integer nextNum) { + this.nextNum = nextNum; + } } diff --git a/src/main/java/cn/com/tenlion/pojo/bos/examcheck/ExamCheckBO.java b/src/main/java/cn/com/tenlion/pojo/bos/examcheck/ExamCheckBO.java index 3f20f66..72c64ac 100644 --- a/src/main/java/cn/com/tenlion/pojo/bos/examcheck/ExamCheckBO.java +++ b/src/main/java/cn/com/tenlion/pojo/bos/examcheck/ExamCheckBO.java @@ -23,6 +23,7 @@ public class ExamCheckBO { private String nextCommitTime; private String workTypeId; private String orgId; + private Integer nextNum; public String getExamCheckId() { return examCheckId == null ? "" : examCheckId.trim(); @@ -127,4 +128,12 @@ public class ExamCheckBO { public void setOrgId(String orgId) { this.orgId = orgId; } + + public Integer getNextNum() { + return nextNum; + } + + public void setNextNum(Integer nextNum) { + this.nextNum = nextNum; + } } diff --git a/src/main/java/cn/com/tenlion/pojo/dtos/examapply/ExamApplyDTO.java b/src/main/java/cn/com/tenlion/pojo/dtos/examapply/ExamApplyDTO.java index 73a8447..fbacbdc 100644 --- a/src/main/java/cn/com/tenlion/pojo/dtos/examapply/ExamApplyDTO.java +++ b/src/main/java/cn/com/tenlion/pojo/dtos/examapply/ExamApplyDTO.java @@ -63,6 +63,8 @@ public class ExamApplyDTO { private String workTypeId; @ApiModelProperty(name = "orgId", value = "机构ID") private String orgId; + @ApiModelProperty(name = "nextNum", value = "下次提交审核时间数字") + private Integer nextNum; public String getExamApplyId() { return examApplyId; @@ -255,4 +257,12 @@ public class ExamApplyDTO { public void setOrgId(String orgId) { this.orgId = orgId; } + + public Integer getNextNum() { + return nextNum; + } + + public void setNextNum(Integer nextNum) { + this.nextNum = nextNum; + } } diff --git a/src/main/java/cn/com/tenlion/pojo/dtos/examcheck/ExamCheckDTO.java b/src/main/java/cn/com/tenlion/pojo/dtos/examcheck/ExamCheckDTO.java index 656fbdd..dd430aa 100644 --- a/src/main/java/cn/com/tenlion/pojo/dtos/examcheck/ExamCheckDTO.java +++ b/src/main/java/cn/com/tenlion/pojo/dtos/examcheck/ExamCheckDTO.java @@ -33,6 +33,8 @@ public class ExamCheckDTO { private String workTypeId; @ApiModelProperty(name = "orgId", value = "机构ID") private String orgId; + @ApiModelProperty(name = "nextNum", value = "下次提交审核时间数字") + private Integer nextNum; public String getExamCheckId() { return examCheckId == null ? "" : examCheckId.trim(); @@ -105,4 +107,12 @@ public class ExamCheckDTO { public void setOrgId(String orgId) { this.orgId = orgId; } + + public Integer getNextNum() { + return nextNum; + } + + public void setNextNum(Integer nextNum) { + this.nextNum = nextNum; + } } diff --git a/src/main/java/cn/com/tenlion/pojo/pos/apply/ApplyPO.java b/src/main/java/cn/com/tenlion/pojo/pos/apply/ApplyPO.java index f131644..05dc993 100644 --- a/src/main/java/cn/com/tenlion/pojo/pos/apply/ApplyPO.java +++ b/src/main/java/cn/com/tenlion/pojo/pos/apply/ApplyPO.java @@ -29,11 +29,9 @@ public class ApplyPO { private String applyUnitPhone; private String applyUnitAddress; private String applyUserCardPhoto; - private String applyPosition; private String applyMajorYear; private String applyTechnicalTitles; - private Integer applyAuditState; private String creator; private String gmtCreate; diff --git a/src/main/java/cn/com/tenlion/pojo/pos/examapply/ExamApplyPO.java b/src/main/java/cn/com/tenlion/pojo/pos/examapply/ExamApplyPO.java index 9fb413c..4a49998 100644 --- a/src/main/java/cn/com/tenlion/pojo/pos/examapply/ExamApplyPO.java +++ b/src/main/java/cn/com/tenlion/pojo/pos/examapply/ExamApplyPO.java @@ -30,6 +30,7 @@ public class ExamApplyPO { private String nextCommitTime; private String workTypeId; private String orgId; + private Integer nextNum; public String getExamApplyId() { return examApplyId; @@ -190,4 +191,12 @@ public class ExamApplyPO { public void setOrgId(String orgId) { this.orgId = orgId; } + + public Integer getNextNum() { + return nextNum; + } + + public void setNextNum(Integer nextNum) { + this.nextNum = nextNum; + } } diff --git a/src/main/java/cn/com/tenlion/pojo/pos/examcheck/ExamCheckPO.java b/src/main/java/cn/com/tenlion/pojo/pos/examcheck/ExamCheckPO.java index 888dbbd..1713a96 100644 --- a/src/main/java/cn/com/tenlion/pojo/pos/examcheck/ExamCheckPO.java +++ b/src/main/java/cn/com/tenlion/pojo/pos/examcheck/ExamCheckPO.java @@ -23,6 +23,7 @@ public class ExamCheckPO { private String nextCommitTime; private String workTypeId; private String orgId; + private Integer nextNum; public String getExamCheckId() { return examCheckId == null ? "" : examCheckId.trim(); @@ -127,4 +128,12 @@ public class ExamCheckPO { public void setOrgId(String orgId) { this.orgId = orgId; } + + public Integer getNextNum() { + return nextNum; + } + + public void setNextNum(Integer nextNum) { + this.nextNum = nextNum; + } } diff --git a/src/main/java/cn/com/tenlion/pojo/vos/examapply/ExamApplyVO.java b/src/main/java/cn/com/tenlion/pojo/vos/examapply/ExamApplyVO.java index 965b65b..4e84bc8 100644 --- a/src/main/java/cn/com/tenlion/pojo/vos/examapply/ExamApplyVO.java +++ b/src/main/java/cn/com/tenlion/pojo/vos/examapply/ExamApplyVO.java @@ -60,6 +60,8 @@ public class ExamApplyVO { private String workTypeId; @ApiModelProperty(name = "orgId", value = "机构ID") private String orgId; + @ApiModelProperty(name = "nextNum", value = "下次提交审核时间数字") + private Integer nextNum; public String getExamApplyId() { return examApplyId; @@ -236,4 +238,12 @@ public class ExamApplyVO { public void setOrgId(String orgId) { this.orgId = orgId; } + + public Integer getNextNum() { + return nextNum; + } + + public void setNextNum(Integer nextNum) { + this.nextNum = nextNum; + } } diff --git a/src/main/java/cn/com/tenlion/pojo/vos/examcheck/ExamCheckVO.java b/src/main/java/cn/com/tenlion/pojo/vos/examcheck/ExamCheckVO.java index 05931a2..08624fb 100644 --- a/src/main/java/cn/com/tenlion/pojo/vos/examcheck/ExamCheckVO.java +++ b/src/main/java/cn/com/tenlion/pojo/vos/examcheck/ExamCheckVO.java @@ -31,6 +31,8 @@ public class ExamCheckVO { private String workTypeId; @ApiModelProperty(name = "orgId", value = "机构ID") private String orgId; + @ApiModelProperty(name = "nextNum", value = "下次提交审核时间数字") + private Integer nextNum; public String getPlanId() { return planId == null ? "" : planId.trim(); @@ -87,4 +89,12 @@ public class ExamCheckVO { public void setOrgId(String orgId) { this.orgId = orgId; } + + public Integer getNextNum() { + return nextNum; + } + + public void setNextNum(Integer nextNum) { + this.nextNum = nextNum; + } } diff --git a/src/main/java/cn/com/tenlion/service/apply/IApplyService.java b/src/main/java/cn/com/tenlion/service/apply/IApplyService.java index 0cd0766..7ea6e10 100644 --- a/src/main/java/cn/com/tenlion/service/apply/IApplyService.java +++ b/src/main/java/cn/com/tenlion/service/apply/IApplyService.java @@ -35,7 +35,7 @@ public interface IApplyService { * @param workTypeId * @return */ - List listByInstitutionIdAndWorkTypeId(String institutionId,String workTypeId); + List listByInstitutionIdAndWorkTypeId(String institutionId,String workTypeId); /** * 工种培训机构分页列表 diff --git a/src/main/java/cn/com/tenlion/service/apply/impl/ApplyServiceImpl.java b/src/main/java/cn/com/tenlion/service/apply/impl/ApplyServiceImpl.java index 08fa4cd..9e9d7a0 100644 --- a/src/main/java/cn/com/tenlion/service/apply/impl/ApplyServiceImpl.java +++ b/src/main/java/cn/com/tenlion/service/apply/impl/ApplyServiceImpl.java @@ -123,14 +123,14 @@ public class ApplyServiceImpl extends DefaultBaseService implements IApplyServic - public List listByInstitutionIdAndWorkTypeId(String institutionId,String workTypeId){ + public List listByInstitutionIdAndWorkTypeId(String institutionId,String workTypeId){ Map params = new HashMap<>(); params.put("applyInstitutionId",institutionId); params.put("applyWorkTypeId",workTypeId); List applyAuditStates = new ArrayList<>(); applyAuditStates.add(2); params.put("applyAuditStates",applyAuditStates); - return this.list(params); + return this.listPO(params); } @@ -311,7 +311,6 @@ public class ApplyServiceImpl extends DefaultBaseService implements IApplyServic auditLogVO.setApplyAuditState(0); auditLogVO.setApplyAuditExplain("用户申请报名"); applyAuditLogService.save(token,auditLogVO); - return applyId; } diff --git a/src/main/java/cn/com/tenlion/service/applystudents/impl/ApplyStudentsServiceImpl.java b/src/main/java/cn/com/tenlion/service/applystudents/impl/ApplyStudentsServiceImpl.java index 869273f..80439cb 100644 --- a/src/main/java/cn/com/tenlion/service/applystudents/impl/ApplyStudentsServiceImpl.java +++ b/src/main/java/cn/com/tenlion/service/applystudents/impl/ApplyStudentsServiceImpl.java @@ -1,6 +1,7 @@ package cn.com.tenlion.service.applystudents.impl; import cn.com.tenlion.pojo.dtos.apply.ApplyDTO; +import cn.com.tenlion.pojo.pos.apply.ApplyPO; import cn.com.tenlion.service.apply.IApplyService; import ink.wgink.common.base.DefaultBaseService; import ink.wgink.exceptions.ParamsException; @@ -58,13 +59,14 @@ public class ApplyStudentsServiceImpl extends DefaultBaseService implements IApp throw new ParamsException("参数错误"); } List deleteIdList = new ArrayList<>(); - List applyDTOList = applyService.listByInstitutionIdAndWorkTypeId(institutionId,workTypeId); - for (ApplyDTO applyDTO : applyDTOList) { + List applyPOList = applyService.listByInstitutionIdAndWorkTypeId(institutionId,workTypeId); + for (ApplyPO applyPO : applyPOList) { ApplyStudentsVO vo = new ApplyStudentsVO(); - BeanUtils.copyProperties(vo,applyDTO); + BeanUtils.copyProperties(vo,applyPO); vo.setApplyClassId(classId); - this.save(vo); - deleteIdList.add(applyDTO.getApplyId()); + Map params = HashMapUtil.beanToMap(vo); + applyStudentsDao.save(params);; + deleteIdList.add(applyPO.getApplyId()); } applyService.delete(deleteIdList); } diff --git a/src/main/java/cn/com/tenlion/service/examapply/impl/ExamApplyServiceImpl.java b/src/main/java/cn/com/tenlion/service/examapply/impl/ExamApplyServiceImpl.java index 31b2e95..4484619 100644 --- a/src/main/java/cn/com/tenlion/service/examapply/impl/ExamApplyServiceImpl.java +++ b/src/main/java/cn/com/tenlion/service/examapply/impl/ExamApplyServiceImpl.java @@ -138,25 +138,6 @@ public class ExamApplyServiceImpl extends DefaultBaseService implements IExamApp setAppUpdateInfo(token, params); } examApplyDao.update(params); - // 如果受理通过,则新增一条考场分配数据 - if(!StringUtils.isBlank(examApplyVO.getCertificateOffice())) { - // 申请考场信息开始 - DistributionSaveVO dstributionSaveVO = new DistributionSaveVO(); - dstributionSaveVO.setPlanId(examApplyVO.getExamId()); - dstributionSaveVO.setPlanName(examApplyVO.getPlanName()); - if(1 == examApplyVO.getExamType()) { - dstributionSaveVO.setDistributionTime(examApplyVO.getTheoryExamStartTime()); - dstributionSaveVO.setDistributionEndTime(examApplyVO.getTheoryExamEndTime()); - } - if(2 == examApplyVO.getExamType()) { - dstributionSaveVO.setDistributionTime(examApplyVO.getPracticeExamStartTime()); - dstributionSaveVO.setDistributionEndTime(examApplyVO.getPracticeExamEndTime()); - } - dstributionSaveVO.setDistributionNumber(examApplyVO.getPlanPersonNum()); - dstributionSaveVO.setStationId(examApplyVO.getTheoryExamAddressId()); - distributionService.save(dstributionSaveVO); - // 申请考场信息结束 - } } @Override diff --git a/src/main/resources/mybatis/mapper/apply/apply-mapper.xml b/src/main/resources/mybatis/mapper/apply/apply-mapper.xml index 0cff122..deba6a8 100644 --- a/src/main/resources/mybatis/mapper/apply/apply-mapper.xml +++ b/src/main/resources/mybatis/mapper/apply/apply-mapper.xml @@ -618,6 +618,22 @@ #{applyIds[${index}]} + + AND + t1.apply_institution_id = #{applyInstitutionId} + + + AND + t1.apply_work_type_id = #{applyWorkTypeId} + + + AND + t1.apply_audit_state IN + + #{applyAuditStates[${index}]} + + + ORDER BY t1.gmt_create DESC diff --git a/src/main/resources/mybatis/mapper/examapply/exam-apply-mapper.xml b/src/main/resources/mybatis/mapper/examapply/exam-apply-mapper.xml index 636ee74..11cd3b0 100644 --- a/src/main/resources/mybatis/mapper/examapply/exam-apply-mapper.xml +++ b/src/main/resources/mybatis/mapper/examapply/exam-apply-mapper.xml @@ -23,6 +23,7 @@ + @@ -46,6 +47,7 @@ + @@ -69,6 +71,7 @@ + @@ -91,6 +94,7 @@ next_commit_time, work_type_id, org_id, + next_num, gmt_create, creator, gmt_modified, @@ -114,6 +118,7 @@ #{nextCommitTime}, #{workTypeId}, #{orgId}, + #{nextNum}, #{gmtCreate}, #{creator}, #{gmtModified}, @@ -209,6 +214,9 @@ org_id = #{orgId}, + + + next_num = #{nextNum}, gmt_modified = #{gmtModified}, modifier = #{modifier}, @@ -245,6 +253,7 @@ t1.next_commit_time, t1.work_type_id, t1.org_id, + t1.next_num, t1.exam_apply_id FROM management_exam_apply t1 @@ -281,6 +290,7 @@ t1.next_commit_time, t1.work_type_id, t1.org_id, + t1.next_num, t1.exam_apply_num FROM management_exam_apply t1 @@ -314,6 +324,7 @@ t1.next_commit_time, t1.work_type_id, t1.org_id, + t1.next_num, t1.exam_apply_num FROM management_exam_apply t1 @@ -348,6 +359,7 @@ t1.next_commit_time, t1.work_type_id, t1.org_id, + t1.next_num, 1 FROM management_exam_apply t1 @@ -401,6 +413,7 @@ t1.next_commit_time, t1.work_type_id, t1.org_id, + t1.next_num, t1.exam_apply_num FROM management_exam_apply t1 @@ -451,6 +464,7 @@ t1.next_commit_time, t1.work_type_id, t1.org_id, + t1.next_num, t1.exam_apply_num FROM management_exam_apply t1 diff --git a/src/main/resources/mybatis/mapper/examcheck/exam-check-mapper.xml b/src/main/resources/mybatis/mapper/examcheck/exam-check-mapper.xml index b77da81..1f46638 100644 --- a/src/main/resources/mybatis/mapper/examcheck/exam-check-mapper.xml +++ b/src/main/resources/mybatis/mapper/examcheck/exam-check-mapper.xml @@ -11,6 +11,7 @@ + @@ -27,6 +28,7 @@ + @@ -43,6 +45,7 @@ + @@ -56,6 +59,7 @@ next_commit_time, work_type_id, org_id, + next_num, gmt_create, creator, gmt_modified, @@ -70,6 +74,7 @@ #{nextCommitTime}, #{workTypeId}, #{orgId}, + #{nextNum}, #{gmtCreate}, #{creator}, #{gmtModified}, @@ -129,6 +134,9 @@ org_id = #{orgId}, + + + next_num = #{nextNum}, gmt_modified = #{gmtModified}, modifier = #{modifier}, @@ -147,6 +155,7 @@ t1.next_commit_time, t1.work_type_id, t1.org_id, + t1.next_num, t1.exam_check_id FROM management_exam_check t1 @@ -177,6 +186,7 @@ t1.next_commit_time, t1.work_type_id, t1.org_id, + t1.next_num, t1.gmt_create, t1.creator, t1.gmt_modified, @@ -203,6 +213,7 @@ t1.next_commit_time, t1.work_type_id, t1.org_id, + t1.next_num, t1.gmt_create, t1.creator, t1.gmt_modified, @@ -229,6 +240,7 @@ t1.next_commit_time, t1.work_type_id, t1.org_id, + t1.next_num, 1 FROM management_exam_check t1 @@ -273,6 +285,7 @@ t1.next_commit_time, t1.work_type_id, t1.org_id, + t1.next_num, t1.gmt_create, t1.creator, t1.gmt_modified, @@ -314,12 +327,13 @@ t1.reason, t1.exam_apply_id, t1.next_commit_time, + t1.work_type_id, + t1.org_id, + t1.next_num, t1.gmt_create, t1.creator, t1.gmt_modified, t1.modifier, - t1.work_type_id, - t1.org_id, t1.is_delete FROM management_exam_check t1 @@ -380,6 +394,7 @@ t1.next_commit_time, t1.work_type_id, t1.org_id, + t1.next_num, 1 FROM management_exam_check t1 diff --git a/src/main/resources/static/route/examapply/list-check.html b/src/main/resources/static/route/examapply/list-check.html index d015166..61849a8 100644 --- a/src/main/resources/static/route/examapply/list-check.html +++ b/src/main/resources/static/route/examapply/list-check.html @@ -131,7 +131,7 @@ nextTime.setDate(nextTime.getDate() + $('#nextCommitTime').val()); formData.field.nextCommitTime = nextTime.format("yyyy-MM-dd hh:mm:ss"); formData.field.checkStatus = '2'; - top.restAjax.put(top.restAjax.path('api/examapply/update-more/{examCheckId}', [ids]), formData.field, null, function(code, data) { + top.restAjax.put(top.restAjax.path('api/examapply/update-more/{examApplyId}', [ids]), formData.field, null, function(code, data) { if('200' == code) { top.dialog.msg('退回成功'); window.location.reload(); @@ -232,15 +232,6 @@ return rowData; } }, - {field: 'planPersonNum', width: 180, title: '计划人数', align:'center', - templet: function(row) { - var rowData = row.classPlanDTO[this.field]; - if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') { - return '-'; - } - return rowData; - } - }, {field: 'planStartTime', width: 180, title: '计划开始时间', align:'center', templet: function(row) { var rowData = row.classPlanDTO[this.field]; @@ -304,7 +295,7 @@ return rowData; } }, - {field: 'status', width: 180, title: '查看考场信息', align:'center', + {field: 'status', fixed: 'right', width: 180, title: '查看考场信息', align:'center', templet: function(row) { var rowData = row[this.field]; if(typeof(rowData) === 'undefined' || rowData === null || rowData === '') { @@ -361,7 +352,7 @@ // 考试申请批量审核 function checkMore(ids, planIds) { - top.dialog.msg('开班计划审核', { + top.dialog.msg('考试申请审核', { time: 0, btn: ['通过', '退回'], shade: 0.3, diff --git a/src/main/resources/static/route/examapply/update-check.html b/src/main/resources/static/route/examapply/update-check.html index 36cad71..0b33982 100644 --- a/src/main/resources/static/route/examapply/update-check.html +++ b/src/main/resources/static/route/examapply/update-check.html @@ -49,12 +49,6 @@ -
- -
- -
-
@@ -93,10 +87,16 @@
- +
+