Commit d1d6ccce authored by YangZhaoJun1's avatar YangZhaoJun1

修改验重方法

parent 4288e93d
......@@ -227,7 +227,6 @@ public class BArrangeServiceImpl implements BArrangeService {
@Transactional(propagation = Propagation.REQUIRED,readOnly = false)
@Override
public PersistModel importExcel(HSSFWorkbook hwb, String token , String subAgencyId) {
//先将原来的excel数据删除
ArrayList<ScheduleDto> scheduleDtos = new ArrayList<ScheduleDto>();
Boolean contanSunday = ExcelUtil.containSunday(hwb);
......@@ -611,7 +610,7 @@ public class BArrangeServiceImpl implements BArrangeService {
String slCode = "";
for(int i=1;i<99999;i++){
slCode = termCode+String.valueOf(maxSlCode+i);
if(bSlRepository.selectOne(new BSl(slCode,"0","1"))==null)
if(bSlRepository.selectOne(new BSl(slCode))==null)
maxSlCode = maxSlCode + i;
break;
}
......
......@@ -44,7 +44,7 @@ public class BCompanyServiceImpl implements BCompanyService{
int line = 0;
BeanUtils.copyProperties((DataEntity) model, (DataEntity) user);
if (model.getBusinessId() == null) { //添加
if (sysUserMapper.selectOne(new SysUser(model.getCode(),"0","1")) != null)
if (sysUserMapper.selectOne(new SysUser(model.getCode())) != null)
throw new ServiceException(ResultServiceEnums.COMPANY_EXISTS);
//1. 添加s_user
......
......@@ -31,10 +31,8 @@ public class BSl extends IdEntity<BSl> {
this.termCode = termCode;
}
public BSl(String code, String delFlag, String flag) {
public BSl(String code) {
this.code = code;
this.delFlag = delFlag;
this.flag = flag;
}
@Length(min = 1,max = 64,message = "长度最小为1,最大为50")
@NotBlank
......
......@@ -118,7 +118,7 @@ public class BSlServiceImpl implements BSlService {
throw new ServiceException(ResultServiceEnums.LESSON_NOT_EXISTA);
model.setSlCoverUrl(bLesson.getDefaultUrl());
if(bSlRepository.selectOne(new BSl(model.getCode(),"0","1"))!=null)
if(bSlRepository.selectOne(new BSl(model.getCode()))!=null)
throw new ServiceException(ResultServiceEnums.SL_EXISTS);
//3. 封装git lab
/*User user = userRepository.selectOne(new User(model.getTeacherCode()));
......@@ -171,7 +171,7 @@ public class BSlServiceImpl implements BSlService {
if(value.length>=4) {
//1. 检查数据正确性
BSl bSl = null;
BSl b = new BSl(value[0],"0","1");
BSl b = new BSl(value[0]);
/*BSl bSl1 = new BSl();
bSl1.setTermCode(value[3]);
bSl1.setTeacherCode(value[2]);
......
......@@ -83,7 +83,7 @@ public class BStudentServiceImpl implements BStudentService {
int line = 0;
BeanUtils.copyProperties((DataEntity) model, (DataEntity) user);
if (model.getBusinessId() == null) { //添加
if (sysUserMapper.selectOne(new SysUser(model.getCode(),"0","1")) != null)
if (sysUserMapper.selectOne(new SysUser(model.getCode())) != null)
throw new ServiceException(ResultServiceEnums.STUDENT_EXISTS);
/*SysUser user1 = new SysUser();
user1.setEmail(model.getEmail());
......@@ -153,8 +153,6 @@ public class BStudentServiceImpl implements BStudentService {
//判断2:MySQL数据库中是否存在该用户;
SysUser user1 =new SysUser();
user1.setLoginName(value[0]);
user1.setDelFlag("0");
user1.setFlag("1");
if (sysUserMapper.selectOne(user1) != null) {
//该用户已存在,记入codeRepeat中
valuesRepeat.add(value[0]);
......
......@@ -108,8 +108,6 @@ public class BTeacherServiceImpl implements BTeacherService {
//判断2:MySQL数据库中是否存在该用户;
SysUser user1 =new SysUser();
user1.setLoginName(value[0]);
user1.setDelFlag("0");
user1.setFlag("1");
if (sysUserMapper.selectOne(user1) != null) {
//该用户已存在,记入codeRepeat中
valuesRepeat.add(value[0]);
......@@ -236,9 +234,9 @@ public class BTeacherServiceImpl implements BTeacherService {
int line = 0;
BeanUtils.copyProperties((DataEntity) model, (DataEntity) user);
if (model.getBusinessId() == null) {
if (sysUserMapper.selectOne(new SysUser(model.getCode(),"0","1")) != null)
if (sysUserMapper.selectOne(new SysUser(model.getCode())) != null)
{throw new ServiceException(ResultServiceEnums.TEACHER_EXISTS);}
SysUser user1 = new SysUser();
/*SysUser user1 = new SysUser();
user1.setEmail(model.getEmail());
user1.setDelFlag("0");
user1.setFlag("1");
......@@ -246,7 +244,7 @@ public class BTeacherServiceImpl implements BTeacherService {
if (sysUserMapper.selectOne(user1) != null) {
throw new ServiceException(ResultServiceEnums.EMAIL_EXISTS);
}
}
}*/
//1添加用户
user.setHeadPic(global.getDEFAULT_TEACHER_LOCATION());
UserUtil.setCurrentPersistOperation(user);
......
......@@ -66,10 +66,8 @@ public class SysUser extends IdEntity<SysUser> {
private Date loginDate; // 最后登陆日期
public SysUser(String loginName, String delFlag, String flag){
public SysUser(String loginName){
this.loginName = loginName;
this.delFlag = delFlag;
this.flag = flag;
}
public SysUser(String loginName, String password, String name, String sex) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment