@ -5,7 +5,7 @@
<select id= "searchSrmSupplierList" resultType= "SrmSupplierData" > <select id= "searchSrmSupplierList" resultType= "SrmSupplierData" >
SELECT SELECT
id,site,supplier_no,supplier_name,supplier_group,create_date,create_by,update_date,update_by,supplier_doc_type, id,site,supplier_no,supplier_name,supplier_group,create_date,create_by,update_date,update_by,supplier_doc_type,
TaxCode,FaxNo,PhoneNo,Contact,Address,PaymentTerm,DeliveryTerm,Buyer,Currency,ABC,Active,CreateDate, BankName,BankAccount,
TaxCode,FaxNo,PhoneNo,Contact,Address,PaymentTerm,DeliveryTerm,Buyer,Currency,ABC,Active,BankName,BankAccount,
TaxNo,Email,Memo TaxNo,Email,Memo
FROM srm_supplier FROM srm_supplier
<where > <where >
@ -27,7 +27,7 @@
<select id= "checkSrmSupplierList" resultType= "SrmSupplierData" > <select id= "checkSrmSupplierList" resultType= "SrmSupplierData" >
SELECT SELECT
id,site,supplier_no,supplier_name,supplier_group,create_date,create_by,update_date,update_by,supplier_doc_type, id,site,supplier_no,supplier_name,supplier_group,create_date,create_by,update_date,update_by,supplier_doc_type,
TaxCode,FaxNo,PhoneNo,Contact,Address,PaymentTerm,DeliveryTerm,Buyer,Currency,ABC,Active,CreateDate, BankName,BankAccount,
TaxCode,FaxNo,PhoneNo,Contact,Address,PaymentTerm,DeliveryTerm,Buyer,Currency,ABC,Active,BankName,BankAccount,
TaxNo,Email,Memo TaxNo,Email,Memo
FROM srm_supplier FROM srm_supplier
<where > <where >
@ -53,7 +53,7 @@
</select> </select>
<select id= "searchSupplierGroupRequestList" resultType= "SrmSupplierGroupRequsetData" > <select id= "searchSupplierGroupRequestList" resultType= "SrmSupplierGroupRequsetData" >
select a.id,a.site,a.request_no,a.request_date,a.supplier_no,a.old_supplier_group,a.new_supplier_group,a.reason,a.[status], select a.id,a.site,a.request_no,a.request_date,a.supplier_no,a.old_supplier_group,a.new_supplier_group,a.reason,a.[status],
a.create_date,a.create_ by,a.update_date,a.update_by,dbo.plm_get_user_display(a.site,a.create_by) requestBy
a.create_by,a.update_date,a.update_by,dbo.plm_get_user_display(a.site,a.create_by) requestBy
from srm_supplierGroupRequset a from srm_supplierGroupRequset a
<where > <where >
<if test= "site !=null and site !=''" > <if test= "site !=null and site !=''" >
@ -69,7 +69,7 @@
and a.status like '%' + #{status} + '%' and a.status like '%' + #{status} + '%'
</if> </if>
</where> </where>
order by a.request _date desc
order by a.create _date desc
</select> </select>
<select id= "getSupplierGroupRequestList" resultType= "SrmSupplierGroupRequsetData" > <select id= "getSupplierGroupRequestList" resultType= "SrmSupplierGroupRequsetData" >
SELECT SELECT
@ -95,7 +95,7 @@
AND a.supplier_no like '%' + #{query.supplierNo} + '%' AND a.supplier_no like '%' + #{query.supplierNo} + '%'
</if> </if>
<if test = "query.supplierName != null and query.supplierName != ''" > <if test = "query.supplierName != null and query.supplierName != ''" >
AND b.supplier_name like '%' + #{query.supplierNo } + '%'
AND b.supplier_name like '%' + #{query.supplierName } + '%'
</if> </if>
<if test = "query.status != null and query.status != ''" > <if test = "query.status != null and query.status != ''" >
AND a.status like '%' + #{query.status} + '%' AND a.status like '%' + #{query.status} + '%'
@ -106,6 +106,41 @@
</where> </where>
order by a.request_date desc order by a.request_date desc
</select> </select>
<!-- 新增：用于MyBatis Plus内置分页的查询方法（无ORDER BY，避免SQL Server分页问题） -->
<select id= "queryPage" resultType= "SrmSupplierGroupRequsetData" >
SELECT
a.id,a.site,a.request_no,a.request_date,a.supplier_no,a.old_supplier_group,a.new_supplier_group,a.reason,a.[status],
a.create_date,a.create_by,a.update_date,a.update_by,dbo.plm_get_user_display(a.site,a.create_by) requestBy,b.supplier_name
FROM srm_supplierGroupRequset a
left join srm_supplier b on a.site=b.site and a.supplier_no=b.supplier_no
<where >
<if test= "query.site != null and query.site != ''" >
AND a.site=#{query.site}
</if>
<if test= "query.startDate != null " >
AND a.request_date >= #{query.startDate}
</if>
<if test= "query.endDate != null " >
AND #{query.endDate} >=a.request_date
</if>
<if test = "query.requestNo != null and query.requestNo != ''" >
AND a.request_no like '%' + #{query.requestNo} + '%'
</if>
<if test = "query.supplierNo != null and query.supplierNo != ''" >
AND a.supplier_no like '%' + #{query.supplierNo} + '%'
</if>
<if test = "query.supplierName != null and query.supplierName != ''" >
AND b.supplier_name like '%' + #{query.supplierName} + '%'
</if>
<if test = "query.status != null and query.status != ''" >
AND a.status like '%' + #{query.status} + '%'
</if>
<if test = "query.requestBy != null and query.requestBy != ''" >
AND dbo.plm_get_user_display(a.site,a.create_by) like '%' + #{query.requestBy} + '%'
</if>
</where>
</select>
<insert id= "saveSrmSupplierGroupRequsetData" > <insert id= "saveSrmSupplierGroupRequsetData" >
insert into srm_supplierGroupRequset(site,request_no,request_date,supplier_no,old_supplier_group,new_supplier_group,reason,[status],create_date,create_by) insert into srm_supplierGroupRequset(site,request_no,request_date,supplier_no,old_supplier_group,new_supplier_group,reason,[status],create_date,create_by)
values(#{site},#{requestNo},#{requestDate},#{supplierNo},#{oldSupplierGroup},#{newSupplierGroup},#{reason},#{status},GetDate(),#{createBy}) values(#{site},#{requestNo},#{requestDate},#{supplierNo},#{oldSupplierGroup},#{newSupplierGroup},#{reason},#{status},GetDate(),#{createBy})
@ -160,7 +195,6 @@
left join srm_supplier b on a.site=b.site and a.supplier_no=b.supplier_no left join srm_supplier b on a.site=b.site and a.supplier_no=b.supplier_no
left join srm_supplierContract c on a.site=c.site and a.contractId=c.contractId left join srm_supplierContract c on a.site=c.site and a.contractId=c.contractId
<where > <where >
<if test= "query.site != null and query.site != ''" > <if test= "query.site != null and query.site != ''" >
AND a.site=#{query.site} AND a.site=#{query.site}
</if> </if>
@ -177,14 +211,14 @@
AND a.supplier_no like '%' + #{query.supplierNo} + '%' AND a.supplier_no like '%' + #{query.supplierNo} + '%'
</if> </if>
<if test = "query.supplierName != null and query.supplierName != ''" > <if test = "query.supplierName != null and query.supplierName != ''" >
AND b.supplier_name like '%' + #{query.supplierNo } + '%'
AND b.supplier_name like '%' + #{query.supplierName } + '%'
</if> </if>
<if test = "query.status != null and query.status != ''" > <if test = "query.status != null and query.status != ''" >
AND a.status like '%' + #{query.status} + '%' AND a.status like '%' + #{query.status} + '%'
</if> </if>
</where> </where>
order by a.request_date desc
</select> </select>
<update id= "updateContractRequestStatus" > <update id= "updateContractRequestStatus" >
