Procházet zdrojové kódy

打卡人员列表与详情创建时间字段修改

anderx před 6 dny
rodič
revize
424af68f1d

+ 0 - 1
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ProjectTaskController.java

@@ -155,7 +155,6 @@ public class ProjectTaskController extends BaseController {
     @GetMapping("/recordDetails")
     @ApiOperation("打卡日志详情")
     public AjaxResult recordDetails( Long id){
-
         return projectStaffRecordService.recordDetails(id);
     }
 

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

@@ -20,6 +20,7 @@ public class ProjectStaffRecordOut extends ProjectStaffRecord {
     @Excel(name = "打卡时间", dateFormat = "yyyy-MM-dd")
     @JsonFormat(pattern = "yyyy-MM-dd")
     private Date recordTime;
+    @JsonFormat(pattern = "yyyy-MM-dd")
     private Date createTime;
     @Excel(name = "初始工时",width = 8)
     private Double initDuration;

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

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

+ 12 - 2
ruoyi-system/src/main/java/com/ruoyi/project/service/impl/ProjectStaffRecordServiceImpl.java

@@ -266,7 +266,9 @@ public class ProjectStaffRecordServiceImpl implements ProjectStaffRecordService
 
     @Override
     public AjaxResult recordDetails(Long id) {
-        return AjaxResult.success(projectStaffRecordMapper.selectDetailsById(id));
+        ProjectStaffRecordOut out = projectStaffRecordMapper.selectDetailsById(id);
+        out.setCreateTime(out.getRecordTime());
+        return AjaxResult.success(out);
     }
 
     @Override
@@ -640,9 +642,17 @@ public class ProjectStaffRecordServiceImpl implements ProjectStaffRecordService
         Long companyId = deptService.selectCompanyByDeptId();
         if (companyId!=null)in.setCompanyId(companyId);
         if (in.getEndTime()!=null)in.setEndTime(in.getEndTime()+" 23:59:59");
-        return projectStaffRecordMapper.selectList(in);
+        List<ProjectStaffRecordOut> outs = projectStaffRecordMapper.selectList(in);
+        for (ProjectStaffRecordOut out : outs) {
+            out.setCreateTime(out.getRecordTime());
+        }
+        return outs;
     }
 
+
+
+
+
     @Override
     public String importProject(List<ProjectStaffRecordOut> list, boolean updateSupport) {
         if (StringUtils.isNull(list) || list.size() == 0)