|
@@ -36,13 +36,13 @@ public interface TaskesTimateMapper extends ZtBaseMapper<TaskesTimateEntity, Lon
|
|
|
/**
|
|
|
* 工时单位:天, 保留两位小数
|
|
|
*/
|
|
|
- @Select("SELECT a.* , b.project, ROUND(SUM(a.consumed/8),2) as consumed,c.code, c.name as projectName, d.realname as realname " +
|
|
|
+ @Select("SELECT a.* , b.project, ROUND(SUM(a.consumed/8),4) as consumed,c.code, c.name as projectName, d.realname as realname " +
|
|
|
"FROM zt_taskestimate a left join zt_task b on b.id = a.task left join zt_project c on c.id=b.project left join zt_user d on d.account = a.account " +
|
|
|
"WHERE b.deleted = '0' AND b.project = #{projectId} and DATE_FORMAT( date, '%Y%m' ) = DATE_FORMAT(#{date} , '%Y%m' ) GROUP BY a.account ")
|
|
|
List<DetailVo> sumEffortByMonth(String projectId, String date);
|
|
|
|
|
|
// 查询当月所有项目每个人的总工时
|
|
|
- @Select("SELECT a.id, a.account, a.task , b.project, ROUND(SUM(a.consumed/8),2) as consumed,c.code, c.name as projectName, " +
|
|
|
+ @Select("SELECT a.id, a.account, a.task , b.project, ROUND(SUM(a.consumed/8),4) as consumed,c.code, c.name as projectName, " +
|
|
|
"d.realname as realname, d.slack, e.name as deptName " +
|
|
|
"FROM zt_taskestimate a left join zt_task b on b.id = a.task left join zt_project c on c.id=b.project " +
|
|
|
"left join zt_user d on d.account = a.account left join zt_dept e on d.dept = e.id " +
|
|
@@ -58,7 +58,7 @@ public interface TaskesTimateMapper extends ZtBaseMapper<TaskesTimateEntity, Lon
|
|
|
* @param date 日期 : yyyy-MM-dd
|
|
|
* @return
|
|
|
*/
|
|
|
- @Select("select f.account, f.date, ROUND(sum(f.consumed),2) as consumed, f.realname , f.deptName from " +
|
|
|
+ @Select("select f.account, f.date, ROUND(sum(f.consumed),4) as consumed, f.realname , f.deptName from " +
|
|
|
" (select a.*,b.project,c.name as projectName,c.code,d.realname as realname,e.name as deptName from zt_taskestimate a " +
|
|
|
"left join zt_task b on b.id = a.task left join zt_project c on c.id=b.project " +
|
|
|
"left join zt_user d on d.account = a.account left join zt_dept e on d.dept = e.id " +
|
|
@@ -77,7 +77,7 @@ public interface TaskesTimateMapper extends ZtBaseMapper<TaskesTimateEntity, Lon
|
|
|
@SelectProvider(type = TaskesTimateProvider.class, method = "dayDetail")
|
|
|
List<DetailVo> workByDayDetail(PersonalPageDateDto param);
|
|
|
|
|
|
- @Select("select a.task, a.date, a.account, ROUND(a.consumed/8,2) as consumed, b.project, b.name as taskName, c.name as projectName,c.code,d.realname as realname, d.slack, " +
|
|
|
+ @Select("select a.task, a.date, a.account, ROUND(a.consumed/8,4) as consumed, b.project, b.name as taskName, c.name as projectName,c.code,d.realname as realname, d.slack, " +
|
|
|
" e.id as deptId, e.name as deptName, g.name as moduleName " +
|
|
|
" from zt_taskestimate a left join zt_task b on b.id = a.task left join zt_module g on g.id=b.module left join zt_project c on c.id=b.project " +
|
|
|
" left join zt_user d on d.account = a.account left join zt_dept e on d.dept = e.id " +
|