Browse Source

[feat]客户列表新增根据审核状态排序,销售订单新增根据审核状态排序,供应商资料销售订单新增根据审核状态排序,采购报价销售订单新增根据审核状态排序

dev
zhangsiqi 4 months ago
parent
commit
89d1ba1ca6
  1. 1
      ruoyi-admin/src/main/resources/mapper/purchase/PurchasePlanChildMapper.xml
  2. 2
      ruoyi-admin/src/main/resources/mapper/purchase/PurchaseQuoteMapper.xml
  3. 2
      ruoyi-admin/src/main/resources/mapper/system/SysCustomerMapper.xml
  4. 2
      ruoyi-admin/src/main/resources/mapper/system/SysSalesOrderMapper.xml
  5. 2
      ruoyi-admin/src/main/resources/mapper/system/SysSupplierMapper.xml

1
ruoyi-admin/src/main/resources/mapper/purchase/PurchasePlanChildMapper.xml

@ -58,6 +58,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="useStatus != null and useStatus != ''"> and use_status = #{useStatus}</if>
<if test="auditStatus != null and auditStatus != ''"> and audit_status = #{auditStatus}</if>
</where>
order by create_time desc
</select>
<select id="selectPurchasePlanChildById" parameterType="Long" resultMap="PurchasePlanChildResult">

2
ruoyi-admin/src/main/resources/mapper/purchase/PurchaseQuoteMapper.xml

@ -136,7 +136,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</if>
<if test="keyword != null and keyword != ''"> and p.purchase_quote_code like concat('%',#{keyword},'%')</if>
</where>
order by p.create_time desc
order by p.audit_status asc, p.create_time desc
</select>
<select id="selectPurchaseQuoteById" parameterType="Long" resultMap="PurchaseQuoteResult">
select p.purchase_quote_id, p.purchase_quote_code, p.purchaseBuyer,

2
ruoyi-admin/src/main/resources/mapper/system/SysCustomerMapper.xml

@ -118,7 +118,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="params.beginCreateTime != null and params.beginCreateTime != '' and params.endCreateTime != null and params.endCreateTime != ''"> and s.first_add_time between #{params.beginCreateTime} and #{params.endCreateTime}</if>
<if test="customerSign != null and customerSign != ''"> and s.customer_sign = #{customerSign}</if>
</where>
order by s.create_time desc
order by s.audit_status asc, s.create_time desc
</select>
<select id="selectSysCustomerWithComplaintNotice" resultMap="SysCustomerResult">

2
ruoyi-admin/src/main/resources/mapper/system/SysSalesOrderMapper.xml

@ -129,7 +129,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="applyTime != null and applyTime != ''"> and s.apply_time = #{applyTime}</if>
<if test="applyTitle != null and applyTitle != ''"> and s.apply_title = #{applyTitle}</if>
</where>
order by s.create_time desc
order by s.audit_status asc, s.create_time desc
</select>
<select id="selectSysSalesOrderById" parameterType="Long" resultMap="SysSalesOrderResult">

2
ruoyi-admin/src/main/resources/mapper/system/SysSupplierMapper.xml

@ -127,7 +127,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</if>
<if test="keyword != null and keyword != ''"> and ((sup.supplierCode like concat('%',#{keyword},'%') or sup.suppplierName like concat('%',#{keyword},'%'))</if>
</where>
order by sup.create_time desc
order by sup.apply_time asc, sup.create_time desc
</select>
<select id="selectSysSupplierById" parameterType="Long" resultMap="SysSupplierResult">
select sup.supplier_id, sup.supplier_code, sup.supplier_name, sup.export_sales,

Loading…
Cancel
Save