Qchen 2 лет назад
Родитель
Сommit
27577f4ca3

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

@@ -107,7 +107,7 @@ public class OrderQueryVo {
     private String auditId;
 
     @ApiModelProperty(value = "投保险种")
-    private String productId;
+    private String productid;
 
     @ApiModelProperty(value = "险种")
     private String product;

+ 4 - 3
src/main/resources/mapper/modules/order/InsOrdersMapper.xml

@@ -334,10 +334,8 @@
         from
             ins_orders io
         <!--如果存在 公司查询则进行连表 -->
-        <if test="orderQueryVo.companyId != null and orderQueryVo.companyId != ''">
             left JOIN
             ins_area_company iac on iac.orderno = io.orderno
-        </if>
         <where>
             <if test="orderQueryVo.orderNo != null and orderQueryVo.orderNo != ''">
                 and io.orderno = #{orderQueryVo.orderNo}
@@ -364,7 +362,10 @@
                 and iac.company_id = #{orderQueryVo.companyId}
             </if>
             <if test="orderQueryVo.product != null and orderQueryVo.product != ''">
-                and iac.product = #{orderQueryVo.product}
+                and io.product = #{orderQueryVo.product}
+            </if>
+            <if test="orderQueryVo.productid != null and orderQueryVo.productid != ''">
+                and io.productid = #{orderQueryVo.productid}
             </if>
 
              <!--