审核功能修改

fs-company/src/main/java/com/fs/hisStore/controller/FsStoreOrderAuditScrmController.java

@@ -2,7 +2,6 @@ package com.fs.hisStore.controller;
 
 import com.fs.common.core.controller.BaseController;
 import com.fs.common.core.domain.AjaxResult;
-import com.fs.common.core.domain.entity.SysUser;
 import com.fs.common.core.page.TableDataInfo;
 import com.fs.company.domain.CompanyUser;
 import com.fs.framework.security.SecurityUtils;

fs-service/src/main/java/com/fs/hisStore/param/FsStoreOrderAuditParam.java

@@ -10,6 +10,9 @@ public class FsStoreOrderAuditParam {
      * 公司ID
      */
     private Long companyId;
+
+    // 订单号
+    private Long orderCode;
     /**
      * 销售名称
      */

fs-service/src/main/resources/mapper/hisStore/FsStoreOrderAuditScrmMapper.xml

@@ -55,7 +55,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 and date_format(fso.create_time, '%Y-%m-%d') >= #{beginTime} and date_format(fso.create_time, '%Y-%m-%d') <= #{endTime}
             </if>
             <if test="auditBeginTime != null and auditEndTime != null">
-                and date_format(fsoa.admin_audit_time, '%Y-%m-%d') &gt;= #{auditBeginTime} and date_format(fsoa.admin_audit_time, '%Y-%m-%d') &lt;= #{auditEndTime}
+                and date_format(fsoa.company_audit_time, '%Y-%m-%d') &gt;= #{auditBeginTime} and date_format(fsoa.company_audit_time, '%Y-%m-%d') &lt;= #{auditEndTime}
             </if>
             <if test="orderAmountSmall != null and orderAmountBig != null">
                 and fso.pay_price &gt;= #{orderAmountSmall} and fso.pay_price &lt;= #{orderAmountBig}
@@ -63,6 +63,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="orderType != null">
                 and fso.order_type = #{orderType}
             </if>
+            <if test="orderCode != null">
+                and fso.order_code like concat('%', #{orderCode}, '%')
+            </if>
         </where>
         order by fsoa.admin_audit_time desc, fsoa.company_audit_time desc, fsoa.create_time desc
     </select>