Commit a0c10bdc authored by zhangqingle's avatar zhangqingle

修改比分比对类型

parent 187988ba
...@@ -21,3 +21,7 @@ alter table b_banner modify column `external_url` VARCHAR (2000); ...@@ -21,3 +21,7 @@ alter table b_banner modify column `external_url` VARCHAR (2000);
alter table b_external_link modify column `external_url` VARCHAR (2000); alter table b_external_link modify column `external_url` VARCHAR (2000);
-- 收藏表增加收藏时间 19-12-17 19:14 -- 收藏表增加收藏时间 19-12-17 19:14
ALTER TABLE b_collect ADD `collect_date` datetime COMMENT '收藏时间' ; ALTER TABLE b_collect ADD `collect_date` datetime COMMENT '收藏时间' ;
# -------------测试环境已更新--------------
-- 收藏表增加收藏时间 19-12-17 19:14
ALTER TABLE b_collect ADD `collect_date` datetime COMMENT '收藏时间' ;
...@@ -13,7 +13,7 @@ public class AddOrUpdateDTO { ...@@ -13,7 +13,7 @@ public class AddOrUpdateDTO {
private String businessId; private String businessId;
@NotBlank(message = "标题不能为空") @NotBlank(message = "标题不能为空")
@Length(min = 1,max = 256,message = "长度最小为1,最大为256") @Length(max = 50,message = "长度最大为50")
@ApiModelProperty(value = "标题" ,required = true, dataType = "varchar") @ApiModelProperty(value = "标题" ,required = true, dataType = "varchar")
private String title; private String title;
......
...@@ -2,6 +2,7 @@ package org.rcisoft.business.bexternallink.dto; ...@@ -2,6 +2,7 @@ package org.rcisoft.business.bexternallink.dto;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import org.hibernate.validator.constraints.Length;
import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotBlank;
...@@ -12,6 +13,7 @@ public class AddOrUpdateDTO { ...@@ -12,6 +13,7 @@ public class AddOrUpdateDTO {
private String businessId; private String businessId;
@NotBlank(message = "标题不能为空") @NotBlank(message = "标题不能为空")
@Length(max = 50,message = "长度最大为50")
@ApiModelProperty(value = "标题" ,required = true, dataType = "varchar") @ApiModelProperty(value = "标题" ,required = true, dataType = "varchar")
private String title; private String title;
......
...@@ -1200,7 +1200,7 @@ public class BLessonServiceImpl implements BLessonService { ...@@ -1200,7 +1200,7 @@ public class BLessonServiceImpl implements BLessonService {
if (userInfo == null) { if (userInfo == null) {
throw new ServiceException(ResultServiceEnums.COMPANY_NOT_EXISTS); throw new ServiceException(ResultServiceEnums.COMPANY_NOT_EXISTS);
} }
if (bLesson.getValueConsume() != null && !"0".equals(bLesson.getValueConsume()) && Integer.parseInt(userInfo.getValue()) < Integer.parseInt(bLesson.getValueConsume()) && !curUser.getUserId().equals(bLesson.getLecturerId())) { if (bLesson.getValueConsume() != null && !("0".equals(bLesson.getValueConsume())) && Long.parseLong(userInfo.getValue()) < Long.parseLong(bLesson.getValueConsume()) && !(curUser.getUserId().equals(bLesson.getLecturerId()))) {
throw new ServiceException(ResultServiceEnums.VALUE_NOT_ENOUGH); throw new ServiceException(ResultServiceEnums.VALUE_NOT_ENOUGH);
} }
int line = bLessonPersonRepository.updateByPrimaryKeySelective(person); int line = bLessonPersonRepository.updateByPrimaryKeySelective(person);
...@@ -1231,7 +1231,7 @@ public class BLessonServiceImpl implements BLessonService { ...@@ -1231,7 +1231,7 @@ public class BLessonServiceImpl implements BLessonService {
if (userInfo == null) { if (userInfo == null) {
throw new ServiceException(ResultServiceEnums.COMPANY_NOT_EXISTS); throw new ServiceException(ResultServiceEnums.COMPANY_NOT_EXISTS);
} }
if (bLesson.getValueConsume() != null && !"0".equals(bLesson.getValueConsume()) && Integer.parseInt(userInfo.getValue()) < Integer.parseInt(bLesson.getValueConsume())) { if (bLesson.getValueConsume() != null && !"0".equals(bLesson.getValueConsume()) && Long.parseLong(userInfo.getValue()) < Long.parseLong(bLesson.getValueConsume())) {
throw new ServiceException(ResultServiceEnums.VALUE_NOT_ENOUGH); throw new ServiceException(ResultServiceEnums.VALUE_NOT_ENOUGH);
} }
int line = this.trainInsert("0", bLesson, bLessonPersons); int line = this.trainInsert("0", bLesson, bLessonPersons);
......
...@@ -134,16 +134,16 @@ public class BReleaseValueServiceImpl implements BReleaseValueService { ...@@ -134,16 +134,16 @@ public class BReleaseValueServiceImpl implements BReleaseValueService {
public List<LessonValueDto> queryLessonValueByPagination(PageUtil pageUtil, CurUser curUser, LessonValueSettingQueryDto dto) { public List<LessonValueDto> queryLessonValueByPagination(PageUtil pageUtil, CurUser curUser, LessonValueSettingQueryDto dto) {
try{ try{
if(dto.getValueConsumeEnd()!=null && !"".equals(dto.getValueConsumeEnd())){ if(dto.getValueConsumeEnd()!=null && !"".equals(dto.getValueConsumeEnd())){
Integer.parseInt(dto.getValueConsumeEnd()); Long.parseLong(dto.getValueConsumeEnd());
} }
if(dto.getValueConsumeStart()!=null && !"".equals(dto.getValueConsumeStart())){ if(dto.getValueConsumeStart()!=null && !"".equals(dto.getValueConsumeStart())){
Integer.parseInt(dto.getValueConsumeStart()); Long.parseLong(dto.getValueConsumeStart());
} }
if(dto.getValueGainEnd()!=null && !"".equals(dto.getValueGainEnd())){ if(dto.getValueGainEnd()!=null && !"".equals(dto.getValueGainEnd())){
Integer.parseInt(dto.getValueGainEnd()); Long.parseLong(dto.getValueGainEnd());
} }
if(dto.getValueGainStart()!=null && !"".equals(dto.getValueGainStart())){ if(dto.getValueGainStart()!=null && !"".equals(dto.getValueGainStart())){
Integer.parseInt(dto.getValueGainStart()); Long.parseLong(dto.getValueGainStart());
} }
}catch (Exception e){ }catch (Exception e){
throw new ServiceException(ResultServiceEnums.NUM_IS_ERROR); throw new ServiceException(ResultServiceEnums.NUM_IS_ERROR);
......
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