Commit 9c71b838 by 涂亚平

补贴培训第2次上课熬夜改数据

1 parent 78c193ec
...@@ -26,7 +26,7 @@ import java.util.concurrent.ConcurrentHashMap; ...@@ -26,7 +26,7 @@ import java.util.concurrent.ConcurrentHashMap;
/** /**
* 企业职工线上培训 * 企业职工线上培训
*/ */
@Component //@Component
public class RenSheJuJob { public class RenSheJuJob {
...@@ -118,7 +118,7 @@ public class RenSheJuJob { ...@@ -118,7 +118,7 @@ public class RenSheJuJob {
// renSheJuService.getErrorClass(); // renSheJuService.getErrorClass();
// } // }
@Scheduled(cron = "00 50 23 * * ?") @Scheduled(cron = "0 50 23 * * ?")
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public void logout(){ public void logout(){
//让当前用户下线 //让当前用户下线
...@@ -140,7 +140,7 @@ public class RenSheJuJob { ...@@ -140,7 +140,7 @@ public class RenSheJuJob {
} }
@Scheduled(cron = "00 55 23 * * ?") @Scheduled(cron = "0 55 23 * * ?")
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public void cancelLogin() { public void cancelLogin() {
......
...@@ -10,15 +10,13 @@ import com.subsidy.vo.vod.VodPlayStateVO; ...@@ -10,15 +10,13 @@ import com.subsidy.vo.vod.VodPlayStateVO;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.annotation.Value;
import org.springframework.scheduling.annotation.Scheduled; import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
import java.io.IOException; import java.io.IOException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.HashSet;
import java.util.List; import java.util.List;
@Component //@Component
public class WarningJob { public class WarningJob {
/** /**
...@@ -61,8 +59,9 @@ public class WarningJob { ...@@ -61,8 +59,9 @@ public class WarningJob {
VodPlayStateVO vodPlayStateVO = vodPlayStateVOS.get(i + 1); //后面 VodPlayStateVO vodPlayStateVO = vodPlayStateVOS.get(i + 1); //后面
VodPlayStateVO vodPlayStateVO1 = vodPlayStateVOS.get(i); //前面 VodPlayStateVO vodPlayStateVO1 = vodPlayStateVOS.get(i); //前面
if (vodPlayStateVO1.getEndDate().getTime() > vodPlayStateVO.getStartDate().getTime()) { if (vodPlayStateVO1.getEndDate().getTime() > vodPlayStateVO.getStartDate().getTime()) {
result.add(vodPlayStateVO.getClassId()); if (!result.contains(vodPlayStateVO1.getClassId())){
break; result.add(vodPlayStateVO.getClassId());
}
} }
} }
} }
......
...@@ -216,27 +216,27 @@ public class RenSheJuServiceImpl implements RenSheJuService { ...@@ -216,27 +216,27 @@ public class RenSheJuServiceImpl implements RenSheJuService {
System.out.println(com.alibaba.fastjson.JSONObject.toJSONString(classHourBehaviorDTO)); System.out.println(com.alibaba.fastjson.JSONObject.toJSONString(classHourBehaviorDTO));
if (classHourBasics.size()>0){ if (classHourBasics.size()>0){
RequestBody body = RequestBody.create(mediaType, JSONObject.fromObject(classHourBehaviorDTO).toString()); // RequestBody body = RequestBody.create(mediaType, JSONObject.fromObject(classHourBehaviorDTO).toString());
//
Request request = new Request.Builder() // Request request = new Request.Builder()
.url(renSheConfig.getUrl() + "/import/downstream/enterprise/uploadClassHourBehavior") // .url(renSheConfig.getUrl() + "/import/downstream/enterprise/uploadClassHourBehavior")
.method("POST", body) // .method("POST", body)
.addHeader("User-Agent", "Apifox/1.0.0 (https://www.apifox.cn)") // .addHeader("User-Agent", "Apifox/1.0.0 (https://www.apifox.cn)")
.addHeader("Content-Type", "application/json") // .addHeader("Content-Type", "application/json")
.build(); // .build();
Response response = client.newCall(request).execute(); // Response response = client.newCall(request).execute();
//
RensheResponseVO rensheResponseVO = JSON.parseObject(response.body().string(), RensheResponseVO.class); // RensheResponseVO rensheResponseVO = JSON.parseObject(response.body().string(), RensheResponseVO.class);
RenshejuHistoryDO renshejuHistoryDO = new RenshejuHistoryDO(); // RenshejuHistoryDO renshejuHistoryDO = new RenshejuHistoryDO();
renshejuHistoryDO.setInterfaceName(RenSheJuConstant.POST_3); // renshejuHistoryDO.setInterfaceName(RenSheJuConstant.POST_3);
renshejuHistoryDO.setInputParam(JSONObject.fromObject(classHourBehaviorDTO).toString()); // renshejuHistoryDO.setInputParam(JSONObject.fromObject(classHourBehaviorDTO).toString());
if (200 == response.code()) { // if (200 == response.code()) {
renshejuHistoryDO.setOutputParam(rensheResponseVO.getCtt().toString()); // renshejuHistoryDO.setOutputParam(rensheResponseVO.getCtt().toString());
} else { // } else {
renshejuHistoryDO.setOutputParam(RenSheJuConstant.API_ERROR); // renshejuHistoryDO.setOutputParam(RenSheJuConstant.API_ERROR);
} // }
renshejuHistoryMapper.insert(renshejuHistoryDO); // renshejuHistoryMapper.insert(renshejuHistoryDO);
return rensheResponseVO; // return rensheResponseVO;
}else { }else {
RenshejuHistoryDO renshejuHistoryDO = new RenshejuHistoryDO(); RenshejuHistoryDO renshejuHistoryDO = new RenshejuHistoryDO();
renshejuHistoryDO.setInterfaceName(RenSheJuConstant.POST_3); renshejuHistoryDO.setInterfaceName(RenSheJuConstant.POST_3);
......
...@@ -695,18 +695,9 @@ public class VodPlayHistoryServiceImpl extends ServiceImpl<VodPlayHistoryMapper, ...@@ -695,18 +695,9 @@ public class VodPlayHistoryServiceImpl extends ServiceImpl<VodPlayHistoryMapper,
result.add(vodPlayStateVO.getClassId()); result.add(vodPlayStateVO.getClassId());
} }
} }
break;
} }
} }
} }
//
// StringBuffer stringBuffer = new StringBuffer();
// for (int i = 0; i < result.size(); i++) {
// stringBuffer.append(result);
// if (i == result.size()-1){
// stringBuffer.append("n");
// }
// }
if (result.size()>0){ if (result.size()>0){
List<String> telephones = Arrays.asList(new String[]{"15201936167", "18201963812", "18217669021"}); List<String> telephones = Arrays.asList(new String[]{"15201936167", "18201963812", "18217669021"});
......
...@@ -256,7 +256,7 @@ ...@@ -256,7 +256,7 @@
FROM FROM
vod_play_history t1 vod_play_history t1
WHERE WHERE
DATE_FORMAT( DATE_ADD( t1.create_date,interval 0 day), '%Y-%m-%d' ) = DATE_FORMAT( NOW(), '%Y-%m-%d' ) DATE_FORMAT( DATE_ADD( t1.create_date,interval 1 day), '%Y-%m-%d' ) = DATE_FORMAT( NOW(), '%Y-%m-%d' )
AND t1.delete_date IS NULL AND t1.delete_date IS NULL
</select> </select>
......
...@@ -93,7 +93,7 @@ ...@@ -93,7 +93,7 @@
SELECT SELECT
t.member_id, t.member_id,
t.vod_id, t.vod_id,
max( t.create_date ) AS create_date max( t.id ) AS id
FROM FROM
vod_play_history t vod_play_history t
WHERE WHERE
...@@ -105,9 +105,7 @@ ...@@ -105,9 +105,7 @@
t.vod_id, t.vod_id,
t.class_id t.class_id
) t ) t
LEFT JOIN vod_play_history t2 ON t.vod_id = t2.vod_id LEFT JOIN vod_play_history t2 ON t.id = t2.id
AND t.member_id = t2.member_id
AND t.create_date = t2.create_date
) t4 ON t2.vod_id = t4.vod_id ) t4 ON t2.vod_id = t4.vod_id
WHERE WHERE
t.delete_date IS NULL t.delete_date IS NULL
......
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
FROM FROM
vod_play_history t vod_play_history t
WHERE WHERE
DATE_FORMAT( DATE_ADD( t.create_date,interval 0 day), '%Y-%m-%d' ) = DATE_FORMAT( NOW(), '%Y-%m-%d' ) DATE_FORMAT( DATE_ADD( t.create_date,interval 1 day), '%Y-%m-%d' ) = DATE_FORMAT( NOW(), '%Y-%m-%d' )
AND t.delete_date IS NULL AND t.delete_date IS NULL
) t2 ON t.id = t2.class_id ) t2 ON t.id = t2.class_id
LEFT JOIN company_dict t3 ON t.company_id = t3.id LEFT JOIN company_dict t3 ON t.company_id = t3.id
...@@ -43,7 +43,7 @@ ...@@ -43,7 +43,7 @@
FROM FROM
exercise_done_result t exercise_done_result t
WHERE WHERE
DATE_FORMAT( DATE_ADD( t.create_date,interval 0 day), '%Y-%m-%d' ) = DATE_FORMAT( NOW(), '%Y-%m-%d' ) DATE_FORMAT( DATE_ADD( t.create_date,interval 1 day), '%Y-%m-%d' ) = DATE_FORMAT( NOW(), '%Y-%m-%d' )
AND t.delete_date IS NULL AND t.delete_date IS NULL
) t2 ON t.id = t2.class_id ) t2 ON t.id = t2.class_id
LEFT JOIN company_dict t3 ON t.company_id = t3.id LEFT JOIN company_dict t3 ON t.company_id = t3.id
...@@ -64,7 +64,7 @@ ...@@ -64,7 +64,7 @@
FROM FROM
answering_question t answering_question t
WHERE WHERE
DATE_FORMAT( DATE_ADD( t.create_date,interval 0 day), '%Y-%m-%d' ) = DATE_FORMAT( NOW(), '%Y-%m-%d' ) DATE_FORMAT( DATE_ADD( t.create_date,interval 1 day), '%Y-%m-%d' ) = DATE_FORMAT( NOW(), '%Y-%m-%d' )
AND t.delete_date IS NULL AND t.delete_date IS NULL
) t2 ON t.id = t2.class_id ) t2 ON t.id = t2.class_id
LEFT JOIN company_dict t3 ON t.company_id = t3.id LEFT JOIN company_dict t3 ON t.company_id = t3.id
...@@ -85,7 +85,7 @@ ...@@ -85,7 +85,7 @@
FROM FROM
image_check_record t image_check_record t
WHERE WHERE
DATE_FORMAT( DATE_ADD( t.create_date,interval 0 day), '%Y-%m-%d' ) = DATE_FORMAT( NOW(), '%Y-%m-%d' ) DATE_FORMAT( DATE_ADD( t.create_date,interval 1 day), '%Y-%m-%d' ) = DATE_FORMAT( NOW(), '%Y-%m-%d' )
AND t.delete_date IS NULL AND t.delete_date IS NULL
AND t.result = 1 AND t.result = 1
) t2 ON t.id = t2.class_id ) t2 ON t.id = t2.class_id
...@@ -117,7 +117,7 @@ ...@@ -117,7 +117,7 @@
FROM FROM
vod_play_history t1 vod_play_history t1
WHERE WHERE
DATE_FORMAT( DATE_ADD( t1.create_date,interval 0 day), '%Y-%m-%d' ) = DATE_FORMAT( NOW(), '%Y-%m-%d' ) DATE_FORMAT( DATE_ADD( t1.create_date,interval 1 day), '%Y-%m-%d' ) = DATE_FORMAT( NOW(), '%Y-%m-%d' )
AND AND
t1.delete_date IS NULL t1.delete_date IS NULL
GROUP BY GROUP BY
...@@ -140,7 +140,7 @@ ...@@ -140,7 +140,7 @@
FROM FROM
opr_mem_dict t1 opr_mem_dict t1
WHERE WHERE
DATE_FORMAT( DATE_ADD( t1.create_date,interval 0 day), '%Y-%m-%d' ) = DATE_FORMAT( NOW(), '%Y-%m-%d' ) DATE_FORMAT( DATE_ADD( t1.create_date,interval 1 day), '%Y-%m-%d' ) = DATE_FORMAT( NOW(), '%Y-%m-%d' )
AND AND
t1.delete_date IS NULL t1.delete_date IS NULL
AND opr_type = "登出" AND opr_type = "登出"
...@@ -155,7 +155,7 @@ ...@@ -155,7 +155,7 @@
FROM FROM
opr_mem_dict t1 opr_mem_dict t1
WHERE WHERE
DATE_FORMAT( DATE_ADD( t1.create_date,interval 0 day), '%Y-%m-%d' ) = DATE_FORMAT( NOW(), '%Y-%m-%d' ) DATE_FORMAT( DATE_ADD( t1.create_date,interval 1 day), '%Y-%m-%d' ) = DATE_FORMAT( NOW(), '%Y-%m-%d' )
AND AND
t1.delete_date IS NULL t1.delete_date IS NULL
AND opr_type = "登录" AND opr_type = "登录"
...@@ -179,7 +179,7 @@ ...@@ -179,7 +179,7 @@
WHERE WHERE
t1.delete_date IS NULL t1.delete_date IS NULL
AND t2.class_type = #{classType} AND t2.class_type = #{classType}
AND DATE_FORMAT( DATE_ADD( t1.create_date,interval 0 day), '%Y-%m-%d' ) = DATE_FORMAT( AND DATE_FORMAT( DATE_ADD( t1.create_date,interval 1 day), '%Y-%m-%d' ) = DATE_FORMAT(
NOW(), NOW(),
'%Y-%m-%d' '%Y-%m-%d'
) )
...@@ -200,7 +200,7 @@ ...@@ -200,7 +200,7 @@
LEFT JOIN member t3 ON t1.ask_id = t3.id LEFT JOIN member t3 ON t1.ask_id = t3.id
LEFT JOIN company_dict t4 ON t2.company_id = t4.id LEFT JOIN company_dict t4 ON t2.company_id = t4.id
WHERE WHERE
DATE_FORMAT( DATE_ADD( t1.update_date,interval 0 day), '%Y-%m-%d' ) = DATE_FORMAT( NOW(), '%Y-%m-%d' ) DATE_FORMAT( DATE_ADD( t1.update_date,interval 1 day), '%Y-%m-%d' ) = DATE_FORMAT( NOW(), '%Y-%m-%d' )
AND AND
t1.delete_date IS NULL t1.delete_date IS NULL
AND t2.delete_date IS NULL AND t2.delete_date IS NULL
...@@ -216,7 +216,7 @@ ...@@ -216,7 +216,7 @@
class_dict t1 class_dict t1
LEFT JOIN company_dict t3 ON t1.company_id = t3.id LEFT JOIN company_dict t3 ON t1.company_id = t3.id
WHERE WHERE
DATE_FORMAT( DATE_ADD( t1.create_date,interval 0 day), '%Y-%m-%d' ) = DATE_FORMAT( NOW(), '%Y-%m-%d' ) DATE_FORMAT( DATE_ADD( t1.create_date,interval 1 day), '%Y-%m-%d' ) = DATE_FORMAT( NOW(), '%Y-%m-%d' )
AND t1.delete_date IS NULL AND t1.delete_date IS NULL
and t1.class_code is not NULL and t1.class_code is not NULL
<if test="classType != null and classType != ''"> <if test="classType != null and classType != ''">
......
...@@ -70,7 +70,7 @@ ...@@ -70,7 +70,7 @@
FROM FROM
opr_adm_dict opr_adm_dict
WHERE WHERE
create_date &lt; (NOW() -interval 0 day) create_date &lt; (NOW() -interval 1 day)
</select> </select>
</mapper> </mapper>
...@@ -52,7 +52,7 @@ ...@@ -52,7 +52,7 @@
FROM FROM
opr_mem_dict opr_mem_dict
WHERE WHERE
create_date &lt; (NOW() -interval 0 day) create_date &lt; (NOW() -interval 1 day)
</select> </select>
<select id="getLatestLoginInfo" parameterType="long" resultType="com.subsidy.model.OprMemDictDO"> <select id="getLatestLoginInfo" parameterType="long" resultType="com.subsidy.model.OprMemDictDO">
...@@ -148,62 +148,69 @@ ...@@ -148,62 +148,69 @@
</select> </select>
<select id="insertLastStudyRecord" resultType="com.subsidy.vo.opr.InsertLastStudyRecordVO"> <select id="insertLastStudyRecord" resultType="com.subsidy.vo.opr.InsertLastStudyRecordVO">
SELECT SELECT
t1.member_id, t1.member_id,
t1.sign_in_date, t1.sign_in_date,
t1.ip_address, t1.ip_address,
DATE_ADD(t2.mt,INTERVAL FLOOR(RAND()*100) SECOND) as mt DATE_ADD(t2.mt,INTERVAL FLOOR(RAND()*100) SECOND) as mt
FROM FROM
( (
SELECT DISTINCT SELECT DISTINCT
t.sign_in_date, t.sign_in_date,
t.member_id, t.member_id,
t.ip_address t.ip_address
FROM FROM
sign_in_record t sign_in_record t
WHERE WHERE
t.delete_date IS NULL t.delete_date IS NULL
AND DATE_FORMAT( t.sign_in_date, '%Y-%m-%d' ) = DATE_FORMAT( now(), '%Y-%m-%d' )) t1 AND DATE_FORMAT( t.sign_in_date, '%Y-%m-%d' ) = DATE_FORMAT( now(), '%Y-%m-%d' )) t1
LEFT JOIN ( LEFT JOIN (
SELECT SELECT
t1.member_id, t1.member_id,
max( t1.maxtime ) AS mt max( t1.maxtime ) AS mt
FROM FROM
( (
SELECT SELECT
member_id, member_id,
max( create_date ) AS maxtime max( create_date ) AS maxtime
FROM FROM
vod_play_history vod_play_history
WHERE WHERE
delete_date IS NULL delete_date IS NULL
AND DATE_FORMAT( create_date, '%Y-%m-%d' ) = DATE_FORMAT( now(), '%Y-%m-%d' ) AND DATE_FORMAT( create_date, '%Y-%m-%d' ) = DATE_FORMAT( now(), '%Y-%m-%d' )
GROUP BY GROUP BY
member_id UNION ALL member_id UNION ALL
SELECT SELECT
member_id, member_id,
max( create_date ) AS maxtime max( create_date ) AS maxtime
FROM FROM
exercise_done_result exercise_done_result
WHERE WHERE
delete_date IS NULL delete_date IS NULL
AND DATE_FORMAT( create_date, '%Y-%m-%d' ) = DATE_FORMAT( now(), '%Y-%m-%d' ) AND DATE_FORMAT( create_date, '%Y-%m-%d' ) = DATE_FORMAT( now(), '%Y-%m-%d' )
GROUP BY GROUP BY
member_id UNION ALL member_id UNION ALL
SELECT SELECT
ask_id, ask_id,
max( create_date ) AS maxtime max( create_date ) AS maxtime
FROM FROM
answering_question answering_question
WHERE WHERE
delete_date IS NULL delete_date IS NULL
AND DATE_FORMAT( create_date, '%Y-%m-%d' ) = DATE_FORMAT( now(), '%Y-%m-%d' ) AND DATE_FORMAT( create_date, '%Y-%m-%d' ) = DATE_FORMAT( now(), '%Y-%m-%d' )
GROUP BY GROUP BY
ask_id ask_id UNION ALL
) t1 SELECT member_id,
GROUP BY max( create_date ) AS maxtime
t1.member_id from
) t2 ON t1.member_id = t2.member_id activity_detection
where delete_date is null
and DATE_FORMAT( create_date, '%Y-%m-%d' ) = DATE_FORMAT( now(), '%Y-%m-%d' )
GROUP BY member_id
) t1
GROUP BY
t1.member_id
) t2 ON t1.member_id = t2.member_id
</select> </select>
<select id="shutdownUser" resultType="long"> <select id="shutdownUser" resultType="long">
......
...@@ -95,7 +95,7 @@ ...@@ -95,7 +95,7 @@
FROM FROM
class_dict t1 class_dict t1
WHERE WHERE
DATE_FORMAT( DATE_ADD( t1.create_date,interval 0 day), '%Y-%m-%d' ) = DATE_FORMAT( NOW(), '%Y-%m-%d' ) DATE_FORMAT( DATE_ADD( t1.create_date,interval 1 day), '%Y-%m-%d' ) = DATE_FORMAT( NOW(), '%Y-%m-%d' )
AND t1.delete_date IS NULL AND t1.delete_date IS NULL
and t1.class_code is not NULL and t1.class_code is not NULL
<if test="classType != null and classType != ''"> <if test="classType != null and classType != ''">
...@@ -105,66 +105,68 @@ ...@@ -105,66 +105,68 @@
<select id="dailyStudyInfo" resultType="com.subsidy.vo.renshe.DailyStudyInfoVO"> <select id="dailyStudyInfo" resultType="com.subsidy.vo.renshe.DailyStudyInfoVO">
SELECT SELECT
t2.class_id as downCode, t2.class_id AS downCode,
t2.member_id, t2.member_id,
t4.user_name as studentName, t4.user_name AS studentName,
t4.telephone as phone, t4.telephone AS phone,
t4.id_card as identity, t4.id_card AS identity,
t2.learnTime, t2.learnTime,
t2.playTime, t2.playTime,
t5.loginTime t5.loginTime
FROM FROM
( (
SELECT SELECT
t1.class_id, t3.user_id,
t1.member_id, login - logout AS loginTime
sum( t1.play_length ) AS learnTime, FROM
sum( t1.play_length + t1.suspend_length ) AS playTime (
FROM SELECT
vod_play_history t1 user_id,
WHERE sum(
DATE_FORMAT( DATE_ADD( t1.create_date,interval 0 day), '%Y-%m-%d' ) = DATE_FORMAT( NOW(), '%Y-%m-%d' ) unix_timestamp( t1.create_date )) AS login
AND t1.delete_date IS NULL FROM
GROUP BY opr_mem_dict t1
t1.class_id, WHERE
t1.member_id DATE_FORMAT( DATE_ADD( t1.create_date, INTERVAL 1 DAY ), '%Y-%m-%d' ) = DATE_FORMAT( NOW(), '%Y-%m-%d' )
) t2 AND t1.delete_date IS NULL
LEFT JOIN class_dict t3 ON t2.class_id = t3.id AND opr_type = "登出"
LEFT JOIN member t4 ON t2.member_id = t4.id AND result = 1
LEFT JOIN ( GROUP BY
SELECT user_id
t3.user_id, ) t3
login - logout AS loginTime LEFT JOIN (
FROM SELECT
( user_id,
SELECT sum(
user_id, unix_timestamp( t1.create_date )) AS logout
sum( FROM
unix_timestamp( t1.create_date )) AS login opr_mem_dict t1
FROM WHERE
opr_mem_dict t1 DATE_FORMAT( DATE_ADD( t1.create_date, INTERVAL 1 DAY ), '%Y-%m-%d' ) = DATE_FORMAT( NOW(), '%Y-%m-%d' )
WHERE AND t1.delete_date IS NULL
DATE_FORMAT( DATE_ADD( t1.create_date,interval 0 day), '%Y-%m-%d' ) = DATE_FORMAT( NOW(), '%Y-%m-%d' ) AND opr_type = "登录"
AND t1.delete_date IS NULL AND result = 1
AND opr_type = "登出" GROUP BY
AND result = 1 user_id
GROUP BY user_id ) t2 ON t3.user_id = t2.user_id
) t3 ) t5
LEFT JOIN ( LEFT JOIN (
SELECT SELECT
user_id, t1.class_id,
sum( t1.member_id,
unix_timestamp( t1.create_date )) AS logout sum( t1.play_length ) AS learnTime,
FROM sum( t1.play_length + t1.suspend_length ) AS playTime
opr_mem_dict t1 FROM
WHERE vod_play_history t1
DATE_FORMAT( DATE_ADD( t1.create_date,interval 0 day), '%Y-%m-%d' ) = DATE_FORMAT( NOW(), '%Y-%m-%d' ) WHERE
AND t1.delete_date IS NULL DATE_FORMAT( DATE_ADD( t1.create_date, INTERVAL 1 DAY ), '%Y-%m-%d' ) = DATE_FORMAT( NOW(), '%Y-%m-%d' )
AND opr_type = "登录" AND t1.delete_date IS NULL
AND result = 1 GROUP BY
GROUP BY user_id t1.class_id,
) t2 ON t3.user_id = t2.user_id t1.member_id
) t5 ON t4.id = t5.user_id ) t2 ON t5.user_id = t2.member_id
LEFT JOIN class_dict t3 ON t2.class_id = t3.id
LEFT JOIN member t4 ON t2.member_id = t4.id
<if test="classType != null and classType != ''"> <if test="classType != null and classType != ''">
where t3.class_type = #{classType} where t3.class_type = #{classType}
</if> </if>
...@@ -179,7 +181,7 @@ ...@@ -179,7 +181,7 @@
FROM FROM
activity_detection t1 activity_detection t1
WHERE WHERE
DATE_FORMAT( DATE_ADD( t1.create_date,interval 0 day), '%Y-%m-%d' ) = DATE_FORMAT( NOW(), '%Y-%m-%d' ) DATE_FORMAT( DATE_ADD( t1.create_date,interval 1 day), '%Y-%m-%d' ) = DATE_FORMAT( NOW(), '%Y-%m-%d' )
AND AND
t1.delete_date IS NULL t1.delete_date IS NULL
AND t1.member_id = #{memberId} AND t1.member_id = #{memberId}
...@@ -194,7 +196,7 @@ ...@@ -194,7 +196,7 @@
image_check_record t1 image_check_record t1
WHERE WHERE
class_id =#{classId} class_id =#{classId}
AND DATE_FORMAT( DATE_ADD( t1.create_date,interval 0 day), '%Y-%m-%d' ) = DATE_FORMAT( NOW(), '%Y-%m-%d' ) AND DATE_FORMAT( DATE_ADD( t1.create_date,interval 1 day), '%Y-%m-%d' ) = DATE_FORMAT( NOW(), '%Y-%m-%d' )
AND t1.paper_id IS NOT NULL AND t1.paper_id IS NOT NULL
and t1.result =1 and t1.result =1
AND t1.member_id=#{memberId} AND t1.member_id=#{memberId}
...@@ -212,7 +214,7 @@ ...@@ -212,7 +214,7 @@
FROM FROM
opr_mem_dict t1 opr_mem_dict t1
WHERE WHERE
DATE_FORMAT( DATE_ADD( t1.create_date,interval 0 day), '%Y-%m-%d' ) = DATE_FORMAT( NOW(), '%Y-%m-%d' ) DATE_FORMAT( DATE_ADD( t1.create_date,interval 1 day), '%Y-%m-%d' ) = DATE_FORMAT( NOW(), '%Y-%m-%d' )
AND t1.delete_date IS NULL AND t1.delete_date IS NULL
AND t1.user_id = #{memberId} AND t1.user_id = #{memberId}
AND opr_type = "登出" AND opr_type = "登出"
...@@ -226,7 +228,7 @@ ...@@ -226,7 +228,7 @@
FROM FROM
opr_mem_dict t1 opr_mem_dict t1
WHERE WHERE
DATE_FORMAT( DATE_ADD( t1.create_date,interval 0 day), '%Y-%m-%d' ) = DATE_FORMAT( NOW(), '%Y-%m-%d' ) DATE_FORMAT( DATE_ADD( t1.create_date,interval 1 day), '%Y-%m-%d' ) = DATE_FORMAT( NOW(), '%Y-%m-%d' )
AND t1.delete_date IS NULL AND t1.delete_date IS NULL
AND t1.user_id = #{memberId} AND t1.user_id = #{memberId}
AND opr_type = "登录" AND opr_type = "登录"
...@@ -244,7 +246,7 @@ ...@@ -244,7 +246,7 @@
AND t.result = 1 AND t.result = 1
AND t.delete_date IS NULL AND t.delete_date IS NULL
AND opr_type = "登录" AND opr_type = "登录"
AND DATE_FORMAT( DATE_ADD( create_date,interval 0 day), '%Y-%m-%d' ) = DATE_FORMAT( AND DATE_FORMAT( DATE_ADD( create_date,interval 1 day), '%Y-%m-%d' ) = DATE_FORMAT(
NOW(), NOW(),
'%Y-%m-%d' '%Y-%m-%d'
) )
...@@ -261,7 +263,7 @@ ...@@ -261,7 +263,7 @@
AND t.result = 1 AND t.result = 1
AND t.delete_date IS NULL AND t.delete_date IS NULL
AND opr_type = "登出" AND opr_type = "登出"
AND DATE_FORMAT( DATE_ADD( create_date,interval 0 day), '%Y-%m-%d' ) = DATE_FORMAT( AND DATE_FORMAT( DATE_ADD( create_date,interval 1 day), '%Y-%m-%d' ) = DATE_FORMAT(
NOW(), NOW(),
'%Y-%m-%d' '%Y-%m-%d'
) )
...@@ -295,7 +297,7 @@ ...@@ -295,7 +297,7 @@
WHERE WHERE
t1.delete_date IS NULL t1.delete_date IS NULL
AND t2.class_type = #{classType} AND t2.class_type = #{classType}
AND DATE_FORMAT( DATE_ADD( t1.create_date,interval 0 day), '%Y-%m-%d' ) = DATE_FORMAT( AND DATE_FORMAT( DATE_ADD( t1.create_date,interval 1 day), '%Y-%m-%d' ) = DATE_FORMAT(
NOW(), NOW(),
'%Y-%m-%d' '%Y-%m-%d'
) )
...@@ -312,7 +314,7 @@ ...@@ -312,7 +314,7 @@
LEFT JOIN member t2 ON t1.member_id = t2.id LEFT JOIN member t2 ON t1.member_id = t2.id
WHERE WHERE
t1.delete_date IS NULL t1.delete_date IS NULL
AND DATE_FORMAT( DATE_ADD( t1.create_date,interval 0 day), '%Y-%m-%d' ) = DATE_FORMAT( NOW(), '%Y-%m-%d' ) AND DATE_FORMAT( DATE_ADD( t1.create_date,interval 1 day), '%Y-%m-%d' ) = DATE_FORMAT( NOW(), '%Y-%m-%d' )
and class_id = #{classId} and class_id = #{classId}
</select> </select>
...@@ -346,7 +348,7 @@ ...@@ -346,7 +348,7 @@
exercise_done_result t1 exercise_done_result t1
WHERE WHERE
t1.delete_date IS NULL t1.delete_date IS NULL
AND DATE_FORMAT( DATE_ADD( t1.create_date,interval 0 day), '%Y-%m-%d' ) = DATE_FORMAT( NOW(), '%Y-%m-%d' ) AND DATE_FORMAT( DATE_ADD( t1.create_date,interval 1 day), '%Y-%m-%d' ) = DATE_FORMAT( NOW(), '%Y-%m-%d' )
AND class_id = #{classId} AND class_id = #{classId}
AND member_id = #{memberId} AND member_id = #{memberId}
</select> </select>
...@@ -377,7 +379,7 @@ ...@@ -377,7 +379,7 @@
LEFT JOIN class_dict t2 ON t1.class_id = t2.id LEFT JOIN class_dict t2 ON t1.class_id = t2.id
LEFT JOIN member t3 ON t1.ask_id = t3.id LEFT JOIN member t3 ON t1.ask_id = t3.id
WHERE WHERE
DATE_FORMAT( DATE_ADD( t1.update_date,interval 0 day), '%Y-%m-%d' ) = DATE_FORMAT( NOW(), '%Y-%m-%d' ) DATE_FORMAT( DATE_ADD( t1.update_date,interval 1 day), '%Y-%m-%d' ) = DATE_FORMAT( NOW(), '%Y-%m-%d' )
AND t1.delete_date IS NULL AND t1.delete_date IS NULL
AND t2.delete_date IS NULL AND t2.delete_date IS NULL
AND t3.delete_date IS NULL AND t3.delete_date IS NULL
...@@ -392,7 +394,7 @@ ...@@ -392,7 +394,7 @@
left join class_dict t2 on t.class_id = t2.id left join class_dict t2 on t.class_id = t2.id
WHERE WHERE
t.delete_date IS NULL t.delete_date IS NULL
AND DATE_FORMAT( DATE_ADD( t.create_date,interval 0 day), '%Y-%m-%d' ) = DATE_FORMAT( AND DATE_FORMAT( DATE_ADD( t.create_date,interval 1 day), '%Y-%m-%d' ) = DATE_FORMAT(
NOW(), NOW(),
'%Y-%m-%d' '%Y-%m-%d'
) )
...@@ -418,7 +420,7 @@ ...@@ -418,7 +420,7 @@
class_id = #{classId} class_id = #{classId}
AND t1.delete_date IS NULL AND t1.delete_date IS NULL
and t2.delete_date is null and t2.delete_date is null
AND DATE_FORMAT( DATE_ADD( t1.update_date,interval 0 day), '%Y-%m-%d' ) = DATE_FORMAT( AND DATE_FORMAT( DATE_ADD( t1.update_date,interval 1 day), '%Y-%m-%d' ) = DATE_FORMAT(
NOW(), NOW(),
'%Y-%m-%d' '%Y-%m-%d'
) )
...@@ -437,7 +439,7 @@ ...@@ -437,7 +439,7 @@
LEFT JOIN member t2 ON t1.member_id = t2.id LEFT JOIN member t2 ON t1.member_id = t2.id
WHERE WHERE
class_id = #{classId} class_id = #{classId}
AND DATE_FORMAT( DATE_ADD( t1.create_date,interval 0 day), '%Y-%m-%d' ) = DATE_FORMAT( NOW(), '%Y-%m-%d' ) AND DATE_FORMAT( DATE_ADD( t1.create_date,interval 1 day), '%Y-%m-%d' ) = DATE_FORMAT( NOW(), '%Y-%m-%d' )
AND t1.paper_id IS NOT NULL AND t1.paper_id IS NOT NULL
AND t1.result = 1 AND t1.result = 1
</select> </select>
...@@ -457,7 +459,7 @@ ...@@ -457,7 +459,7 @@
WHERE WHERE
t1.delete_date is null t1.delete_date is null
and class_id = #{classId} and class_id = #{classId}
AND DATE_FORMAT( DATE_ADD( t1.create_date,interval 0 day), '%Y-%m-%d' ) = DATE_FORMAT( NOW(), '%Y-%m-%d' ) AND DATE_FORMAT( DATE_ADD( t1.create_date,interval 1 day), '%Y-%m-%d' ) = DATE_FORMAT( NOW(), '%Y-%m-%d' )
AND t1.paper_id IS NULL AND t1.paper_id IS NULL
AND t1.result = 1 AND t1.result = 1
and t1.member_id and t1.member_id
...@@ -480,7 +482,7 @@ ...@@ -480,7 +482,7 @@
LEFT JOIN member t2 ON t1.member_id = t2.id LEFT JOIN member t2 ON t1.member_id = t2.id
WHERE WHERE
t1.delete_date is null t1.delete_date is null
AND DATE_FORMAT( DATE_ADD( t1.create_date,interval 0 day), '%Y-%m-%d' ) = DATE_FORMAT( NOW(), '%Y-%m-%d' ) AND DATE_FORMAT( DATE_ADD( t1.create_date,interval 1 day), '%Y-%m-%d' ) = DATE_FORMAT( NOW(), '%Y-%m-%d' )
and class_id = #{classId} and class_id = #{classId}
AND t1.paper_id IS not NULL AND t1.paper_id IS not NULL
AND t1.result = 1 AND t1.result = 1
...@@ -500,7 +502,7 @@ ...@@ -500,7 +502,7 @@
FROM FROM
vod_play_history t vod_play_history t
WHERE WHERE
DATE_FORMAT( DATE_ADD( t.create_date,interval 0 day), '%Y-%m-%d' ) = DATE_FORMAT( NOW(), '%Y-%m-%d' ) DATE_FORMAT( DATE_ADD( t.create_date,interval 1 day), '%Y-%m-%d' ) = DATE_FORMAT( NOW(), '%Y-%m-%d' )
AND t.delete_date IS NULL AND t.delete_date IS NULL
) t2 ON t.id = t2.class_id ) t2 ON t.id = t2.class_id
WHERE WHERE
...@@ -519,7 +521,7 @@ ...@@ -519,7 +521,7 @@
FROM FROM
exercise_done_result t exercise_done_result t
WHERE WHERE
DATE_FORMAT( DATE_ADD( t.create_date,interval 0 day), '%Y-%m-%d' ) = DATE_FORMAT( NOW(), '%Y-%m-%d' ) DATE_FORMAT( DATE_ADD( t.create_date,interval 1 day), '%Y-%m-%d' ) = DATE_FORMAT( NOW(), '%Y-%m-%d' )
AND t.delete_date IS NULL AND t.delete_date IS NULL
) t2 ON t.id = t2.class_id ) t2 ON t.id = t2.class_id
WHERE WHERE
...@@ -538,7 +540,7 @@ ...@@ -538,7 +540,7 @@
FROM FROM
answering_question t answering_question t
WHERE WHERE
DATE_FORMAT( DATE_ADD( t.create_date,interval 0 day), '%Y-%m-%d' ) = DATE_FORMAT( NOW(), '%Y-%m-%d' ) DATE_FORMAT( DATE_ADD( t.create_date,interval 1 day), '%Y-%m-%d' ) = DATE_FORMAT( NOW(), '%Y-%m-%d' )
AND t.delete_date IS NULL AND t.delete_date IS NULL
) t2 ON t.id = t2.class_id ) t2 ON t.id = t2.class_id
WHERE WHERE
...@@ -557,7 +559,7 @@ ...@@ -557,7 +559,7 @@
FROM FROM
image_check_record t image_check_record t
WHERE WHERE
DATE_FORMAT( DATE_ADD( t.create_date,interval 0 day), '%Y-%m-%d' ) = DATE_FORMAT( NOW(), '%Y-%m-%d' ) DATE_FORMAT( DATE_ADD( t.create_date,interval 1 day), '%Y-%m-%d' ) = DATE_FORMAT( NOW(), '%Y-%m-%d' )
AND t.delete_date IS NULL AND t.delete_date IS NULL
AND t.result = 1 AND t.result = 1
) t2 ON t.id = t2.class_id ) t2 ON t.id = t2.class_id
......
...@@ -55,7 +55,7 @@ ...@@ -55,7 +55,7 @@
delete_date IS NULL delete_date IS NULL
AND date(sign_in_date) = date_sub( AND date(sign_in_date) = date_sub(
curdate(), curdate(),
interval 0 day) interval 1 day)
</select> </select>
</mapper> </mapper>
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!