Bladeren bron

修改bug:
1、补录订单-订单管理,补录订单-订单管理列表页面问题,筛选条件没有传到后台
2、解决保存补录订单时报的selectOne但是selectList的错

jiakai 4 maanden geleden
bovenliggende
commit
afeefe03b5

+ 3 - 0
commons/src/main/java/com/jzg/commons/entity/dto/InsOrdersParam.java

@@ -11,6 +11,9 @@ import lombok.Data;
 public class InsOrdersParam extends PageRequest {
 public class InsOrdersParam extends PageRequest {
 
 
     @Schema(description = "订单号")
     @Schema(description = "订单号")
+    private String orderId;
+
+    @Schema(description = "报价号")
     private String orderNo;
     private String orderNo;
 
 
     @Schema(description = "车牌号")
     @Schema(description = "车牌号")

+ 6 - 1
tenant/insurance/quotation-summary/src/main/resources/mapper/InsOrdersMapper.xml

@@ -538,6 +538,9 @@
             <if test="insOrdersParam.orderNo != null and insOrdersParam.orderNo != ''">
             <if test="insOrdersParam.orderNo != null and insOrdersParam.orderNo != ''">
                 AND o.quote_no = #{insOrdersParam.orderNo}
                 AND o.quote_no = #{insOrdersParam.orderNo}
             </if>
             </if>
+            <if test="insOrdersParam.orderId != null and insOrdersParam.orderId != ''">
+                AND o.id = #{insOrdersParam.orderId}
+            </if>
             <if test="insOrdersParam.parentId == 0 ">
             <if test="insOrdersParam.parentId == 0 ">
                 AND o.parent_id = 0
                 AND o.parent_id = 0
             </if>
             </if>
@@ -554,7 +557,7 @@
                 AND suji.name = #{insOrdersParam.salesman}
                 AND suji.name = #{insOrdersParam.salesman}
             </if>
             </if>
             <if test="insOrdersParam.salesmanCompany != null and insOrdersParam.salesmanCompany != ''">
             <if test="insOrdersParam.salesmanCompany != null and insOrdersParam.salesmanCompany != ''">
-                AND o.salesman_company = #{insOrdersParam.salesmanCompany}
+                AND sd.name = #{insOrdersParam.salesmanCompany}
             </if>
             </if>
             <if test="insOrdersParam.auditStatus != null and insOrdersParam.auditStatus != ''">
             <if test="insOrdersParam.auditStatus != null and insOrdersParam.auditStatus != ''">
                 AND o.audit_status = #{insOrdersParam.auditStatus}
                 AND o.audit_status = #{insOrdersParam.auditStatus}
@@ -1452,6 +1455,8 @@
         FROM ins_orders o
         FROM ins_orders o
                  LEFT JOIN ins_orders_car_info c ON o.id = c.order_no
                  LEFT JOIN ins_orders_car_info c ON o.id = c.order_no
         WHERE o.parent_id = 0 AND o.entry_status = 3 AND c.license_no = #{licenseNo} AND o.real_quote_user_id = #{realQuoteUserId}
         WHERE o.parent_id = 0 AND o.entry_status = 3 AND c.license_no = #{licenseNo} AND o.real_quote_user_id = #{realQuoteUserId}
+        ORDER BY o.create_time DESC
+        LIMIT 1
     </select>
     </select>