Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
E
education
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
李丛阳
education
Commits
d1d6ccce
Commit
d1d6ccce
authored
May 14, 2018
by
YangZhaoJun1
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改验重方法
parent
4288e93d
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
10 additions
and
19 deletions
+10
-19
BArrangeServiceImpl.java
...t/business/barrange/service/impl/BArrangeServiceImpl.java
+1
-2
BCompanyServiceImpl.java
...t/business/bcompany/service/impl/BCompanyServiceImpl.java
+1
-1
BSl.java
src/main/java/org/rcisoft/business/bsl/entity/BSl.java
+1
-3
BSlServiceImpl.java
...org/rcisoft/business/bsl/service/impl/BSlServiceImpl.java
+2
-2
BStudentServiceImpl.java
...t/business/bstudent/service/impl/BStudentServiceImpl.java
+1
-3
BTeacherServiceImpl.java
...t/business/bteacher/service/impl/BTeacherServiceImpl.java
+3
-5
SysUser.java
src/main/java/org/rcisoft/sys/user/entity/SysUser.java
+1
-3
No files found.
src/main/java/org/rcisoft/business/barrange/service/impl/BArrangeServiceImpl.java
View file @
d1d6ccce
...
...
@@ -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
;
}
...
...
src/main/java/org/rcisoft/business/bcompany/service/impl/BCompanyServiceImpl.java
View file @
d1d6ccce
...
...
@@ -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
...
...
src/main/java/org/rcisoft/business/bsl/entity/BSl.java
View file @
d1d6ccce
...
...
@@ -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
...
...
src/main/java/org/rcisoft/business/bsl/service/impl/BSlServiceImpl.java
View file @
d1d6ccce
...
...
@@ -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]);
...
...
src/main/java/org/rcisoft/business/bstudent/service/impl/BStudentServiceImpl.java
View file @
d1d6ccce
...
...
@@ -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
]);
...
...
src/main/java/org/rcisoft/business/bteacher/service/impl/BTeacherServiceImpl.java
View file @
d1d6ccce
...
...
@@ -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
);
...
...
src/main/java/org/rcisoft/sys/user/entity/SysUser.java
View file @
d1d6ccce
...
...
@@ -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
)
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment