添加两个接口

1.查询除第一个月以外的每月投保单列表
1.每月投保单详情

picc-admin-server/src/main/java/com/jpsoft/picc/modules/base/controller/InsuranceAgentController.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.InsuranceAgentService;
 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 InsuranceAgentController {
 
     @ApiOperation(value="列表")
     @RequestMapping(value = "pageList",method = RequestMethod.POST)
+    @ApiImplicitParams({
+            @ApiImplicitParam(name="name",value = "姓名",required = true,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 InsuranceAgentController {
         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<InsuranceAgent> page = insuranceAgentService.pageSearch(searchParams,pageIndex,pageSize,sortList);

picc-admin-server/src/main/java/com/jpsoft/picc/modules/business/controller/ApplicationPolicyController.java

@@ -58,7 +58,7 @@ public class ApplicationPolicyController {
         Map<String,Object> searchParams = new HashMap<>();
 
         List<Sort> sortList = new ArrayList<>();
-        sortList.add(new Sort("id_","asc"));
+        sortList.add(new Sort("create_time","desc"));
 
         if (StringUtils.isNotEmpty(id)) {
             searchParams.put("id","%" + id + "%");
@@ -73,6 +73,62 @@ public class ApplicationPolicyController {
     }
 
 
+    @ApiOperation(value="第一次投保除外的每月投保单列表")
+    @RequestMapping(value = "otherPageList",method = RequestMethod.POST)
+    @ApiImplicitParams({
+            @ApiImplicitParam(name="applicationId",value = "投保单ID",required = true,paramType = "query")
+    })
+    public MessageResult<Map> otherPageList(
+            String applicationId,
+            @RequestParam(value="pageIndex",defaultValue="1") int pageIndex,
+            @RequestParam(value="pageSize",defaultValue="20") int pageSize,
+            @RequestAttribute String subject){
+
+        //当前用户ID
+        System.out.println(subject);
+
+        MessageResult<Map> msgResult = new MessageResult<>();
+
+        Map<String,Object> searchParams = new HashMap<>();
+
+        List<Sort> sortList = new ArrayList<>();
+        sortList.add(new Sort("create_time","desc"));
+
+        if (StringUtils.isNotEmpty(applicationId)) {
+            searchParams.put("applicationId",applicationId);
+        }
+
+        Page<ApplicationPolicy> page = applicationPolicyService.otherSearch(searchParams,pageIndex,pageSize,sortList);
+
+        msgResult.setResult(true);
+        msgResult.setData(PojoUtils.pageWrapper(page));
+
+        return msgResult;
+    }
+
+
+    @ApiOperation(value="每月投保单详情")
+    @RequestMapping(value = "detail",method = RequestMethod.POST)
+    @ApiImplicitParams({
+            @ApiImplicitParam(name="applicationId",value = "投保单ID",required = true,paramType = "query"),
+            @ApiImplicitParam(name="policyId",value = "每月投保单ID",required = true,paramType = "query")
+    })
+    public MessageResult<ApplicationPolicy> detail(String applicationId,String policyId,
+            @RequestAttribute String subject){
+
+        //当前用户ID
+        System.out.println(subject);
+
+        MessageResult<ApplicationPolicy> msgResult = new MessageResult<>();
+
+        ApplicationPolicy applicationPolicy = applicationPolicyService.getDetail(applicationId,policyId);
+
+        msgResult.setResult(true);
+        msgResult.setData(applicationPolicy);
+
+        return msgResult;
+    }
+
 
     @ApiOperation(value="获取每月投保单列表")
     @ApiImplicitParams({