Commit 9975badf by 陶光胜

自定义字段接口

parent f127c889
......@@ -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);
}
......
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);
}
}
}
......
......@@ -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;
}
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment