|
@@ -45,6 +45,7 @@
|
|
|
SELECT
|
|
|
t1.*,
|
|
|
t2.name as company_name,
|
|
|
+ t2.old_name as oldName,
|
|
|
t2.social_credit_code as social_credit_code,
|
|
|
t3.nick_name as signer_name,
|
|
|
t4.title as source_category_name,
|
|
@@ -58,6 +59,7 @@
|
|
|
<if test="fromId != null">AND (t1.from_id = #{fromId} or t1.id = #{fromId})</if>
|
|
|
<if test="id != null and id != ''">AND t1.id = #{id}</if>
|
|
|
<if test="companyName != null and companyName != ''">AND t2.name like concat("%", #{companyName}, "%")</if>
|
|
|
+ <if test="oldName != null and oldName != ''">AND t2.old_name like concat("%", #{oldName}, "%")</if>
|
|
|
<if test="archiveTypeId != null">and archive_type_id = #{archiveTypeId}</if>
|
|
|
<if test="companyId != null and companyId != ''">AND t1.company_id = #{companyId}</if>
|
|
|
<if test="archiveCode != null and archiveCode != ''">AND t1.archive_code = #{archiveCode}</if>
|
|
@@ -109,6 +111,7 @@
|
|
|
SELECT
|
|
|
t1.*,
|
|
|
t2.name as company_name,
|
|
|
+ t2.old_name as oldName,
|
|
|
t2.customer_label_id as customerLabelId,
|
|
|
t5.lable as customerLabelName,
|
|
|
t2.social_credit_code as social_credit_code,
|
|
@@ -126,6 +129,7 @@
|
|
|
<if test="id != null and id != ''">AND t1.id = #{id}</if>
|
|
|
<if test="contractNo!=null and contractNo != '' ">AND t1.contract_no like concat("%",#{contractNo}, "%")</if>
|
|
|
<if test="companyName != null and companyName != ''">AND t2.name like concat("%", #{companyName}, "%")</if>
|
|
|
+ <if test="oldName != null and oldName != ''">AND t2.old_name like concat("%", #{oldName}, "%")</if>
|
|
|
<if test="archiveTypeId != null">and archive_type_id = #{archiveTypeId}</if>
|
|
|
<if test="companyId != null and companyId != ''">AND t1.company_id = #{companyId}</if>
|
|
|
<if test="archiveCode != null and archiveCode != ''">AND t1.archive_code = #{archiveCode}</if>
|