Qchen 2 år sedan
förälder
incheckning
a1ca3c62e8

+ 8 - 0
src/main/java/com/ydtech/modules/order/entity/InsOrders.java

@@ -257,6 +257,14 @@ public class InsOrders implements Serializable {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime payDate;   //支付时间
 
+    @TableField(exist = false)
+    private String jqpremium;
+    @TableField(exist = false)
+    private String sypremium;
+    @TableField(exist = false)
+    private String jypremium;
+    @TableField(exist = false)
+    private String taxamount;
 
     public InsOrders(SysUser user, SysDept dept, BaseQuoteInfoVo quoteInfoVo) {
         // 2. 组装订单

+ 2 - 0
src/main/java/com/ydtech/modules/order/entity/vo/OrderQueryVo.java

@@ -109,6 +109,8 @@ public class OrderQueryVo {
     @ApiModelProperty(value = "投保险种")
     private String productId;
 
+    @ApiModelProperty(value = "险种")
+    private String product;
 
 
     @ApiModelProperty(value = "投保人姓名")

+ 12 - 0
src/main/resources/mapper/modules/order/InsOrdersMapper.xml

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