报告上传2

cement-business/src/main/java/cn/wise/sc/cement/business/controller/NormProductionController.java

 package cn.wise.sc.cement.business.controller;
 
+import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.wise.sc.cement.business.entity.NormProduction;
 import cn.wise.sc.cement.business.entity.NormProductionStatistics;
 import cn.wise.sc.cement.business.model.BaseResponse;
+import cn.wise.sc.cement.business.model.LoginUser;
 import cn.wise.sc.cement.business.model.PageQuery;
 import cn.wise.sc.cement.business.model.vo.NormProductionVo;
 import cn.wise.sc.cement.business.model.vo.ProductionVo;
@@ -13,6 +15,7 @@ import cn.wise.sc.cement.business.model.vo.WorkloadStatisticsVo;
 import cn.wise.sc.cement.business.service.INonStandardValueService;
 import cn.wise.sc.cement.business.service.INormProductionService;
 import cn.wise.sc.cement.business.service.IPrecipriceService;
+import cn.wise.sc.cement.business.service.ISysUserService;
 import cn.wise.sc.cement.business.util.PageUtil;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -55,10 +58,15 @@ public class NormProductionController {
     IPrecipriceService iPrecipriceService;
     final
     INonStandardValueService inonStandardValueService;
-    public NormProductionController(INormProductionService iNormProductionService, IPrecipriceService iPrecipriceService, INonStandardValueService inonStandardValueService) {
+
+    final
+    ISysUserService iSysUserService;
+
+    public NormProductionController(INormProductionService iNormProductionService, IPrecipriceService iPrecipriceService, INonStandardValueService inonStandardValueService, ISysUserService iSysUserService) {
         this.iNormProductionService = iNormProductionService;
         this.iPrecipriceService = iPrecipriceService;
         this.inonStandardValueService = inonStandardValueService;
+        this.iSysUserService = iSysUserService;
     }
 
     @PostMapping("/create")
@@ -247,6 +255,15 @@ public class NormProductionController {
     @ApiOperation("工作量统计")
     public BaseResponse<List<WorkloadStatisticsVo>> workloadStatistics(String start, String end, Integer userId) {
 
+        LoginUser loginUser = iSysUserService.getLoginUser();
+        if (BeanUtil.isEmpty(loginUser)){
+            return BaseResponse.errorMsg("请登录!");
+        }
+
+        if (!loginUser.getRoleList().getName().equals("系统管理员")) {
+            userId = loginUser.getId();
+        }
+
         Date startTime = null;
         Date endTime = DateUtil.date();
         if (StrUtil.isNotBlank(start) && StrUtil.isNotBlank(end)) {

cement-business/src/main/java/cn/wise/sc/cement/business/service/impl/PrecipriceServiceImpl.java

@@ -20,6 +20,7 @@ import cn.wise.sc.cement.business.entity.SysUser;
 import cn.wise.sc.cement.business.entity.TeamGroup;
 import cn.wise.sc.cement.business.mapper.PrecipriceMapper;
 import cn.wise.sc.cement.business.model.BaseResponse;
+import cn.wise.sc.cement.business.model.LoginUser;
 import cn.wise.sc.cement.business.model.vo.ProductionVo;
 import cn.wise.sc.cement.business.model.vo.WorkloadStatisticsVo;
 import cn.wise.sc.cement.business.service.IEntrustService;
@@ -531,6 +532,8 @@ public class PrecipriceServiceImpl extends ServiceImpl<PrecipriceMapper, Precipr
 
     @Override
     public List<WorkloadStatisticsVo> workloadStatistics(Date startTime, Date endTime, Integer userId) {
+
+
         long start = getDefaultStart(startTime == null ? 0 : startTime.getTime());
         long end = getDefaultEnd(endTime.getTime());
         Map<String, Integer> map1 = initMonthMoneyMap(start, end);