Bläddra i källkod

模糊查询修改

anderx 2 år sedan
förälder
incheckning
9713783461

+ 12 - 2
ruoyi-system/src/main/java/com/ruoyi/project/bo/ProjectStaffRecordOut.java

@@ -17,8 +17,9 @@ public class ProjectStaffRecordOut extends ProjectStaffRecord {
     private Long deptId;
     @Excel(name = "部门")
     private String deptName;
-    @Excel(name = "打卡时间", dateFormat = "yyyy-MM-dd HH:mm:ss")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "打卡时间", dateFormat = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date recordTime;
     private Date createTime;
     @Excel(name = "工时")
     private Double duration;
@@ -48,6 +49,15 @@ public class ProjectStaffRecordOut extends ProjectStaffRecord {
 
     private Long aid;
 
+    @Override
+    public Date getRecordTime() {
+        return recordTime;
+    }
+
+    @Override
+    public void setRecordTime(Date recordTime) {
+        this.recordTime = recordTime;
+    }
 
     public Long getProjectNumber() {
         return projectNumber;

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

@@ -193,7 +193,7 @@
   <select id="selectList" resultType="com.ruoyi.project.bo.ProjectStaffRecordOut">
     select a.id,c.job_number jobNumber,a.name   ,d.dept_id deptId ,d.dept_name deptName ,c.create_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.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
     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