增加查询投保时间区间

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

@@ -973,13 +973,15 @@ public class InsurancePolicyController {
             @ApiImplicitParam(name="endCreat",value = "创建结束时间",paramType = "query"),
             @ApiImplicitParam(name="startFinish",value = "出单开始时间",paramType = "query"),
             @ApiImplicitParam(name="endFinish",value = "出单结束时间",paramType = "query"),
-            @ApiImplicitParam(name="isCommission",value = "是否录入佣金（0:否，1:是，不传查询全部）",paramType = "query")
+            @ApiImplicitParam(name="isCommission",value = "是否录入佣金（0:否，1:是，不传查询全部）",paramType = "query"),
+            @ApiImplicitParam(name="startTime",value = "投保开始时间",paramType = "query"),
+            @ApiImplicitParam(name="endTime",value = "投保结束时间",paramType = "query")
     })
     public MessageResult<Map> insuranceHistoryPageList(
             String definitionId,String companyName,String promoter,String agentId,
             String startCreat,String endCreat,
             String startFinish,String endFinish,
-            Boolean isCommission,
+            Boolean isCommission,String startTime,String endTime,
             @RequestParam(value="pageIndex",defaultValue="1") int pageIndex,
             @RequestParam(value="pageSize",defaultValue="20") int pageSize,
             @RequestAttribute String subject){
@@ -1033,6 +1035,13 @@ public class InsurancePolicyController {
 
         }
 
+        if (StringUtils.isNotEmpty(startTime)) {
+            searchParams.put("startTime",startTime);
+        }
+        if (StringUtils.isNotEmpty(endTime)) {
+            searchParams.put("endTime",endTime);
+        }
+
         Page<InsurancePolicy> page = insurancePolicyService.hisPageSearch(searchParams,pageIndex,pageSize,sortList);
 
         msgResult.setResult(true);

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

@@ -386,6 +386,17 @@
                     and a.commission_ is null
                 </if>
             </if>
+
+            <if test="searchParams.startTime != null">
+                <![CDATA[
+					and a.start_time >= #{searchParams.startTime}
+				]]>
+            </if>
+            <if test="searchParams.endTime != null">
+                <![CDATA[
+					and a.end_time <= #{searchParams.endTime}
+				]]>
+            </if>
         </where>
         <foreach item="sort" collection="sortList"  open="order by" separator=",">
             ${sort.name} ${sort.order}