Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gic-platform-enterprise
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
base_platform_enterprise
gic-platform-enterprise
Commits
0d17c7b3
Commit
0d17c7b3
authored
Jul 28, 2021
by
guojuxing
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
tab_store&tab_store_field_rel&tab_store_region_rel&tab_store_brand_ref own_type改成owner_flag
parent
2bc266b5
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
28 additions
and
22 deletions
+28
-22
IndexModuleController.java
.../gic/enterprise/web/controller/IndexModuleController.java
+3
-3
ResouceVO.java
...eb/src/main/java/com/gic/enterprise/web/vo/ResouceVO.java
+9
-6
ChannelUserRateVO.java
...va/com/gic/enterprise/web/vo/index/ChannelUserRateVO.java
+7
-7
MemberCardInfoVO.java
...ava/com/gic/enterprise/web/vo/index/MemberCardInfoVO.java
+9
-6
No files found.
gic-platform-enterprise-web/src/main/java/com/gic/enterprise/web/controller/IndexModuleController.java
View file @
0d17c7b3
...
...
@@ -429,7 +429,7 @@ public class IndexModuleController {
ChannelUserRateVO
vo
=
new
ChannelUserRateVO
();
vo
.
setAreaId
(
Long
.
parseLong
(
e
.
getMbrAreaId
()));
vo
.
setAreaName
(
e
.
getMbrAreaName
());
vo
.
setOwn
Type
(
e
.
getOwnType
());
vo
.
setOwn
erFlag
(
e
.
getOwnerFlag
());
vo
.
setCuType
(
finalCuType
);
vo
.
setMemberCount
(
finalMap
.
getOrDefault
(
Long
.
parseLong
(
e
.
getMbrAreaId
()),
0
));
return
vo
;
...
...
@@ -521,7 +521,7 @@ public class IndexModuleController {
ResouceVO
vo
=
new
ResouceVO
();
vo
.
setId
(
Long
.
valueOf
(
dto
.
getMbrAreaId
()));
vo
.
setName
(
dto
.
getMbrAreaName
());
vo
.
setOwn
Type
(
dto
.
getOwnType
());
vo
.
setOwn
erFlag
(
dto
.
getOwnerFlag
());
result
.
add
(
vo
);
}
}
...
...
@@ -616,7 +616,7 @@ public class IndexModuleController {
MemberCardInfoVO
vo
=
new
MemberCardInfoVO
();
vo
.
setMbrAreaId
(
dto
.
getAreaId
().
toString
());
vo
.
setMbrAreaName
(
dto
.
getName
());
vo
.
setOwn
Type
(
dto
.
getOwnerFlag
());
vo
.
setOwn
erFlag
(
dto
.
getOwnerFlag
());
return
vo
;
}).
collect
(
Collectors
.
toList
());
}
...
...
gic-platform-enterprise-web/src/main/java/com/gic/enterprise/web/vo/ResouceVO.java
View file @
0d17c7b3
...
...
@@ -11,7 +11,10 @@ import java.io.Serializable;
public
class
ResouceVO
implements
Serializable
{
private
Long
id
;
private
String
name
;
private
Integer
ownType
;
/**
* 共享标记 1:自有 0:共享
*/
private
Integer
ownerFlag
;
public
Long
getId
()
{
return
id
;
...
...
@@ -29,12 +32,12 @@ public class ResouceVO implements Serializable {
this
.
name
=
name
;
}
public
Integer
getOwn
Type
()
{
return
own
Type
;
public
Integer
getOwn
erFlag
()
{
return
own
erFlag
;
}
public
ResouceVO
setOwn
Type
(
Integer
ownType
)
{
this
.
own
Type
=
ownType
;
public
ResouceVO
setOwn
erFlag
(
Integer
ownerFlag
)
{
this
.
own
erFlag
=
ownerFlag
;
return
this
;
}
...
...
@@ -43,7 +46,7 @@ public class ResouceVO implements Serializable {
return
"ResouceVO{"
+
"id="
+
id
+
", name='"
+
name
+
'\''
+
", own
Type="
+
ownType
+
", own
erFlag="
+
ownerFlag
+
'}'
;
}
}
gic-platform-enterprise-web/src/main/java/com/gic/enterprise/web/vo/index/ChannelUserRateVO.java
View file @
0d17c7b3
...
...
@@ -44,9 +44,9 @@ public class ChannelUserRateVO implements Serializable{
private
String
areaName
;
/**
* 共享标
志
* 共享标
记 1:自有 0:共享
*/
private
Integer
own
Type
;
private
Integer
own
erFlag
;
public
Integer
getMemberCount
()
{
return
memberCount
;
...
...
@@ -84,12 +84,12 @@ public class ChannelUserRateVO implements Serializable{
return
this
;
}
public
Integer
getOwn
Type
()
{
return
own
Type
;
public
Integer
getOwn
erFlag
()
{
return
own
erFlag
;
}
public
ChannelUserRateVO
setOwn
Type
(
Integer
ownType
)
{
this
.
own
Type
=
ownType
;
public
ChannelUserRateVO
setOwn
erFlag
(
Integer
ownerFlag
)
{
this
.
own
erFlag
=
ownerFlag
;
return
this
;
}
...
...
@@ -141,7 +141,7 @@ public class ChannelUserRateVO implements Serializable{
", cuType="
+
cuType
+
", areaId="
+
areaId
+
", areaName='"
+
areaName
+
'\''
+
", own
Type="
+
ownType
+
", own
erFlag="
+
ownerFlag
+
'}'
;
}
}
gic-platform-enterprise-web/src/main/java/com/gic/enterprise/web/vo/index/MemberCardInfoVO.java
View file @
0d17c7b3
...
...
@@ -13,7 +13,10 @@ public class MemberCardInfoVO implements Serializable{
private
String
mbrAreaId
;
private
String
mbrAreaName
;
private
Integer
ownType
;
/**
* 共享标记 1:自有 0:共享
*/
private
Integer
ownerFlag
;
public
String
getMbrAreaId
()
{
return
mbrAreaId
;
...
...
@@ -33,12 +36,12 @@ public class MemberCardInfoVO implements Serializable{
return
this
;
}
public
Integer
getOwn
Type
()
{
return
own
Type
;
public
Integer
getOwn
erFlag
()
{
return
own
erFlag
;
}
public
MemberCardInfoVO
setOwn
Type
(
Integer
ownType
)
{
this
.
own
Type
=
ownType
;
public
MemberCardInfoVO
setOwn
erFlag
(
Integer
ownerFlag
)
{
this
.
own
erFlag
=
ownerFlag
;
return
this
;
}
...
...
@@ -47,7 +50,7 @@ public class MemberCardInfoVO implements Serializable{
return
"MemberCardInfoVO{"
+
"mbrAreaId='"
+
mbrAreaId
+
'\''
+
", mbrAreaName='"
+
mbrAreaName
+
'\''
+
", own
Type="
+
ownType
+
", own
erFlag="
+
ownerFlag
+
'}'
;
}
}
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