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
93f80283
Commit
93f80283
authored
Dec 09, 2019
by
zhangqingle
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改发布课程等 信息未带名称问题;
修改取消指派参加时间未改变问题
parent
da93461e
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
12 additions
and
4 deletions
+12
-4
BLessonPersonServiceImpl.java
...siness/blesson/service/impl/BLessonPersonServiceImpl.java
+1
-0
BLessonServiceImpl.java
...oft/business/blesson/service/impl/BLessonServiceImpl.java
+4
-4
MvcConfig.java
src/main/java/org/rcisoft/config/MvcConfig.java
+7
-0
No files found.
src/main/java/org/rcisoft/business/blesson/service/impl/BLessonPersonServiceImpl.java
View file @
93f80283
...
...
@@ -297,6 +297,7 @@ public class BLessonPersonServiceImpl implements BLessonPersonService {
if
(
bLessonPersons
!=
null
&&
bLessonPersons
.
size
()>
0
&&
"0"
.
equals
(
bLessonPersons
.
get
(
0
).
getIsFinish
())
){
bLessonPerson
=
bLessonPersons
.
get
(
0
);
bLessonPerson
.
setIsFinish
(
"1"
);
bLessonPerson
.
setApplyDate
(
new
Date
());
line
=
bLessonPersonRepository
.
updateByPrimaryKeySelective
(
bLessonPerson
);
//重新统计在学人数
bLessonRepository
.
personNumberReCount
(
lessonAndUserDTO
.
getLessonId
(),
"0"
);
...
...
src/main/java/org/rcisoft/business/blesson/service/impl/BLessonServiceImpl.java
View file @
93f80283
...
...
@@ -585,11 +585,11 @@ public class BLessonServiceImpl implements BLessonService {
bPersonValue
.
setPersonId
(
bLesson
.
getLecturerId
());
bPersonValue
.
setType
(
"0"
);
if
(
"0"
.
equals
(
bLesson
.
getLessonType
()))
{
bPersonValue
.
setEvent
(
"发布课程"
);
bPersonValue
.
setEvent
(
"发布
"
+
bLesson
.
getLessonName
()+
"
课程"
);
bPersonValue
.
setValue
(
bReleaseValueList
.
get
(
0
).
getLessonValue
());
}
if
(
"1"
.
equals
(
bLesson
.
getLessonType
()))
{
bPersonValue
.
setEvent
(
"发布培训"
);
bPersonValue
.
setEvent
(
"发布
"
+
bLesson
.
getLessonName
()+
"
培训"
);
bPersonValue
.
setValue
(
bReleaseValueList
.
get
(
0
).
getTrainValue
());
}
bPersonValueRepository
.
add
(
bPersonValue
);
...
...
@@ -1182,7 +1182,7 @@ public class BLessonServiceImpl implements BLessonService {
//扣除对应积分 添加用户积分详情 更新用户积分
//增加用户积分详情
if
(
bLesson
.
getValueConsume
()
!=
null
&&
bLesson
.
getValueConsume
()
!=
0
&&
!
curUser
.
getUserId
().
equals
(
bLesson
.
getLecturerId
()))
{
BPersonValue
bPersonValue
=
new
BPersonValue
(
curUser
.
getUserId
(),
"报名培训"
,
bLesson
.
getValueConsume
(),
"1"
);
BPersonValue
bPersonValue
=
new
BPersonValue
(
curUser
.
getUserId
(),
"报名
"
+
bLesson
.
getLessonName
()+
"
培训"
,
bLesson
.
getValueConsume
(),
"1"
);
addValueEvent
(
curUser
.
getUserId
(),
bPersonValue
,
userInfo
.
getLockNum
());
}
bLessonRepository
.
personNumberReCount
(
bLesson
.
getBusinessId
(),
"1"
);
...
...
@@ -1213,7 +1213,7 @@ public class BLessonServiceImpl implements BLessonService {
//扣除对应积分 添加用户积分详情 更新用户积分
//增加用户积分详情
if
(
bLesson
.
getValueConsume
()
!=
null
&&
bLesson
.
getValueConsume
()
!=
0
&&
!
curUser
.
getUserId
().
equals
(
bLesson
.
getLecturerId
()))
{
BPersonValue
bPersonValue
=
new
BPersonValue
(
curUser
.
getUserId
(),
"报名培训"
,
bLesson
.
getValueConsume
(),
"1"
);
BPersonValue
bPersonValue
=
new
BPersonValue
(
curUser
.
getUserId
(),
"报名
"
+
bLesson
.
getLessonName
()+
"
培训"
,
bLesson
.
getValueConsume
(),
"1"
);
addValueEvent
(
curUser
.
getUserId
(),
bPersonValue
,
userInfo
.
getLockNum
());
}
bLessonRepository
.
personNumberReCount
(
bLesson
.
getBusinessId
(),
"1"
);
...
...
src/main/java/org/rcisoft/config/MvcConfig.java
View file @
93f80283
...
...
@@ -36,6 +36,10 @@ public class MvcConfig extends WebMvcConfigurerAdapter {
@Value
(
"${spring.profiles.active}"
)
private
String
env
;
//当前激活的配置文件
@Value
(
"${server.type}"
)
private
String
serverType
;
//当前环境
@Override
public
void
addViewControllers
(
ViewControllerRegistry
registry
)
{
registry
.
addViewController
(
"/"
).
setViewName
(
"/connect"
);
...
...
@@ -71,6 +75,9 @@ public class MvcConfig extends WebMvcConfigurerAdapter {
//统一异常处理
@Override
public
void
configureHandlerExceptionResolvers
(
List
<
HandlerExceptionResolver
>
exceptionResolvers
)
{
// if ("prod".equalsIgnoreCase(serverType)){
// return;
// }
exceptionResolvers
.
add
((
HttpServletRequest
request
,
HttpServletResponse
response
,
Object
handler
,
Exception
e
)
->
{
Result
result
=
new
Result
();
String
message
=
e
.
getMessage
();
...
...
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