Commit 93f80283 authored by zhangqingle's avatar zhangqingle

修改发布课程等 信息未带名称问题;

修改取消指派参加时间未改变问题
parent da93461e
...@@ -297,6 +297,7 @@ public class BLessonPersonServiceImpl implements BLessonPersonService { ...@@ -297,6 +297,7 @@ public class BLessonPersonServiceImpl implements BLessonPersonService {
if (bLessonPersons != null && bLessonPersons.size()>0 && "0".equals(bLessonPersons.get(0).getIsFinish()) ){ if (bLessonPersons != null && bLessonPersons.size()>0 && "0".equals(bLessonPersons.get(0).getIsFinish()) ){
bLessonPerson = bLessonPersons.get(0); bLessonPerson = bLessonPersons.get(0);
bLessonPerson.setIsFinish("1"); bLessonPerson.setIsFinish("1");
bLessonPerson.setApplyDate(new Date());
line = bLessonPersonRepository.updateByPrimaryKeySelective(bLessonPerson); line = bLessonPersonRepository.updateByPrimaryKeySelective(bLessonPerson);
//重新统计在学人数 //重新统计在学人数
bLessonRepository.personNumberReCount(lessonAndUserDTO.getLessonId(),"0"); bLessonRepository.personNumberReCount(lessonAndUserDTO.getLessonId(),"0");
......
...@@ -585,11 +585,11 @@ public class BLessonServiceImpl implements BLessonService { ...@@ -585,11 +585,11 @@ public class BLessonServiceImpl implements BLessonService {
bPersonValue.setPersonId(bLesson.getLecturerId()); bPersonValue.setPersonId(bLesson.getLecturerId());
bPersonValue.setType("0"); bPersonValue.setType("0");
if ("0".equals(bLesson.getLessonType())) { if ("0".equals(bLesson.getLessonType())) {
bPersonValue.setEvent("发布课程"); bPersonValue.setEvent("发布"+bLesson.getLessonName()+"课程");
bPersonValue.setValue(bReleaseValueList.get(0).getLessonValue()); bPersonValue.setValue(bReleaseValueList.get(0).getLessonValue());
} }
if ("1".equals(bLesson.getLessonType())) { if ("1".equals(bLesson.getLessonType())) {
bPersonValue.setEvent("发布培训"); bPersonValue.setEvent("发布"+bLesson.getLessonName()+"培训");
bPersonValue.setValue(bReleaseValueList.get(0).getTrainValue()); bPersonValue.setValue(bReleaseValueList.get(0).getTrainValue());
} }
bPersonValueRepository.add(bPersonValue); bPersonValueRepository.add(bPersonValue);
...@@ -1182,7 +1182,7 @@ public class BLessonServiceImpl implements BLessonService { ...@@ -1182,7 +1182,7 @@ public class BLessonServiceImpl implements BLessonService {
//扣除对应积分 添加用户积分详情 更新用户积分 //扣除对应积分 添加用户积分详情 更新用户积分
//增加用户积分详情 //增加用户积分详情
if (bLesson.getValueConsume() != null && bLesson.getValueConsume() != 0 && !curUser.getUserId().equals(bLesson.getLecturerId())) { 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()); addValueEvent(curUser.getUserId(), bPersonValue, userInfo.getLockNum());
} }
bLessonRepository.personNumberReCount(bLesson.getBusinessId(), "1"); bLessonRepository.personNumberReCount(bLesson.getBusinessId(), "1");
...@@ -1213,7 +1213,7 @@ public class BLessonServiceImpl implements BLessonService { ...@@ -1213,7 +1213,7 @@ public class BLessonServiceImpl implements BLessonService {
//扣除对应积分 添加用户积分详情 更新用户积分 //扣除对应积分 添加用户积分详情 更新用户积分
//增加用户积分详情 //增加用户积分详情
if (bLesson.getValueConsume() != null && bLesson.getValueConsume() != 0 && !curUser.getUserId().equals(bLesson.getLecturerId())) { 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()); addValueEvent(curUser.getUserId(), bPersonValue, userInfo.getLockNum());
} }
bLessonRepository.personNumberReCount(bLesson.getBusinessId(), "1"); bLessonRepository.personNumberReCount(bLesson.getBusinessId(), "1");
......
...@@ -36,6 +36,10 @@ public class MvcConfig extends WebMvcConfigurerAdapter { ...@@ -36,6 +36,10 @@ public class MvcConfig extends WebMvcConfigurerAdapter {
@Value("${spring.profiles.active}") @Value("${spring.profiles.active}")
private String env;//当前激活的配置文件 private String env;//当前激活的配置文件
@Value("${server.type}")
private String serverType;//当前环境
@Override @Override
public void addViewControllers(ViewControllerRegistry registry) { public void addViewControllers(ViewControllerRegistry registry) {
registry.addViewController("/").setViewName("/connect"); registry.addViewController("/").setViewName("/connect");
...@@ -71,6 +75,9 @@ public class MvcConfig extends WebMvcConfigurerAdapter { ...@@ -71,6 +75,9 @@ public class MvcConfig extends WebMvcConfigurerAdapter {
//统一异常处理 //统一异常处理
@Override @Override
public void configureHandlerExceptionResolvers(List<HandlerExceptionResolver> exceptionResolvers) { public void configureHandlerExceptionResolvers(List<HandlerExceptionResolver> exceptionResolvers) {
// if ("prod".equalsIgnoreCase(serverType)){
// return;
// }
exceptionResolvers.add((HttpServletRequest request, HttpServletResponse response, Object handler, Exception e) -> { exceptionResolvers.add((HttpServletRequest request, HttpServletResponse response, Object handler, Exception e) -> {
Result result = new Result(); Result result = new Result();
String message = e.getMessage(); String message = e.getMessage();
......
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