值班管理员工作台需求修改

duty-service/src/main/java/cn/com/taiji/duty/controller/AuthController.java

@@ -119,7 +119,7 @@ public class AuthController {
         }
         AjaxResult ajaxResult = new AjaxResult(200, "登录成功!");
         ajaxResult.put("token", uuid);
-        redisTemplate.opsForValue().set(uuid, username, 7200, TimeUnit.SECONDS);
+        redisTemplate.opsForValue().set(uuid, username, 28800, TimeUnit.SECONDS);
 
         DutyAccount one = accountService.findByUsername(username);
         DutyLoginLog log = loginLogService.getOne(new LambdaQueryWrapper<DutyLoginLog>()

duty-service/src/main/java/cn/com/taiji/duty/mapper/DutySignInRecordMapper.java

@@ -40,4 +40,6 @@ public interface DutySignInRecordMapper extends BaseMapper<DutySignInRecord> {
 
     AdminStatisticsDay queryAdminStatisticsDay(@Param("startTime") String startTime, @Param("endTime") String endTime);
 
+    AdminStatisticsDay queryAdminStatisticsNow(@Param("startDate") String startDate, @Param("endDate") String endDate);
+
 }

duty-service/src/main/java/cn/com/taiji/duty/model/AdminStatisticsDay.java

@@ -18,6 +18,12 @@ public class AdminStatisticsDay implements Serializable {
 	@ApiModelProperty("出勤")
 	private String cq;
 
+	@ApiModelProperty("签到")
+	private String qd;
+
+	@ApiModelProperty("签退")
+	private String qt;
+
 	@ApiModelProperty("缺勤")
 	private String qq;
 

duty-service/src/main/java/cn/com/taiji/duty/service/impl/DutyWorkbenchServiceImpl.java

@@ -376,11 +376,19 @@ public class DutyWorkbenchServiceImpl implements IDutyWorkbenchService {
             month.setWeekRate(rate);
             statistics.setMonth(month);
         } else if ("4".equals(type)) {
-            LocalDate localDate = LocalDate.now().minusDays(1);
+
+            LocalDate now = LocalDate.now();
+            String startDate = now.format(formatter);
+            String endDate = now.format(formatter);
+            AdminStatisticsDay statisticsNow = signInRecordMapper.queryAdminStatisticsNow(startDate, endDate);
+
+            LocalDate localDate = now.minusDays(1);
             startTime = localDate.format(formatter);
             endTime = localDate.format(formatter);
             AdminStatisticsDay day = signInRecordMapper.queryAdminStatisticsDay(startTime, endTime);
             int count = unitMapper.queryCount();
+            day.setQd(statisticsNow.getQd());
+            day.setQt(statisticsNow.getQt());
             day.setTotal(String.valueOf(count));
             day.setCqRate(String.format("%.2f", Double.parseDouble(day.getCq())/count*100));
             day.setDayRate(statisticsService.queryRateDay(startTime, null, null, "2"));

duty-service/src/main/resources/mapper/DutySignInRecordMapper.xml

@@ -79,7 +79,7 @@
                 </if>
             </if>
         </where>
-        order by time desc
+        order by time desc,sign_time desc
     </select>
     <select id="queryByAccountId" resultType="DutySignInRecord">
         select *
@@ -240,5 +240,20 @@
         from duty_sign_in_record
         where id = (select max(id) from duty_sign_in_record where status != 0 and dept_id = #{deptId} and date_format(sign_time, '%Y-%m-%d') = date_format(sysdate(), '%Y-%m-%d'))
     </select>
+    <select id="queryAdminStatisticsNow" resultType="AdminStatisticsDay">
+        select
+            ifnull(sum(case when type = '1' then number end),0) as qd,
+            ifnull(sum(case when type = '2' then number end),0) as qt
+        from (
+            select type,count(1) as number
+            from duty_sign_in_record
+            where
+                status != '4' and status != '0'
+                <if test="startDate != null and endDate != null">
+                    and (DATE_FORMAT(sign_time,'%Y-%m-%d') between #{startDate} and #{endDate})
+                </if>
+            GROUP BY type
+        ) t
+    </select>
 
 </mapper>