Pārlūkot izejas kodu

调整销售权限

yumeng 5 gadi atpakaļ
vecāks
revīzija
dbface817a

+ 9 - 9
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/AdvertiserController.java

@@ -134,7 +134,7 @@ public class AdvertiserController {
         Result<IPage<Advertiser>> result = new Result<IPage<Advertiser>>();
         String roleCode = materialReportMapper.getRoleCodeByUserId(advertiser.getUserId());
         String userId = advertiser.getUserId();
-        if ("admin".equals(roleCode) || "kuaishouOperationManager".equals(roleCode) || "touTiaoOperationManager".equals(roleCode)) {
+        if ("admin".equals(roleCode) || "kuaishouOperationManager".equals(roleCode) || "touTiaoOperationManager".equals(roleCode) || "sale".equals(roleCode) || "saleDirector".equals(roleCode)) {
             advertiser.setUserId(null);
         }
         QueryWrapper<Advertiser> queryWrapper = QueryGenerator.initQueryWrapper(advertiser, req.getParameterMap());
@@ -437,10 +437,10 @@ public class AdvertiserController {
         }
         SheetInfoVo totalSheetVo = advertiserService.getXxlStatisticInfo(projectId, systemType, null, "汇总表");
         sheets.add(totalSheetVo);
-        if(null == systemType){
-            List<SheetInfoVo>vos = advertiserService.getSystemTypeXxlStatisticInfo(projectId);
-            if(null!=vos&&vos.size()>0){
-                for(SheetInfoVo vo:vos){
+        if (null == systemType) {
+            List<SheetInfoVo> vos = advertiserService.getSystemTypeXxlStatisticInfo(projectId);
+            if (null != vos && vos.size() > 0) {
+                for (SheetInfoVo vo : vos) {
                     sheets.add(vo);
                 }
             }
@@ -472,10 +472,10 @@ public class AdvertiserController {
         //查询总的消耗信息
         SheetInfoVo totalSheetVo = advertiserService.getXxlStatisticInfo(projectId, systemType, null, "汇总表");
         sheets.add(totalSheetVo);
-        if(null == systemType){
-            List<SheetInfoVo>vos = advertiserService.getSystemTypeXxlStatisticInfo(projectId);
-            if(null!=vos&&vos.size()>0){
-                for(SheetInfoVo vo:vos){
+        if (null == systemType) {
+            List<SheetInfoVo> vos = advertiserService.getSystemTypeXxlStatisticInfo(projectId);
+            if (null != vos && vos.size() > 0) {
+                for (SheetInfoVo vo : vos) {
                     sheets.add(vo);
                 }
             }

+ 47 - 2
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/MaterialImageInfoController.java

@@ -20,7 +20,9 @@ import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.system.vo.LoginUser;
+import org.jeecg.common.util.DateUtils;
 import org.jeecg.common.util.oConvertUtils;
+import org.jeecg.modules.ctop.service.IProjectMemberService;
 import org.jeecgframework.poi.excel.ExcelImportUtil;
 import org.jeecgframework.poi.excel.def.NormalExcelConstants;
 import org.jeecgframework.poi.excel.entity.ExportParams;
@@ -37,6 +39,7 @@ import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
+import java.text.ParseException;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
@@ -59,6 +62,8 @@ public class MaterialImageInfoController {
     private IMaterialInfoService materialInfoService;
     @Autowired
     private MaterialInfoMapper materialInfoMapper;
+    @Autowired
+    private IProjectMemberService memberService;
 
 
     @ApiOperation(value = "截屏-分页列表查询", notes = "截屏-分页列表查询")
@@ -68,12 +73,52 @@ public class MaterialImageInfoController {
                                                      @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
                                                      HttpServletRequest req) {
         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);
+
+
         result.setSuccess(true);
         result.setResult(pageList);
         return result;
+
     }
 
 

+ 1 - 1
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/MaterialInfoController.java

@@ -180,7 +180,7 @@ public class MaterialInfoController {
         materialInfo.setCreateTime(null);
         if (!Check.isNull(materialInfo.getUserId())) {
             String roleCode = materialInfoService.getRoleCodeByUserId(materialInfo.getUserId());
-            if ("admin".equals(roleCode) || "operator".equals(roleCode) || "kuaishouOperationManager".equals(roleCode) || "operationAssistant".equals(roleCode) || "touTiaoOperationManager".equals(roleCode)) {
+            if ("admin".equals(roleCode) || "operator".equals(roleCode) || "kuaishouOperationManager".equals(roleCode) || "operationAssistant".equals(roleCode) || "touTiaoOperationManager".equals(roleCode) || "sale".equals(roleCode) || "saleDirector".equals(roleCode)) {
                 materialInfo.setUserId(null);
                 queryWrapper = QueryGenerator.initQueryWrapper(materialInfo, req.getParameterMap());
             } else if ("designTeamLeader".equals(roleCode) || "planeLeader".equals(roleCode) || "plane".equals(roleCode) || "plan".equals(roleCode) || "shot".equals(roleCode)) {

+ 2 - 2
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/ProjectController.java

@@ -118,7 +118,7 @@ public class ProjectController {
         String roleCode = materialReportMapper.getRoleCodeByUserId(userId);
         QueryWrapper<Project> queryWrapper = new QueryWrapper<>();
         List<Project> projects = new ArrayList<>();
-        if (!"admin".equals(roleCode)) {
+        if (!"admin".equals(roleCode) && !"sale".equals(roleCode) && !"saleDirector".equals(roleCode)) {
             if ("designTeamLeader".equals(roleCode) || "touTiaoOperationManager".equals(roleCode) || "kuaishouOperationManager".equals(roleCode) || "planeLeader".equals(roleCode)) {
                 QueryWrapper<ProjectMember> memberQueryWrapper = new QueryWrapper<>();
                 memberQueryWrapper.eq("user_id", userId);
@@ -198,7 +198,7 @@ public class ProjectController {
         }
 
         String roleCode = materialReportMapper.getRoleCodeByUserId(sysUser.getId());
-        if (!"admin".equals(roleCode)) {
+        if (!"admin".equals(roleCode) || "sale".equals(roleCode) || "saleDirector".equals(roleCode)) {
             queryWrapper.eq("user_id", sysUser.getId());
             queryWrapper.orderByDesc("create_time");
         }

+ 1 - 2
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/ProjectMemberController.java

@@ -106,9 +106,8 @@ public class ProjectMemberController {
         try {
             QueryWrapper<ProjectMember> queryWrapper = new QueryWrapper<>();
             String roleCode = materialReportMapper.getRoleCodeByUserId(userId);
-            if (!"admin".equals(roleCode)) {
+            if (!"admin".equals(roleCode) && !"sale".equals(roleCode) && !"saleDirector".equals(roleCode)) {
                 queryWrapper.eq("user_id", userId);
-
             }
             queryWrapper.groupBy("project_id");
             queryWrapper.orderByDesc("create_time");