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 b2b640b..522889b 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 @@ -94,7 +94,7 @@ public class ApplyStudentsServiceImpl extends DefaultBaseService implements IApp applyStudentsNewVO.setOrgId(po.getApplyInstitutionId()); ClassPlanDTO classPlanDTO = classPlanService.get(po.getApplyClassId()); if(null != classPlanDTO) { - applyStudentsNewVO.setOrgName(classPlanDTO.getOrgName()); + applyStudentsNewVO.setOrgName(classPlanDTO.getOrgName()); } applyStudentsNewVO.setClassPlanId(po.getApplyClassId()); applyStudentsNewVO.setUserId(params.get("creator").toString()); diff --git a/src/main/java/cn/com/tenlion/service/applystudentsnew/impl/ApplyStudentsNewServiceImpl.java b/src/main/java/cn/com/tenlion/service/applystudentsnew/impl/ApplyStudentsNewServiceImpl.java index c5dbcf5..bf717ae 100644 --- a/src/main/java/cn/com/tenlion/service/applystudentsnew/impl/ApplyStudentsNewServiceImpl.java +++ b/src/main/java/cn/com/tenlion/service/applystudentsnew/impl/ApplyStudentsNewServiceImpl.java @@ -3,7 +3,6 @@ package cn.com.tenlion.service.applystudentsnew.impl; import cn.com.tenlion.dao.applystudentsnew.IApplyStudentsNewDao; import cn.com.tenlion.dao.classplan.IClassPlanDao; import cn.com.tenlion.dao.examcheck.IExamCheckDao; -import cn.com.tenlion.institutionmanagement.service.institution.IInstitutionService; import cn.com.tenlion.pojo.bos.applystudentsnew.ApplyStudentsNewBO; import cn.com.tenlion.pojo.dtos.apply.ApplyDTO; import cn.com.tenlion.pojo.dtos.applystudents.ApplyStudentsDTO; @@ -22,22 +21,24 @@ import cn.com.tenlion.service.classplan.IClassPlanService; import cn.com.tenlion.service.examapply.IExamApplyService; import cn.com.tenlion.service.examplan.IExamPlanService; import cn.com.tenlion.service.worktype.IWorkTypeService; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; import ink.wgink.common.base.DefaultBaseService; import ink.wgink.module.dictionary.pojo.dtos.DataDTO; import ink.wgink.module.dictionary.service.IDataService; import ink.wgink.pojo.ListPage; import ink.wgink.pojo.app.AppTokenUser; -import ink.wgink.pojo.result.SuccessResultData; import ink.wgink.pojo.result.SuccessResultList; -import ink.wgink.util.map.HashMapUtil; import ink.wgink.util.UUIDUtil; -import com.github.pagehelper.PageHelper; -import com.github.pagehelper.PageInfo; +import ink.wgink.util.map.HashMapUtil; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import java.util.*; +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; +import java.util.Map; /** * @ClassName: ApplyStudentsNewServiceImpl @@ -95,17 +96,17 @@ public class ApplyStudentsNewServiceImpl extends DefaultBaseService implements I // 性别转为汉字 if(!StringUtils.isBlank(applyStudentsNewVO.getSex())) { DataDTO dataDTO = dataService.get(applyStudentsNewVO.getSex()); - applyStudentsNewVO.setSex(dataDTO.getDataName()); + applyStudentsNewVO.setSex(dataDTO == null ? applyStudentsNewVO.getSex() : dataDTO.getDataName()); } // 保存证件类型中文 if(!StringUtils.isBlank(applyStudentsNewVO.getCardType())) { DataDTO dataDTO = dataService.get(applyStudentsNewVO.getCardType()); - applyStudentsNewVO.setCardTypeName(dataDTO.getDataName()); + applyStudentsNewVO.setCardTypeName(dataDTO == null ? applyStudentsNewVO.getCardType() : dataDTO.getDataName()); } // 保存学历中文 if(!StringUtils.isBlank(applyStudentsNewVO.getEducation())) { DataDTO dataDTO = dataService.get(applyStudentsNewVO.getCardType()); - applyStudentsNewVO.setEducationName(dataDTO.getDataName()); + applyStudentsNewVO.setEducationName(dataDTO == null ? applyStudentsNewVO.getEducation() : dataDTO.getDataName()); } if(!StringUtils.isBlank(applyStudentsNewVO.getClassPlanId())) { ExamPlanDTO examPlanDTO = examPlanService.get(applyStudentsNewVO.getClassPlanId()); diff --git a/src/main/java/cn/com/tenlion/service/classplan/impl/ClassPlanServiceImpl.java b/src/main/java/cn/com/tenlion/service/classplan/impl/ClassPlanServiceImpl.java index 44dabd4..b26fbc7 100644 --- a/src/main/java/cn/com/tenlion/service/classplan/impl/ClassPlanServiceImpl.java +++ b/src/main/java/cn/com/tenlion/service/classplan/impl/ClassPlanServiceImpl.java @@ -1,5 +1,6 @@ package cn.com.tenlion.service.classplan.impl; +import cn.com.tenlion.buildingpictures.service.picturestemplatebuilding.IPicturesTemplateBuildingService; import cn.com.tenlion.dao.classplan.IClassPlanDao; import cn.com.tenlion.dao.examcheck.IExamCheckDao; import cn.com.tenlion.institutionmanagement.pojo.dtos.institution.InstitutionDTO; @@ -7,13 +8,13 @@ import cn.com.tenlion.institutionmanagement.service.institution.IInstitutionServ import cn.com.tenlion.pojo.bos.classplan.ClassPlanBO; import cn.com.tenlion.pojo.dtos.apply.ApplyDTO; import cn.com.tenlion.pojo.dtos.applystudents.ApplyStudentsDTO; +import cn.com.tenlion.pojo.dtos.cardential.CardentialDTO; import cn.com.tenlion.pojo.dtos.classplan.ClassPlanDTO; import cn.com.tenlion.pojo.dtos.classplan.ClassPlanReportExamDTO; import cn.com.tenlion.pojo.dtos.distributioncard.DistributionCardDTO; import cn.com.tenlion.pojo.dtos.examapply.ExamApplyDTO; import cn.com.tenlion.pojo.dtos.examcheck.ExamCheckDTO; import cn.com.tenlion.pojo.dtos.teacher.TeacherDTO; -import cn.com.tenlion.pojo.dtos.teacher.TeacherLessonsTimeDTO; import cn.com.tenlion.pojo.dtos.worktype.WorkTypeDTO; import cn.com.tenlion.pojo.pos.classplan.ClassPlanPO; import cn.com.tenlion.pojo.vos.classplan.ClassPlanVO; @@ -85,6 +86,8 @@ public class ClassPlanServiceImpl extends DefaultBaseService implements IClassPl private ITeacherService teacher; @Autowired private IApplyStudentsService studentsService; + @Autowired + private IPicturesTemplateBuildingService credentialService; @Override public void save(ClassPlanVO classPlanVO) { diff --git a/src/main/java/cn/com/tenlion/service/examcheck/impl/ExamCheckServiceImpl.java b/src/main/java/cn/com/tenlion/service/examcheck/impl/ExamCheckServiceImpl.java index 981af71..507645a 100644 --- a/src/main/java/cn/com/tenlion/service/examcheck/impl/ExamCheckServiceImpl.java +++ b/src/main/java/cn/com/tenlion/service/examcheck/impl/ExamCheckServiceImpl.java @@ -7,38 +7,27 @@ import cn.com.tenlion.pojo.bos.examcheck.ExamCheckBO; import cn.com.tenlion.pojo.dtos.classplan.ClassPlanDTO; import cn.com.tenlion.pojo.dtos.examcheck.ExamCheckDTO; import cn.com.tenlion.pojo.pos.examcheck.ExamCheckPO; -import cn.com.tenlion.pojo.vos.classplan.ClassPlanVO; import cn.com.tenlion.pojo.vos.examcheck.ExamCheckVO; import cn.com.tenlion.pojo.vos.plancheck.PlanCheckVO; import cn.com.tenlion.service.applystudents.IApplyStudentsService; import cn.com.tenlion.service.classplan.IClassPlanService; -import cn.com.tenlion.service.examapply.IExamApplyService; import cn.com.tenlion.service.examcheck.IExamCheckService; import cn.com.tenlion.service.plancheck.IPlanCheckService; -import com.sun.org.apache.xpath.internal.operations.Bool; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; import ink.wgink.common.base.DefaultBaseService; import ink.wgink.exceptions.UpdateException; import ink.wgink.pojo.ListPage; -import ink.wgink.pojo.bos.UserInfoBO; -import ink.wgink.pojo.dtos.position.PositionDTO; -import ink.wgink.pojo.dtos.position.PositionUserDTO; -import ink.wgink.pojo.dtos.user.UserDTO; import ink.wgink.pojo.result.SuccessResultList; -import ink.wgink.pojo.vos.IdsVO; -import ink.wgink.service.position.service.IPositionService; -import ink.wgink.service.position.service.IPositionUserService; -import ink.wgink.service.user.service.IUserService; -import ink.wgink.util.date.DateUtil; -import ink.wgink.util.map.HashMapUtil; import ink.wgink.util.UUIDUtil; -import com.github.pagehelper.PageHelper; -import com.github.pagehelper.PageInfo; +import ink.wgink.util.map.HashMapUtil; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.security.core.parameters.P; import org.springframework.stereotype.Service; -import java.util.*; +import java.util.HashMap; +import java.util.List; +import java.util.Map; /** * @ClassName: ExamCheckServiceImpl @@ -142,7 +131,7 @@ public class ExamCheckServiceImpl extends DefaultBaseService implements IExamChe } examCheckDao.update(params); ExamCheckDTO examCheckDTO = get(examCheckId); - // 开班计划审核通过以后，调用机构接口，删除机构相关信息 + // 开班申请通过后,将报名中人员信息转移到班级表中 if(1 == examCheckVO.getCheckStatus()) { try { applyStudentsService.saveCopeApply(examCheckDTO.getOrgId(), examCheckDTO.getWorkTypeId(), examCheckDTO.getPlanId());