Merge branch 'fu-dev' of uskycloud/usky-modules into server-165

service-iot/service-iot-biz/src/main/java/com/usky/iot/service/impl/PmWorkContentServiceImpl.java

@@ -4,9 +4,9 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.common.datascope.annotation.DataScope;
 import com.usky.common.core.bean.CommonPage;
 import com.usky.common.core.exception.BusinessException;
+import com.usky.common.mybatis.core.AbstractCrudService;
 import com.usky.common.security.utils.SecurityUtils;
 import com.usky.iot.domain.PmProject;
 import com.usky.iot.domain.PmReceive;
@@ -15,7 +15,6 @@ import com.usky.iot.domain.PmWorkReport;
 import com.usky.iot.mapper.*;
 import com.usky.iot.service.PmProjectService;
 import com.usky.iot.service.PmWorkContentService;
-import com.usky.common.mybatis.core.AbstractCrudService;
 import com.usky.iot.service.vo.ProjectWorkTimeVO;
 import com.usky.iot.service.vo.UserWorkTimeVO;
 import com.usky.iot.service.vo.WorkHoursStatisticsVO;
@@ -25,7 +24,6 @@ import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import com.ruoyi.common.datascope.context.DataScopeContextHolder;
 
 import java.math.BigDecimal;
 import java.time.LocalDate;
@@ -90,6 +88,13 @@ public class PmWorkContentServiceImpl extends AbstractCrudService<PmWorkContentM
         return rIds;
     }
 
+    /**
+     * @description: 查询我收到的报告
+     * @author: fu
+     * @date: 2024/8/7 17:48
+     * @param: []
+     * @return: java.util.List<java.lang.Integer>
+     **/
     private List<Integer> receive() {
         Long userId = SecurityUtils.getUserId();
         Integer tenantId = SecurityUtils.getTenantId();
@@ -115,7 +120,14 @@ public class PmWorkContentServiceImpl extends AbstractCrudService<PmWorkContentM
         }
         return rIds;
     }
-
+    
+    /**
+     * @description: 负责人项目id查询
+     * @author: fu
+     * @date: 2024/8/7 17:14
+     * @param: []
+     * @return: java.util.List<java.lang.Integer>
+     **/
     private List<Integer> head() {
         Long userId = SecurityUtils.getUserId();
         Integer tenantId = SecurityUtils.getTenantId();
@@ -331,6 +343,13 @@ public class PmWorkContentServiceImpl extends AbstractCrudService<PmWorkContentM
         return reportList;
     }
 
+    /**
+     * @description: 用户名、账户名查询
+     * @author: fu
+     * @date: 2024/8/7 17:28
+     * @param: [userIds]
+     * @return: java.util.List<com.usky.system.domain.SysUser>
+     **/
     @Override
     public List<SysUser> nickNames(List<Long> userIds) {
         LambdaQueryWrapper<SysUser> usersQuery = Wrappers.lambdaQuery();
@@ -352,12 +371,19 @@ public class PmWorkContentServiceImpl extends AbstractCrudService<PmWorkContentM
 
     @Override
     public CommonPage<PmWorkReport> reportPage(Integer projectAscription, Integer pageNum, Integer pageSize, Integer reportId, String startDate, String endDate, Integer projectId) {
+        CommonPage<PmWorkReport> returnPage = new CommonPage<>(new ArrayList<>(), 0, pageSize, pageNum);
         Integer tenantId = SecurityUtils.getTenantId();
         Long userId = SecurityUtils.getUserId();
         String userName = SecurityUtils.getUsername();
         Long deptId = SecurityUtils.getLoginUser().getSysUser().getDeptId();
         List<Integer> headProjects = head();
+        if (projectAscription == 1 && headProjects.isEmpty()){
+            return returnPage;
+        }
         List<Integer> receiveList2 = receive();
+        if (projectAscription == 2 && receiveList2.isEmpty()){
+            return returnPage;
+        }
         List<Long> userIds = new ArrayList<>();
         LambdaQueryWrapper<PmWorkContent> contentLambdaQuery = Wrappers.lambdaQuery();
         contentLambdaQuery.select(PmWorkContent::getReportId, PmWorkContent::getWorkContent, PmWorkContent::getWorkTime, PmWorkContent::getProjectName);
@@ -391,7 +417,7 @@ public class PmWorkContentServiceImpl extends AbstractCrudService<PmWorkContentM
         List<PmWorkContent> pmWorkContentList = pmWorkContentMapper.selectList(contentLambdaQuery);
         Set<Integer> reportIds = pmWorkContentList.stream().map(PmWorkContent::getReportId).collect(Collectors.toSet());
         if (reportIds.isEmpty()) {
-            return new CommonPage<>(new ArrayList<>(), 0, pageSize, pageNum);
+            return returnPage;
         }
 
         LambdaQueryWrapper<PmWorkReport> reportQuery = Wrappers.lambdaQuery();
@@ -404,6 +430,9 @@ public class PmWorkContentServiceImpl extends AbstractCrudService<PmWorkContentM
                     .orderByDesc(PmWorkReport::getCreateTime);
         }
         IPage<PmWorkReport> reportPage = pmWorkReportMapper.selectPage(new Page<>(pageNum, pageSize), reportQuery);
+        if (reportPage.getRecords() == null || reportPage.getRecords().isEmpty()){
+            return returnPage;
+        }
         List<PmWorkReport> reportList = reportPage.getRecords();
 
         LambdaQueryWrapper<PmReceive> statusQuery = Wrappers.lambdaQuery();
@@ -429,12 +458,16 @@ public class PmWorkContentServiceImpl extends AbstractCrudService<PmWorkContentM
             }
         });
 
-        List<SysUser> nickNames = nickNames(userIds);
-        Map<Long, String> userNicknameMap = nickNames.stream()
-                .collect(Collectors.toMap(SysUser::getUserId, SysUser::getNickName));
-        reportList.forEach(report -> {
-            report.setCreateBy(userNicknameMap.get(report.getSubmitterId()));
-        });
+        if (!userIds.isEmpty()) {
+            List<SysUser> nickNames = nickNames(userIds);
+            Map<Long, String> userNicknameMap = nickNames.stream()
+                    .collect(Collectors.toMap(SysUser::getUserId, SysUser::getNickName));
+            reportList.forEach(report -> {
+                report.setCreateBy(userNicknameMap.get(report.getSubmitterId()));
+            });
+        }else {
+
+        }
 
         return new CommonPage<>(reportList, reportPage.getTotal(), pageSize, pageNum);
     }

service-job/src/main/java/com/ruoyi/job/controller/SysJobController.java

@@ -1,35 +1,25 @@
 package com.ruoyi.job.controller;
 
-import java.util.List;
-import javax.servlet.http.HttpServletResponse;
-
-import com.usky.common.core.bean.ApiResult;
-import com.usky.common.core.utils.StringUtils;
-import com.usky.common.log.annotation.Log;
-import com.usky.common.log.enums.BusinessType;
-import com.usky.common.security.annotation.RequiresPermissions;
-import com.usky.common.security.utils.SecurityUtils;
-import org.quartz.SchedulerException;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.job.domain.SysJob;
+import com.ruoyi.job.service.ISysJobService;
+import com.ruoyi.job.util.CronUtils;
+import com.ruoyi.job.util.ScheduleUtils;
 import com.usky.common.core.constant.Constants;
 import com.usky.common.core.exception.job.TaskException;
+import com.usky.common.core.utils.StringUtils;
 import com.usky.common.core.utils.poi.ExcelUtil;
 import com.usky.common.core.web.controller.BaseController;
 import com.usky.common.core.web.domain.AjaxResult;
 import com.usky.common.core.web.page.TableDataInfo;
+import com.usky.common.log.annotation.Log;
+import com.usky.common.log.enums.BusinessType;
+import com.usky.common.security.utils.SecurityUtils;
+import org.quartz.SchedulerException;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
 
-import com.ruoyi.job.domain.SysJob;
-import com.ruoyi.job.service.ISysJobService;
-import com.ruoyi.job.util.CronUtils;
-import com.ruoyi.job.util.ScheduleUtils;
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
 
 /**
  * 调度任务信息操作处理
@@ -48,11 +38,11 @@ public class SysJobController extends BaseController
      */
 //    @RequiresPermissions("monitor:job:list")
     @GetMapping("/list")
-    public ApiResult<List<SysJob>> list(SysJob sysJob)
+    public TableDataInfo list(SysJob sysJob)
     {
         startPage();
         List<SysJob> list = jobService.selectJobList(sysJob);
-        return ApiResult.success(list);
+        return getDataTable(list);
     }
 
     /**

service-job/src/main/resources/mapper/job/SysJobLogMapper.xml

@@ -42,6 +42,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 				and date_format(create_time,'%y%m%d') <= date_format(#{params.endTime},'%y%m%d')
 			</if>
 		</where>
+		ORDER BY job_log_id DESC
 	</select>
 	
 	<select id="selectJobLogAll" resultMap="SysJobLogResult">