第一次投保除外的每月投保单列表增加参数userType

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

@@ -76,10 +76,12 @@ public class ApplicationPolicyController {
     @ApiOperation(value="第一次投保除外的每月投保单列表")
     @RequestMapping(value = "otherPageList",method = RequestMethod.POST)
     @ApiImplicitParams({
-            @ApiImplicitParam(name="applicationId",value = "投保单ID",required = true,paramType = "query")
+            @ApiImplicitParam(name="applicationId",value = "投保单ID",required = true,paramType = "query"),
+            @ApiImplicitParam(name="status",value = "状态",paramType = "query"),
+            @ApiImplicitParam(name="userType",value = "用户类型（0为人才超市，1为PICC）",paramType = "query")
     })
     public MessageResult<Map> otherPageList(
-            String applicationId,String status,
+            String applicationId,String status,String userType,
             @RequestParam(value="pageIndex",defaultValue="1") int pageIndex,
             @RequestParam(value="pageSize",defaultValue="20") int pageSize,
             @RequestAttribute String subject){
@@ -102,6 +104,12 @@ public class ApplicationPolicyController {
             searchParams.put("status",status);
         }
 
+        if (StringUtils.isNotEmpty(userType)) {
+            if(userType.equals("1")){
+                searchParams.put("userType",userType);
+            }
+        }
+
         Page<ApplicationPolicy> page = applicationPolicyService.otherSearch(searchParams,pageIndex,pageSize,sortList);
 
         msgResult.setResult(true);

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

@@ -148,6 +148,7 @@ public class InsuranceApplicationController {
         MessageResult<InsuranceApplication> msgResult = new MessageResult<>();
 
         try {
+
             InsuranceApplication insuranceApplication = insuranceApplicationService.get(id);
 
             List<InsurancePolicy> list = new ArrayList<InsurancePolicy>();

picc-common/src/main/resources/mapper/business/ApplicationPolicy.xml

@@ -82,6 +82,9 @@
 			<if test="searchParams.status != null">
 				and b.status_ = #{searchParams.status}
 			</if>
+			<if test="searchParams.userType != null">
+				and (status_='30' or status_='60' or status_='70')
+			</if>
 		</where>
 		<foreach item="sort" collection="sortList"  open="order by" separator=",">
 			${sort.name} ${sort.order}