Ver Código Fonte

话务,报表

duhongyu 9 meses atrás
pai
commit
6fa6259aff

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

70
         {
70
         {
71
             qw.and(wq -> {
71
             qw.and(wq -> {
72
                 wq.eq(CallLog::getNote,1);
72
                 wq.eq(CallLog::getNote,1);
73
-                wq.or().isNull(CallLog::getNote);
73
+                wq.or().isNull(CallLog::getNote).eq(CallLog::getCallType,2);
74
             });
74
             });
75
            // qw.eq(CallLog::getNote, 1).or().isNull(CallLog::getNote);
75
            // qw.eq(CallLog::getNote, 1).or().isNull(CallLog::getNote);
76
         }
76
         }
201
         {
201
         {
202
             qw.and(wq -> {
202
             qw.and(wq -> {
203
                 wq.eq(CallLog::getNote,1);
203
                 wq.eq(CallLog::getNote,1);
204
-                wq.or().isNull(CallLog::getNote);
204
+                wq.or().isNull(CallLog::getNote).eq(CallLog::getCallType,2);
205
             });
205
             });
206
             // qw.eq(CallLog::getNote, 1).or().isNull(CallLog::getNote);
206
             // qw.eq(CallLog::getNote, 1).or().isNull(CallLog::getNote);
207
         }
207
         }

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

261
 		AND createtime <![CDATA[<=]]> DATE_ADD(CURDATE() - DAY(CURDATE()) + 1, INTERVAL 1 MONTH)
261
 		AND createtime <![CDATA[<=]]> DATE_ADD(CURDATE() - DAY(CURDATE()) + 1, INTERVAL 1 MONTH)
262
 		and isdelete=0
262
 		and isdelete=0
263
 		<if test="time != null and time !='' ">
263
 		<if test="time != null and time !='' ">
264
-			and YEAR(create_time) = YEAR(CURRENT_DATE)
265
-			AND ${time}(create_time) = ${time}(CURRENT_DATE)
264
+			and YEAR(createtime) = YEAR(CURRENT_DATE)
265
+			AND ${time}(createtime) = ${time}(CURRENT_DATE)
266
 		</if>
266
 		</if>
267
 		<if test="area >0  ">
267
 		<if test="area >0  ">
268
 			AND `area`= #{area}
268
 			AND `area`= #{area}
416
 	</select>
416
 	</select>
417
 	<select id="selectTelephoneData"  parameterType="String" resultMap="RecordDateViewResult">
417
 	<select id="selectTelephoneData"  parameterType="String" resultMap="RecordDateViewResult">
418
 		select count(1) total,
418
 		select count(1) total,
419
-		count(note=${note} and call_type = 1 or null )	incoming,		count(note=${note} and call_type = 2
419
+		count(note=${note} and call_type = 1 or null )	incoming,		count(call_type = 2
420
 		or null )	exhalation  from rep_record
420
 		or null )	exhalation  from rep_record
421
 		where 1=1
421
 		where 1=1
422
 		<if test="time != null and time !='' ">
422
 		<if test="time != null and time !='' ">
473
 			o.area = #{area}
473
 			o.area = #{area}
474
 		</if>
474
 		</if>
475
 		<if test="time != null and time !='' ">
475
 		<if test="time != null and time !='' ">
476
-			and YEAR(create_time) = YEAR(CURRENT_DATE)
477
-			AND ${time}(create_time) = ${time}(CURRENT_DATE)
476
+			and YEAR(createtime) = YEAR(CURRENT_DATE)
477
+			AND ${time}(createtime) = ${time}(CURRENT_DATE)
478
 		</if>
478
 		</if>
479
 		GROUP BY
479
 		GROUP BY
480
 		keyword_text
480
 		keyword_text