列表接口增加查询条件

picc-admin-server/src/main/java/com/jpsoft/picc/modules/base/controller/InsuranceAgentController.java

@@ -196,7 +196,7 @@ public class InsuranceAgentController {
     @ApiOperation(value="列表")
     @RequestMapping(value = "pageList",method = RequestMethod.POST)
     @ApiImplicitParams({
-            @ApiImplicitParam(name="name",value = "姓名",required = true,paramType = "query")
+            @ApiImplicitParam(name="name",value = "姓名",paramType = "query")
     })
     public MessageResult<Map> pageList(
             String name,

picc-admin-server/src/main/java/com/jpsoft/picc/modules/base/controller/InsuranceDefinitionController.java

@@ -7,6 +7,8 @@ import com.jpsoft.picc.modules.common.dto.Sort;
 import com.jpsoft.picc.modules.common.dto.MessageResult;
 import com.jpsoft.picc.modules.base.service.InsuranceDefinitionService;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
@@ -193,8 +195,11 @@ public class InsuranceDefinitionController {
 
     @ApiOperation(value="列表")
     @RequestMapping(value = "pageList",method = RequestMethod.POST)
+    @ApiImplicitParams({
+            @ApiImplicitParam(name="name",value = "名称",paramType = "query")
+    })
     public MessageResult<Map> pageList(
-            String id,
+            String name,
             @RequestParam(value="pageIndex",defaultValue="1") int pageIndex,
             @RequestParam(value="pageSize",defaultValue="20") int pageSize,
             @RequestAttribute String subject){
@@ -209,8 +214,8 @@ public class InsuranceDefinitionController {
         List<Sort> sortList = new ArrayList<>();
         sortList.add(new Sort("create_time","desc"));
 
-        if (StringUtils.isNotEmpty(id)) {
-            searchParams.put("id","%" + id + "%");
+        if (StringUtils.isNotEmpty(name)) {
+            searchParams.put("name","%" + name + "%");
         }
 
         Page<InsuranceDefinition> page = insuranceDefinitionService.pageSearch(searchParams,pageIndex,pageSize,sortList);

picc-admin-server/src/main/java/com/jpsoft/picc/modules/base/controller/InsuranceDefinitionLimitController.java

@@ -8,6 +8,8 @@ import com.jpsoft.picc.modules.common.dto.Sort;
 import com.jpsoft.picc.modules.common.dto.MessageResult;
 import com.jpsoft.picc.modules.base.service.InsuranceDefinitionLimitService;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
@@ -194,8 +196,11 @@ public class InsuranceDefinitionLimitController {
 
     @ApiOperation(value="列表")
     @RequestMapping(value = "pageList",method = RequestMethod.POST)
+    @ApiImplicitParams({
+            @ApiImplicitParam(name="name",value = "险种限额名称",paramType = "query")
+    })
     public MessageResult<Map> pageList(
-            String id,
+            String name,
             @RequestParam(value="pageIndex",defaultValue="1") int pageIndex,
             @RequestParam(value="pageSize",defaultValue="20") int pageSize,
             @RequestAttribute String subject){
@@ -210,8 +215,8 @@ public class InsuranceDefinitionLimitController {
         List<Sort> sortList = new ArrayList<>();
         sortList.add(new Sort("create_time","desc"));
 
-        if (StringUtils.isNotEmpty(id)) {
-            searchParams.put("id","%" + id + "%");
+        if (StringUtils.isNotEmpty(name)) {
+            searchParams.put("name","%" + name + "%");
         }
 
         Page<InsuranceDefinitionLimit> page = insuranceDefinitionLimitService.pageSearch(searchParams,pageIndex,pageSize,sortList);

picc-admin-server/src/main/java/com/jpsoft/picc/modules/base/controller/InsuranceJobsController.java

@@ -195,8 +195,12 @@ public class InsuranceJobsController {
 
     @ApiOperation(value="列表")
     @RequestMapping(value = "pageList",method = RequestMethod.POST)
+    @ApiImplicitParams({
+            @ApiImplicitParam(name="jobsId",value = "行业ID",paramType = "query"),
+            @ApiImplicitParam(name="definitionId",value = "险种ID",paramType = "query")
+    })
     public MessageResult<Map> pageList(
-            String id,
+            String jobsId,String definitionId,
             @RequestParam(value="pageIndex",defaultValue="1") int pageIndex,
             @RequestParam(value="pageSize",defaultValue="20") int pageSize,
             @RequestAttribute String subject){
@@ -211,8 +215,12 @@ public class InsuranceJobsController {
         List<Sort> sortList = new ArrayList<>();
         sortList.add(new Sort("id_","asc"));
 
-        if (StringUtils.isNotEmpty(id)) {
-            searchParams.put("id","%" + id + "%");
+        if (StringUtils.isNotEmpty(jobsId)) {
+            searchParams.put("jobsId",jobsId);
+        }
+
+        if (StringUtils.isNotEmpty(definitionId)) {
+            searchParams.put("definitionId",definitionId);
         }
 
         Page<InsuranceJobs> page = insuranceJobsService.pageSearch(searchParams,pageIndex,pageSize,sortList);

picc-admin-server/src/main/java/com/jpsoft/picc/modules/base/controller/JobsController.java

@@ -194,7 +194,7 @@ public class JobsController {
     @ApiOperation(value="列表")
     @RequestMapping(value = "pageList",method = RequestMethod.POST)
     public MessageResult<Map> pageList(
-            String id,
+            String name,
             @RequestParam(value="pageIndex",defaultValue="1") int pageIndex,
             @RequestParam(value="pageSize",defaultValue="20") int pageSize,
             @RequestAttribute String subject){
@@ -209,8 +209,8 @@ public class JobsController {
         List<Sort> sortList = new ArrayList<>();
         sortList.add(new Sort("create_time","desc"));
 
-        if (StringUtils.isNotEmpty(id)) {
-            searchParams.put("id","%" + id + "%");
+        if (StringUtils.isNotEmpty(name)) {
+            searchParams.put("name","%" + name + "%");
         }
 
         Page<Jobs> page = jobsService.pageSearch(searchParams,pageIndex,pageSize,sortList);