增加工单结算日期

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/entity/FinanceMonthlyWorktime.java

@@ -2,6 +2,7 @@ package com.management.platform.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
+import java.time.LocalDate;
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.time.LocalDateTime;
 import com.baomidou.mybatisplus.annotation.TableField;
@@ -16,7 +17,7 @@ import lombok.experimental.Accessors;
  * </p>
  *
  * @author Seyason
- * @since 2025-04-16
+ * @since 2025-04-17
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
@@ -64,6 +65,12 @@ public class FinanceMonthlyWorktime extends Model<FinanceMonthlyWorktime> {
     @TableField("user_id")
     private String userId;
 
+    /**
+     * 工单结算日期
+     */
+    @TableField("timesheet_date")
+    private LocalDate timesheetDate;
+
 
     @Override
     protected Serializable pkVal() {

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/entity/vo/DepartmentVO.java

@@ -24,6 +24,7 @@ public class DepartmentVO {
     private List<String> otherManagerIds;
     private Integer ddDeptid;
     private Integer pushToSap;
+    private String deptCode;
 
     public static DepartmentVO convertFromDepartment(Department department) {
         DepartmentVO vo = new DepartmentVO()
@@ -35,6 +36,7 @@ public class DepartmentVO {
                 .setCorpwxDeptid(department.getCorpwxDeptid())
                 .setReportAuditUserid(department.getReportAuditUserid())
                 .setDdDeptid(department.getDdDeptid())
+                .setDeptCode(department.getDeptCode())
                 .setSeq(department.getSeq());
         return vo;
     }

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/impl/DepartmentServiceImpl.java

@@ -470,16 +470,8 @@ public class DepartmentServiceImpl extends ServiceImpl<DepartmentMapper, Departm
         //获取该部门的其他管理者
         List<String> collect = departmentOtherManagerList.stream().filter(dm -> dm.getDepartmentId().equals(department.getDepartmentId())).map(vo -> vo.getOtherManagerId()).collect(Collectors.toList());
         //这俩东西并没有继承关系
-        return new DepartmentVO()
-                .setId(department.getDepartmentId())
-                .setManagerId(department.getManagerId())
-                .setLabel(department.getDepartmentName())
-                .setParentId(department.getSuperiorId())
-                .setOtherManagerIds(collect)
-                .setPushToSap(department.getPushToSap())
-                .setReportAuditUserid(department.getReportAuditUserid())
-                .setDdDeptid(department.getDdDeptid())
-                .setSeq(department.getSeq());
+        DepartmentVO departmentVO = DepartmentVO.convertFromDepartment(department);
+        return departmentVO.setOtherManagerIds(collect);
     }
 
     //获取某个项目下的统计
@@ -523,7 +515,6 @@ public class DepartmentServiceImpl extends ServiceImpl<DepartmentMapper, Departm
             queryWrapper.eq("superior_id", parentDeptId);
         }
         //获取第一级部门
-        System.out.println(deptIds);
         List<Department> masterList = departmentMapper.selectList(queryWrapper);
         Map<String, Object> resultMap = new HashMap<>();
         List<DepartmentMasterVO> list = new ArrayList<>();