财务-月详情加入模块名称、任务名称

gis_domain/src/main/java/com/gis/domain/vo/DetailVo.java

@@ -48,6 +48,12 @@ public class DetailVo implements Serializable {
     @ApiModelProperty(value = "工号")
     private String slack;
 
+    @ApiModelProperty(value = "任务名称")
+    private String taskName;
+
+    @ApiModelProperty(value = "模块名称")
+    private String moduleName;
+
 
 
 

gis_mapper/src/main/java/com/gis/mapper/TaskesTimateMapper.java

@@ -65,7 +65,6 @@ public interface TaskesTimateMapper extends ZtBaseMapper<TaskesTimateEntity, Lon
             "group by f.account, f.date")
     List<MonthVo> deptEffortByMonth(String deptId, String date);
 
-//    @SelectProvider(type = TaskesTimateProvider.class, method = "list")
     @Select("select account, date , sum(consumed) as consumed from zt_taskestimate where DATE_FORMAT( date, '%Y%m' ) = DATE_FORMAT(#{date} , '%Y%m' )" +
             " AND account = #{account} GROUP BY date;")
     List<MonthVo> workByMonth(String account, String date);
@@ -77,9 +76,9 @@ 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,c.name as projectName,c.code,d.realname as realname, d.slack, " +
-            " e.id as deptId, 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 " +
+    @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, " +
+            " 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 " +
             " where b.deleted = '0' AND DATE_FORMAT( date, '%Y%m' ) = DATE_FORMAT(#{date} , '%Y%m' ) order by a.account asc")
     List<DetailVo> excelDetailByDay(DeptDto param);

gis_service/src/main/java/com/gis/service/impl/TaskesTimateServiceImpl.java

@@ -16,6 +16,7 @@ import com.gis.mapper.TaskesTimateMapper;
 import com.gis.mapper.ZtBaseMapper;
 import com.gis.service.TaskesTimateService;
 import com.github.pagehelper.PageInfo;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -192,6 +193,10 @@ public class TaskesTimateServiceImpl extends ZtBaseServiceImpl<TaskesTimateEntit
         rowTitle.put("consumed", "消耗时间(天)");
         rowTitle.put("deptId", "部门Id");
         rowTitle.put("deptName", "部门名称");
+
+        // 2022-2-24 by owen 新增
+        rowTitle.put("taskName", "任务名称");
+        rowTitle.put("moduleName", "模块名称");
         ExcelUtils.createExcel(effortVos, savePath, rowTitle);
 
         log.info("sql耗时： {}s", (end-start)/1000);

gis_web/src/main/java/com/gis/web/controller/FinanceController.java

@@ -41,7 +41,6 @@ public class FinanceController extends BaseController {
     public Result<DetailVo> excelByDetail(@PathVariable String date) {
         DeptDto param = new DeptDto();
         param.setDate(date);
-//        return taskesTimateService.excelByDetail(param);
         return taskesTimateService.excelDetailByDay(param);
     }