话务，报表

hjzx-api/src/main/java/api/controller/call/CallLogController.java

@@ -70,7 +70,7 @@ public class CallLogController extends BaseController {
         {
             qw.and(wq -> {
                 wq.eq(CallLog::getNote,1);
-                wq.or().isNull(CallLog::getNote);
+                wq.or().isNull(CallLog::getNote).eq(CallLog::getCallType,2);
             });
            // qw.eq(CallLog::getNote, 1).or().isNull(CallLog::getNote);
         }
@@ -201,7 +201,7 @@ public class CallLogController extends BaseController {
         {
             qw.and(wq -> {
                 wq.eq(CallLog::getNote,1);
-                wq.or().isNull(CallLog::getNote);
+                wq.or().isNull(CallLog::getNote).eq(CallLog::getCallType,2);
             });
             // qw.eq(CallLog::getNote, 1).or().isNull(CallLog::getNote);
         }

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

@@ -261,8 +261,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		AND createtime <![CDATA[<=]]> DATE_ADD(CURDATE() - DAY(CURDATE()) + 1, INTERVAL 1 MONTH)
 		and isdelete=0
 		<if test="time != null and time !='' ">
-			and YEAR(create_time) = YEAR(CURRENT_DATE)
-			AND ${time}(create_time) = ${time}(CURRENT_DATE)
+			and YEAR(createtime) = YEAR(CURRENT_DATE)
+			AND ${time}(createtime) = ${time}(CURRENT_DATE)
 		</if>
 		<if test="area >0  ">
 			AND `area`= #{area}
@@ -416,7 +416,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	</select>
 	<select id="selectTelephoneData"  parameterType="String" resultMap="RecordDateViewResult">
 		select count(1) total,
-		count(note=${note} and call_type = 1 or null )	incoming,		count(note=${note} and call_type = 2
+		count(note=${note} and call_type = 1 or null )	incoming,		count(call_type = 2
 		or null )	exhalation  from rep_record
 		where 1=1
 		<if test="time != null and time !='' ">
@@ -473,8 +473,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			o.area = #{area}
 		</if>
 		<if test="time != null and time !='' ">
-			and YEAR(create_time) = YEAR(CURRENT_DATE)
-			AND ${time}(create_time) = ${time}(CURRENT_DATE)
+			and YEAR(createtime) = YEAR(CURRENT_DATE)
+			AND ${time}(createtime) = ${time}(CURRENT_DATE)
 		</if>
 		GROUP BY
 		keyword_text