Skip to content

8
8timerapiv200
Commit fe2c9cb6 by leialin
Options

Merge branch 'lal' into 'develop' 

Lal

See merge request 8timerv2/8timerapiv200!287
parents 051144d0 f70602a8
Showing with 52 additions and 8 deletions
src/main/java/cn/timer/api/bean/kqmk/KqglAssoDkjl.java
...@@ -60,7 +60,7 @@ public class KqglAssoDkjl extends Model<KqglAssoDkjl> { ...@@ -60,7 +60,7 @@ public class KqglAssoDkjl extends Model<KqglAssoDkjl> {
@ApiModelProperty(value = "类型(0：无排班打卡 1：上班 2：下班)", example = "101") @ApiModelProperty(value = "类型(0：无排班打卡 1：上班 2：下班)", example = "101")
private Integer type; private Integer type;
@ApiModelProperty(value = "（0：打卡无效:此记录已被更新 1：正常 2：异常 3：迟到 4：早退 5：补卡 6：请假 7：加班 8：调休）", example = "101") @ApiModelProperty(value = "（0：打卡无效:此记录已被更新 1：正常 2：异常 3：迟到 4：早退 5：补卡 6：请假 7：加班 8：调休 9：管理员改为正常 10：管理员改为迟到 11：管理员改为早退 12：补卡通过/正常 13：补卡通过/迟到 14：补卡通过/早退）", example = "101")
private Integer status; private Integer status;
@ApiModelProperty(value = "序号（0：打卡无效:此记录已被更新） 序号（0：打卡无效:此记录已被更新）", example = "101") @ApiModelProperty(value = "序号（0：打卡无效:此记录已被更新） 序号（0：打卡无效:此记录已被更新）", example = "101")
......
src/main/java/cn/timer/api/controller/kqgl/service/KqglServiceImpl.java
...@@ -716,10 +716,26 @@ public class KqglServiceImpl implements KqglService { ...@@ -716,10 +716,26 @@ public class KqglServiceImpl implements KqglService {
dkmxid = pcd.getId(); dkmxid = pcd.getId();
} }
//0：打卡无效:此记录已被更新 1：正常 2：异常 3：迟到 4：早退 5：补卡 6：请假 7：加班 8：调休
//9：管理员改为正常 10：管理员改为迟到 11：管理员改为早退 12：补卡通过/正常 13：补卡通过/迟到 14：补卡通过/早退
int status = 2;
if((atttype)%2 > 0){ if((atttype)%2 > 0){
type = 1; type = 1;
if(results == 0) {
status = 12;
}else {
status = 13;
}
}else { }else {
type = 2; type = 2;
if(results == 0) {
status = 12;
}else {
status = 14;
}
} }
Long startDate = DateUtil.getStartTime(0,DateUtil.getStringTime(cardrepltime,"yyyy-MM-dd")).getTime(); Long startDate = DateUtil.getStartTime(0,DateUtil.getStringTime(cardrepltime,"yyyy-MM-dd")).getTime();
...@@ -727,7 +743,7 @@ public class KqglServiceImpl implements KqglService { ...@@ -727,7 +743,7 @@ public class KqglServiceImpl implements KqglService {
//attime 应打卡时间 //attime 应打卡时间
KqglAssoDkjl pre = KqglAssoDkjl.builder().dktime(repaappr.getCardrepltime()).results(results).userId(repaappr.getUserid()).type(type).status(5).sort(atttype) KqglAssoDkjl pre = KqglAssoDkjl.builder().dktime(repaappr.getCardrepltime()).results(results).userId(repaappr.getUserid()).type(type).status(status).sort(atttype)
.cardType(0).qyid(repaappr.getOrgcode()).attdate(attdate_+" "+ClockInTool.dateToWeek2(cardrepltime)).attime(attime).dkmxid(dkmxid).bcid(shifid).remarks("审批补卡通过打卡").punchmode(0) .cardType(0).qyid(repaappr.getOrgcode()).attdate(attdate_+" "+ClockInTool.dateToWeek2(cardrepltime)).attime(attime).dkmxid(dkmxid).bcid(shifid).remarks("审批补卡通过打卡").punchmode(0)
.punchequipment("").commentary("成功打卡").build(); .punchequipment("").commentary("成功打卡").build();
......
src/main/java/cn/timer/api/dao/kqmk/KqglAssoDkjlMapper.java
package cn.timer.api.dao.kqmk; package cn.timer.api.dao.kqmk;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import java.util.List;
import org.springframework.stereotype.Repository; import org.springframework.stereotype.Repository;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import cn.timer.api.bean.kqmk.KqglAssoDkjl; import cn.timer.api.bean.kqmk.KqglAssoDkjl;
/** /**
...@@ -12,5 +15,5 @@ import cn.timer.api.bean.kqmk.KqglAssoDkjl; ...@@ -12,5 +15,5 @@ import cn.timer.api.bean.kqmk.KqglAssoDkjl;
*/ */
@Repository @Repository
public interface KqglAssoDkjlMapper extends BaseMapper<KqglAssoDkjl> { public interface KqglAssoDkjlMapper extends BaseMapper<KqglAssoDkjl> {
List<KqglAssoDkjl> getDetailedRecordClock(Long start,Long end,Integer userId);
} }
src/main/java/cn/timer/api/dto/kqmk/AttendanceCardListDto.java
...@@ -3,6 +3,8 @@ package cn.timer.api.dto.kqmk; ...@@ -3,6 +3,8 @@ package cn.timer.api.dto.kqmk;
import java.io.Serializable; import java.io.Serializable;
import java.util.List; import java.util.List;
import cn.timer.api.bean.kqmk.KqglAssoDkjl;
import cn.timer.api.bean.kqmk.KqglAssoDkjl.KqglAssoDkjlBuilder;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Builder; import lombok.Builder;
import lombok.Data; import lombok.Data;
...@@ -21,9 +23,9 @@ public class AttendanceCardListDto implements Serializable { ...@@ -21,9 +23,9 @@ public class AttendanceCardListDto implements Serializable {
private boolean attaddress;// 考勤地址 private boolean attaddress;// 考勤地址
private boolean attwifi;// 考勤WIFI private boolean attwifi;// 考勤WIFI
private List<AttClockMethod> machine;// 详细打卡方式 private List<AttClockMethod> machine;// 详细打卡方式
private List<PunchRecord> attpr;// 打卡记录 private List<KqglAssoDkjl> attpr;// 打卡记录
private boolean optscheduling;// 未排班时，员工可选择班次打卡 // private boolean optscheduling;// 未排班时，员工可选择班次打卡
private boolean fieldpersonnel;// 外勤 true:开 false:关 private boolean fieldpersonnel;// 外勤 true:开 false:关
...@@ -37,8 +39,9 @@ public class AttendanceCardListDto implements Serializable { ...@@ -37,8 +39,9 @@ public class AttendanceCardListDto implements Serializable {
private boolean islatelate;// 晚走晚到 private boolean islatelate;// 晚走晚到
private List<AttLateLate> attlat;// 晚走晚到时间 private List<AttLateLate> attlat;// 晚走晚到时间
private String latetime;// 前一天晚走小时**** private double latetime;// 前天晚走时长（分钟）
private Long changed_time;// 根据班次规则计算出的 应晚到的打卡时间
private List<SystemShift> ssfh;// 无排班时获取的系统班次 // private List<SystemShift> ssfh;// 无排班时获取的系统班次
private Integer attgrouptype;// 1：固定排班；2：自由排班；3：自由工时 private Integer attgrouptype;// 1：固定排班；2：自由排班；3：自由工时
} }
src/main/java/cn/timer/api/dto/kqmk/DailyDetailsDto.java
...@@ -39,6 +39,7 @@ public class DailyDetailsDto { ...@@ -39,6 +39,7 @@ public class DailyDetailsDto {
private String bcxbdk2; private String bcxbdk2;
private String bcsbdk3; private String bcsbdk3;
private String bcxbdk3; private String bcxbdk3;
private Integer isxbdk;
private Integer dktj1; private Integer dktj1;
private Integer dktj2; private Integer dktj2;
......
src/main/resources/mapping/kqmk/KqglAssoDkjlMapper.xml
...@@ -78,6 +78,13 @@ ...@@ -78,6 +78,13 @@
commentary KqglAssoDkjl_explain commentary KqglAssoDkjl_explain
</sql> </sql>
<select id="getDetailedRecordClock" resultMap="BaseResultMap">
select * from kqgl_asso_dkjl dkjl
where dkjl.attime &gt;= #{start}
and dkjl.attime &lt;= #{end}
and dkjl.user_id = #{userId,jdbcType=INTEGER}
and dkjl.status != 0
</select>
<!-- <!--
<insert id="insert" useGeneratedKeys="true" keyColumn="id" parameterType="cn.timer.api.bean.kqmk.KqglAssoDkjl"> <insert id="insert" useGeneratedKeys="true" keyColumn="id" parameterType="cn.timer.api.bean.kqmk.KqglAssoDkjl">
......
src/main/resources/mapping/kqmk/KqglAssoMonthPunchSummaryMapper.xml
...@@ -167,6 +167,7 @@ ...@@ -167,6 +167,7 @@
<result column="bcxbdk2" property="bcxbdk2" /> <result column="bcxbdk2" property="bcxbdk2" />
<result column="bcsbdk3" property="bcsbdk3" /> <result column="bcsbdk3" property="bcsbdk3" />
<result column="bcxbdk3" property="bcxbdk3" /> <result column="bcxbdk3" property="bcxbdk3" />
<result column="isxbdk" property="isxbdk" />
<result column="dktj1" property="dktj1" /> <result column="dktj1" property="dktj1" />
<result column="dktj2" property="dktj2" /> <result column="dktj2" property="dktj2" />
...@@ -350,6 +351,19 @@ ...@@ -350,6 +351,19 @@
WHEN IFNULL((select kqz.pbfs from kqgl_main_kqz kqz where kqz.id = sum.att_group),'') = 2 WHEN IFNULL((select kqz.pbfs from kqgl_main_kqz kqz where kqz.id = sum.att_group),'') = 2
THEN (select pb.bcid from kqgl_asso_pbmx pb where pb.userid = sum.num THEN (select pb.bcid from kqgl_asso_pbmx pb where pb.userid = sum.num
and pb.`data` = #{param.times} and pb.kqzid = sum.att_group) ELSE '' END))),'') as ydkcs, and pb.`data` = #{param.times} and pb.kqzid = sum.att_group) ELSE '' END))),'') as ydkcs,
IFNULL((select bc.is_xbdk from kqgl_asso_bcsz bc where bc.id = ((CASE WHEN IFNULL((select kqz.pbfs from kqgl_main_kqz kqz where kqz.id = sum.att_group),'') = 1
THEN (IFNULL((select zh.bcid from kqgl_asso_zhoupaiban zh where zh.kqzid = sum.att_group
and zh.type = (select CASE WHEN DAYNAME(#{param.times}) = 'Monday' THEN '1'
WHEN DAYNAME(#{param.times}) = 'Tuesday' THEN '2'
WHEN DAYNAME(#{param.times}) = 'Wednesday' THEN '3'
WHEN DAYNAME(#{param.times}) = 'Thursday' THEN '4'
WHEN DAYNAME(#{param.times}) = 'Friday' THEN '5'
WHEN DAYNAME(#{param.times}) = 'Saturday' THEN '6' ELSE '7' END)), (select te.bcid from kqgl_asso_teshu te where te.kqzid = sum.att_group and te.tsrq = #{param.times})))
WHEN IFNULL((select kqz.pbfs from kqgl_main_kqz kqz where kqz.id = sum.att_group),'') = 2
THEN (select pb.bcid from kqgl_asso_pbmx pb where pb.userid = sum.num
and pb.`data` = #{param.times} and pb.kqzid = sum.att_group) ELSE '' END))),'') as isxbdk,
'' address,'' remarks,'' cardtype,'' macaddress,'' macname, '' address,'' remarks,'' cardtype,'' macaddress,'' macname,
IFNULL(rtj.attdate, '') attdate,IFNULL(rtj.userid,'') userid, IFNULL(rtj.attdate, '') attdate,IFNULL(rtj.userid,'') userid,
#{param.times} data, #{param.times} data,
......
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