update

src/main/java/com/galaxis/manatee/dao/ChuanyunSelfCostDao.java

@@ -14,8 +14,16 @@ import java.util.List;
 public interface ChuanyunSelfCostDao extends GalaxisRepository<ChuanyunSelfCostDO,String> {
 
     /**
+     * 根据状态查询月工时统计记录
+     * @param status    状态
+     * @param userId    用户Id
+     * @return  月工时统计列表
+     */
+    List<ChuanyunSelfCostDO> findAllByStatusAndUserId(String status,String userId);
+
+    /**
      * 获取项目人员总工时
-     * @return
+     * @return  月工时统计列表
      */
     @Query(value="SELECT chuanyun_self_cost.object_id,SUM(chuanyun_self_cost.total_hour) AS total_hour,SUM(chuanyun_self_cost.cost) AS cost,chuanyun_self_cost.project_id,chuanyun_self_cost.user_id"+
             " FROM chuanyun_self_cost GROUP BY chuanyun_self_cost.project_id,chuanyun_self_cost.user_id",nativeQuery = true)
@@ -23,19 +31,11 @@ public interface ChuanyunSelfCostDao extends GalaxisRepository<ChuanyunSelfCostD
 
     /**
      * 根据用户ID和项目ID，日期获取工时成本数据
-     * @param userId
-     * @param projectId
-     * @param dayLogDate
-     * @return
+     * @param userId    用户Id
+     * @param projectId 项目Id
+     * @param dayLogDate    日期
+     * @return  月工时统计列表
      */
     @Query(value="SELECT * FROM chuanyun_self_cost WHERE user_id = ?1 AND project_id = ?2 AND DATE_FORMAT(chuanyun_self_cost.day_log_date,'%Y-%m')=DATE_FORMAT(?3,'%Y-%m')",nativeQuery = true)
     ChuanyunSelfCostDO getOldSelfDO(@Param("userId")String userId,@Param("projectId")String projectId,@Param("dayLogDate")String dayLogDate);
-
-    /**
-     * 根据流程状态删除数据
-     * @param status
-     */
-    @Transactional
-    void deleteAllByStatus(String status);
-
 }

src/main/java/com/galaxis/manatee/dao/ChuanyunSelfWorkHourDao.java

@@ -19,14 +19,25 @@ public interface ChuanyunSelfWorkHourDao extends GalaxisRepository<ChuanyunSelfW
 
     /**
      * 根据项目id，用户id，日期获取工时数据
-     * @param userId
-     * @param projectId
-     * @param dayLogDate
-     * @return
+     * @param userId    用户Id
+     * @param projectId 项目Id
+     * @param dayLogDate    日志日期
+     * @return  日工时记录
      */
     ChuanyunSelfWorkHourDO findByUserIdAndAndProjectIdAndAndDayLogDate(String userId, String projectId, LocalDateTime dayLogDate);
 
     /**
+     * 根据用户Id，项目Id，起止时间获取工时列表
+     * @param userId    用户Id
+     * @param projectId 项目Id
+     * @param status    状态
+     * @param start     开始时间
+     * @param end       结束时间
+     * @return  日工时列表
+     */
+    List<ChuanyunSelfWorkHourDO> findAllByUserIdAndProjectIdAndStatusAndDayLogDateBetween(String userId,String projectId,String status,LocalDateTime start,LocalDateTime end);
+
+    /**
      * 获取人员-项目-月度标准总工时
      * @param userId    用户ID
      * @return  汇总数据