Pārlūkot izejas kodu

月度工时表

cs 2 gadi atpakaļ
vecāks
revīzija
be22232c15

+ 7 - 0
fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/controller/ReportController.java

@@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.github.pagehelper.util.StringUtil;
 import com.management.platform.config.LimitRequest;
 import com.management.platform.entity.*;
+import com.management.platform.entity.vo.MonthWorkingTimeVO;
 import com.management.platform.entity.vo.SysRichFunction;
 import com.management.platform.entity.vo.WorktimeItem;
 import com.management.platform.mapper.*;
@@ -2051,5 +2052,11 @@ public class ReportController {
         return result;
     }
 
+    //为单个人补足工时
+    @RequestMapping("/fillWorkingHours")
+    public HttpRespMsg fillWorkingHours(String yearMonth, MonthWorkingTimeVO monthVO){
+        return reportService.fillWorkingHours(yearMonth,monthVO,request);
+    }
+
 }
 

+ 10 - 0
fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/entity/vo/MonthWorkingTimeVO.java

@@ -1,5 +1,7 @@
 package com.management.platform.entity.vo;
 
+import lombok.Data;
+
 /**
  * @author cs
  * @version 1.0
@@ -7,5 +9,13 @@ package com.management.platform.entity.vo;
  * @Description
  * @date 2023-04-18 15:25
  */
+@Data
 public class MonthWorkingTimeVO {
+    private Double allday;
+    private Double leaveTime;
+    private String name;
+    private Double standardHours;
+    private String userId;
+    private Integer whether;
+    private Double workingTime;
 }

+ 3 - 0
fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/ReportService.java

@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONArray;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.management.platform.entity.Report;
 import com.management.platform.entity.User;
+import com.management.platform.entity.vo.MonthWorkingTimeVO;
 import com.management.platform.util.HttpRespMsg;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.multipart.MultipartFile;
@@ -107,4 +108,6 @@ public interface ReportService extends IService<Report> {
 	HttpRespMsg approveDeptAuditReport(User user, String auditDeptId);
 
     void moveReport(User sourceUser,User targetUser);
+
+    HttpRespMsg fillWorkingHours(String yearMonth, MonthWorkingTimeVO monthVO, HttpServletRequest request);
 }

+ 5 - 0
fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/impl/ReportServiceImpl.java

@@ -5800,4 +5800,9 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
             reportLogDetailService.updateBatchById(reportLogDetailsList);
         }
     }
+
+    @Override
+    public HttpRespMsg fillWorkingHours(String yearMonth, MonthWorkingTimeVO monthVO, HttpServletRequest request) {
+        return null;
+    }
 }