Commit 12e0fefb authored by zhangqingle's avatar zhangqingle

修改接口

parent b200684a
......@@ -988,16 +988,8 @@ public class BLessonServiceImpl implements BLessonService {
//step 1 查询数 x 当前报名数 y 总数
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 判断该用户是否被指派该培训或已经报名
person = bLessonPersonRepository.getRelInBLessonPerson(lessonId, curUser.getUserId());
// person = bLessonPersonRepository.getAppointInTraining(lessonId, curUser.getUserId());
if (person != null && !"1".equals(person.getDelFlag())) {
if ("1".equals(person.getIsApply())) {
log.info("-----------该培训已报名-------------");
......@@ -1008,7 +1000,6 @@ public class BLessonServiceImpl implements BLessonService {
person.setIsApply("1");
return bLessonPersonRepository.updateLessonPersonByUserId(person);
}
if (person != null && "1".equals(person.getDelFlag())){
UserUtil.setCurrentMergeOperation(person);
person.setDelFlag("0");
......
......@@ -104,3 +104,6 @@ eureka:
fetch-registry: true
service-url:
defaultZone: http://zx:zgiot@192.168.5.48:7001/eureka
ribbon:
ReadTimeout: 10000
ConnectTimeout: 10000
\ No newline at end of file
spring:
profiles:
# active: dev
active: mt
# active: mtzql
# active: mt
active: mtzql
# active: prod
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