完善工时统计

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

@@ -27,9 +27,6 @@ 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-model/src/main/java/cn/wisenergy/model/dto/UserWorkTimeStatisticsByProject.java

@@ -31,6 +31,12 @@ public class UserWorkTimeStatisticsByProject implements Serializable{
     @ApiModelProperty(name = "userName", value = "用户名")
     private String userName;
 
+    /**
+     * 用户部门名臣
+     */
+    @ApiModelProperty(name = "userDeptName", value = "用户所在部门名称")
+    private String userDeptName;
+
     /**
      * 总工时
      */

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

@@ -545,7 +545,19 @@ public class WorkTimeOrderServiceImpl implements WorkTimeOrderService {
         if (!UserRoleLevelUtils.isManagerLevel(userId, LevelEnum.EXAMINE.getLevelName())) {
             throw new BaseCustomException(BASE_RESP_CODE_ENUM.USER_NOT_LEVEL);
         }
+        Date startDate;
+        Date endDate;
+        Date date = new Date();
+        Calendar calendar = Calendar.getInstance();
+        calendar.setTime(date);
+        WorkSubmitAdopt submitAdopt = workSubmitAdoptService.getById(1);
+        Integer orderChange = submitAdopt.getOrderChange();
+        calendar.add(Calendar.DAY_OF_MONTH, -orderChange);
+        startDate = DateUtil.getFirstDayOfMonth(calendar.getTime());
+        endDate = DateUtil.getLastDayByMonth2(calendar.getTime());
         QueryWrapper<WorkTimeOrder> wrapper = new QueryWrapper<>();
+        wrapper.ge("work_day", startDate);
+        wrapper.le("work_day", endDate);
         wrapper.eq("reviewer_id", userId);
         wrapper.eq("status", REJECTED);
         wrapper.orderByDesc("work_day");