Merge remote-tracking branch 'origin/master'

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,16 @@ 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"),
+            @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,String startTime,String endTime,
             @RequestParam(value="pageIndex",defaultValue="1") int pageIndex,
             @RequestParam(value="pageSize",defaultValue="20") int pageSize,
             @RequestAttribute String subject){
@@ -1021,6 +1025,23 @@ public class InsurancePolicyController {
             searchParams.put("endFinish",endFinish);
         }
 
+        if (isCommission!=null) {
+            if(isCommission){
+                searchParams.put("isCommission",true);
+            }
+            else{
+                searchParams.put("isCommission",false);
+            }
+
+        }
+
+        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/java/com/jpsoft/picc/modules/business/entity/InsurancePolicy.java

@@ -106,6 +106,11 @@ public class InsurancePolicy {
     @ApiModelProperty(value = "佣金金额")
     private BigDecimal commission;
 
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone ="GMT+8")
+    @ApiModelProperty(value = "佣金打款时间")
+    private Date commissionTime;
+
     /**
      * 状态翻译
      * @return

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

@@ -31,6 +31,7 @@
         <result property="policyNo" column="policy_no"/>
         <result property="finishTime" column="finish_time"/>
         <result property="commission" column="commission_"/>
+        <result property="commissionTime" column="commission_time"/>
 
         <association property="agent" column="agent_id" select="com.jpsoft.picc.modules.base.dao.InsuranceAgentDAO.get"></association>
         <association property="definition" column="definition_id" select="com.jpsoft.picc.modules.base.dao.InsuranceDefinitionDAO.get"></association>
@@ -47,7 +48,7 @@
 	    (id_,definition_id,status_,process_status,insurance_fee,start_time,end_time,
 	    number_,account_bank,issuing_bank,singl_number,transfer_time,
 	    agent_id,insurance_policy_file,no_,effective_date,del_flag,create_by,create_time,update_by,update_time,
-	    company_id,latest_application_id,policy_no,finish_time,commission)
+	    company_id,latest_application_id,policy_no,finish_time,commission_,commission_time)
 		values
 		(
             #{id,jdbcType=VARCHAR}
@@ -76,6 +77,7 @@
             ,#{policyNo,jdbcType=VARCHAR}
             ,#{finishTime,jdbcType= TIMESTAMP }
             ,#{commission,jdbcType= NUMERIC }
+            ,#{commissionTime,jdbcType= TIMESTAMP }
 		)
 	]]>
     </insert>
@@ -160,6 +162,9 @@
             <if test="commission!=null">
                 commission_=#{commission,jdbcType= NUMERIC },
             </if>
+            <if test="commissionTime!=null">
+                commission_time=#{commissionTime,jdbcType= TIMESTAMP },
+            </if>
         </set>
         where id_=#{id}
     </update>
@@ -378,6 +383,25 @@
 					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>
+
+            <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}