anderx пре 1 година
родитељ
комит
816f25fc68

+ 24 - 0
ruoyi-system/src/main/java/com/ruoyi/project/bo/ProjectStaffRecordOut.java

@@ -23,6 +23,10 @@ public class ProjectStaffRecordOut extends ProjectStaffRecord {
     private Date createTime;
     @Excel(name = "工时")
     private Double duration;
+    @Excel(name = "初始工时")
+    private Double initDuration;
+    @Excel(name = "考勤")
+    private Double checkDuration;
     @Excel(name = "打卡月份", dateFormat = "MM")
     @JsonFormat(pattern = "MM")
     private Date createMonth;
@@ -50,6 +54,26 @@ public class ProjectStaffRecordOut extends ProjectStaffRecord {
     private Long aid;
 
     @Override
+    public Double getInitDuration() {
+        return initDuration;
+    }
+
+    @Override
+    public void setInitDuration(Double initDuration) {
+        this.initDuration = initDuration;
+    }
+
+    @Override
+    public Double getCheckDuration() {
+        return checkDuration;
+    }
+
+    @Override
+    public void setCheckDuration(Double checkDuration) {
+        this.checkDuration = checkDuration;
+    }
+
+    @Override
     public Date getRecordTime() {
         return recordTime;
     }

+ 2 - 1
ruoyi-system/src/main/resources/mapper/project/ProjectStaffRecordMapper.xml

@@ -179,7 +179,8 @@
         select a.id,c.job_number jobNumber,a.name   ,d.dept_id deptId ,d.dept_name deptName ,a.record_time createMonth,
         b.name projectName,b.admin_name adminName ,a.project_status projectStatus,a.content ,b.project_number projectNumber,
         a.pid ,a.aid ,a.examine_id examineId ,a.examine_name examineName ,a.examine_time examineTime,a.record_time recordTime,
-        a.annex_url annexUrl,a.create_time createTime,a.process_status processStatus , a.duration
+        a.annex_url annexUrl,a.create_time createTime,a.process_status processStatus , a.duration,a.init_duration initDuration,
+        a.check_duration checkDuration
         from project_staff_record a left join project_task b on a.pid=b.id
         left join sys_user c on a.aid=c.user_id left join sys_dept d on c.dept_id =d.dept_id
         where 1=1