Merge remote-tracking branch 'origin/main'

This commit is contained in:
方亮 2025-11-19 18:12:07 +08:00
commit f032eeeac5
2 changed files with 26 additions and 18 deletions

View File

@ -135,4 +135,9 @@ public class PmSub {
* 分公司id
*/
private String subComId;
/**
* 分公司名称
*/
private String subComName;
}

View File

@ -58,28 +58,31 @@
</delete>
<select id="selectSubList" resultType="com.bonus.bmw.domain.po.PmSub">
select id as id,
sub_name as subName,
legal_person as legalPerson,
legal_person_phone as legalPersonPhone,
sub_address as subAddress,
business_license as businessLicense,
electronic_seal as electronicSeal,
id_card_front as idCardFront,
id_card_reverse as idCardReverse,
corporate_seal as corporateSeal,
sub_ein_status as subEinStatus,
sub_com_id as subComId
from pm_sub where is_active='1'
select ps.id as id,
ps.sub_name as subName,
ps.legal_person as legalPerson,
ps.legal_person_phone as legalPersonPhone,
ps.sub_address as subAddress,
ps.business_license as businessLicense,
ps.electronic_seal as electronicSeal,
ps.id_card_front as idCardFront,
ps.id_card_reverse as idCardReverse,
ps.corporate_seal as corporateSeal,
ps.sub_ein_status as subEinStatus,
ps.sub_com_id as subComId,
psc.sub_company_name as subComName
from pm_sub ps
left join pm_sub_company psc on ps.sub_com_id = psc.id
where is_active='1'
<if test="subComId!= null " >
and sub_com_id=#{subComId}
and ps.sub_com_id=#{subComId}
</if>
<if test="keyWord !=null and keyWord!= ''" >
and (
sub_name like concat('%', #{keyWord}, '%')
or legal_person like concat('%', #{keyWord}, '%')
or legal_person_phone like concat('%', #{keyWord}, '%')
or sub_address like concat('%', #{keyWord}, '%')
ps.sub_name like concat('%', #{keyWord}, '%')
or ps.legal_person like concat('%', #{keyWord}, '%')
or ps.legal_person_phone like concat('%', #{keyWord}, '%')
or ps.sub_address like concat('%', #{keyWord}, '%')
)
</if>
</select>