zhangjinli 3 years ago
parent 4497e93d21
commit 1b8ac0dfda

@ -382,7 +382,7 @@ public class TaskController {
@PostMapping("taskEffect") @PostMapping("taskEffect")
@AdminTokenValid @AdminTokenValid
public Result taskEffect(@Validated @RequestBody DetTaskParam param) { public Result taskEffect(@Validated @RequestBody DetTaskParam param) {
List<Map> maps = taskService.taskEffectData(new QueryWrapper<>()); List<Map> maps = taskService.taskEffectData(new QueryWrapper<Task>().eq("t2.id",param.getId()));
JSONObject obj = new JSONObject(); JSONObject obj = new JSONObject();
obj.put("taskEffect",maps.get(0)); obj.put("taskEffect",maps.get(0));
if(maps!=null) { if(maps!=null) {
@ -409,7 +409,7 @@ public class TaskController {
@AdminTokenValid @AdminTokenValid
public Result taskUserEffect(@Validated @RequestBody TaskUserParam param) { public Result taskUserEffect(@Validated @RequestBody TaskUserParam param) {
QueryWrapper<Task> qw = new QueryWrapper<>(); QueryWrapper<Task> qw = new QueryWrapper<>();
qw.eq("t1.userId",param.getUserId()).groupBy("t1.userId"); qw.eq("t2.id",param.getId()).eq("t1.userId",param.getUserId()).groupBy("t1.userId");
JSONObject taskEffect = taskService.taskEffect(qw); JSONObject taskEffect = taskService.taskEffect(qw);
if(taskEffect!=null) { if(taskEffect!=null) {
QueryWrapper<Video> qw2 = new QueryWrapper<>(); QueryWrapper<Video> qw2 = new QueryWrapper<>();

@ -65,7 +65,7 @@ public interface TaskMapper extends BaseMapper<Task> {
@Select("SELECT SUM(t1.playNum) as playNumSum,SUM(t1.commendNum) as commendNumSum,\n" + @Select("SELECT SUM(t1.playNum) as playNumSum,SUM(t1.commendNum) as commendNumSum,\n" +
"SUM(t1.collectionNum) as collectionNumSum,SUM(t1.commentNum) as commentNumSum,\n" + "SUM(t1.collectionNum) as collectionNumSum,SUM(t1.commentNum) as commentNumSum,\n" +
"SUM(t1.reSendNum) as reSendNumSum,SUM(t1.recommendNum) as recommendNumSum,SUM(t1.effectResult) as effectResultSum,t1.userId,\n" + "SUM(t1.reSendNum) as reSendNumSum,SUM(t1.recommendNum) as recommendNumSum,SUM(t1.effectResult) as effectResultSum,t1.userId,\n" +
"t2.title as taskTitle from video as t1 INNER JOIN task as t2 on t2.id = 31 and t2.id = t1.taskId\n" + "t2.title as taskTitle from video as t1 INNER JOIN task as t2 on t2.id = t1.taskId\n" +
"LEFT JOIN user as t3 on t1.userId = t3.id\n" + "LEFT JOIN user as t3 on t1.userId = t3.id\n" +
"LEFT JOIN qywxDepartment as t4 on t3.main_department = t4.departmentId " + "LEFT JOIN qywxDepartment as t4 on t3.main_department = t4.departmentId " +
"${ew.customSqlSegment}") "${ew.customSqlSegment}")
@ -74,7 +74,7 @@ public interface TaskMapper extends BaseMapper<Task> {
@Select("SELECT SUM(t1.playNum) as playNumSum,SUM(t1.commendNum) as commendNumSum,\n" + @Select("SELECT SUM(t1.playNum) as playNumSum,SUM(t1.commendNum) as commendNumSum,\n" +
"SUM(t1.collectionNum) as collectionNumSum,SUM(t1.commentNum) as commentNumSum,\n" + "SUM(t1.collectionNum) as collectionNumSum,SUM(t1.commentNum) as commentNumSum,\n" +
"SUM(t1.reSendNum) as reSendNumSum,SUM(t1.recommendNum) as recommendNumSum,SUM(t1.effectResult) as effectResultSum,t1.userId,\n" + "SUM(t1.reSendNum) as reSendNumSum,SUM(t1.recommendNum) as recommendNumSum,SUM(t1.effectResult) as effectResultSum,t1.userId,\n" +
"t2.title as taskTitle,t3.name as userName,t4.name as departmentName from video as t1 INNER JOIN task as t2 on t2.id = 31 and t2.id = t1.taskId\n" + "t2.title as taskTitle,t3.name as userName,t4.name as departmentName from video as t1 INNER JOIN task as t2 on t2.id = t1.taskId\n" +
"LEFT JOIN user as t3 on t1.userId = t3.id\n" + "LEFT JOIN user as t3 on t1.userId = t3.id\n" +
"LEFT JOIN qywxDepartment as t4 on t3.main_department = t4.departmentId " + "LEFT JOIN qywxDepartment as t4 on t3.main_department = t4.departmentId " +
"${ew.customSqlSegment}") "${ew.customSqlSegment}")

Loading…
Cancel
Save