zhangjinli 3 years ago
parent b09960945d
commit b8638dd70a

@ -2,9 +2,16 @@ package com.zh.project0512.controller;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
//import com.zh.project0512.service.IUserService;
import com.zh.project0512.mapper.QywxDepartmentUserLinkMapper;
import com.zh.project0512.mapper.RankMapper;
import com.zh.project0512.model.dto.RankListDTO;
import com.zh.project0512.model.vo.RankListVo;
import com.zh.project0512.service.ITaskService;
import com.zh.project0512.service.IVideoService;
import com.zh.project0512.utils.AliyunOss;
import com.zh.project0512.utils.FileTypeUtil;
import com.zh.project0512.utils.JSONResult;
@ -22,10 +29,12 @@ import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import javax.annotation.Resource;
import java.io.File;
import java.io.IOException;
import java.time.LocalDateTime;
import java.time.ZoneOffset;
import java.util.List;
import java.util.UUID;
/**
@ -134,4 +143,23 @@ public class UtilsController {
return res;
}
@Autowired
private ITaskService taskService;
@Resource
QywxDepartmentUserLinkMapper qywxDepartmentUserLinkMapper;
@Resource
RankMapper rankMapper;
@Autowired
private IVideoService videoService;
@PostMapping("/test")
@ResponseBody
public Result test(){
//获取员工排名进排名数据库
QueryWrapper<RankListDTO> queryWrapper = new QueryWrapper<>();
queryWrapper.groupBy("u.id");
queryWrapper.orderByDesc("value");
List<RankListVo> rankUserList = qywxDepartmentUserLinkMapper.getUserRankList(queryWrapper);
return Result.success();
}
}

@ -73,7 +73,7 @@ public class VideoController {
qw.like(param.providerName != null, "t2.name", param.getProviderName());
qw.eq(param.getDepartmentId() != null, "t3.departmentId", param.getDepartmentId());
qw.like(param.getTaskTitle() != null, "t4.title", param.getTaskTitle());
return Result.success(videoService.pageList(MybatisPlusUtil.SetNumPage(param.getPageNum(), param.getPageNum()), qw));
return Result.success(videoService.pageList(MybatisPlusUtil.SetNumPage(param.getPageNum(), param.getPageSize()), qw));
}
@Data
@ -140,7 +140,6 @@ public class VideoController {
up.set(param.getReSendNum() != null, "reSendNum", param.getReSendNum());
up.set(param.getRecommendNum() != null, "recommendNum", param.getRecommendNum());
up.set("status", 2);
int a = 0;
List<VideoEffectSetting> list = videoEffectSettingService.list();
Integer effectResult = cal(param.getPlayNum(), list.get(0).getEffectTimes()) + cal(param.getCommendNum(), list.get(1).getEffectTimes())
+ cal(param.getCollectionNum(), list.get(2).getEffectTimes()) + cal(param.getCommentNum(), list.get(3).getEffectTimes())

Loading…
Cancel
Save