Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gic-webapp-plug
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-webapp-plug
Commits
9975badf
Commit
9975badf
authored
Aug 08, 2019
by
陶光胜
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
自定义字段接口
parent
f127c889
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
29 additions
and
16 deletions
+29
-16
ScreeningController.java
...java/com/gic/plug/web/controller/ScreeningController.java
+13
-15
StoreFieldController.java
...ava/com/gic/plug/web/controller/StoreFieldController.java
+6
-1
StoreFieldRegionVO.java
src/main/java/com/gic/plug/web/vo/StoreFieldRegionVO.java
+10
-0
No files found.
src/main/java/com/gic/plug/web/controller/ScreeningController.java
View file @
9975badf
...
...
@@ -37,12 +37,11 @@ public class ScreeningController {
private
EsScreeningTemplateService
esScreeningTemplateService
;
/**
*
* @Title: getScreeningTemplate
* @Description: 获取模板
* @author xugh
* @return
* @throws
* @return
* @throws
* @Title: getScreeningTemplate
* @Description: 获取模板
* @author xugh
*/
@RequestMapping
(
"get-screening-template"
)
@ResponseBody
...
...
@@ -52,19 +51,18 @@ public class ScreeningController {
}
/**
*
* @Title: getScreeningInitData
* @Description: 获取初始化筛选条件
* @author xugh
* @param sceneCode
* @return
* @throws
* @param sceneCode
* @return
* @throws
* @Title: getScreeningInitData
* @Description: 获取初始化筛选条件
* @author xugh
*/
@RequestMapping
(
"get-screening-init-data"
)
@ResponseBody
public
RestResponse
getScreeningInitData
(
@RequestParam
(
defaultValue
=
"member"
)
String
sceneCode
)
{
String
enterpriseId
=
UserDetailUtils
.
getUserDetail
().
getEnterpriseId
().
toString
();
if
(
Constants
.
STORE_SCENECODE
.
equals
(
sceneCode
))
{
if
(
Constants
.
STORE_SCENECODE
.
equals
(
sceneCode
))
{
enterpriseId
=
Constants
.
INDEX_ENTERPRISEID
;
}
List
<
EsScreeningEnterpriseCategorySceneInfoDTO
>
list
=
this
.
esScreeningInitService
...
...
@@ -96,7 +94,7 @@ public class ScreeningController {
@RequestMapping
(
"get-screening-widget-chain-detail"
)
@ResponseBody
public
Object
getScreeningWidgetDetail
(
String
widgetChainId
){
public
Object
getScreeningWidgetDetail
(
String
widgetChainId
)
{
EsScreeningChainDetailDTO
dto
=
this
.
esScreeningInitService
.
findChainDetail
(
widgetChainId
);
return
RestResponse
.
success
(
dto
);
}
...
...
src/main/java/com/gic/plug/web/controller/StoreFieldController.java
View file @
9975badf
package
com
.
gic
.
plug
.
web
.
controller
;
import
com.alibaba.fastjson.JSON
;
import
com.alibaba.fastjson.JSONObject
;
import
com.gic.api.base.commons.ServiceResponse
;
import
com.gic.commons.util.EntityUtil
;
import
com.gic.commons.webapi.reponse.RestResponse
;
...
...
@@ -118,8 +120,11 @@ public class StoreFieldController {
if
(
obj
!=
null
){
StoreFieldRegionVO
vo
=
EntityUtil
.
changeEntityNew
(
StoreFieldRegionVO
.
class
,
dto
);
vo
.
setStoreFieldKey
(
obj
.
toString
());
if
(
vo
.
getStoreFieldType
().
intValue
()
==
StoreFieldTypeEnum
.
DATE
.
getCode
()){
JSONObject
json
=
JSON
.
parseObject
(
dto
.
getStoreFieldDetail
());
vo
.
setDateType
(
json
.
getIntValue
(
"dateType"
));
}
voList
.
add
(
vo
);
}
}
}
...
...
src/main/java/com/gic/plug/web/vo/StoreFieldRegionVO.java
View file @
9975badf
...
...
@@ -24,6 +24,8 @@ public class StoreFieldRegionVO implements Serializable{
private
String
storeFieldKey
;
private
int
dateType
;
/**
* 排序
*/
...
...
@@ -76,4 +78,12 @@ public class StoreFieldRegionVO implements Serializable{
public
void
setStoreFieldKey
(
String
storeFieldKey
)
{
this
.
storeFieldKey
=
storeFieldKey
;
}
public
int
getDateType
()
{
return
dateType
;
}
public
void
setDateType
(
int
dateType
)
{
this
.
dateType
=
dateType
;
}
}
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