|
@@ -20,7 +20,9 @@ import org.jeecg.common.api.vo.Result;
|
|
import org.jeecg.common.aspect.annotation.AutoLog;
|
|
import org.jeecg.common.aspect.annotation.AutoLog;
|
|
import org.jeecg.common.system.query.QueryGenerator;
|
|
import org.jeecg.common.system.query.QueryGenerator;
|
|
import org.jeecg.common.system.vo.LoginUser;
|
|
import org.jeecg.common.system.vo.LoginUser;
|
|
|
|
+import org.jeecg.common.util.DateUtils;
|
|
import org.jeecg.common.util.oConvertUtils;
|
|
import org.jeecg.common.util.oConvertUtils;
|
|
|
|
+import org.jeecg.modules.ctop.service.IProjectMemberService;
|
|
import org.jeecgframework.poi.excel.ExcelImportUtil;
|
|
import org.jeecgframework.poi.excel.ExcelImportUtil;
|
|
import org.jeecgframework.poi.excel.def.NormalExcelConstants;
|
|
import org.jeecgframework.poi.excel.def.NormalExcelConstants;
|
|
import org.jeecgframework.poi.excel.entity.ExportParams;
|
|
import org.jeecgframework.poi.excel.entity.ExportParams;
|
|
@@ -37,6 +39,7 @@ import javax.servlet.http.HttpServletResponse;
|
|
import java.io.IOException;
|
|
import java.io.IOException;
|
|
import java.io.UnsupportedEncodingException;
|
|
import java.io.UnsupportedEncodingException;
|
|
import java.net.URLDecoder;
|
|
import java.net.URLDecoder;
|
|
|
|
+import java.text.ParseException;
|
|
import java.util.Arrays;
|
|
import java.util.Arrays;
|
|
import java.util.List;
|
|
import java.util.List;
|
|
import java.util.Map;
|
|
import java.util.Map;
|
|
@@ -59,6 +62,8 @@ public class MaterialImageInfoController {
|
|
private IMaterialInfoService materialInfoService;
|
|
private IMaterialInfoService materialInfoService;
|
|
@Autowired
|
|
@Autowired
|
|
private MaterialInfoMapper materialInfoMapper;
|
|
private MaterialInfoMapper materialInfoMapper;
|
|
|
|
+ @Autowired
|
|
|
|
+ private IProjectMemberService memberService;
|
|
|
|
|
|
|
|
|
|
@ApiOperation(value = "截屏-分页列表查询", notes = "截屏-分页列表查询")
|
|
@ApiOperation(value = "截屏-分页列表查询", notes = "截屏-分页列表查询")
|
|
@@ -68,12 +73,52 @@ public class MaterialImageInfoController {
|
|
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
|
|
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
|
|
HttpServletRequest req) {
|
|
HttpServletRequest req) {
|
|
Result<IPage<MaterialImageInfo>> result = new Result<IPage<MaterialImageInfo>>();
|
|
Result<IPage<MaterialImageInfo>> result = new Result<IPage<MaterialImageInfo>>();
|
|
- QueryWrapper<MaterialImageInfo> queryWrapper = QueryGenerator.initQueryWrapper(materialImageInfo, req.getParameterMap());
|
|
|
|
- Page<MaterialImageInfo> page = new Page<MaterialImageInfo>(pageNo, pageSize);
|
|
|
|
|
|
+
|
|
|
|
+
|
|
|
|
+ QueryWrapper<MaterialImageInfo> queryWrapper = new QueryWrapper<>();
|
|
|
|
+ Object createTime = materialImageInfo.getCreateTime();
|
|
|
|
+ materialImageInfo.setCreateTime(null);
|
|
|
|
+ if (!Check.isNull(materialImageInfo.getUserId())) {
|
|
|
|
+ String roleCode = materialInfoService.getRoleCodeByUserId(materialImageInfo.getUserId());
|
|
|
|
+ if ("admin".equals(roleCode) || "operator".equals(roleCode) || "kuaishouOperationManager".equals(roleCode) || "operationAssistant".equals(roleCode) || "touTiaoOperationManager".equals(roleCode) || "sale".equals(roleCode) || "saleDirector".equals(roleCode)) {
|
|
|
|
+ materialImageInfo.setUserId(null);
|
|
|
|
+ queryWrapper = QueryGenerator.initQueryWrapper(materialImageInfo, req.getParameterMap());
|
|
|
|
+ } else if ("designTeamLeader".equals(roleCode) || "planeLeader".equals(roleCode) || "plane".equals(roleCode) || "plan".equals(roleCode) || "shot".equals(roleCode)) {
|
|
|
|
+ String userId = materialImageInfo.getUserId();
|
|
|
|
+ materialImageInfo.setUserId(null);
|
|
|
|
+ queryWrapper = QueryGenerator.initQueryWrapper(materialImageInfo, req.getParameterMap());
|
|
|
|
+ if (Check.isNull(materialImageInfo.getProjectId())) {
|
|
|
|
+ List<Long> projects = memberService.selectProjectsByUserId(userId);
|
|
|
|
+ if (!Check.isNull(projects)) {
|
|
|
|
+ queryWrapper.in("project_id", projects);
|
|
|
|
+ } else {
|
|
|
|
+ result.setSuccess(true);
|
|
|
|
+ result.setResult(null);
|
|
|
|
+ return result;
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ } else {
|
|
|
|
+ queryWrapper = QueryGenerator.initQueryWrapper(materialImageInfo, req.getParameterMap());
|
|
|
|
+ }
|
|
|
|
+ if (!Check.isNull(createTime)) {
|
|
|
|
+ try {
|
|
|
|
+ String dateString = DateUtils.getDateString(String.valueOf(createTime));
|
|
|
|
+ Map<String, Object> map = DateUtils.getStartEndTime(dateString);
|
|
|
|
+ queryWrapper.ge("create_time", map.get("start"));
|
|
|
|
+ queryWrapper.lt("create_time", map.get("end"));
|
|
|
|
+ } catch (ParseException e) {
|
|
|
|
+ e.printStackTrace();
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ Page<MaterialImageInfo> page = new Page<>(pageNo, pageSize);
|
|
IPage<MaterialImageInfo> pageList = MaterialImageInfoService.page(page, queryWrapper);
|
|
IPage<MaterialImageInfo> pageList = MaterialImageInfoService.page(page, queryWrapper);
|
|
|
|
+
|
|
|
|
+
|
|
result.setSuccess(true);
|
|
result.setSuccess(true);
|
|
result.setResult(pageList);
|
|
result.setResult(pageList);
|
|
return result;
|
|
return result;
|
|
|
|
+
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|