adm服务：新增周日报功能增加部门id；修复根据周数统计报告无结果的问题；周日报详情接口优化

zjugis-module-adm/zjugis-module-adm-biz/src/main/java/com/zjugis/module/adm/controller/admin/workday/WorkdayController.java

@@ -68,7 +68,7 @@ public class WorkdayController {
 
     @GetMapping("/group-week")
     @Operation(summary = "获得行政管理_工作周分组")
-    public CommonResult<List<List<WorkdayDO>>> getWorkWeekGroup(@Valid WorkdayListReqVO listVO) {
+    public CommonResult<List<List<WorkdayRespVO>>> getWorkWeekGroup(@Valid WorkdayListReqVO listVO) {
         return success(workdayService.getWorkWeekGroup(listVO));
     }
 }

zjugis-module-adm/zjugis-module-adm-biz/src/main/java/com/zjugis/module/adm/dal/dataobject/report/ReportDO.java

@@ -1,10 +1,6 @@
 package com.zjugis.module.adm.dal.dataobject.report;
 
 import lombok.*;
-import java.util.*;
-import java.time.LocalDateTime;
-import java.time.LocalDateTime;
-import java.time.LocalDateTime;
 import java.time.LocalDateTime;
 import com.baomidou.mybatisplus.annotation.*;
 import com.zjugis.framework.mybatis.core.dataobject.BaseDO;
@@ -67,6 +63,12 @@ public class ReportDO extends BaseDO {
      */
     private Short reportDay;
 
+
+    /**
+     * 部门id
+     */
+    private String deptId;
+
     /**
      * 用户ID
      */

zjugis-module-adm/zjugis-module-adm-biz/src/main/java/com/zjugis/module/adm/dal/mysql/report/ReportMapper.java

@@ -57,7 +57,7 @@ public interface ReportMapper extends BaseMapperX<ReportDO> {
         return selectList(new LambdaQueryWrapperX<ReportDO>()
         .eqIfPresent(ReportDO::getReportType, "daily")
         .eqIfPresent(ReportDO::getUserId, getLoginUserId())
-        .eqIfPresent(ReportDO::getReportMonth, reqVO.getReportYear())
+        .eqIfPresent(ReportDO::getReportYear, reqVO.getReportYear())
         .eqIfPresent(ReportDO::getReportMonth, reqVO.getReportMonth()));
     }
 

zjugis-module-adm/zjugis-module-adm-biz/src/main/java/com/zjugis/module/adm/remote/dto/ProjectDto.java

@@ -2,9 +2,6 @@ package com.zjugis.module.adm.remote.dto;
 
 import com.zjugis.framework.common.pojo.PageParam;
 import lombok.Data;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.time.LocalDate;
 
 /**
  * @Author：zjq
@@ -13,31 +10,6 @@ import java.time.LocalDate;
 @Data
 public class ProjectDto extends PageParam {
 
-    private String xmmc;
-
-    private String xmbh;
-
-    private String xzqdm;
-
-    private String projectTypeId;
-
-    private Integer hyId;
-
-    @DateTimeFormat(pattern="yyyy-MM-dd")
-    private LocalDate lxsjOn;
-
-    @DateTimeFormat(pattern="yyyy-MM-dd")
-    private LocalDate lxsjOff;
-
-    // 1-立项时间 2-验收时间
-    private Integer sortType;
-
-    private Integer xmzt;
-
-    private Integer isSign;
-
-    private String deptId;
-
     private String userId;
 
 

zjugis-module-adm/zjugis-module-adm-biz/src/main/java/com/zjugis/module/adm/service/report/ReportServiceImpl.java

@@ -55,7 +55,6 @@ public class ReportServiceImpl implements ReportService {
     @Override
     @Transactional
     public Long addReportInfo(ReportCreateReqVO reportRequestVO) {
-
         //新增或更新报告
         Long reportId = this.createReport(reportRequestVO);
         reportRequestVO.setReportId(reportId);
@@ -108,10 +107,12 @@ public class ReportServiceImpl implements ReportService {
     @Override
     public Long createReport(ReportCreateReqVO createReqVO) {
         String loginUserId = SecurityFrameworkUtils.getLoginUserId();
+        AdminUserRespDTO user = adminUserApi.getUser(loginUserId).getData();
 
         ReportDO report = ReportConvert.INSTANCE.convert(createReqVO);
         report.setFillingDate(LocalDateTime.now());
         report.setUserId(loginUserId);
+        report.setDeptId(user.getDeptId());
         if (createReqVO.getReportId() == null) {
             // 执行新增操作
             reportMapper.insert(report);
@@ -119,7 +120,6 @@ public class ReportServiceImpl implements ReportService {
             // 执行更新操作
             reportMapper.updateById(report);
         }
-
         return report.getId();
     }
 

zjugis-module-adm/zjugis-module-adm-biz/src/main/java/com/zjugis/module/adm/service/reportreceive/ReportReceiveServiceImpl.java

@@ -6,6 +6,8 @@ import com.zjugis.module.adm.controller.admin.report.vo.base.ReportCreateReqVO;
 import com.zjugis.module.adm.controller.admin.report.vo.receive.*;
 import org.springframework.stereotype.Service;
 import javax.annotation.Resource;
+
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.validation.annotation.Validated;
 
 import java.util.*;
@@ -41,11 +43,12 @@ public class ReportReceiveServiceImpl implements ReportReceiveService {
     }
 
     @Override
+    @Transactional
     public void batchCreateReportReceive(ReportCreateReqVO reportRequestVO) {
-
+        Long reportId = reportRequestVO.getReportId();
         //删除之前的接收者
         LambdaQueryWrapper<ReportReceiveDO> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.eq(ReportReceiveDO::getReportId, reportRequestVO.getReportId());
+        queryWrapper.eq(ReportReceiveDO::getReportId, reportId);
         reportReceiveMapper.delete(queryWrapper);
 
         //新增接收者
@@ -53,7 +56,7 @@ public class ReportReceiveServiceImpl implements ReportReceiveService {
         List<ReportReceiveDO> repostReceiveList = new ArrayList<>();
         for (String receiveUserId : receiveUserIds) {
             ReportReceiveDO reportReceiveDO = new ReportReceiveDO();
-            reportReceiveDO.setReportId(reportRequestVO.getReportId());
+            reportReceiveDO.setReportId(reportId);
             reportReceiveDO.setReceiveUserId(receiveUserId);
             repostReceiveList.add(reportReceiveDO);
         }

zjugis-module-adm/zjugis-module-adm-biz/src/main/java/com/zjugis/module/adm/service/reportworkload/ReportWorkloadServiceImpl.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.zjugis.framework.common.pojo.CommonResult;
 import com.zjugis.framework.mybatis.core.query.LambdaQueryWrapperX;
+import com.zjugis.framework.security.core.util.SecurityFrameworkUtils;
 import com.zjugis.module.adm.controller.admin.report.vo.base.ReportCreateReqVO;
 import com.zjugis.module.adm.controller.admin.report.vo.workload.*;
 import com.zjugis.module.adm.convert.report.ReportConvert;
@@ -15,6 +16,8 @@ import com.zjugis.module.adm.remote.dto.ProjectDto;
 import com.zjugis.module.adm.remote.vo.ProjectVO;
 import org.springframework.stereotype.Service;
 import javax.annotation.Resource;
+
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.validation.annotation.Validated;
 
 import java.util.*;
@@ -44,18 +47,19 @@ public class ReportWorkloadServiceImpl implements ReportWorkloadService {
     @Override
     public List<ReportWorkloadRespVO> getReportWorkloadByRId(Long reportId) {
         List<ReportWorkloadRespVO> reportWorkloadList = ReportWorkloadConvert.INSTANCE.convertList(
-                reportWorkloadMapper.selectList(new LambdaQueryWrapperX<ReportWorkloadDO>()
-                        .eqIfPresent(ReportWorkloadDO::getReportId, reportId)));
+                reportWorkloadMapper.selectList(new LambdaQueryWrapperX<ReportWorkloadDO>().eqIfPresent(ReportWorkloadDO::getReportId, reportId)));
         ProjectDto projectDto = new ProjectDto();
         projectDto.setPageNo(1);
         projectDto.setPageSize(-1);
-//        projectDto.setUserId(SecurityFrameworkUtils.getLoginUserId());
+        projectDto.setUserId(SecurityFrameworkUtils.getLoginUserId());
         CommonResult<Page<ProjectVO>> projectPage = projectClient.getProjectPage(projectDto);
-        List<ProjectVO> projectList = projectPage.getData().getRecords();
-        reportWorkloadList.forEach(report->{
-            Optional<ProjectVO> projectOptional = projectList.stream().filter(c -> c.getId().equals(report.getProjectId())).findFirst();
-            report.setProjectName(projectOptional.get().getXmmc());
-        });
+        if(projectPage.isSuccess()){
+            List<ProjectVO> projectList = projectPage.getData().getRecords();
+            reportWorkloadList.forEach(report->{
+                Optional<ProjectVO> projectOptional = projectList.stream().filter(c -> c.getId().equals(report.getProjectId())).findFirst();
+                report.setProjectName(projectOptional.get().getXmmc());
+            });
+        }
         return reportWorkloadList;
     }
 
@@ -69,16 +73,18 @@ public class ReportWorkloadServiceImpl implements ReportWorkloadService {
     }
 
     @Override
+    @Transactional
     public void batchCreateReportWorkload(ReportCreateReqVO reportRequestVO) {
+        Long reportId = reportRequestVO.getReportId();
         //删除之前的工作量
         LambdaQueryWrapper<ReportWorkloadDO> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.eq(ReportWorkloadDO::getReportId, reportRequestVO.getReportId());
+        queryWrapper.eq(ReportWorkloadDO::getReportId, reportId);
         reportWorkloadMapper.delete(queryWrapper);
 
         //新增工作量
-        List<ReportWorkloadDO> workloadDOList = ReportConvert.INSTANCE.convertWLoadReq(reportRequestVO.getWeeklyWorkloadList());
-        workloadDOList.forEach(c->c.setReportId(reportRequestVO.getReportId()));
-        reportWorkloadMapper.saveOrUpdateBatch(workloadDOList);
+        List<ReportWorkloadDO> workloadList = ReportConvert.INSTANCE.convertWLoadReq(reportRequestVO.getWeeklyWorkloadList());
+        workloadList.forEach(c->c.setReportId(reportId));
+        reportWorkloadMapper.saveOrUpdateBatch(workloadList);
     }
 
     @Override

zjugis-module-adm/zjugis-module-adm-biz/src/main/java/com/zjugis/module/adm/service/workday/WorkdayService.java

@@ -2,6 +2,7 @@ package com.zjugis.module.adm.service.workday;
 
 import com.zjugis.framework.common.pojo.PageResult;
 import com.zjugis.module.adm.controller.admin.workday.vo.WorkdayListReqVO;
+import com.zjugis.module.adm.controller.admin.workday.vo.WorkdayRespVO;
 import com.zjugis.module.adm.controller.admin.workday.vo.WorkdayUpdateReqVO;
 import com.zjugis.module.adm.dal.dataobject.workday.WorkdayDO;
 
@@ -61,5 +62,5 @@ public interface WorkdayService {
      * @param listReqVO 列表查询
      * @return 行政管理_工作周分组
      */
-    List<List<WorkdayDO>> getWorkWeekGroup(WorkdayListReqVO listReqVO);
+    List<List<WorkdayRespVO>> getWorkWeekGroup(WorkdayListReqVO listReqVO);
 }

zjugis-module-adm/zjugis-module-adm-biz/src/main/java/com/zjugis/module/adm/service/workday/WorkdayServiceImpl.java

@@ -1,6 +1,7 @@
 package com.zjugis.module.adm.service.workday;
 
 import com.zjugis.module.adm.controller.admin.workday.vo.WorkdayListReqVO;
+import com.zjugis.module.adm.controller.admin.workday.vo.WorkdayRespVO;
 import com.zjugis.module.adm.controller.admin.workday.vo.WorkdayUpdateReqVO;
 import com.zjugis.module.adm.convert.workday.WorkdayConvert;
 import com.zjugis.module.adm.dal.dataobject.workday.WorkdayDO;
@@ -65,13 +66,14 @@ public class WorkdayServiceImpl implements WorkdayService {
     }
 
     @Override
-    public List<List<WorkdayDO>> getWorkWeekGroup(WorkdayListReqVO listReqVO) {
-        List<WorkdayDO> workdayList= workdayMapper.selectWeekList(listReqVO);
-        TreeMap<String, List<WorkdayDO>> workdayGroup = workdayList.stream()
+    public List<List<WorkdayRespVO>> getWorkWeekGroup(WorkdayListReqVO listReqVO) {
+        List<WorkdayRespVO> workdayList = WorkdayConvert.INSTANCE.convertList(workdayMapper.selectWeekList(listReqVO));
+
+        TreeMap<String, List<WorkdayRespVO>> workdayGroup = workdayList.stream()
                 .collect(Collectors.groupingBy(c -> c.getYear() + "-" + c.getMonth() + "-" + c.getWeek(),
                         TreeMap::new, Collectors.toList()));
-        List<List<WorkdayDO>> resultList = new ArrayList<>();
-        for (Map.Entry<String, List<WorkdayDO>> entry : workdayGroup.entrySet()) {
+        List<List<WorkdayRespVO>> resultList = new ArrayList<>();
+        for (Map.Entry<String, List<WorkdayRespVO>> entry : workdayGroup.entrySet()) {
             resultList.add(entry.getValue());
         }
         return resultList;