考勤统计规则修改
diff --git a/src/main/resources/data.sql b/src/main/resources/data.sql
index 54c03ed..83baf7d 100644
--- a/src/main/resources/data.sql
+++ b/src/main/resources/data.sql
@@ -252,7 +252,7 @@
t.attedate,
t.apflag,
CASE
- WHEN (EXISTS ( SELECT d.atteno,
+ WHEN (not EXISTS ( SELECT d.atteno,
d.custid,
d.attedate,
d.timeid,
@@ -263,7 +263,7 @@
d.operid,
d.updatetime
FROM t_atte_dtl d
- WHERE ((t.apflag = d.apflag) AND ((t.custid)::text = (d.custid)::text) AND ((t.attedate)::text = (d.attedate)::text) AND (d.state = 0)))) THEN 0
+ WHERE ((t.apflag = d.apflag) AND ((t.custid)::text = (d.custid)::text) AND ((t.attedate)::text = (d.attedate)::text) AND (d.state != 0)))) THEN 0
WHEN (EXISTS ( SELECT d.atteno,
d.custid,
d.attedate,
diff --git a/src/main/resources/templates/atte/timedtl/index.html b/src/main/resources/templates/atte/timedtl/index.html
index 308613d..c8a86b6 100644
--- a/src/main/resources/templates/atte/timedtl/index.html
+++ b/src/main/resources/templates/atte/timedtl/index.html
@@ -135,7 +135,7 @@
<template scope="scope">
<span v-if="scope.row.state=='0'" class="layui-badge layui-bg-orange">未打卡</span>
<span v-if="scope.row.state=='1'" class="layui-badge layui-bg-green">正常</span>
- <span v-if="scope.row.state=='2'" class="layui-badge layui-bg-red">迟到</span>
+ <span v-if="scope.row.state=='2'" class="layui-badge layui-bg-red">迟到早退</span>
<span v-if="scope.row.state=='11'" class="layui-badge layui-bg-gray">事假</span>
<span v-if="scope.row.state=='12'" class="layui-badge layui-bg-gray">病假</span>
<span v-if="scope.row.state=='13'" class="layui-badge layui-bg-gray">年假</span>
@@ -149,7 +149,7 @@
<template scope="scope">
<span v-if="scope.row.oldstate=='0'" class="layui-badge layui-bg-orange">未打卡</span>
<span v-if="scope.row.oldstate=='1'" class="layui-badge layui-bg-green">正常</span>
- <span v-if="scope.row.oldstate=='2'" class="layui-badge layui-bg-red">迟到</span>
+ <span v-if="scope.row.oldstate=='2'" class="layui-badge layui-bg-red">迟到早退</span>
<span v-if="scope.row.oldstate=='11'" class="layui-badge layui-bg-gray">事假</span>
<span v-if="scope.row.oldstate=='12'" class="layui-badge layui-bg-gray">病假</span>
<span v-if="scope.row.oldstate=='13'" class="layui-badge layui-bg-gray">年假</span>
@@ -238,7 +238,7 @@
pageSize:10,
totSize:0,
currentRow: null,
- stategrplist:[{value:0,label:'未打卡'},{value:1,label:'正常'},{value:2,label:'迟到'},
+ stategrplist:[{value:0,label:'未打卡'},{value:1,label:'正常'},{value:2,label:'迟到早退'},
{value:11,label:'事假'},{value:12,label:'病假'},{value:13,label:'年假'},{value:14,label:'调休'},{value:15,label:'其他'},],
attedtlform:{
startdate:Date.now(),