Skip to content

8
8timerapiv200
Commit bf585f10 by ilal
Options

提交

parent 80828539
Showing with 44 additions and 7 deletions
src/main/java/cn/timer/api/bean/kqmk/KqglAssoDkmx.java
...@@ -49,6 +49,9 @@ public class KqglAssoDkmx extends Model<KqglAssoDkmx> { ...@@ -49,6 +49,9 @@ public class KqglAssoDkmx extends Model<KqglAssoDkmx> {
@ApiModelProperty(value = "上班1打卡结果 上班1打卡结果", example = "101") @ApiModelProperty(value = "上班1打卡结果 上班1打卡结果", example = "101")
private Integer sbdk1jg; private Integer sbdk1jg;
@ApiModelProperty(value = "打卡时态（0：无；1：严重迟到；2：旷工迟到）", example = "0")
private Integer dkst1;
@ApiModelProperty(value = "打卡途径（1：补卡；2：管理员更改）", example = "0") @ApiModelProperty(value = "打卡途径（1：补卡；2：管理员更改）", example = "0")
private Integer dktj1; private Integer dktj1;
...@@ -67,6 +70,9 @@ public class KqglAssoDkmx extends Model<KqglAssoDkmx> { ...@@ -67,6 +70,9 @@ public class KqglAssoDkmx extends Model<KqglAssoDkmx> {
@ApiModelProperty(value = "上班2打卡结果 上班2打卡结果", example = "101") @ApiModelProperty(value = "上班2打卡结果 上班2打卡结果", example = "101")
private Integer sbdk2jg; private Integer sbdk2jg;
@ApiModelProperty(value = "打卡时态（0：无；1：严重迟到；2：旷工迟到）", example = "0")
private Integer dkst2;
@ApiModelProperty(value = "打卡途径（1：补卡；2：管理员更改）", example = "0") @ApiModelProperty(value = "打卡途径（1：补卡；2：管理员更改）", example = "0")
private Integer dktj3; private Integer dktj3;
...@@ -85,6 +91,9 @@ public class KqglAssoDkmx extends Model<KqglAssoDkmx> { ...@@ -85,6 +91,9 @@ public class KqglAssoDkmx extends Model<KqglAssoDkmx> {
@ApiModelProperty(value = "上班3打卡结果 上班3打卡结果", example = "101") @ApiModelProperty(value = "上班3打卡结果 上班3打卡结果", example = "101")
private Integer sbdk3jg; private Integer sbdk3jg;
@ApiModelProperty(value = "打卡时态（0：无；1：严重迟到；2：旷工迟到）", example = "0")
private Integer dkst3;
@ApiModelProperty(value = "打卡途径（1：补卡；2：管理员更改）", example = "0") @ApiModelProperty(value = "打卡途径（1：补卡；2：管理员更改）", example = "0")
private Integer dktj5; private Integer dktj5;
......
src/main/java/cn/timer/api/controller/kqgl/ClockInController.java
...@@ -589,7 +589,7 @@ public class ClockInController { ...@@ -589,7 +589,7 @@ public class ClockInController {
if(execution_status == 1) {//上班1 ****新增 if(execution_status == 1) {//上班1 ****新增
KqglAssoDkmx pcd = KqglAssoDkmx.builder().userid(userid).data(putime).qyid(qyid).dksj(startDate).build(); KqglAssoDkmx pcd = KqglAssoDkmx.builder().userid(userid).data(putime).qyid(qyid).dksj(startDate).build();
int sbdkjg = 0,yzcdsc = 0,yzcdcs = 0,kgcdcs = 0; int sbdkjg = 0,yzcdsc = 0,yzcdcs = 0,kgcdcs = 0,dkst1 = 0;
if(punchcardtime != 0){//有应打卡时间时 if(punchcardtime != 0){//有应打卡时间时
Long time = (time_ - punchcardtime)/1000/60; Long time = (time_ - punchcardtime)/1000/60;
if((atttype)%2 > 0){//上班 if((atttype)%2 > 0){//上班
...@@ -683,12 +683,16 @@ public class ClockInController { ...@@ -683,12 +683,16 @@ public class ClockInController {
if(sbdkjg>yzcd && sbdkjg < kgcdfzs && yzcd>0) { if(sbdkjg>yzcd && sbdkjg < kgcdfzs && yzcd>0) {
yzcdcs++; yzcdcs++;
yzcdsc = sbdkjg; yzcdsc = sbdkjg;
dkst1 = 1;
} }
//旷工迟到 //旷工迟到
if(sbdkjg>kgcdfzs && kgcdfzs>0) { if(sbdkjg>kgcdfzs && kgcdfzs>0) {
kgcdcs++; kgcdcs++;
dkst1 = 2;
} }
pcd.setDkst1(dkst1);//打卡时态（0：无；1：严重迟到；2：旷工迟到）
pcd.setYzcdcs(yzcdcs);//严重迟到次数 pcd.setYzcdcs(yzcdcs);//严重迟到次数
pcd.setYzcdsc(Double.valueOf(yzcdsc));//严重迟到时长（分钟） pcd.setYzcdsc(Double.valueOf(yzcdsc));//严重迟到时长（分钟）
pcd.setKgcdfzs(kgcdcs);//旷工迟到次数 pcd.setKgcdfzs(kgcdcs);//旷工迟到次数
...@@ -719,7 +723,7 @@ public class ClockInController { ...@@ -719,7 +723,7 @@ public class ClockInController {
}else if(atttype == 3){//上班2 }else if(atttype == 3){//上班2
int sbdk2jg = 0,yzcdsc = 0,yzcdcs = 0,kgcdcs = 0; int sbdk2jg = 0,yzcdsc = 0,yzcdcs = 0,kgcdcs = 0,dkst2=0;
if(punchcardtime != 0){//有应打卡时间时 if(punchcardtime != 0){//有应打卡时间时
Long time = (time_ - punchcardtime)/1000/60; Long time = (time_ - punchcardtime)/1000/60;
if(time > 0){sbdk2jg = Math.abs(Integer.valueOf(time.toString()));} if(time > 0){sbdk2jg = Math.abs(Integer.valueOf(time.toString()));}
...@@ -734,12 +738,17 @@ public class ClockInController { ...@@ -734,12 +738,17 @@ public class ClockInController {
if(sbdk2jg>yzcd && sbdk2jg < kgcdfzs && yzcd>0) { if(sbdk2jg>yzcd && sbdk2jg < kgcdfzs && yzcd>0) {
yzcdcs = dkmc.getYzcdcs()+1; yzcdcs = dkmc.getYzcdcs()+1;
yzcdsc = sbdk2jg; yzcdsc = sbdk2jg;
dkst2 = 1;
} }
//旷工迟到 //旷工迟到
if(sbdk2jg>kgcdfzs && kgcdfzs>0) { if(sbdk2jg>kgcdfzs && kgcdfzs>0) {
kgcdcs++; kgcdcs++;
kgcdcs = kgcdcs + dkmc.getKgcdfzs();
dkst2 = 2;
} }
pcd.setDkst2(dkst2);//打卡时态（0：无；1：严重迟到；2：旷工迟到）
pcd.setId(dkmc.getId()); pcd.setId(dkmc.getId());
pcd.setSbdk2(time_);//上班1打卡时间 pcd.setSbdk2(time_);//上班1打卡时间
pcd.setSbdk2jg(sbdk2jg); pcd.setSbdk2jg(sbdk2jg);
...@@ -774,7 +783,7 @@ public class ClockInController { ...@@ -774,7 +783,7 @@ public class ClockInController {
} }
kqglassodkmxmapper.updateByPrimaryKeySelective(pcd);//修改打卡记录 kqglassodkmxmapper.updateByPrimaryKeySelective(pcd);//修改打卡记录
}else if(atttype == 5){//上班3 }else if(atttype == 5){//上班3
int sbdk3jg = 0,yzcdsc = 0,yzcdcs = 0,kgcdcs = 0; int sbdk3jg = 0,yzcdsc = 0,yzcdcs = 0,kgcdcs = 0,dkst3=0;
if(punchcardtime != 0){//有应打卡时间时 if(punchcardtime != 0){//有应打卡时间时
Long time = (time_ - punchcardtime)/1000/60; Long time = (time_ - punchcardtime)/1000/60;
if(time > 0){sbdk3jg = Math.abs(Integer.valueOf(time.toString()));} if(time > 0){sbdk3jg = Math.abs(Integer.valueOf(time.toString()));}
...@@ -788,12 +797,17 @@ public class ClockInController { ...@@ -788,12 +797,17 @@ public class ClockInController {
if(sbdk3jg>yzcd && sbdk3jg < kgcdfzs && yzcd>0) { if(sbdk3jg>yzcd && sbdk3jg < kgcdfzs && yzcd>0) {
yzcdcs = dkmc.getYzcdcs()+1; yzcdcs = dkmc.getYzcdcs()+1;
yzcdsc = sbdk3jg; yzcdsc = sbdk3jg;
dkst3 = 1;
} }
//旷工迟到 //旷工迟到
if(sbdk3jg>kgcdfzs && kgcdfzs>0) { if(sbdk3jg>kgcdfzs && kgcdfzs>0) {
kgcdcs++; kgcdcs++;
kgcdcs = kgcdcs + dkmc.getKgcdfzs();
dkst3 = 2;
} }
pcd.setDkst3(dkst3);//打卡时态（0：无；1：严重迟到；2：旷工迟到）
pcd.setId(dkmc.getId()); pcd.setId(dkmc.getId());
pcd.setSbdk3(time_);//上班1打卡时间 pcd.setSbdk3(time_);//上班1打卡时间
pcd.setSbdk3jg(sbdk3jg); pcd.setSbdk3jg(sbdk3jg);
......
src/main/java/cn/timer/api/dto/kqmk/DailyDetailsDto.java
...@@ -30,7 +30,11 @@ public class DailyDetailsDto { ...@@ -30,7 +30,11 @@ public class DailyDetailsDto {
private Integer cardtype;// 打卡类型（1：GPS，2：WIFI，3：考勤机） private Integer cardtype;// 打卡类型（1：GPS，2：WIFI，3：考勤机）
private String macaddress;// WIFI打卡地址 private String macaddress;// WIFI打卡地址
private String macname;// WIFI打卡名称 private String macname;// WIFI打卡名称
private Integer dkst1;//打卡时态（0：无；1：严重迟到；2：旷工迟到）
private Integer dkst2;//打卡时态（0：无；1：严重迟到；2：旷工迟到）
private Integer dkst3;//打卡时态（0：无；1：严重迟到；2：旷工迟到）
private Integer bcszid; private Integer bcszid;
private String bcname; private String bcname;
private String bcsbdk1; private String bcsbdk1;
......
src/main/resources/mapping/kqmk/KqglAssoDkmxMapper.xml
...@@ -9,13 +9,16 @@ ...@@ -9,13 +9,16 @@
<result column="data" property="data" /> <result column="data" property="data" />
<result column="sbdk1" property="sbdk1" /> <result column="sbdk1" property="sbdk1" />
<result column="sbdk1jg" property="sbdk1jg" /> <result column="sbdk1jg" property="sbdk1jg" />
<result column="dkst1" property="dkst1" />
<result column="dktj1" property="dktj1" /> <result column="dktj1" property="dktj1" />
<result column="xbdk1" property="xbdk1" /> <result column="xbdk1" property="xbdk1" />
<result column="xbdk1jg" property="xbdk1jg" /> <result column="xbdk1jg" property="xbdk1jg" />
<result column="dktj2" property="dktj2" /> <result column="dktj2" property="dktj2" />
<result column="sbdk2" property="sbdk2" /> <result column="sbdk2" property="sbdk2" />
<result column="sbdk2jg" property="sbdk2jg" /> <result column="sbdk2jg" property="sbdk2jg" />
<result column="dkst2" property="dkst2" />
<result column="dktj3" property="dktj3" /> <result column="dktj3" property="dktj3" />
<result column="xbdk2" property="xbdk2" /> <result column="xbdk2" property="xbdk2" />
...@@ -24,6 +27,7 @@ ...@@ -24,6 +27,7 @@
<result column="sbdk3" property="sbdk3" /> <result column="sbdk3" property="sbdk3" />
<result column="sbdk3jg" property="sbdk3jg" /> <result column="sbdk3jg" property="sbdk3jg" />
<result column="dkst3" property="dkst3" />
<result column="dktj5" property="dktj5" /> <result column="dktj5" property="dktj5" />
<result column="xbdk3" property="xbdk3" /> <result column="xbdk3" property="xbdk3" />
...@@ -65,14 +69,17 @@ ...@@ -65,14 +69,17 @@
<if test ='null != data'>data = #{data},</if> <if test ='null != data'>data = #{data},</if>
<if test ='null != sbdk1'>sbdk1 = #{sbdk1},</if> <if test ='null != sbdk1'>sbdk1 = #{sbdk1},</if>
<if test ='null != sbdk1jg'>sbdk1jg = #{sbdk1jg},</if> <if test ='null != sbdk1jg'>sbdk1jg = #{sbdk1jg},</if>
<if test ='null != dkst1'>dkst1 = #{dkst1},</if>
<if test ='null != xbdk1'>xbdk1 = #{xbdk1},</if> <if test ='null != xbdk1'>xbdk1 = #{xbdk1},</if>
<if test ='null != xbdk1jg'>xbdk1jg = #{xbdk1jg},</if> <if test ='null != xbdk1jg'>xbdk1jg = #{xbdk1jg},</if>
<if test ='null != sbdk2'>sbdk2 = #{sbdk2},</if> <if test ='null != sbdk2'>sbdk2 = #{sbdk2},</if>
<if test ='null != sbdk2jg'>sbdk2jg = #{sbdk2jg},</if> <if test ='null != sbdk2jg'>sbdk2jg = #{sbdk2jg},</if>
<if test ='null != dkst2'>dkst2 = #{dkst2},</if>
<if test ='null != xbdk2'>xbdk2 = #{xbdk2},</if> <if test ='null != xbdk2'>xbdk2 = #{xbdk2},</if>
<if test ='null != xbdk2jg'>xbdk2jg = #{xbdk2jg},</if> <if test ='null != xbdk2jg'>xbdk2jg = #{xbdk2jg},</if>
<if test ='null != sbdk3'>sbdk3 = #{sbdk3},</if> <if test ='null != sbdk3'>sbdk3 = #{sbdk3},</if>
<if test ='null != sbdk3jg'>sbdk3jg = #{sbdk3jg},</if> <if test ='null != sbdk3jg'>sbdk3jg = #{sbdk3jg},</if>
<if test ='null != dkst3'>dkst3 = #{dkst3},</if>
<if test ='null != xbdk3'>xbdk3 = #{xbdk3},</if> <if test ='null != xbdk3'>xbdk3 = #{xbdk3},</if>
<if test ='null != xbdk3jg'>xbdk3jg = #{xbdk3jg},</if> <if test ='null != xbdk3jg'>xbdk3jg = #{xbdk3jg},</if>
<if test ='null != ydkcs'>ydkcs = #{ydkcs},</if> <if test ='null != ydkcs'>ydkcs = #{ydkcs},</if>
......
src/main/resources/mapping/kqmk/KqglAssoMonthPunchSummaryMapper.xml
...@@ -169,6 +169,10 @@ ...@@ -169,6 +169,10 @@
<result column="bcxbdk3" property="bcxbdk3" /> <result column="bcxbdk3" property="bcxbdk3" />
<result column="isxbdk" property="isxbdk" /> <result column="isxbdk" property="isxbdk" />
<result column="dkst1" property="dkst1" />
<result column="dkst2" property="dkst2" />
<result column="dkst3" property="dkst3" />
<result column="dktj1" property="dktj1" /> <result column="dktj1" property="dktj1" />
<result column="dktj2" property="dktj2" /> <result column="dktj2" property="dktj2" />
<result column="dktj3" property="dktj3" /> <result column="dktj3" property="dktj3" />
...@@ -424,6 +428,7 @@ ...@@ -424,6 +428,7 @@
(IFNULL(rtj.sbdk1jg,0) + IFNULL(rtj.sbdk2jg ,0) + IFNULL(rtj.sbdk3jg ,0)) as sbcdzs, (IFNULL(rtj.sbdk1jg,0) + IFNULL(rtj.sbdk2jg ,0) + IFNULL(rtj.sbdk3jg ,0)) as sbcdzs,
(IFNULL(rtj.xbdk1jg,0) + IFNULL(rtj.xbdk2jg ,0) + IFNULL(rtj.xbdk3jg ,0)) as xbztzs, (IFNULL(rtj.xbdk1jg,0) + IFNULL(rtj.xbdk2jg ,0) + IFNULL(rtj.xbdk3jg ,0)) as xbztzs,
IFNULL(rtj.dktj1,'') dktj1,IFNULL(rtj.dktj2,'') dktj2,IFNULL(rtj.dktj3,'') dktj3,IFNULL(rtj.dktj4,'') dktj4,IFNULL(rtj.dktj5,'') dktj5,IFNULL(rtj.dktj6,'') dktj6, IFNULL(rtj.dktj1,'') dktj1,IFNULL(rtj.dktj2,'') dktj2,IFNULL(rtj.dktj3,'') dktj3,IFNULL(rtj.dktj4,'') dktj4,IFNULL(rtj.dktj5,'') dktj5,IFNULL(rtj.dktj6,'') dktj6,
IFNULL(rtj.dkst1,'') dkst1,IFNULL(rtj.dkst2,'') dkst2,IFNULL(rtj.dkst3,'') dkst3,
IFNULL(rtj.gzsc ,'') gzsc, IFNULL(rtj.gzsc ,'') gzsc,
IFNULL(rtj.qyid,'') qyid, IFNULL(rtj.qyid,'') qyid,
IFNULL(rtj.dksj ,'') dksj, IFNULL(rtj.dksj ,'') dksj,
...@@ -436,7 +441,6 @@ ...@@ -436,7 +441,6 @@
sum.time_out as timeout, sum.time_out as timeout,
(select SUM(su.duration) as duration from kqgl_asso_relation_summary su where su.user_id = sum.num and su.approval_type = 1 and su.overtime_type_id = 1 (select SUM(su.duration) as duration from kqgl_asso_relation_summary su where su.user_id = sum.num and su.approval_type = 1 and su.overtime_type_id = 1
and su.app_time = #{param.times}) as totalovertimehours, and su.app_time = #{param.times}) as totalovertimehours,
(select SUM(su.duration) as duration from kqgl_asso_relation_summary su where su.user_id = sum.num and su.approval_type = 1 (select SUM(su.duration) as duration from kqgl_asso_relation_summary su where su.user_id = sum.num and su.approval_type = 1
and (su.compensate_id = 1 or su.compensate_id = 3) and su.overtime_type_id = 1 and su.app_time = #{param.times}) as workingturncompenleave, and (su.compensate_id = 1 or su.compensate_id = 3) and su.overtime_type_id = 1 and su.app_time = #{param.times}) as workingturncompenleave,
(select SUM(su.duration) as duration from kqgl_asso_relation_summary su where su.user_id = sum.num and su.approval_type = 1 (select SUM(su.duration) as duration from kqgl_asso_relation_summary su where su.user_id = sum.num and su.approval_type = 1
...@@ -449,7 +453,6 @@ ...@@ -449,7 +453,6 @@
and (su.compensate_id = 2 or su.compensate_id = 4) and su.overtime_type_id = 2 and su.app_time = #{param.times}) as resttransferovertime, and (su.compensate_id = 2 or su.compensate_id = 4) and su.overtime_type_id = 2 and su.app_time = #{param.times}) as resttransferovertime,
(select SUM(su.duration) as duration from kqgl_asso_relation_summary su where su.user_id = sum.num and su.approval_type = 1 (select SUM(su.duration) as duration from kqgl_asso_relation_summary su where su.user_id = sum.num and su.approval_type = 1
and (su.compensate_id = 2 or su.compensate_id = 4) and su.overtime_type_id = 3 and su.app_time = #{param.times}) as holidaytransferovertime and (su.compensate_id = 2 or su.compensate_id = 4) and su.overtime_type_id = 3 and su.app_time = #{param.times}) as holidaytransferovertime
from kqgl_asso_month_punch_summary sum from kqgl_asso_month_punch_summary sum
LEFT JOIN ( LEFT JOIN (
select DISTINCT info.`name` as username , select DISTINCT info.`name` as username ,
...@@ -457,7 +460,7 @@ ...@@ -457,7 +460,7 @@
bcsz.`name` as bcname,bcsz.sbdk1 as bcsbdk1,bcsz.xbdk1 as bcxbdk1,bcsz.sbdk2 as bcsbdk2,bcsz.xbdk2 as bcxbdk2,bcsz.sbdk3 as bcsbdk3,bcsz.xbdk3 as bcxbdk3, bcsz.`name` as bcname,bcsz.sbdk1 as bcsbdk1,bcsz.xbdk1 as bcxbdk1,bcsz.sbdk2 as bcsbdk2,bcsz.xbdk2 as bcxbdk2,bcsz.sbdk3 as bcsbdk3,bcsz.xbdk3 as bcxbdk3,
dkmx.`userid`,dkmx.`data` ,dkmx.`sbdk1`,dkmx.`sbdk1jg`,dkmx.`xbdk1` ,dkmx.`xbdk1jg`,dkmx.`sbdk2` ,dkmx.`sbdk2jg` ,dkmx.`xbdk2` , dkmx.`userid`,dkmx.`data` ,dkmx.`sbdk1`,dkmx.`sbdk1jg`,dkmx.`xbdk1` ,dkmx.`xbdk1jg`,dkmx.`sbdk2` ,dkmx.`sbdk2jg` ,dkmx.`xbdk2` ,
dkmx.`xbdk2jg`,dkmx.`sbdk3` ,dkmx.`sbdk3jg` ,dkmx.`xbdk3`,dkmx.`xbdk3jg` ,dkmx.`ydkcs` ,dkmx.`gzsc` ,dkmx.`qyid`,dkmx.`dksj` , dkmx.`xbdk2jg`,dkmx.`sbdk3` ,dkmx.`sbdk3jg` ,dkmx.`xbdk3`,dkmx.`xbdk3jg` ,dkmx.`ydkcs` ,dkmx.`gzsc` ,dkmx.`qyid`,dkmx.`dksj` ,
dkmx.`yzcdcs` ,dkmx.`yzcdsc` ,dkmx.`kgcdfzs`,dkmx.dktj1,dkmx.dktj2,dkmx.dktj3,dkmx.dktj4,dkmx.dktj5,dkmx.dktj6 dkmx.`yzcdcs` ,dkmx.`yzcdsc` ,dkmx.`kgcdfzs`,dkmx.dktj1,dkmx.dktj2,dkmx.dktj3,dkmx.dktj4,dkmx.dktj5,dkmx.dktj6,dkmx.dkst1,dkmx.dkst2,dkmx.dkst3
from kqgl_asso_dkmx dkmx from kqgl_asso_dkmx dkmx
LEFT JOIN yggl_main_emp as info on info.emp_num = dkmx.userid and info.org_code = #{param.orgCode} LEFT JOIN yggl_main_emp as info on info.emp_num = dkmx.userid and info.org_code = #{param.orgCode}
LEFT JOIN kqgl_asso_dkjl as dkjl on dkjl.dkmxid = dkmx.id LEFT JOIN kqgl_asso_dkjl as dkjl on dkjl.dkmxid = dkmx.id
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment