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
a0c10bdc
Commit
a0c10bdc
authored
Dec 18, 2019
by
zhangqingle
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改比分比对类型
parent
187988ba
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
13 additions
and
7 deletions
+13
-7
edu_modify_table.sql
sql/edu_modify_table.sql
+4
-0
AddOrUpdateDTO.java
...java/org/rcisoft/business/bbanner/dto/AddOrUpdateDTO.java
+1
-1
AddOrUpdateDTO.java
...rg/rcisoft/business/bexternallink/dto/AddOrUpdateDTO.java
+2
-0
BLessonServiceImpl.java
...oft/business/blesson/service/impl/BLessonServiceImpl.java
+2
-2
BReleaseValueServiceImpl.java
.../breleasevalue/service/impl/BReleaseValueServiceImpl.java
+4
-4
No files found.
sql/edu_modify_table.sql
View file @
a0c10bdc
...
...
@@ -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
);
-- 收藏表增加收藏时间 19-12-17 19:14
ALTER
TABLE
b_collect
ADD
`collect_date`
datetime
COMMENT
'收藏时间'
;
#
-------------测试环境已更新--------------
-- 收藏表增加收藏时间 19-12-17 19:14
ALTER
TABLE
b_collect
ADD
`collect_date`
datetime
COMMENT
'收藏时间'
;
src/main/java/org/rcisoft/business/bbanner/dto/AddOrUpdateDTO.java
View file @
a0c10bdc
...
...
@@ -13,7 +13,7 @@ public class AddOrUpdateDTO {
private
String
businessId
;
@NotBlank
(
message
=
"标题不能为空"
)
@Length
(
m
in
=
1
,
max
=
256
,
message
=
"长度最小为1,最大为256
"
)
@Length
(
m
ax
=
50
,
message
=
"长度最大为50
"
)
@ApiModelProperty
(
value
=
"标题"
,
required
=
true
,
dataType
=
"varchar"
)
private
String
title
;
...
...
src/main/java/org/rcisoft/business/bexternallink/dto/AddOrUpdateDTO.java
View file @
a0c10bdc
...
...
@@ -2,6 +2,7 @@ package org.rcisoft.business.bexternallink.dto;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.Data
;
import
org.hibernate.validator.constraints.Length
;
import
javax.validation.constraints.NotBlank
;
...
...
@@ -12,6 +13,7 @@ public class AddOrUpdateDTO {
private
String
businessId
;
@NotBlank
(
message
=
"标题不能为空"
)
@Length
(
max
=
50
,
message
=
"长度最大为50"
)
@ApiModelProperty
(
value
=
"标题"
,
required
=
true
,
dataType
=
"varchar"
)
private
String
title
;
...
...
src/main/java/org/rcisoft/business/blesson/service/impl/BLessonServiceImpl.java
View file @
a0c10bdc
...
...
@@ -1200,7 +1200,7 @@ public class BLessonServiceImpl implements BLessonService {
if
(
userInfo
==
null
)
{
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
);
}
int
line
=
bLessonPersonRepository
.
updateByPrimaryKeySelective
(
person
);
...
...
@@ -1231,7 +1231,7 @@ public class BLessonServiceImpl implements BLessonService {
if
(
userInfo
==
null
)
{
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
);
}
int
line
=
this
.
trainInsert
(
"0"
,
bLesson
,
bLessonPersons
);
...
...
src/main/java/org/rcisoft/business/breleasevalue/service/impl/BReleaseValueServiceImpl.java
View file @
a0c10bdc
...
...
@@ -134,16 +134,16 @@ public class BReleaseValueServiceImpl implements BReleaseValueService {
public
List
<
LessonValueDto
>
queryLessonValueByPagination
(
PageUtil
pageUtil
,
CurUser
curUser
,
LessonValueSettingQueryDto
dto
)
{
try
{
if
(
dto
.
getValueConsumeEnd
()!=
null
&&
!
""
.
equals
(
dto
.
getValueConsumeEnd
())){
Integer
.
parseInt
(
dto
.
getValueConsumeEnd
());
Long
.
parseLong
(
dto
.
getValueConsumeEnd
());
}
if
(
dto
.
getValueConsumeStart
()!=
null
&&
!
""
.
equals
(
dto
.
getValueConsumeStart
())){
Integer
.
parseInt
(
dto
.
getValueConsumeStart
());
Long
.
parseLong
(
dto
.
getValueConsumeStart
());
}
if
(
dto
.
getValueGainEnd
()!=
null
&&
!
""
.
equals
(
dto
.
getValueGainEnd
())){
Integer
.
parseInt
(
dto
.
getValueGainEnd
());
Long
.
parseLong
(
dto
.
getValueGainEnd
());
}
if
(
dto
.
getValueGainStart
()!=
null
&&
!
""
.
equals
(
dto
.
getValueGainStart
())){
Integer
.
parseInt
(
dto
.
getValueGainStart
());
Long
.
parseLong
(
dto
.
getValueGainStart
());
}
}
catch
(
Exception
e
){
throw
new
ServiceException
(
ResultServiceEnums
.
NUM_IS_ERROR
);
...
...
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