话务简报 报表分析

.gitignore

@@ -4,5 +4,4 @@ target/
 files/
 *.log
 *.iml
-*.xml
 logs/

hjzx-mapper/src/main/resources/mapper/report/ReportMapper.xml

@@ -246,7 +246,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			AND `callee_agent`= #{usercode}
 		</if>
 		<if test="@api.entity.view.config.GlobalConfig@isNote == 1">
-			AND IFNULL(note,'1')='1'
+			AND  (note=1 or (call_type=2 and note is null ))
 		</if>
 
 		GROUP BY `callee_agent`
@@ -311,7 +311,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		from rep_record
 		where  DATE_FORMAT(create_time, '%Y-%m-%d') = DATE_FORMAT(NOW(), '%Y-%m-%d')
 		<if test="@api.entity.view.config.GlobalConfig@isNote == 1">
-			AND IFNULL(note,'1')='1'
+			AND  (note=1 or (call_type=2 and note is null ))
 		</if>
 		GROUP BY DATE
 		ORDER BY DATE;
@@ -324,7 +324,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		from rep_record
 		where  1=1
 		<if test="@api.entity.view.config.GlobalConfig@isNote == 1">
-			AND IFNULL(note,'1')='1'
+			AND  (note=1 or (call_type=2 and note is null ))
 		</if>
 	</select>
 	<select id="selectTrafficMeasurement"  parameterType="Date" resultMap="TrafficMeasurementResult">
@@ -336,7 +336,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		from rep_record
 		WHERE `create_time`>=#{beginTime}  AND `create_time`<![CDATA[<=]]> #{endTime}
 		<if test="@api.entity.view.config.GlobalConfig@isNote == 1">
-			AND IFNULL(note,'1')='1'
+			AND  (note=1 or (call_type=2 and note is null ))
 		</if>
 	</select>
 
@@ -348,7 +348,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		WHERE `create_time`>=#{startTime}  AND `create_time`<![CDATA[<=]]> #{endTime}
 		and call_type=1
 		<if test="@api.entity.view.config.GlobalConfig@isNote == 1">
-			AND IFNULL(note,'1')='1'
+			AND  (note=1 or (call_type=2 and note is null ))
 		</if>
 		<if test="isAnswer >-1  ">
 			AND `is_answer`= #{isAnswer}
@@ -364,7 +364,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		from  rep_record where
 		DATE_FORMAT(  `create_time`, '%Y-%m' )= DATE_FORMAT( #{time}, '%Y-%m' )
 		<if test="@api.entity.view.config.GlobalConfig@isNote == 1">
-			AND IFNULL(note,'1')='1'
+			AND  (note=1 or (call_type=2 and note is null ))
 		</if>
 	</select>
 
@@ -384,7 +384,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		WHERE `create_time`>=#{startTime}  AND `create_time`<![CDATA[<=]]> #{endTime}
 		and call_type=1
 		<if test="@api.entity.view.config.GlobalConfig@isNote == 1">
-			AND IFNULL(note,'1')='1'
+			AND  (note=1 or (call_type=2 and note is null ))
 		</if>
 		group by DATE
 		order by DATE
@@ -482,8 +482,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		count(myd=3  or null  )  dissatisfied
 		from rep_record
 		where 1=1
-		<if test="@api.entity.view.config.GlobalConfig@isNote == 1">
-			AND IFNULL(note,'1')='1'
+		<if test="@api.entity.view.config.GlobalConfig@isNote == 1"  >
+			AND  (note=1 or (call_type=2 and note is null ))
 		</if>
 		<if test="startTime != null and startTime !=''">
 			AND UNIX_TIMESTAMP(`create_time`)>=UNIX_TIMESTAMP(#{startTime})