项目列表添加项目数量统计、工作报告添加提交时间参返回

service-iot/service-iot-biz/src/main/java/com/usky/iot/service/PmProjectService.java

@@ -5,6 +5,7 @@ import com.usky.iot.domain.PmProject;
 import com.usky.common.mybatis.core.CrudService;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -37,5 +38,17 @@ public interface PmProjectService extends CrudService<PmProject> {
       */
      CommonPage<PmProject> projectList(String projectName, Integer projectType, Integer projectStatus, Integer projectAscription, Integer pageNum, Integer pageSize);
 
+     /**
+      * 查询项目名
+      *
+      * @param projectIds
+      * @return
+      */
      List<PmProject> projectName(List<Integer> projectIds);
+
+     /**
+      * 所有、我负责、我参与项目数量统计
+      * @return
+      */
+     Map<String, Integer> sum();
 }

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

@@ -14,7 +14,9 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.Collections;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -123,4 +125,30 @@ public class PmProjectServiceImpl extends AbstractCrudService<PmProjectMapper, P
         return pmProjectMapper.selectList(wrapper);
     }
 
+    @Override
+    public Map<String, Integer> sum() {
+        LambdaQueryWrapper<PmProject> lambdaQuery = Wrappers.lambdaQuery();
+        lambdaQuery.eq(PmProject::getTenantId, SecurityUtils.getTenantId())
+                .eq(PmProject::getDelFlag, 0);
+        Integer all = this.count(lambdaQuery);
+
+        LambdaQueryWrapper<PmProject> lambdaQuery1 = Wrappers.lambdaQuery();
+        lambdaQuery1.eq(PmProject::getTenantId, SecurityUtils.getTenantId())
+                .eq(PmProject::getDelFlag, 0)
+                .eq(PmProject::getProjectHead, SecurityUtils.getUserId());
+        Integer head = this.count(lambdaQuery1);
+
+        LambdaQueryWrapper<PmProject> lambdaQuery2 = Wrappers.lambdaQuery();
+        lambdaQuery2.eq(PmProject::getTenantId, SecurityUtils.getTenantId())
+                .eq(PmProject::getDelFlag, 0)
+                .apply("FIND_IN_SET('" + SecurityUtils.getUserId() + "', project_member) > 0");
+        Integer join = this.count(lambdaQuery2);
+
+        Map<String, Integer> sumMap = new HashMap<>();
+        sumMap.put("allProject",all);
+        sumMap.put("headProject", head);
+        sumMap.put("joinProject", join);
+        return sumMap;
+    }
+
 }

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

@@ -78,7 +78,7 @@ public class PmWorkReportServiceImpl extends AbstractCrudService<PmWorkReportMap
             startDate1 = startDate1.plusDays(1);
         }
         LambdaQueryWrapper<PmWorkReport> queryWrapperR = Wrappers.lambdaQuery();
-        queryWrapperR.select(PmWorkReport::getId, PmWorkReport::getReportDate, PmWorkReport::getTomorrowPlan, PmWorkReport::getCoordinateWork, PmWorkReport::getCcTo)
+        queryWrapperR.select(PmWorkReport::getId, PmWorkReport::getReportDate, PmWorkReport::getSubmitDate,PmWorkReport::getTomorrowPlan, PmWorkReport::getCoordinateWork, PmWorkReport::getCcTo)
                 .eq(PmWorkReport::getSubmitterId, SecurityUtils.getUserId())
                 .between(PmWorkReport::getReportDate, startDate, endDate)
                 .orderByAsc(PmWorkReport::getReportDate)