获取后台系统时间接口

src/main/java/cn/com/oa/controller/CommonController.java

@@ -7,6 +7,11 @@ import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+import java.util.HashMap;
+import java.util.Map;
+
 /**
  * 获取天气
  *
@@ -20,6 +25,14 @@ public class CommonController {
     @GetMapping("/weather")
     public AjaxResult getWeather() {
         HttpResponse response = HttpRequest.get("https://weather.visualcrossing.com/VisualCrossingWebServices/rest/services/timeline/25.9645%2C119.2197?unitGroup=metric&elements=datetime%2Ctemp%2Cpreciptype&include=hours&key=PA6TZ5RK5NS48644CHCKX6FGK&contentType=json").execute();
-        return AjaxResult.successData(200, response.body()).put("msg","获取成功");
+        Map<String, String> map = new HashMap<>();
+        map.put("date", LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
+        map.put("data", response.body());
+        return AjaxResult.successData(200, map).put("msg","获取成功");
+    }
+
+    @GetMapping("/date")
+    public AjaxResult getDate() {
+        return AjaxResult.successData(200, LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"))).put("msg","获取成功");
     }
 }

src/main/java/cn/com/oa/controller/FlowInstanceController.java

@@ -25,11 +25,11 @@ public class FlowInstanceController extends BaseController {
     private IFlowInstanceService flowInstanceService;
 
     @ApiOperation(value = "获取近七天流程详情统计数据", notes = "获取近七天流程详情统计数据")
-    @GetMapping("/getSevenDayFlowInfoIns")
+    @GetMapping("/getSevenDayFlowInsInfo")
     @ResponseBody
-    public AjaxResult getSevenDayFlowInfoIns()
+    public AjaxResult getSevenDayFlowInsInfo()
     {
-        List<FlowInstanceVo> flowInfoInsMap = flowInstanceService.getSevenDayFlowInfoIns();
+        List<FlowInstanceVo> flowInfoInsMap = flowInstanceService.getSevenDayFlowInsInfo();
         return AjaxResult.successData(200,flowInfoInsMap).put("msg","获取成功");
     }
 

src/main/java/cn/com/oa/mapper/AttendanceRecordMapper.java

@@ -1,7 +1,7 @@
 package cn.com.oa.mapper;
 
 import cn.com.oa.model.AttendanceRecord;
-import cn.com.oa.model.DTO.AttendanceRecordDTO;
+import cn.com.oa.model.dto.AttendanceRecordDTO;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 import java.util.List;

src/main/java/cn/com/oa/mapper/FlowInstanceMapper.java

@@ -30,5 +30,5 @@ public interface FlowInstanceMapper extends BaseMapper<FlowInstance> {
 
     List<FlowInstanceVo> listAllDealing(@Param("flowInstance") FlowInstanceVo flowInstance);
 
-    List<FlowInstanceVo> getSevenDayFlowInfoIns();
+    List<FlowInstanceVo> getSevenDayFlowInsInfo();
 }

src/main/java/cn/com/oa/model/DTO/AttendanceRecordDTO.java → src/main/java/cn/com/oa/model/dto/AttendanceRecordDTO.java

@@ -1,4 +1,4 @@
-package cn.com.oa.model.DTO;
+package cn.com.oa.model.dto;
 
 import cn.com.oa.model.AttendanceRecord;
 import lombok.Data;

src/main/java/cn/com/oa/service/AttendanceRecordService.java

@@ -1,7 +1,7 @@
 package cn.com.oa.service;
 
 import cn.com.oa.model.AttendanceRecord;
-import cn.com.oa.model.DTO.AttendanceRecordDTO;
+import cn.com.oa.model.dto.AttendanceRecordDTO;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 import java.util.List;

src/main/java/cn/com/oa/service/IFlowInstanceService.java

@@ -26,5 +26,5 @@ public interface IFlowInstanceService extends IService<FlowInstance> {
 
     List<FlowInstanceVo> listAllDealing();
 
-    List<FlowInstanceVo> getSevenDayFlowInfoIns();
+    List<FlowInstanceVo> getSevenDayFlowInsInfo();
 }

src/main/java/cn/com/oa/service/impl/AttendanceRecordResultServiceImpl.java

@@ -4,7 +4,7 @@ import cn.com.oa.common.constant.DataService;
 import cn.com.oa.mapper.AttendanceRecordResultMapper;
 import cn.com.oa.model.AttendanceRecord;
 import cn.com.oa.model.AttendanceRecordResult;
-import cn.com.oa.model.DTO.AttendanceRecordDTO;
+import cn.com.oa.model.dto.AttendanceRecordDTO;
 import cn.com.oa.model.Group;
 import cn.com.oa.model.User;
 import cn.com.oa.model.vo.AttendanceRecordResultVo;
@@ -22,7 +22,6 @@ import java.time.ZoneId;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
-import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -73,7 +72,7 @@ public class AttendanceRecordResultServiceImpl extends ServiceImpl<AttendanceRec
         // 缺勤人数
         int absenceCount = totalCount - recordCount;
         // 迟到时间和早退时间
-        LocalTime lateThreshold = LocalTime.of(9, 0, 0);
+        LocalTime lateThreshold = LocalTime.of(9, 0, 59);
         LocalTime leaveEarlyThreshold = LocalTime.of(17, 30, 0);
         for (AttendanceRecordDTO record : recordList) {
 
@@ -122,7 +121,7 @@ public class AttendanceRecordResultServiceImpl extends ServiceImpl<AttendanceRec
         attendanceRecord.setUnitId(group.getUNIVERSALID());
         // 当日打卡数据
         List<AttendanceRecordDTO> recordList = attendanceRecordService.getResultListDay(attendanceRecord);
-        LocalTime lateThreshold = LocalTime.of(9, 0, 0);
+        LocalTime lateThreshold = LocalTime.of(9, 0, 59);
         LocalTime leaveEarlyThreshold = LocalTime.of(17, 30, 0);
         List<DeptAttendanceRecordVo> deptAttendanceRecordVos = new ArrayList<>();
         //遍历deptCount

src/main/java/cn/com/oa/service/impl/AttendanceRecordServiceImpl.java

@@ -2,7 +2,7 @@ package cn.com.oa.service.impl;
 
 import cn.com.oa.mapper.AttendanceRecordMapper;
 import cn.com.oa.model.AttendanceRecord;
-import cn.com.oa.model.DTO.AttendanceRecordDTO;
+import cn.com.oa.model.dto.AttendanceRecordDTO;
 import cn.com.oa.service.AttendanceRecordService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;

src/main/java/cn/com/oa/service/impl/FlowInstancelServiceImpl.java

@@ -76,8 +76,8 @@ public class FlowInstancelServiceImpl extends ServiceImpl<FlowInstanceMapper, Fl
     }
 
     @Override
-    public List<FlowInstanceVo> getSevenDayFlowInfoIns() {
-        return baseMapper.getSevenDayFlowInfoIns();
+    public List<FlowInstanceVo> getSevenDayFlowInsInfo() {
+        return baseMapper.getSevenDayFlowInsInfo();
     }
 
 }

src/main/resources/mapper/oa/AttendanceRecordMapper.xml

@@ -35,7 +35,7 @@
         out_type,out_address,allDay,
         special_type
     </sql>
-    <select id="getRecordList" resultType="cn.com.oa.model.DTO.AttendanceRecordDTO">
+    <select id="getRecordList" resultType="cn.com.oa.model.dto.AttendanceRecordDTO">
         SELECT
             t.att_user_name,
             MIN(t.att_time) AS first_att_time,
@@ -47,7 +47,7 @@
         GROUP BY t.att_user_name
         ORDER BY first_att_time DESC
     </select>
-    <select id="getResultListDay" resultType="cn.com.oa.model.DTO.AttendanceRecordDTO">
+    <select id="getResultListDay" resultType="cn.com.oa.model.dto.AttendanceRecordDTO">
         SELECT
             har.att_user_name,
             tg.GROUPNAME as dept_name,

src/main/resources/mapper/oa/FlowInstanceMapper.xml

@@ -230,7 +230,7 @@
         ORDER BY
         s.d_createdate DESC
     </select>
-    <select id="getSevenDayFlowInfoIns" resultType="cn.com.oa.model.vo.FlowInstanceVo">
+    <select id="getSevenDayFlowInsInfo" resultType="cn.com.oa.model.vo.FlowInstanceVo">
         SELECT
             DATE ( a.d_createdate ) AS totalDate,
             b.v_model_name AS modelName,