Browse Source

获取最近项目

cs 2 years ago
parent
commit
8f8e417d58

+ 10 - 0
fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/controller/ProjectController.java

@@ -1185,5 +1185,15 @@ public class ProjectController {
     public HttpRespMsg timeCostAndExpenseByProject(HttpServletRequest request,String startDate,String endDate,Integer projectId){
         return projectService.timeCostAndExpenseByProject(request,startDate,endDate,projectId);
     }
+
+    /**
+     * 获取最近填写的三个项目
+     * @param request
+     * @return
+     */
+    @RequestMapping("/nearProject")
+    public HttpRespMsg nearProject(HttpServletRequest request){
+        return projectService.nearProject(request);
+    }
 }
 

+ 1 - 1
fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/entity/Report.java

@@ -52,7 +52,7 @@ public class Report extends Model<Report> {
     private Integer projectId;
 
     /**
-     * 日期
+     * 工作日期
      */
     @TableField("create_date")
     @DateTimeFormat(pattern = "yyyy-MM-dd")

+ 2 - 0
fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/mapper/ProjectMapper.java

@@ -151,4 +151,6 @@ public interface ProjectMapper extends BaseMapper<Project> {
     List<Map<String, Object>> getExportDegreeCost(Integer companyId, String startDate, String endDate,Integer projectId, List<Integer> deptIds, List<Integer> filterDeptIds, List<Integer> deptRelatedProjectIds);
 
     List<Map<String, Object>> getDegreeDetailCost(Integer companyId, String startDate, String endDate, Integer projectId,int curProjectId, List<Integer> finalDeptIds, List<Integer> filterDeptIds, List<Integer> deptIds);
+
+    List<Project> selectNearProject(String userId);
 }

+ 2 - 0
fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/ProjectService.java

@@ -225,4 +225,6 @@ public interface ProjectService extends IService<Project> {
     HttpRespMsg exportDegreeCost(String startDate, String endDate, Integer projectId,Integer deptId, HttpServletRequest request);
 
     HttpRespMsg timeCostAndExpenseByProject(HttpServletRequest request, String startDate, String endDate, Integer projectId);
+
+    HttpRespMsg nearProject(HttpServletRequest request);
 }

+ 14 - 0
fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/impl/ProjectServiceImpl.java

@@ -9345,4 +9345,18 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
         httpRespMsg.data = map;
         return httpRespMsg;
     }
+
+    /**
+     * 获取最新填写的三个项目
+     * @param request
+     * @return
+     */
+    @Override
+    public HttpRespMsg nearProject(HttpServletRequest request) {
+        HttpRespMsg httpRespMsg = new HttpRespMsg();
+        User user = userMapper.selectById(request.getHeader("token"));
+        List<Project> projects = projectMapper.selectNearProject(user.getId());
+        httpRespMsg.data = projects;
+        return httpRespMsg;
+    }
 }

+ 21 - 0
fhKeeper/formulahousekeeper/management-platform/src/main/resources/mapper/ProjectMapper.xml

@@ -1570,4 +1570,25 @@
         GROUP BY a.project_id,b.id,a.degree_id
         ORDER BY b.id,a.degree_id ASC
     </select>
+
+    <select id="selectNearProject" resultType="com.management.platform.entity.Project">
+        select * from project
+        where id in (
+            SELECT project_id
+            from (
+                SELECT project_id
+                FROM (
+                        SELECT DISTINCT *
+                        FROM report
+                        WHERE creator_id = #{userId}
+                        order by create_time
+                        DESC
+                    ) p1
+                    GROUP BY project_id
+                    order by create_time
+                    DESC
+                    LIMIT 3
+            ) p2
+        )
+    </select>
 </mapper>