Skip to content

J
jgjy
提交 567103cf authored 作者: malei's avatar malei
浏览文件
操作

feat(resource): fg-resource

1. 过滤空值 References: N/A
上级 ccb6e885
隐藏空白字符变更
内嵌 并排
正在显示 包含 52 行增加 和 59 行删除
com.zrqx.school.sysuser/src/main/java/com/zrqx/school/sysuser/service/basicteachingplan/FgBasicTeachingPlanServiceImpl.java
浏览文件 @ 567103cf
package com.zrqx.school.sysuser.service.basicteachingplan;
import java.io.IOException;
import java.io.OutputStream;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Comparator;
import java.util.Date;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.apache.commons.lang3.StringUtils;
import org.apache.poi.hssf.usermodel.HSSFCellStyle;
import org.apache.poi.hssf.usermodel.HSSFSheet;
import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import org.apache.poi.ss.usermodel.Cell;
import org.apache.poi.ss.usermodel.Row;
import org.apache.poi.ss.util.CellRangeAddress;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.web.multipart.MultipartFile;
import com.alibaba.fastjson.JSON;
import com.zrqx.core.commons.redis.FgRedisManage;
import com.zrqx.core.enums.BooleanStatusEnum;
......@@ -85,6 +59,26 @@ import com.zrqx.school.sysuser.service.major.FgMajorService;
import com.zrqx.school.sysuser.service.major.FgProfessionalService;
import com.zrqx.school.sysuser.service.publiclesson.FgPublicLessonClassArrangeRealtionService;
import com.zrqx.school.sysuser.service.publiclesson.FgPublicLessonPlanRelationService;
import org.apache.commons.lang3.StringUtils;
import org.apache.poi.hssf.usermodel.HSSFCellStyle;
import org.apache.poi.hssf.usermodel.HSSFSheet;
import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import org.apache.poi.ss.usermodel.Cell;
import org.apache.poi.ss.usermodel.Row;
import org.apache.poi.ss.util.CellRangeAddress;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.io.OutputStream;
import java.text.SimpleDateFormat;
import java.util.*;
import java.util.stream.Collectors;
@Service
public class FgBasicTeachingPlanServiceImpl extends BaseModelServiceImpl<BasicTeachingPlan,Integer> implements FgBasicTeachingPlanService{
......@@ -220,7 +214,7 @@ public class FgBasicTeachingPlanServiceImpl extends BaseModelServiceImpl<BasicTe
public boolean batchDelete(List<Integer> ids) {
CycleStatusAndFlowCodeVo biddingConfig = biddingFlowService.getBiddingConfig();
if(biddingConfig != null){
if("1".equals(biddingConfig.getStatus())){
if("0".equals(biddingConfig.getStatus())){
throw new BaseException("当前有开启的征订周期,不能进行删除操作,请联系出版社管理员");
}
}
......
com.zrqx.school.sysuser/src/main/java/com/zrqx/school/sysuser/service/classmanagement/FgClassManagementServiceImpl.java
浏览文件 @ 567103cf
......@@ -360,7 +360,7 @@ public class FgClassManagementServiceImpl extends BaseModelServiceImpl<ClassMana
//验证当前是否有征订周期存在，若有征订周期存在，则不让删除
CycleStatusAndFlowCodeVo biddingConfig = biddingFlowService.getBiddingConfig();
if(biddingConfig != null){
if("1".equals(biddingConfig.getStatus())){
if("0".equals(biddingConfig.getStatus())){
throw new BaseException("当前有开启的征订周期,不能进行删除操作,请联系出版社管理员");
}
}
......
com.zrqx.school.sysuser/src/main/java/com/zrqx/school/sysuser/service/major/FgMajorServiceImpl.java
浏览文件 @ 567103cf
package com.zrqx.school.sysuser.service.major;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.web.multipart.MultipartFile;
import com.alibaba.fastjson.JSON;
import com.zrqx.core.commons.redis.FgRedisManage;
import com.zrqx.core.exception.BaseException;
......@@ -50,6 +36,19 @@ import com.zrqx.school.sysuser.mapper.major.FgPMajorMapper;
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 org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.web.multipart.MultipartFile;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@Service
public class FgMajorServiceImpl extends BaseModelServiceImpl<Major,Integer> implements FgMajorService{
......@@ -355,7 +354,7 @@ public class FgMajorServiceImpl extends BaseModelServiceImpl<Major,Integer> impl
//验证当前是否有征订周期存在，若有征订周期存在，则不让删除
CycleStatusAndFlowCodeVo biddingConfig = biddingFlowService.getBiddingConfig();
if(biddingConfig != null){
if("1".equals(biddingConfig.getStatus())){
if("0".equals(biddingConfig.getStatus())){
throw new BaseException("当前有开启的征订周期,不能进行删除操作,请联系出版社管理员");
}
}
......
com.zrqx.school.sysuser/src/main/java/com/zrqx/school/sysuser/service/publiclesson/FgPublicLessonServiceImpl.java
浏览文件 @ 567103cf
package com.zrqx.school.sysuser.service.publiclesson;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Comparator;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
import com.zrqx.school.sysuser.service.biddingflow.BiddingFlowService;
import com.zrqx.school.sysuser.service.schoolasedlibrary.FgSchoolAsedLibraryService;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.web.multipart.MultipartFile;
import com.zrqx.core.commons.redis.FgRedisManage;
import com.zrqx.core.enums.member.publiclesson.PublicLessonTypeEnum;
import com.zrqx.core.enums.member.publiclessonclassarrangerealtion.PublicLessonClassArrangeRealtionTypeEnum;
......@@ -52,6 +37,21 @@ import com.zrqx.school.sysuser.manage.export.ExportManage;
import com.zrqx.school.sysuser.mapper.basicteachingplan.FgBasicTeachingPlanMapper;
import com.zrqx.school.sysuser.mapper.publiclesson.FgPublicLessonMapper;
import com.zrqx.school.sysuser.mapper.school.FgSchoolMapper;
import com.zrqx.school.sysuser.service.biddingflow.BiddingFlowService;
import com.zrqx.school.sysuser.service.schoolasedlibrary.FgSchoolAsedLibraryService;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.web.multipart.MultipartFile;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Comparator;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
@Service
public class FgPublicLessonServiceImpl extends BaseModelServiceImpl<PublicLesson,Integer> implements FgPublicLessonService{
......@@ -388,7 +388,7 @@ public class FgPublicLessonServiceImpl extends BaseModelServiceImpl<PublicLesson
//验证当前是否有征订周期存在，若有征订周期存在，则不让删除
CycleStatusAndFlowCodeVo biddingConfig = biddingFlowService.getBiddingConfig();
if(biddingConfig != null){
if("1".equals(biddingConfig.getStatus())){
if("0".equals(biddingConfig.getStatus())){
throw new BaseException("当前有开启的征订周期,不能进行删除操作,请联系出版社管理员");
}
}
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论