提交 5349b6cd authored 作者: zhouzhigang's avatar zhouzhigang

--no commit message

上级 9bfdad9a
...@@ -63,6 +63,7 @@ import com.zrqx.core.vo.schoolsysuser.fg.IdAndNameVo; ...@@ -63,6 +63,7 @@ import com.zrqx.core.vo.schoolsysuser.fg.IdAndNameVo;
import com.zrqx.core.vo.schoolsysuser.fg.basicteachingplan.BasicPlanErrVo; import com.zrqx.core.vo.schoolsysuser.fg.basicteachingplan.BasicPlanErrVo;
import com.zrqx.core.vo.schoolsysuser.fg.basicteachingplan.ExportPlanErrVo; import com.zrqx.core.vo.schoolsysuser.fg.basicteachingplan.ExportPlanErrVo;
import com.zrqx.core.vo.schoolsysuser.fg.basicteachingplan.ImportPlanExcelVo; import com.zrqx.core.vo.schoolsysuser.fg.basicteachingplan.ImportPlanExcelVo;
import com.zrqx.core.vo.schoolsysuser.fg.biddingflow.CycleStatusAndFlowCodeVo;
import com.zrqx.core.vo.schoolsysuser.fg.publicbasicrelation.PublicBasicRelationVo; import com.zrqx.core.vo.schoolsysuser.fg.publicbasicrelation.PublicBasicRelationVo;
import com.zrqx.school.sysuser.client.BgMemberClient; import com.zrqx.school.sysuser.client.BgMemberClient;
import com.zrqx.school.sysuser.client.FgMemberClient; import com.zrqx.school.sysuser.client.FgMemberClient;
...@@ -74,6 +75,7 @@ import com.zrqx.school.sysuser.mapper.major.FgProfessionalMapper; ...@@ -74,6 +75,7 @@ import com.zrqx.school.sysuser.mapper.major.FgProfessionalMapper;
import com.zrqx.school.sysuser.mapper.order.FgOrderInfoMapper; import com.zrqx.school.sysuser.mapper.order.FgOrderInfoMapper;
import com.zrqx.school.sysuser.mapper.publiclesson.FgPublicBasicRelationMapper; import com.zrqx.school.sysuser.mapper.publiclesson.FgPublicBasicRelationMapper;
import com.zrqx.school.sysuser.mapper.publiclesson.FgPublicLessonMapper; import com.zrqx.school.sysuser.mapper.publiclesson.FgPublicLessonMapper;
import com.zrqx.school.sysuser.service.biddingflow.BiddingFlowService;
import com.zrqx.school.sysuser.service.classmanagement.FgClassManagementService; import com.zrqx.school.sysuser.service.classmanagement.FgClassManagementService;
import com.zrqx.school.sysuser.service.major.FgMajorService; import com.zrqx.school.sysuser.service.major.FgMajorService;
import com.zrqx.school.sysuser.service.major.FgProfessionalService; import com.zrqx.school.sysuser.service.major.FgProfessionalService;
...@@ -115,6 +117,8 @@ public class FgBasicTeachingPlanServiceImpl extends BaseModelServiceImpl<BasicTe ...@@ -115,6 +117,8 @@ public class FgBasicTeachingPlanServiceImpl extends BaseModelServiceImpl<BasicTe
private FgOrderInfoMapper fgOrderInfoMapper; private FgOrderInfoMapper fgOrderInfoMapper;
@Autowired @Autowired
private FgClassManagementService fgClassManagementService; private FgClassManagementService fgClassManagementService;
@Autowired
private BiddingFlowService biddingFlowService;
...@@ -208,6 +212,12 @@ public class FgBasicTeachingPlanServiceImpl extends BaseModelServiceImpl<BasicTe ...@@ -208,6 +212,12 @@ public class FgBasicTeachingPlanServiceImpl extends BaseModelServiceImpl<BasicTe
@Override @Override
public boolean batchDelete(List<Integer> ids) { public boolean batchDelete(List<Integer> ids) {
CycleStatusAndFlowCodeVo biddingConfig = biddingFlowService.getBiddingConfig();
if(biddingConfig != null){
if("1".equals(biddingConfig.getStatus())){
throw new BaseException("当前有开启的征订周期,请联系出版社管理员");
}
}
List<Integer> list = new ArrayList<Integer>(); List<Integer> list = new ArrayList<Integer>();
ids.forEach(vo ->{ ids.forEach(vo ->{
//删除培养层次跟课程的关系 //删除培养层次跟课程的关系
......
...@@ -21,6 +21,7 @@ import com.zrqx.core.util.response.CallBack; ...@@ -21,6 +21,7 @@ import com.zrqx.core.util.response.CallBack;
import com.zrqx.core.vo.member.department.DepartmentMemberVo; import com.zrqx.core.vo.member.department.DepartmentMemberVo;
import com.zrqx.core.vo.member.fg.member.FgMemberVo; import com.zrqx.core.vo.member.fg.member.FgMemberVo;
import com.zrqx.core.vo.schoolsysuser.fg.IdAndNameVo; import com.zrqx.core.vo.schoolsysuser.fg.IdAndNameVo;
import com.zrqx.core.vo.schoolsysuser.fg.biddingflow.CycleStatusAndFlowCodeVo;
import com.zrqx.core.vo.schoolsysuser.fg.classmanagement.ClassManagementVo; import com.zrqx.core.vo.schoolsysuser.fg.classmanagement.ClassManagementVo;
import com.zrqx.core.vo.schoolsysuser.fg.classmanagement.ClassmanagementErrVo; import com.zrqx.core.vo.schoolsysuser.fg.classmanagement.ClassmanagementErrVo;
import com.zrqx.core.vo.schoolsysuser.fg.classmanagement.ExportClassErrVo; import com.zrqx.core.vo.schoolsysuser.fg.classmanagement.ExportClassErrVo;
...@@ -31,6 +32,7 @@ import com.zrqx.school.sysuser.manage.export.ExportManage; ...@@ -31,6 +32,7 @@ import com.zrqx.school.sysuser.manage.export.ExportManage;
import com.zrqx.school.sysuser.mapper.basicteachingplan.FgBasicTeachingPlanMapper; import com.zrqx.school.sysuser.mapper.basicteachingplan.FgBasicTeachingPlanMapper;
import com.zrqx.school.sysuser.mapper.classmanagement.FgClassManagementMapper; import com.zrqx.school.sysuser.mapper.classmanagement.FgClassManagementMapper;
import com.zrqx.school.sysuser.mapper.student.FgStudentMapper; import com.zrqx.school.sysuser.mapper.student.FgStudentMapper;
import com.zrqx.school.sysuser.service.biddingflow.BiddingFlowService;
import com.zrqx.school.sysuser.service.major.FgMajorService; import com.zrqx.school.sysuser.service.major.FgMajorService;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger; import org.slf4j.Logger;
...@@ -60,6 +62,8 @@ public class FgClassManagementServiceImpl extends BaseModelServiceImpl<ClassMana ...@@ -60,6 +62,8 @@ public class FgClassManagementServiceImpl extends BaseModelServiceImpl<ClassMana
private BgMemberClient bgMemberClient; private BgMemberClient bgMemberClient;
@Autowired @Autowired
private FgStudentMapper fgStudentMapper; private FgStudentMapper fgStudentMapper;
@Autowired
private BiddingFlowService biddingFlowService;
@Override @Override
public BaseMapper<ClassManagement> getMapper() { public BaseMapper<ClassManagement> getMapper() {
...@@ -330,6 +334,13 @@ public class FgClassManagementServiceImpl extends BaseModelServiceImpl<ClassMana ...@@ -330,6 +334,13 @@ public class FgClassManagementServiceImpl extends BaseModelServiceImpl<ClassMana
@Override @Override
public boolean batchDelete(List<Integer> ids) { public boolean batchDelete(List<Integer> ids) {
//验证当前是否有征订周期存在,若有征订周期存在,则不让删除
CycleStatusAndFlowCodeVo biddingConfig = biddingFlowService.getBiddingConfig();
if(biddingConfig != null){
if("1".equals(biddingConfig.getStatus())){
throw new BaseException("当前有开启的征订周期,请联系出版社管理员");
}
}
//删除班级下的学生 //删除班级下的学生
ids.forEach(id ->{ ids.forEach(id ->{
Student student = new Student(); Student student = new Student();
......
...@@ -37,6 +37,7 @@ import com.zrqx.core.vo.member.department.DepartmentMemberVo; ...@@ -37,6 +37,7 @@ import com.zrqx.core.vo.member.department.DepartmentMemberVo;
import com.zrqx.core.vo.member.fg.major.FgMajorVo; import com.zrqx.core.vo.member.fg.major.FgMajorVo;
import com.zrqx.core.vo.member.fg.member.FgMemberVo; import com.zrqx.core.vo.member.fg.member.FgMemberVo;
import com.zrqx.core.vo.schoolsysuser.fg.IdAndNameVo; import com.zrqx.core.vo.schoolsysuser.fg.IdAndNameVo;
import com.zrqx.core.vo.schoolsysuser.fg.biddingflow.CycleStatusAndFlowCodeVo;
import com.zrqx.core.vo.schoolsysuser.fg.major.ExportMajorErrVo; import com.zrqx.core.vo.schoolsysuser.fg.major.ExportMajorErrVo;
import com.zrqx.core.vo.schoolsysuser.fg.major.IdAndPidVo; import com.zrqx.core.vo.schoolsysuser.fg.major.IdAndPidVo;
import com.zrqx.core.vo.schoolsysuser.fg.major.ImportMajorExcelVo; import com.zrqx.core.vo.schoolsysuser.fg.major.ImportMajorExcelVo;
...@@ -47,6 +48,7 @@ import com.zrqx.school.sysuser.manage.export.ExportManage; ...@@ -47,6 +48,7 @@ import com.zrqx.school.sysuser.manage.export.ExportManage;
import com.zrqx.school.sysuser.mapper.major.FgMajorMapper; import com.zrqx.school.sysuser.mapper.major.FgMajorMapper;
import com.zrqx.school.sysuser.mapper.major.FgPMajorMapper; import com.zrqx.school.sysuser.mapper.major.FgPMajorMapper;
import com.zrqx.school.sysuser.service.basicteachingplan.FgBasicTeachingPlanService; import com.zrqx.school.sysuser.service.basicteachingplan.FgBasicTeachingPlanService;
import com.zrqx.school.sysuser.service.biddingflow.BiddingFlowService;
import com.zrqx.school.sysuser.service.classmanagement.FgClassManagementService; import com.zrqx.school.sysuser.service.classmanagement.FgClassManagementService;
@Service @Service
...@@ -70,6 +72,8 @@ public class FgMajorServiceImpl extends BaseModelServiceImpl<Major,Integer> impl ...@@ -70,6 +72,8 @@ public class FgMajorServiceImpl extends BaseModelServiceImpl<Major,Integer> impl
private FgBasicTeachingPlanService FgBasicTeachingPlanService; private FgBasicTeachingPlanService FgBasicTeachingPlanService;
@Autowired @Autowired
private FgClassManagementService fgClassManagementService; private FgClassManagementService fgClassManagementService;
@Autowired
private BiddingFlowService biddingFlowService;
@Override @Override
...@@ -348,6 +352,13 @@ public class FgMajorServiceImpl extends BaseModelServiceImpl<Major,Integer> impl ...@@ -348,6 +352,13 @@ public class FgMajorServiceImpl extends BaseModelServiceImpl<Major,Integer> impl
@Override @Override
public boolean batchDelete(List<Integer> ids) { public boolean batchDelete(List<Integer> ids) {
//验证当前是否有征订周期存在,若有征订周期存在,则不让删除
CycleStatusAndFlowCodeVo biddingConfig = biddingFlowService.getBiddingConfig();
if(biddingConfig != null){
if("1".equals(biddingConfig.getStatus())){
throw new BaseException("当前有开启的征订周期,请联系出版社管理员");
}
}
List<Integer> list = new ArrayList<Integer>(); List<Integer> list = new ArrayList<Integer>();
List<Integer> list1 = new ArrayList<Integer>(); List<Integer> list1 = new ArrayList<Integer>();
ids.forEach(vo ->{ ids.forEach(vo ->{
......
...@@ -7,6 +7,7 @@ import java.util.List; ...@@ -7,6 +7,7 @@ import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import com.zrqx.school.sysuser.service.biddingflow.BiddingFlowService;
import com.zrqx.school.sysuser.service.schoolasedlibrary.FgSchoolAsedLibraryService; import com.zrqx.school.sysuser.service.schoolasedlibrary.FgSchoolAsedLibraryService;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger; import org.slf4j.Logger;
...@@ -17,6 +18,7 @@ import org.springframework.web.multipart.MultipartFile; ...@@ -17,6 +18,7 @@ import org.springframework.web.multipart.MultipartFile;
import com.zrqx.core.commons.redis.FgRedisManage; import com.zrqx.core.commons.redis.FgRedisManage;
import com.zrqx.core.enums.member.publiclesson.PublicLessonTypeEnum; import com.zrqx.core.enums.member.publiclesson.PublicLessonTypeEnum;
import com.zrqx.core.enums.member.publiclessonclassarrangerealtion.PublicLessonClassArrangeRealtionTypeEnum; import com.zrqx.core.enums.member.publiclessonclassarrangerealtion.PublicLessonClassArrangeRealtionTypeEnum;
import com.zrqx.core.exception.BaseException;
import com.zrqx.core.exception.BusinessValidateException; import com.zrqx.core.exception.BusinessValidateException;
import com.zrqx.core.form.member.bg.department.QueryTypeAndRelationIdForm; import com.zrqx.core.form.member.bg.department.QueryTypeAndRelationIdForm;
import com.zrqx.core.form.member.fg.publiclesson.FgSavePublicLeesonForm; import com.zrqx.core.form.member.fg.publiclesson.FgSavePublicLeesonForm;
...@@ -39,6 +41,7 @@ import com.zrqx.core.util.page.PageParam; ...@@ -39,6 +41,7 @@ import com.zrqx.core.util.page.PageParam;
import com.zrqx.core.util.response.CallBack; import com.zrqx.core.util.response.CallBack;
import com.zrqx.core.vo.member.fg.member.FgMemberVo; import com.zrqx.core.vo.member.fg.member.FgMemberVo;
import com.zrqx.core.vo.member.fg.publiclesson.FgPublicLessonVo; import com.zrqx.core.vo.member.fg.publiclesson.FgPublicLessonVo;
import com.zrqx.core.vo.schoolsysuser.fg.biddingflow.CycleStatusAndFlowCodeVo;
import com.zrqx.core.vo.schoolsysuser.fg.publicbasicrelation.PublicBasicRelationVo; import com.zrqx.core.vo.schoolsysuser.fg.publicbasicrelation.PublicBasicRelationVo;
import com.zrqx.core.vo.schoolsysuser.fg.publiclesson.ExportLessonErrVo; import com.zrqx.core.vo.schoolsysuser.fg.publiclesson.ExportLessonErrVo;
import com.zrqx.core.vo.schoolsysuser.fg.publiclesson.ImportLessonExcelVo; import com.zrqx.core.vo.schoolsysuser.fg.publiclesson.ImportLessonExcelVo;
...@@ -76,6 +79,8 @@ public class FgPublicLessonServiceImpl extends BaseModelServiceImpl<PublicLesson ...@@ -76,6 +79,8 @@ public class FgPublicLessonServiceImpl extends BaseModelServiceImpl<PublicLesson
private ExportManage exportManage; private ExportManage exportManage;
@Autowired @Autowired
private FgResouceClient fgResouceClient; private FgResouceClient fgResouceClient;
@Autowired
private BiddingFlowService biddingFlowService;
...@@ -367,6 +372,13 @@ public class FgPublicLessonServiceImpl extends BaseModelServiceImpl<PublicLesson ...@@ -367,6 +372,13 @@ public class FgPublicLessonServiceImpl extends BaseModelServiceImpl<PublicLesson
@Override @Override
public boolean batchDelete(List<Integer> ids) { public boolean batchDelete(List<Integer> ids) {
//验证当前是否有征订周期存在,若有征订周期存在,则不让删除
CycleStatusAndFlowCodeVo biddingConfig = biddingFlowService.getBiddingConfig();
if(biddingConfig != null){
if("1".equals(biddingConfig.getStatus())){
throw new BaseException("当前有开启的征订周期,请联系出版社管理员");
}
}
ids.forEach(vo ->{ ids.forEach(vo ->{
//删除教材和课程安排的关系 //删除教材和课程安排的关系
fgPublicLessonClassArrangeRealtionService.batchDel(vo); fgPublicLessonClassArrangeRealtionService.batchDel(vo);
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论