Skip to content
项目
群组
代码片段
帮助
当前项目
正在载入...
登录 / 注册
切换导航面板
J
jgjy
Project
Project
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
Graph
比较
统计图
议题
0
议题
0
列表
看板
标记
Milestones
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程
统计图
注册表
注册表
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
图像
聊天
创建新问题
作业
提交
问题看板
Open sidebar
svn
jgjy
Commits
5349b6cd
提交
5349b6cd
authored
1月 03, 2020
作者:
zhouzhigang
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
--no commit message
上级
9bfdad9a
隐藏空白字符变更
内嵌
并排
正在显示
4 个修改的文件
包含
44 行增加
和
0 行删除
+44
-0
FgBasicTeachingPlanServiceImpl.java
...ice/basicteachingplan/FgBasicTeachingPlanServiceImpl.java
+10
-0
FgClassManagementServiceImpl.java
...service/classmanagement/FgClassManagementServiceImpl.java
+11
-0
FgMajorServiceImpl.java
...zrqx/school/sysuser/service/major/FgMajorServiceImpl.java
+11
-0
FgPublicLessonServiceImpl.java
...suser/service/publiclesson/FgPublicLessonServiceImpl.java
+12
-0
没有找到文件。
com.zrqx.school.sysuser/src/main/java/com/zrqx/school/sysuser/service/basicteachingplan/FgBasicTeachingPlanServiceImpl.java
浏览文件 @
5349b6cd
...
@@ -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
->{
//删除培养层次跟课程的关系
//删除培养层次跟课程的关系
...
...
com.zrqx.school.sysuser/src/main/java/com/zrqx/school/sysuser/service/classmanagement/FgClassManagementServiceImpl.java
浏览文件 @
5349b6cd
...
@@ -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
();
...
...
com.zrqx.school.sysuser/src/main/java/com/zrqx/school/sysuser/service/major/FgMajorServiceImpl.java
浏览文件 @
5349b6cd
...
@@ -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
->{
...
...
com.zrqx.school.sysuser/src/main/java/com/zrqx/school/sysuser/service/publiclesson/FgPublicLessonServiceImpl.java
浏览文件 @
5349b6cd
...
@@ -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
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论