Commit a825becc by Java-张振楠

修改SQL,以适配融创oracle数据库

parent 4904df27
......@@ -215,15 +215,16 @@
<select id="findUser" parameterType="User" resultType="User">
SELECT
su.id AS "id",
su.`no` AS "no",
su.`name` AS "name",
su.no AS "no",
su.name AS "name",
su.login_name AS "loginName",
su.mobile AS "mobile",
so1.`name` AS "company.name",
so2.`name` AS "office.name",
so1.name AS "company.name",
so2.name AS "office.name",
sp.position_name AS "position.name",
sr.`name` AS "role.name",
CONCAT(IFNULL(sac.`name`,""),"-",IFNULL(sao.`name`,"")) AS "devision"
sr.name AS "role.name",
<if test="dbName == 'oracle'">NVL (sac. NAME, NULL) || '-' || NVL (sao. NAME, NULL) AS "devision"</if>
<if test="dbName == 'mysql'"> CONCAT(IFNULL(sac.name,""),"-",IFNULL(sao.name,"")) AS "devision"</if>
FROM
ct_bbtc_sys_user su
LEFT JOIN ct_bbtc_sys_office so1 ON so1.id = su.company_id
......@@ -276,7 +277,7 @@
<select id="getOfficeList" resultType="Office">
SELECT
so.id AS "id",
CONCAT(so.`name`,'(',(SELECT s.`name` FROM ct_bbtc_sys_office s WHERE s.id = so.parent_id),')') AS "name"
CONCAT(so.name,'(',(SELECT s.name FROM ct_bbtc_sys_office s WHERE s.id = so.parent_id),')') AS "name"
FROM ct_bbtc_sys_office so
WHERE so.type = '2'
</select>
......@@ -284,7 +285,7 @@
<select id="getCompanyList" resultType="Office">
SELECT
so.id AS "id",
so.`name` AS "name"
so.name AS "name"
FROM ct_bbtc_sys_office so
WHERE so.type = '1'
</select>
......@@ -355,7 +356,7 @@
LEFT JOIN ct_bbtc_sys_user2role sur ON su.id = sur.user_id
LEFT JOIN ct_bbtc_sys_role sr ON sr.id = sur.role_id
WHERE
sr.`name` = '系统管理员'
sr.name` = '系统管理员'
</select>
<insert id="addRecord">
......@@ -481,7 +482,7 @@
limit 0,10
</select>
<select id="getChooseReportList" parameterType="ReportEntity" resultType="ReportEntity">
<select id="getChooseReportList" parameterType="com.ejweb.modules.report.entity.ReportEntity" resultType="com.ejweb.modules.report.entity.ReportEntity">
SELECT
r.id AS "id",
r.report_project AS "reportProject",
......@@ -493,7 +494,7 @@
r.supplement_type AS "supplementType",
r.deal_person_name AS "dealPersonName",
r.deal_result AS "dealResult",
(CASE WHEN r.exchange_type='2' THEN (SELECT `name` FROM ct_bbtc_sys_user WHERE id=r.exchange_after_user) ELSE '--' END) AS "exchangeAfterUser",
(CASE WHEN r.exchange_type='2' THEN (SELECT name FROM ct_bbtc_sys_user WHERE id=r.exchange_after_user) ELSE '--' END) AS "exchangeAfterUser",
r.exchange_type AS "exchangeType"
FROM ct_bbtc_report r
<where>
......@@ -503,9 +504,7 @@
</if>
<if test="dealPersonName != null and dealPersonName != ''">
AND r.deal_person_name LIKE
<if test="dbName == 'oracle'">'%'||#{dealPersonName}||'%'</if>
<if test="dbName == 'mssql'">'%'+#{dealPersonName}+'%'</if>
<if test="dbName == 'mysql'">CONCAT('%', #{dealPersonName}, '%')</if>
'%'||#{dealPersonName}||'%'
</if>
</where>
ORDER BY r.update_date DESC
......
......@@ -29,7 +29,7 @@
a.primary_person AS "primaryPerson.id",
a.deputy_person AS "deputyPerson.id",
p.name AS "parent.name",
p.`code` AS "parent.code",
p.code AS "parent.code",
ar.name AS "area.name",
ar.parent_ids AS "area.parentIds",
pp.name AS "primaryPerson.name",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment