Ver código fonte

设计师页面接口修改

hcst_sunzhen 5 anos atrás
pai
commit
10aba2ef9e

+ 71 - 4
jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/PerformanceController2.java

@@ -1,19 +1,27 @@
 package org.jeecg.modules.system.controller;
 
+import cn.com.ctop.performanceappraisal.entity.Performance;
 import cn.com.ctop.userefficientvideomap.entity.DesignMaterialInfo;
+import cn.com.ctop.userefficientvideomap.mapper.UserEfficientVideoMapMapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.StringUtils;
+import org.apache.shiro.SecurityUtils;
 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.modules.system.service.IPerformanceService2;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.http.HttpServletRequest;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -32,6 +40,8 @@ import java.util.Map;
 public class PerformanceController2 {
     @Autowired
     private IPerformanceService2 performanceService;
+    @Autowired
+    private UserEfficientVideoMapMapper userEfficientVideoMapMapper;
 
     //平台的总有效数量、素材总数、素材有效率、总跑量、当前可获得绩效
     @AutoLog(value = "平台的总有效数量、素材总数、素材有效率、总跑量、当前可获得绩效")
@@ -247,5 +257,62 @@ public class PerformanceController2 {
         return result;
     }
 
+    /**
+     * 分页列表查询
+     *
+     * @param performance
+     * @param pageNo
+     * @param pageSize
+     * @param req
+     * @return
+     */
+    @AutoLog(value = "平面设计师季度绩效表-分页列表查询")
+    @ApiOperation(value = "平面设计师季度绩效表-分页列表查询", notes = "平面设计师季度绩效表-分页列表查询")
+    @GetMapping(value = "/planePerformanceList")
+    public Result<IPage<Performance>> planePerformanceList(Performance performance,
+                                                    @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+                                                    @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+                                                    HttpServletRequest req) {
+        Result<IPage<Performance>> result = new Result<IPage<Performance>>();
+        LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+        performance.setUserId(sysUser.getId());
+        QueryWrapper<Performance> queryWrapper = QueryGenerator.initQueryWrapper(performance, req.getParameterMap());
+        Page<Performance> page = new Page<Performance>(pageNo, pageSize);
+        IPage<Performance> pageList = performanceService.page(page, queryWrapper);
+        result.setSuccess(true);
+        result.setResult(pageList);
+        return result;
+    }
+
+    /**
+     * 分页列表查询
+     *
+     * @param performance
+     * @param pageNo
+     * @param pageSize
+     * @param req
+     * @return
+     */
+    @AutoLog(value = "平面设计师季度绩效表-分页列表查询")
+    @ApiOperation(value = "平面设计师季度绩效表-分页列表查询", notes = "平面设计师季度绩效表-分页列表查询")
+    @GetMapping(value = "/designerDepartMemberPerformanceList")
+    public Result<IPage<Performance>> designerDepartMemberPerformanceList(Performance performance,
+                                                                          @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+                                                                          @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+                                                                          HttpServletRequest req) {
+        Result<IPage<Performance>> result = new Result<IPage<Performance>>();
+        LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+        String departId = userEfficientVideoMapMapper.getDepartIdByUserId("e9ca23d68d884d4ebb19d07889727dae");
+        List<String> userIdList =  userEfficientVideoMapMapper.getUserIdListByDepId(departId);
+        //
+        QueryWrapper<Performance> queryWrapper = QueryGenerator.initQueryWrapper(performance, req.getParameterMap());
+        queryWrapper.in("user_id", userIdList);
+
+        Page<Performance> page = new Page<Performance>(pageNo, pageSize);
+        IPage<Performance> pageList = performanceService.page(page, queryWrapper);
+        result.setSuccess(true);
+        result.setResult(pageList);
+        return result;
+    }
 
 }

+ 65 - 0
performance-appraisal/src/main/java/cn/com/ctop/performanceappraisal/controller/PerformanceController.java

@@ -2,20 +2,24 @@ package cn.com.ctop.performanceappraisal.controller;
 
 import cn.com.ctop.performanceappraisal.entity.Performance;
 import cn.com.ctop.performanceappraisal.service.IPerformanceService;
+import cn.com.ctop.userefficientvideomap.mapper.UserEfficientVideoMapMapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.shiro.SecurityUtils;
 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.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
 import java.util.Arrays;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -32,6 +36,8 @@ import java.util.Map;
 public class PerformanceController {
     @Autowired
     private IPerformanceService performanceService;
+    @Autowired
+    private UserEfficientVideoMapMapper userEfficientVideoMapMapper;
 
     /**
      * 分页列表查询
@@ -175,4 +181,63 @@ public class PerformanceController {
                                            Long projectId, String appType) {
         return performanceService.getUserOptimizerAccountList(appType, projectId, pageNo, pageSize);
     }
+
+
+    @AutoLog(value = "设计组内设计师季度绩效表-分页列表查询")
+    @ApiOperation(value = "设计组内设计师季度绩效表-分页列表查询", notes = "设计组内设计师季度绩效表-分页列表查询")
+    @GetMapping(value = "/designerDepartMemberPerformanceList")
+    public Result<IPage<Performance>> designerDepartMemberPerformanceList(Performance performance,
+                                                                          @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+                                                                          @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+                                                                          HttpServletRequest req) {
+        Result<IPage<Performance>> result = new Result<IPage<Performance>>();
+        LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+        String departId = userEfficientVideoMapMapper.getDepartIdByUserId("e9ca23d68d884d4ebb19d07889727dae");
+        List<String> userIdList =  userEfficientVideoMapMapper.getUserIdListByDepId(departId);
+        ////
+        QueryWrapper<Performance> queryWrapper = QueryGenerator.initQueryWrapper(performance, req.getParameterMap());
+        queryWrapper.in("user_id", userIdList);
+
+        Page<Performance> page = new Page<Performance>(pageNo, pageSize);
+        IPage<Performance> pageList = performanceService.page(page, queryWrapper);
+        result.setSuccess(true);
+        result.setResult(pageList);
+        return result;
+    }
+
+    @AutoLog(value = "北京设计师季度绩效列表-分页列表查询")
+    @ApiOperation(value = "北京设计师季度绩效列表-分页列表查询", notes = "北京设计师季度绩效列表-分页列表查询")
+    @GetMapping(value = "/beijingDesignerPageList")
+    public Result<IPage<Performance>> beijingDesignerPageList(Performance performance,
+                                                    @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+                                                    @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+                                                    HttpServletRequest req) {
+        Result<IPage<Performance>> result = new Result<IPage<Performance>>();
+        QueryWrapper<Performance> queryWrapper = QueryGenerator.initQueryWrapper(performance, req.getParameterMap());
+        Page<Performance> page = new Page<Performance>(pageNo, pageSize);
+        IPage<Performance> pageList = performanceService.page(page, queryWrapper);
+        result.setSuccess(true);
+        result.setResult(pageList);
+        return result;
+    }
+
+    @AutoLog(value = "北京设计师季度绩效列表-分页列表查询")
+    @ApiOperation(value = "北京设计师季度绩效列表-分页列表查询", notes = "北京设计师季度绩效列表-分页列表查询")
+    @GetMapping(value = "/beijingPlaneDesignerList")
+    public Result<IPage<Performance>> beijingPlaneDesignerPageList(Performance performance,
+                                                              @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+                                                              @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+                                                              HttpServletRequest req) {
+        Result<IPage<Performance>> result = new Result<IPage<Performance>>();
+        QueryWrapper<Performance> queryWrapper = QueryGenerator.initQueryWrapper(performance, req.getParameterMap());
+        LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+        sysUser.setId("b0e4798234df4096936e6bc6d00db3ba");
+        queryWrapper.eq("user_id", sysUser.getId());
+        Page<Performance> page = new Page<Performance>(pageNo, pageSize);
+        IPage<Performance> pageList = performanceService.page(page, queryWrapper);
+        result.setSuccess(true);
+        result.setResult(pageList);
+        return result;
+    }
+
 }

+ 2 - 0
performance-appraisal/src/main/java/cn/com/ctop/userefficientvideomap/mapper/UserEfficientVideoMapMapper.java

@@ -100,5 +100,7 @@ public interface UserEfficientVideoMapMapper extends BaseMapper<UserEfficientVid
 
     List<UserDto2> getUserPerformanceList(@Param("appType")Integer appType, @Param("year")Integer year, @Param("quarter")Integer quarter);
 
+    List<String> getUserIdListByDepId(@Param("depId")String depId);
+
 }
 

+ 9 - 0
performance-appraisal/src/main/java/cn/com/ctop/userefficientvideomap/mapper/xml/UserEfficientVideoMapMapper.xml

@@ -688,4 +688,13 @@
         group by a.user_id
     </select>
 
+    <select id="getUserIdListByDepId" resultType="string">
+            select
+            user_id
+        from
+        sys_user_depart
+        where
+        dep_id = #{depId}
+    </select>
+
 </mapper>