Skip to content

H
Hgs
Commit ea1fe9e3 authored by gaoyuan's avatar gaoyuan
Browse files
Options

4.9.3需求---bug修复

parent 2e15f1bd
Hide whitespace changes
Inline Side-by-side
Showing with 72 additions and 12 deletions
house365-hgs-ws/src/main/resources/development/mybatis/CustomerMergeMapper.xml
View file @ ea1fe9e3
...@@ -222,6 +222,24 @@ ...@@ -222,6 +222,24 @@
group by c3.manager_id,c3.phone group by c3.manager_id,c3.phone
) t1 on c.manager_id=t1.manager_id and c.phone=t1.phone ) t1 on c.manager_id=t1.manager_id and c.phone=t1.phone
</if> </if>
<if test='(createrId != null and createrId != "" )'>
inner join (
SELECT
c3.manager_id,c3.phone
FROM
customer_callback_log c2 right join customer c3 on c2.customer_id = c3.id
where 1=1
and c3.cityCode=#{cityCode}
AND c3.is_delete = 0
AND ( c3.isWaitCall = 0 OR c3.isWaitCall IS NULL )
AND c3.manager_id IS NOT NULL
AND c3.STATUS IN ( 11, 0, 99 )
<if test="createrId != null and createrId != '' ">
AND c3.creater =#{createrId}
</if>
group by c3.manager_id,c3.phone
) t1 on c.manager_id=t1.manager_id and c.phone=t1.phone
</if>
<if test="(projectName != null and projectName != '') or (projectStatus != null and projectStatus != '')"> <if test="(projectName != null and projectName != '') or (projectStatus != null and projectStatus != '')">
LEFT JOIN ( LEFT JOIN (
SELECT c1.manager_id, c1.phone FROM customer c1 inner join customer_project p1 on c1.id=p1.customer_id SELECT c1.manager_id, c1.phone FROM customer c1 inner join customer_project p1 on c1.id=p1.customer_id
...@@ -434,9 +452,6 @@ ...@@ -434,9 +452,6 @@
AND ( SELECT count( * ) FROM customer_callback_log ccl WHERE ccl.customer_id = c.id ) = 0 AND ( SELECT count( * ) FROM customer_callback_log ccl WHERE ccl.customer_id = c.id ) = 0
AND ( SELECT count( * ) FROM customer_status_log csl WHERE csl.customer_id = c.id ) = 0 AND ( SELECT count( * ) FROM customer_status_log csl WHERE csl.customer_id = c.id ) = 0
</if> </if>
<if test="createrId != null and createrId != '' ">
AND c.creater =#{createrId}
</if>
<if test="orderBy != null and orderBy != '' "> <if test="orderBy != null and orderBy != '' ">
order by ${orderBy} order by ${orderBy}
</if> </if>
...@@ -475,6 +490,24 @@ ...@@ -475,6 +490,24 @@
group by c3.manager_id,c3.phone group by c3.manager_id,c3.phone
) t1 on c.manager_id=t1.manager_id and c.phone=t1.phone ) t1 on c.manager_id=t1.manager_id and c.phone=t1.phone
</if> </if>
<if test='(createrId != null and createrId != "" )'>
inner join (
SELECT
c3.manager_id,c3.phone
FROM
customer_callback_log c2 right join customer c3 on c2.customer_id = c3.id
where 1=1
and c3.cityCode=#{cityCode}
AND c3.is_delete = 0
AND ( c3.isWaitCall = 0 OR c3.isWaitCall IS NULL )
AND c3.manager_id IS NOT NULL
AND c3.STATUS IN ( 11, 0, 99 )
<if test="createrId != null and createrId != '' ">
AND c3.creater =#{createrId}
</if>
group by c3.manager_id,c3.phone
) t1 on c.manager_id=t1.manager_id and c.phone=t1.phone
</if>
<if test="(projectName != null and projectName != '') or (projectStatus != null and projectStatus != '')"> <if test="(projectName != null and projectName != '') or (projectStatus != null and projectStatus != '')">
LEFT JOIN ( LEFT JOIN (
SELECT c1.manager_id, c1.phone FROM customer c1 inner join customer_project p1 on c1.id=p1.customer_id SELECT c1.manager_id, c1.phone FROM customer c1 inner join customer_project p1 on c1.id=p1.customer_id
...@@ -687,9 +720,6 @@ ...@@ -687,9 +720,6 @@
AND ( SELECT count( * ) FROM customer_callback_log ccl WHERE ccl.customer_id = c.id ) = 0 AND ( SELECT count( * ) FROM customer_callback_log ccl WHERE ccl.customer_id = c.id ) = 0
AND ( SELECT count( * ) FROM customer_status_log csl WHERE csl.customer_id = c.id ) = 0 AND ( SELECT count( * ) FROM customer_status_log csl WHERE csl.customer_id = c.id ) = 0
</if> </if>
<if test="createrId != null and createrId != '' ">
AND c.creater =#{createrId}
</if>
</select> </select>
......
house365-hgs-ws/src/main/resources/production/mybatis/CustomerMergeMapper.xml
View file @ ea1fe9e3
...@@ -222,6 +222,24 @@ ...@@ -222,6 +222,24 @@
group by c3.manager_id,c3.phone group by c3.manager_id,c3.phone
) t1 on c.manager_id=t1.manager_id and c.phone=t1.phone ) t1 on c.manager_id=t1.manager_id and c.phone=t1.phone
</if> </if>
<if test='(createrId != null and createrId != "" )'>
inner join (
SELECT
c3.manager_id,c3.phone
FROM
customer_callback_log c2 right join customer c3 on c2.customer_id = c3.id
where 1=1
and c3.cityCode=#{cityCode}
AND c3.is_delete = 0
AND ( c3.isWaitCall = 0 OR c3.isWaitCall IS NULL )
AND c3.manager_id IS NOT NULL
AND c3.STATUS IN ( 11, 0, 99 )
<if test="createrId != null and createrId != '' ">
AND c3.creater =#{createrId}
</if>
group by c3.manager_id,c3.phone
) t1 on c.manager_id=t1.manager_id and c.phone=t1.phone
</if>
<if test="(projectName != null and projectName != '') or (projectStatus != null and projectStatus != '')"> <if test="(projectName != null and projectName != '') or (projectStatus != null and projectStatus != '')">
LEFT JOIN ( LEFT JOIN (
SELECT c1.manager_id, c1.phone FROM customer c1 inner join customer_project p1 on c1.id=p1.customer_id SELECT c1.manager_id, c1.phone FROM customer c1 inner join customer_project p1 on c1.id=p1.customer_id
...@@ -434,9 +452,6 @@ ...@@ -434,9 +452,6 @@
AND ( SELECT count( * ) FROM customer_callback_log ccl WHERE ccl.customer_id = c.id ) = 0 AND ( SELECT count( * ) FROM customer_callback_log ccl WHERE ccl.customer_id = c.id ) = 0
AND ( SELECT count( * ) FROM customer_status_log csl WHERE csl.customer_id = c.id ) = 0 AND ( SELECT count( * ) FROM customer_status_log csl WHERE csl.customer_id = c.id ) = 0
</if> </if>
<if test="createrId != null and createrId != '' ">
AND c.creater =#{createrId}
</if>
<if test="orderBy != null and orderBy != '' "> <if test="orderBy != null and orderBy != '' ">
order by ${orderBy} order by ${orderBy}
</if> </if>
...@@ -475,6 +490,24 @@ ...@@ -475,6 +490,24 @@
group by c3.manager_id,c3.phone group by c3.manager_id,c3.phone
) t1 on c.manager_id=t1.manager_id and c.phone=t1.phone ) t1 on c.manager_id=t1.manager_id and c.phone=t1.phone
</if> </if>
<if test='(createrId != null and createrId != "" )'>
inner join (
SELECT
c3.manager_id,c3.phone
FROM
customer_callback_log c2 right join customer c3 on c2.customer_id = c3.id
where 1=1
and c3.cityCode=#{cityCode}
AND c3.is_delete = 0
AND ( c3.isWaitCall = 0 OR c3.isWaitCall IS NULL )
AND c3.manager_id IS NOT NULL
AND c3.STATUS IN ( 11, 0, 99 )
<if test="createrId != null and createrId != '' ">
AND c3.creater =#{createrId}
</if>
group by c3.manager_id,c3.phone
) t1 on c.manager_id=t1.manager_id and c.phone=t1.phone
</if>
<if test="(projectName != null and projectName != '') or (projectStatus != null and projectStatus != '')"> <if test="(projectName != null and projectName != '') or (projectStatus != null and projectStatus != '')">
LEFT JOIN ( LEFT JOIN (
SELECT c1.manager_id, c1.phone FROM customer c1 inner join customer_project p1 on c1.id=p1.customer_id SELECT c1.manager_id, c1.phone FROM customer c1 inner join customer_project p1 on c1.id=p1.customer_id
...@@ -687,9 +720,6 @@ ...@@ -687,9 +720,6 @@
AND ( SELECT count( * ) FROM customer_callback_log ccl WHERE ccl.customer_id = c.id ) = 0 AND ( SELECT count( * ) FROM customer_callback_log ccl WHERE ccl.customer_id = c.id ) = 0
AND ( SELECT count( * ) FROM customer_status_log csl WHERE csl.customer_id = c.id ) = 0 AND ( SELECT count( * ) FROM customer_status_log csl WHERE csl.customer_id = c.id ) = 0
</if> </if>
<if test="createrId != null and createrId != '' ">
AND c.creater =#{createrId}
</if>
</select> </select>
......
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