添加报工记录代码

修复报工的排序问题

ruoyi-oa/src/main/java/com/ruoyi/oa/domain/OaApplication.java

@@ -58,5 +58,9 @@ public class OaApplication extends BaseEntity {
      * 备注
      */
     private String remark;
+    /**
+     * 路由类型
+     */
+    private String routeType;
 
 }

ruoyi-oa/src/main/java/com/ruoyi/oa/domain/OaProjectReport.java

@@ -58,4 +58,10 @@ public class OaProjectReport extends BaseEntity {
      */
     private Long isTrip;
 
+    /**
+     * 报工时间
+     */
+    private Long workType;
+
+
 }

ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/OaApplicationBo.java

@@ -78,5 +78,10 @@ public class OaApplicationBo extends BaseEntity {
      */
     private String remark;
 
+    /**
+     * 路由类型
+     */
+    private String routeType;
+
 
 }

ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/OaProjectReportBo.java

@@ -76,4 +76,10 @@ public class OaProjectReportBo extends BaseEntity {
      */
     private String nickName;
 
+    /**
+     * 报工时间
+     */
+    private Long workType;
+
+
 }

ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/OaApplicationVo.java

@@ -65,5 +65,9 @@ public class OaApplicationVo {
     @ExcelProperty(value = "备注")
     private String remark;
 
+    /**
+     * 路由类型
+     */
+    private String routeType;
 
 }

ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/OaProjectReportVo.java

@@ -87,6 +87,46 @@ public class OaProjectReportVo {
      */
     private Long isTrip;
 
+    /**
+     * 报工次数
+     */
+    private Long count;
+    /**
+     * 报工次数
+     */
+    private Long reportCount;
+
+    /**
+     * 项目剩余时间
+     */
+    private Long remainTime;
+
+    /**
+     * 项目状态
+     */
+    private Long projectStatus;
+
+    /**
+     * 报工时间
+     */
+    private Date createTime;
+
+     /**
+     * 报工时间
+     */
+    private Long workType;
+
+    /**
+     * inWorkNum
+     * 国内工作时间
+     */
+    private Long inWorkNum;
+
+  /**
+     * inWorkNum
+     * 国外工作时间
+     */
+    private Long outWorkNum;
 
 
 }

ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/ProjectReportPieVo.java

@@ -0,0 +1,11 @@
+package com.ruoyi.oa.domain.vo;
+
+
+import lombok.Data;
+
+@Data
+public class ProjectReportPieVo {
+
+    private String projectName;
+    private Integer value;
+}

ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/ProjectReportTrendVo.java

@@ -0,0 +1,14 @@
+package com.ruoyi.oa.domain.vo;
+
+import lombok.Data;
+
+import java.time.LocalDate;
+
+@Data
+public class ProjectReportTrendVo {
+
+    private LocalDate date;
+
+    private Integer count;
+
+}