增加查询是否录入佣金查询条件

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

@@ -962,7 +962,7 @@ public class InsurancePolicyController {
     }
 
 
-    @ApiOperation(value="历史投保单列表")
+    @ApiOperation(value="历史投保单列表或者佣金是否入录列表")
     @RequestMapping(value = "insuranceHistoryPageList",method = RequestMethod.POST)
     @ApiImplicitParams({
             @ApiImplicitParam(name="definitionId",value = "险种ID",paramType = "query"),
@@ -972,12 +972,14 @@ public class InsurancePolicyController {
             @ApiImplicitParam(name="startCreat",value = "创建开始时间",paramType = "query"),
             @ApiImplicitParam(name="endCreat",value = "创建结束时间",paramType = "query"),
             @ApiImplicitParam(name="startFinish",value = "出单开始时间",paramType = "query"),
-            @ApiImplicitParam(name="endFinish",value = "出单结束时间",paramType = "query")
+            @ApiImplicitParam(name="endFinish",value = "出单结束时间",paramType = "query"),
+            @ApiImplicitParam(name="isCommission",value = "是否录入佣金（0:否，1:是，不传查询全部）",paramType = "query")
     })
     public MessageResult<Map> insuranceHistoryPageList(
             String definitionId,String companyName,String promoter,String agentId,
             String startCreat,String endCreat,
             String startFinish,String endFinish,
+            Boolean isCommission,
             @RequestParam(value="pageIndex",defaultValue="1") int pageIndex,
             @RequestParam(value="pageSize",defaultValue="20") int pageSize,
             @RequestAttribute String subject){
@@ -1021,6 +1023,16 @@ public class InsurancePolicyController {
             searchParams.put("endFinish",endFinish);
         }
 
+        if (isCommission!=null) {
+            if(isCommission){
+                searchParams.put("isCommission",true);
+            }
+            else{
+                searchParams.put("isCommission",false);
+            }
+
+        }
+
         Page<InsurancePolicy> page = insurancePolicyService.hisPageSearch(searchParams,pageIndex,pageSize,sortList);
 
         msgResult.setResult(true);

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

@@ -378,6 +378,14 @@
 					and a.finish_time <= #{searchParams.endFinish}
 				]]>
             </if>
+            <if test="searchParams.isCommission != null">
+                <if test="searchParams.isCommission == true">
+                    and a.commission_ is not null
+                </if>
+                <if test="searchParams.isCommission == false">
+                    and a.commission_ is null
+                </if>
+            </if>
         </where>
         <foreach item="sort" collection="sortList"  open="order by" separator=",">
             ${sort.name} ${sort.order}