完善工时统计

wisenergy-model/src/main/java/cn/wisenergy/model/dto/ResultUser.java

@@ -27,6 +27,9 @@ public class ResultUser implements Serializable {
     @ApiModelProperty(name = "deptId",value = "部门id")
     private Integer deptId;
 
+    @ApiModelProperty(name = "deptName", value = "部门名称")
+    private String deptName;
+
     @ApiModelProperty(name = "name",value = "用户名")
     private String name;
 

wisenergy-service/src/main/java/cn/wisenergy/service/impl/StatisticsServiceImpl.java

@@ -1017,6 +1017,7 @@ public class StatisticsServiceImpl implements StatisticsService {
             // sheet名不能存在“/”
             String s = projectName.replaceAll("/", "_");
             HSSFSheet sheet = sheets.createSheet(s);
+            // 单位单元格设置列宽
             sheet.setColumnWidth(2, EXCEL_WIDTH);
             // 普通样式
             HSSFCellStyle ordinaryCellStyle = this.createOrdinaryCellStyle(sheets);

wisenergy-service/src/main/java/cn/wisenergy/service/impl/WorkUserServiceImpl.java

@@ -350,6 +350,8 @@ public class WorkUserServiceImpl implements WorkUserService {
 
         //将用户对象转换为dto
         ResultUser resultUser = getResultUser(user);
+        WorkDept dept = workDeptService.getById(resultUser.getDeptId());
+        resultUser.setDeptName(dept.getDeptName());
         resultUser.setDay(byId.getSubmitTime());
         List<Integer> levelIds = UserRoleLevelUtils.getlevelIds(roles);
         List<WorkLevel> workLevels = UserRoleLevelUtils.getlevelByIds(levelIds);