Browse Source

配置修改

anderx 2 years ago
parent
commit
561d4d30e0

+ 2 - 1
ruoyi-system/src/main/java/com/ruoyi/project/domain/ProjectStaffRecord.java

@@ -48,7 +48,7 @@ public class ProjectStaffRecord implements Serializable {
     /**
      * 创建时间
      */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+
     private Date createTime;
 
     /**
@@ -149,6 +149,7 @@ public class ProjectStaffRecord implements Serializable {
         this.annexUrl = annexUrl;
     }
 
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     public Date getCreateTime() {
         return createTime;
     }

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

@@ -265,7 +265,7 @@
            b.id projectId,b.name projectName,b.admin_name adminName ,a.project_status projectStatus,a.content ,
            a.pid ,a.aid ,a.examine_id examineId ,a.examine_name examineName ,a.examine_time examineTime,
            a.annex_url annexUrl,a.create_time createTime,a.process_status processStatus , a.duration,
-          a.examine_content examineContent
+          a.examine_content examineContent,a.record_time recordTime
     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