Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
R
rs-cloud-platform
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
周健威
rs-cloud-platform
Commits
df166b35
Commit
df166b35
authored
Jan 20, 2021
by
周健威
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改省bug
parent
bff6c41b
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
0 deletions
+10
-0
CustomQueryDTO.java
...upyuns/platform/rs/website/dto/custom/CustomQueryDTO.java
+2
-0
CustomFormController.java
.../platform/rs/website/controller/CustomFormController.java
+8
-0
No files found.
rs-website/rs-website-api/src/main/java/com/upyuns/platform/rs/website/dto/custom/CustomQueryDTO.java
View file @
df166b35
...
@@ -7,4 +7,6 @@ import lombok.Data;
...
@@ -7,4 +7,6 @@ import lombok.Data;
public
class
CustomQueryDTO
extends
PageParam
{
public
class
CustomQueryDTO
extends
PageParam
{
private
Integer
type
;
private
Integer
type
;
private
Integer
status
;
private
Integer
status
;
private
String
startDate
;
private
String
endDate
;
}
}
\ No newline at end of file
rs-website/rs-website-server/src/main/java/com/upyuns/platform/rs/website/controller/CustomFormController.java
View file @
df166b35
package
com
.
upyuns
.
platform
.
rs
.
website
.
controller
;
package
com
.
upyuns
.
platform
.
rs
.
website
.
controller
;
import
cn.hutool.core.date.DateUtil
;
import
cn.hutool.core.util.StrUtil
;
import
com.github.wxiaoqi.security.common.msg.ObjectRestResponse
;
import
com.github.wxiaoqi.security.common.msg.ObjectRestResponse
;
import
com.github.wxiaoqi.security.common.rest.BaseController
;
import
com.github.wxiaoqi.security.common.rest.BaseController
;
import
com.github.wxiaoqi.security.common.vo.PageDataVO
;
import
com.github.wxiaoqi.security.common.vo.PageDataVO
;
...
@@ -27,6 +29,12 @@ public class CustomFormController extends BaseController<CustomFormBiz,CustomFor
...
@@ -27,6 +29,12 @@ public class CustomFormController extends BaseController<CustomFormBiz,CustomFor
if
(
null
!=
dto
.
getStatus
())
{
if
(
null
!=
dto
.
getStatus
())
{
w
.
andEqualTo
(
CustomForm:
:
getStatus
,
dto
.
getStatus
());
w
.
andEqualTo
(
CustomForm:
:
getStatus
,
dto
.
getStatus
());
}
}
if
(
StrUtil
.
isNotBlank
(
dto
.
getStartDate
()))
{
w
.
andGreaterThanOrEqualTo
(
CustomForm:
:
getCrtTime
,
DateUtil
.
beginOfDay
(
DateUtil
.
parseDate
(
dto
.
getStartDate
())));
}
if
(
StrUtil
.
isNotBlank
(
dto
.
getEndDate
()))
{
w
.
andLessThanOrEqualTo
(
CustomForm:
:
getCrtTime
,
DateUtil
.
endOfDay
(
DateUtil
.
parseDate
(
dto
.
getEndDate
())));
}
return
w
;
return
w
;
},
" 'status' asc, crt_time desc"
)));
},
" 'status' asc, crt_time desc"
)));
}
}
...
...
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