|
@@ -34,6 +34,10 @@
|
|
|
<result property="jqenddate" column="jqenddate" jdbcType="VARCHAR"/>
|
|
<result property="jqenddate" column="jqenddate" jdbcType="VARCHAR"/>
|
|
|
<result property="systartdate" column="systartdate" jdbcType="VARCHAR"/>
|
|
<result property="systartdate" column="systartdate" jdbcType="VARCHAR"/>
|
|
|
<result property="syenddate" column="syenddate" jdbcType="VARCHAR"/>
|
|
<result property="syenddate" column="syenddate" jdbcType="VARCHAR"/>
|
|
|
|
|
+ <result property="jqpremium" column="jqpremium" jdbcType="VARCHAR"/>
|
|
|
|
|
+ <result property="sypremium" column="sypremium" jdbcType="VARCHAR"/>
|
|
|
|
|
+ <result property="jypremium" column="jypremium" jdbcType="VARCHAR"/>
|
|
|
|
|
+ <result property="taxamount" column="taxamount" jdbcType="VARCHAR"/>
|
|
|
<result property="risk" column="risk" javaType="com.alibaba.fastjson.JSONArray"
|
|
<result property="risk" column="risk" javaType="com.alibaba.fastjson.JSONArray"
|
|
|
typeHandler="com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler" jdbcType="VARCHAR"/>
|
|
typeHandler="com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler" jdbcType="VARCHAR"/>
|
|
|
<result property="king" column="king" javaType="com.alibaba.fastjson.JSONArray"
|
|
<result property="king" column="king" javaType="com.alibaba.fastjson.JSONArray"
|
|
@@ -359,6 +363,10 @@
|
|
|
<if test="orderQueryVo.companyId != null and orderQueryVo.companyId != ''">
|
|
<if test="orderQueryVo.companyId != null and orderQueryVo.companyId != ''">
|
|
|
and iac.company_id = #{orderQueryVo.companyId}
|
|
and iac.company_id = #{orderQueryVo.companyId}
|
|
|
</if>
|
|
</if>
|
|
|
|
|
+ <if test="orderQueryVo.product != null and orderQueryVo.product != ''">
|
|
|
|
|
+ and iac.product = #{orderQueryVo.product}
|
|
|
|
|
+ </if>
|
|
|
|
|
+
|
|
|
<!--
|
|
<!--
|
|
|
<if test="orderQueryVo.userId != null and orderQueryVo.userId != '' and isCdy">
|
|
<if test="orderQueryVo.userId != null and orderQueryVo.userId != '' and isCdy">
|
|
|
and io.operatorid = #{orderQueryVo.userId}
|
|
and io.operatorid = #{orderQueryVo.userId}
|
|
@@ -823,6 +831,10 @@
|
|
|
iac.jq_end_date as jqenddate,
|
|
iac.jq_end_date as jqenddate,
|
|
|
iac.sy_start_date as systartdate,
|
|
iac.sy_start_date as systartdate,
|
|
|
iac.sy_end_date as syenddate,
|
|
iac.sy_end_date as syenddate,
|
|
|
|
|
+ iac.jqpremium as jqpremium,
|
|
|
|
|
+ iac.sypremium as sypremium,
|
|
|
|
|
+ iac.jypremium as jypremium,
|
|
|
|
|
+ iac.taxamount as taxamount,
|
|
|
io.risk as risk,
|
|
io.risk as risk,
|
|
|
io.king as king,
|
|
io.king as king,
|
|
|
io.vehicle_and_vessel_tax as vehicleAndVesselTax,
|
|
io.vehicle_and_vessel_tax as vehicleAndVesselTax,
|