Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
O
operation-control-platform
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
王锦盛
operation-control-platform
Commits
368d903a
Commit
368d903a
authored
Mar 31, 2022
by
郭凡凡
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改bug
parent
792259bd
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
14 additions
and
8 deletions
+14
-8
src/main/java/com/pms/ocp/model/dto/ApiBaseDto.java
src/main/java/com/pms/ocp/model/dto/ApiBaseDto.java
+0
-6
src/main/java/com/pms/ocp/model/dto/TenantDto.java
src/main/java/com/pms/ocp/model/dto/TenantDto.java
+10
-2
src/main/resources/mapper/OcpGroup.xml
src/main/resources/mapper/OcpGroup.xml
+4
-0
No files found.
src/main/java/com/pms/ocp/model/dto/ApiBaseDto.java
View file @
368d903a
...
@@ -78,13 +78,7 @@ public class ApiBaseDto implements Serializable {
...
@@ -78,13 +78,7 @@ public class ApiBaseDto implements Serializable {
private
List
<
String
>
apiGroupCodeList
;
private
List
<
String
>
apiGroupCodeList
;
public
Integer
getApiPromotion
()
{
return
apiPromotion
;
}
public
void
setApiPromotion
(
Integer
apiPromotion
)
{
this
.
apiPromotion
=
apiPromotion
;
}
public
String
getApiCode
()
{
public
String
getApiCode
()
{
return
apiCode
;
return
apiCode
;
...
...
src/main/java/com/pms/ocp/model/dto/TenantDto.java
View file @
368d903a
...
@@ -33,8 +33,8 @@ public class TenantDto implements Serializable {
...
@@ -33,8 +33,8 @@ public class TenantDto implements Serializable {
@ApiModelProperty
(
"建设单位"
)
@ApiModelProperty
(
"建设单位"
)
private
String
tenantUnit
;
private
String
tenantUnit
;
//
@ApiModelProperty("推广类型0:统建;1:自建")
@ApiModelProperty
(
"推广类型0:统建;1:自建"
)
// private Integer api
Promotion;
private
Integer
tenant
Promotion
;
@ApiModelProperty
(
"注册时段-开始"
)
@ApiModelProperty
(
"注册时段-开始"
)
@DateTimeFormat
(
pattern
=
"yyyy-MM-dd HH:mm:ss"
)
@DateTimeFormat
(
pattern
=
"yyyy-MM-dd HH:mm:ss"
)
...
@@ -165,4 +165,12 @@ public class TenantDto implements Serializable {
...
@@ -165,4 +165,12 @@ public class TenantDto implements Serializable {
public
void
setCurrentPage
(
Integer
currentPage
)
{
public
void
setCurrentPage
(
Integer
currentPage
)
{
this
.
currentPage
=
currentPage
;
this
.
currentPage
=
currentPage
;
}
}
public
Integer
getTenantPromotion
()
{
return
tenantPromotion
;
}
public
void
setTenantPromotion
(
Integer
tenantPromotion
)
{
this
.
tenantPromotion
=
tenantPromotion
;
}
}
}
src/main/resources/mapper/OcpGroup.xml
View file @
368d903a
...
@@ -51,6 +51,10 @@
...
@@ -51,6 +51,10 @@
and otb.tenant_unit = #{tenantUnit}
and otb.tenant_unit = #{tenantUnit}
</if>
</if>
<if
test=
"tenantPromotion !=null "
>
and otb.tenant_promotion = #{tenantPromotion}
</if>
<if
test=
"startCTime !=null "
>
<if
test=
"startCTime !=null "
>
<![CDATA[
<![CDATA[
and otb.tenant_ctime >
= #{startCTime}
and otb.tenant_ctime >
= #{startCTime}
...
...
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