Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
M
map-parent
Overview
Overview
Details
Activity
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
常超
map-parent
Commits
94d8ea8f
Commit
94d8ea8f
authored
Mar 01, 2023
by
宋珺琪
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
222
parent
4b24bd13
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
18 additions
and
0 deletions
+18
-0
common/common_utils/src/main/java/com/founder/commonutils/model/newPublicEntity/CodeYymc/SkCodeYymc.java
+7
-0
common/service_base/src/main/java/com/founder/servicebase/controller/CodeYymcController/CodeYymcController.java
+11
-0
No files found.
common/common_utils/src/main/java/com/founder/commonutils/model/newPublicEntity/CodeYymc/SkCodeYymc.java
View file @
94d8ea8f
...
...
@@ -128,6 +128,13 @@ public class SkCodeYymc implements Serializable {
@DateTimeFormat
(
pattern
=
"yyyy-MM-ss HH:mm:ss"
)
private
Date
gxsj
;
@ApiModelProperty
(
value
=
"开始时间"
)
@TableField
(
exist
=
false
)
private
String
startTime
;
@ApiModelProperty
(
value
=
"结束时间"
)
@TableField
(
exist
=
false
)
private
String
endTime
;
@ApiModelProperty
(
value
=
"当前第几页"
)
...
...
common/service_base/src/main/java/com/founder/servicebase/controller/CodeYymcController/CodeYymcController.java
View file @
94d8ea8f
package
com
.
founder
.
servicebase
.
controller
.
CodeYymcController
;
import
cn.hutool.core.util.ObjectUtil
;
import
com.baomidou.mybatisplus.core.conditions.query.QueryWrapper
;
import
com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper
;
import
com.baomidou.mybatisplus.core.metadata.IPage
;
...
...
@@ -63,6 +64,7 @@ public class CodeYymcController {
}
skCodeYymc
.
setId
(
KeyUtilNaotu
.
getJzKey1
(
"cd"
));
skCodeYymc
.
setLrsj
(
new
Date
());
skCodeYymc
.
setGxsj
(
new
Date
());
int
insert
=
codeYymcMapper
.
insert
(
skCodeYymc
);
if
(
insert
>
0
){
return
new
MapRestResult
(
200
,
"新增成功"
,
skCodeYymc
);
...
...
@@ -80,6 +82,7 @@ public class CodeYymcController {
UpdateWrapper
<
SkCodeYymc
>
wrapper
=
new
UpdateWrapper
<>();
wrapper
.
eq
(
"code"
,
skCodeYymc
.
getCode
());
wrapper
.
set
(
"is_deleted"
,
"1"
);
wrapper
.
set
(
"gxsj"
,
new
Date
());
int
i
=
codeYymcMapper
.
update
(
skCodeYymc
,
wrapper
);
if
(
i
>
0
){
return
new
MapRestResult
(
200
,
"删除成功"
,
skCodeYymc
);
...
...
@@ -134,6 +137,14 @@ public class CodeYymcController {
//级别
wrapper
.
eq
(
StringUtils
.
isNotEmpty
(
skCodeYymc
.
getLev
()),
"lev"
,
skCodeYymc
.
getLev
());
if
(
ObjectUtil
.
isNotNull
(
skCodeYymc
.
getStartTime
())
&&
ObjectUtil
.
isNotNull
(
skCodeYymc
.
getEndTime
()))
{
wrapper
.
apply
(
"gxsj between'"
+
skCodeYymc
.
getStartTime
().
toString
()
+
"' and '"
+
skCodeYymc
.
getEndTime
().
toString
()
+
"'"
);
}
else
if
(
ObjectUtil
.
isNotNull
(
skCodeYymc
.
getStartTime
()))
{
wrapper
.
apply
(
"gxsj >= '"
+
skCodeYymc
.
getStartTime
().
toString
()
+
"'"
);
}
else
if
(
ObjectUtil
.
isNotNull
(
skCodeYymc
.
getEndTime
()))
{
wrapper
.
apply
(
"gxsj <= '"
+
skCodeYymc
.
getEndTime
().
toString
()
+
"'"
);
}
wrapper
.
eq
(
"is_deleted"
,
"0"
);
IPage
iPage
=
codeYymcMapper
.
selectPage
(
new
Page
(
skCodeYymc
.
getPage
(),
skCodeYymc
.
getLimit
()),
wrapper
);
...
...
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