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
12e0fefb
Commit
12e0fefb
authored
Nov 06, 2019
by
zhangqingle
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改接口
parent
b200684a
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
12 deletions
+6
-12
BLessonServiceImpl.java
...oft/business/blesson/service/impl/BLessonServiceImpl.java
+1
-10
application-prod.yml
src/main/resources/application-prod.yml
+3
-0
application.yml
src/main/resources/application.yml
+2
-2
No files found.
src/main/java/org/rcisoft/business/blesson/service/impl/BLessonServiceImpl.java
View file @
12e0fefb
...
@@ -988,16 +988,8 @@ public class BLessonServiceImpl implements BLessonService {
...
@@ -988,16 +988,8 @@ public class BLessonServiceImpl implements BLessonService {
//step 1 查询数 x 当前报名数 y 总数
//step 1 查询数 x 当前报名数 y 总数
synchronized
(
this
)
{
synchronized
(
this
)
{
// Map<String, Object> xy = bLessonPersonRepository.selecTraningNum(lessonId);
//
// int x = Integer.parseInt(String.valueOf(xy.get("x")));
// int y = Integer.parseInt(String.valueOf(xy.get("y")));
// if (y > 0 && x >= y) {
// throw new ServiceException(ResultServiceEnums.PERSON_MAX);
// }
//step2 判断该用户是否被指派该培训或已经报名
//step2 判断该用户是否被指派该培训或已经报名
person
=
bLessonPersonRepository
.
getRelInBLessonPerson
(
lessonId
,
curUser
.
getUserId
());
person
=
bLessonPersonRepository
.
getRelInBLessonPerson
(
lessonId
,
curUser
.
getUserId
());
// person = bLessonPersonRepository.getAppointInTraining(lessonId, curUser.getUserId());
if
(
person
!=
null
&&
!
"1"
.
equals
(
person
.
getDelFlag
()))
{
if
(
person
!=
null
&&
!
"1"
.
equals
(
person
.
getDelFlag
()))
{
if
(
"1"
.
equals
(
person
.
getIsApply
()))
{
if
(
"1"
.
equals
(
person
.
getIsApply
()))
{
log
.
info
(
"-----------该培训已报名-------------"
);
log
.
info
(
"-----------该培训已报名-------------"
);
...
@@ -1008,7 +1000,6 @@ public class BLessonServiceImpl implements BLessonService {
...
@@ -1008,7 +1000,6 @@ public class BLessonServiceImpl implements BLessonService {
person
.
setIsApply
(
"1"
);
person
.
setIsApply
(
"1"
);
return
bLessonPersonRepository
.
updateLessonPersonByUserId
(
person
);
return
bLessonPersonRepository
.
updateLessonPersonByUserId
(
person
);
}
}
if
(
person
!=
null
&&
"1"
.
equals
(
person
.
getDelFlag
())){
if
(
person
!=
null
&&
"1"
.
equals
(
person
.
getDelFlag
())){
UserUtil
.
setCurrentMergeOperation
(
person
);
UserUtil
.
setCurrentMergeOperation
(
person
);
person
.
setDelFlag
(
"0"
);
person
.
setDelFlag
(
"0"
);
...
...
src/main/resources/application-prod.yml
View file @
12e0fefb
...
@@ -104,3 +104,6 @@ eureka:
...
@@ -104,3 +104,6 @@ eureka:
fetch-registry
:
true
fetch-registry
:
true
service-url
:
service-url
:
defaultZone
:
http://zx:zgiot@192.168.5.48:7001/eureka
defaultZone
:
http://zx:zgiot@192.168.5.48:7001/eureka
ribbon
:
ReadTimeout
:
10000
ConnectTimeout
:
10000
\ No newline at end of file
src/main/resources/application.yml
View file @
12e0fefb
spring
:
spring
:
profiles
:
profiles
:
# active: dev
# active: dev
active
:
mt
#
active: mt
#
active: mtzql
active
:
mtzql
# active: prod
# active: prod
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