[修改]添加成员单位后,成员单位名称显示有误,同时修改了工作组成员维护,资料网员成员维护,普通项目维护,共计四个模块的同样问题
This commit is contained in:
+11
-1
@@ -60,7 +60,17 @@
|
||||
|
||||
<select id="getPage" resultMap="MemberProjectSubitemResultMap">
|
||||
select pmps.id,pmps.create_by,pmps.create_time,pmps.update_by,pmps.update_time,pmps.project_id,pmps.company_id,pmps.company_temporary_id,
|
||||
if(pmps.company_name = pcm.company_name, pmps.company_name, concat(pmps.company_name,'(更名为',pcm.company_name,')')) as company_name,
|
||||
# if(pmps.company_name = pcm.company_name, pmps.company_name, concat(pmps.company_name,'(更名为',pcm.company_name,')')) as company_name,
|
||||
IF(
|
||||
pmps.company_name =
|
||||
IF(
|
||||
pmps.company_name LIKE '%(未审核)',
|
||||
CONCAT(pcm.company_name, '(未审核)'),
|
||||
pcm.company_name
|
||||
),
|
||||
pmps.company_name,
|
||||
CONCAT(pmps.company_name, '(更名为', pcm.company_name, ')')
|
||||
) AS company_name,
|
||||
pmps.company_contact_id,pmps.company_contact_temporary_id,pmps.company_contact_name,pmps.post_contact_id,
|
||||
pmps.post_contact_temporary_id,
|
||||
pmps.post_contact_name,pmps.amount_receivable,pmps.paid_amount,pmps.confirm_amount,pmps.payment_method,pmps.charge_notice_no,
|
||||
|
||||
+11
-1
@@ -11,7 +11,17 @@
|
||||
su.realname as principal_name,
|
||||
pcp.charge_company_id,
|
||||
pcp.charge_company_temporary_id,
|
||||
if(pcp.charge_company_temporary_name = pcm.company_name, pcp.charge_company_temporary_name, concat(pcp.charge_company_temporary_name,'(更名为',pcm.company_name,')')) as charge_company_temporary_name,
|
||||
# if(pcp.charge_company_temporary_name = pcm.company_name, pcp.charge_company_temporary_name, concat(pcp.charge_company_temporary_name,'(更名为',pcm.company_name,')')) as charge_company_temporary_name,
|
||||
IF(
|
||||
pcp.charge_company_temporary_name =
|
||||
IF(
|
||||
pcp.charge_company_temporary_name LIKE '%(未审核)',
|
||||
CONCAT(pcm.company_name, '(未审核)'),
|
||||
pcm.company_name
|
||||
),
|
||||
pcp.charge_company_temporary_name,
|
||||
CONCAT(pcp.charge_company_temporary_name, '(更名为', pcm.company_name, ')')
|
||||
) AS chargeCompanyTemporaryName,
|
||||
pcp.charge_use,
|
||||
pcp.contacts_id,
|
||||
pcp.contacts_temporary_id,
|
||||
|
||||
+11
-1
@@ -9,7 +9,17 @@
|
||||
pwgs.charge_company_id AS chargeCompanyId,
|
||||
pwgs.charge_company_temporary_id AS chargeCompanyTemporaryId,
|
||||
<!-- pwgs.charge_company_temporary_name AS chargeCompanyTemporaryName,-->
|
||||
if(pwgs.charge_company_temporary_name = pcm.company_name, pwgs.charge_company_temporary_name, concat(pwgs.charge_company_temporary_name,'(更名为',pcm.company_name,')')) as chargeCompanyTemporaryName,
|
||||
# if(pwgs.charge_company_temporary_name = pcm.company_name, pwgs.charge_company_temporary_name, concat(pwgs.charge_company_temporary_name,'(更名为',pcm.company_name,')')) as chargeCompanyTemporaryName,
|
||||
IF(
|
||||
pwgs.charge_company_temporary_name =
|
||||
IF(
|
||||
pwgs.charge_company_temporary_name LIKE '%(未审核)',
|
||||
CONCAT(pcm.company_name, '(未审核)'),
|
||||
pcm.company_name
|
||||
),
|
||||
pwgs.charge_company_temporary_name,
|
||||
CONCAT(pwgs.charge_company_temporary_name, '(更名为', pcm.company_name, ')')
|
||||
) AS chargeCompanyTemporaryName,
|
||||
pwgs.contacts_id_one AS contactsIdOne,
|
||||
pwgs.contacts_temporary_id_one AS contactsTemporaryIdOne,
|
||||
pwgs.contacts_temporary_name_one AS contactsTemporaryNameOne,
|
||||
|
||||
Reference in New Issue
Block a user