gfwleak/k18-ntcs-web-ntc
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复关联分类，性质，标签的类型sql join 1,2,3

Browse Source 
数值类，增强字符串类PZ搜索调整
This commit is contained in:
wangxin
2018-03-12 16:34:55 +08:00
parent d842c773ec
commit 2df9aa9665
10 changed files with 559 additions and 254 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/main/java/com/nis/web/controller/configuration/NumCfgController.java
View File

@@ -5,7 +5,6 @@ import java.util.List;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.ModelAttribute;
@@ -13,10 +12,10 @@ import org.springframework.web.bind.annotation.RequestMapping;
import com.nis.domain.Page;
import com.nis.domain.ServiceConfigInfo;
import com.nis.domain.basics.ServiceDictInfo;
import com.nis.domain.configuration.BaseCfg;
import com.nis.domain.configuration.NumBoundaryCfg;
import com.nis.domain.configuration.RequestInfo;
import com.nis.domain.basics.ServiceDictInfo;
import com.nis.util.Constants;
import com.nis.web.controller.BaseController;
@@ -40,17 +39,11 @@ public class NumCfgController extends BaseController{
model.addAttribute("serviceId", serviceId);
ServiceConfigInfo serviceConfigInfo=serviceConfigInfoService.findSysServiceConfigInfo(serviceId);
if(serviceConfigInfo!=null){
Page<NumBoundaryCfg> searchPage=new Page<NumBoundaryCfg>(request, response, 1);
if(pageNo!=null) searchPage.setPageNo(pageNo);
if(pageSize!=null) searchPage.setPageSize(pageSize);
if(cfg.getPage()!=null){
if(!StringUtils.isBlank(cfg.getPage().getOrderBy()));
searchPage.setOrderBy(cfg.getPage().getOrderBy());
}
Page<NumBoundaryCfg> searchPage=new Page<NumBoundaryCfg>(request, response, "r");
Page<NumBoundaryCfg> page = numCfgService.findPage(searchPage, cfg);
model.addAttribute("page", page);
model.addAttribute("action", cfg.getAction());
List<RequestInfo> requestInfos=requestInfoService.getValidRequestInfo();
List<RequestInfo> requestInfos=requestInfoService.getAllRequestInfo();
model.addAttribute("requestInfos", requestInfos);
List<ServiceDictInfo> fls=serviceDictInfoService.findAllFlDict();
model.addAttribute("fls", fls);