Skip to content

8
8timerapiv200
Commit 43a1ebcf by ilal
Options

提交考勤组 休息日打卡

parent dc4e6cfb
Showing with 49 additions and 11 deletions
src/main/java/cn/timer/api/bean/kqgl/AttendanceAssistant.java
...@@ -52,4 +52,6 @@ public class AttendanceAssistant implements Serializable{ ...@@ -52,4 +52,6 @@ public class AttendanceAssistant implements Serializable{
int overtimeRulesId;//加班id int overtimeRulesId;//加班id
int fieldpersonnel;//外勤 int fieldpersonnel;//外勤
int restdayclock;//休息日打卡
} }
src/main/java/cn/timer/api/bean/kqgl/AttendanceGroup.java
...@@ -46,6 +46,8 @@ public class AttendanceGroup implements Serializable{ ...@@ -46,6 +46,8 @@ public class AttendanceGroup implements Serializable{
private Integer overtimeRulesId;//加班规则id private Integer overtimeRulesId;//加班规则id
private String overtimeRulesName;//加班规则名称 private String overtimeRulesName;//加班规则名称
private Integer restdayclock;//休息日打卡
private Integer kqjid; private Integer kqjid;
private List<AttGroupBinPunchMode> kqzdkfslist = new ArrayList<AttGroupBinPunchMode>(); private List<AttGroupBinPunchMode> kqzdkfslist = new ArrayList<AttGroupBinPunchMode>();
......
src/main/java/cn/timer/api/bean/kqmk/KqglMainKqz.java
...@@ -97,4 +97,7 @@ public class KqglMainKqz extends Model<KqglMainKqz> { ...@@ -97,4 +97,7 @@ public class KqglMainKqz extends Model<KqglMainKqz> {
@ApiModelProperty(value="加班规则 加班规则",example="101") @ApiModelProperty(value="加班规则 加班规则",example="101")
private Integer overtimeRulesId; private Integer overtimeRulesId;
@ApiModelProperty(value="休息日打卡开关 0:关 1：开",example="101")
private Integer restdayclock;
} }
\ No newline at end of file
src/main/java/cn/timer/api/controller/kqgl/AttController.java
...@@ -1361,6 +1361,8 @@ public class AttController { ...@@ -1361,6 +1361,8 @@ public class AttController {
attgro.setIsWq(attass.getFieldpersonnel());//外勤：0-关 1-开 attgro.setIsWq(attass.getFieldpersonnel());//外勤：0-关 1-开
attgro.setRestdayclock(attass.getRestdayclock());//休息日打卡
if(attass.getAtttype() == 1){ if(attass.getAtttype() == 1){
attgro.setIsFdjjr(attass.getLegalholidays());//是否开启法定节假日休息（固定排班） attgro.setIsFdjjr(attass.getLegalholidays());//是否开启法定节假日休息（固定排班）
} }
......
src/main/java/cn/timer/api/controller/kqgl/ClockInController.java
...@@ -2296,9 +2296,13 @@ public class ClockInController { ...@@ -2296,9 +2296,13 @@ public class ClockInController {
status_ = 2; status_ = 2;
} }
}else { }else {
// msg = "当前是休息时间"; //判断 考勤组是否开启休息日打卡
// sbyf = 0; if(attgro.getRestdayclock().equals(0)) {
// status_ = 2; msg = "当前是休息时间";
sbyf = 0;
status_ = 2;
}else {
KqglAssoDkmx zydkmc = KqglAssoDkmx.builder().build().selectOne(new QueryWrapper<KqglAssoDkmx>().lambda().eq(KqglAssoDkmx::getUserid, userid) KqglAssoDkmx zydkmc = KqglAssoDkmx.builder().build().selectOne(new QueryWrapper<KqglAssoDkmx>().lambda().eq(KqglAssoDkmx::getUserid, userid)
.ge(KqglAssoDkmx::getDksj, startDate).le(KqglAssoDkmx::getDksj, endDate)); .ge(KqglAssoDkmx::getDksj, startDate).le(KqglAssoDkmx::getDksj, endDate));
if(zydkmc == null) {//新增 if(zydkmc == null) {//新增
...@@ -2383,6 +2387,8 @@ public class ClockInController { ...@@ -2383,6 +2387,8 @@ public class ClockInController {
} }
} }
}
} }
} }
}else { }else {
......
src/main/java/cn/timer/api/controller/kqgl/TimeCardController.java
...@@ -1309,7 +1309,8 @@ public class TimeCardController { ...@@ -1309,7 +1309,8 @@ public class TimeCardController {
.isWq(attass.getFieldpersonnel()).isFdjjr(attass.getLegalholidays()).isXzbcdk(attass.getOptscheduling()).sybc(String.join(",",attass.getAttShifts())) .isWq(attass.getFieldpersonnel()).isFdjjr(attass.getLegalholidays()).isXzbcdk(attass.getOptscheduling()).sybc(String.join(",",attass.getAttShifts()))
.isDqtx(attass.getAttRemind()).txry(String.join(",",attass.getAttRemindUserids())).txfs(attass.getAdvanceDays()).txxhts(attass.getRemCycleDays()) .isDqtx(attass.getAttRemind()).txry(String.join(",",attass.getAttRemindUserids())).txfs(attass.getAdvanceDays()).txxhts(attass.getRemCycleDays())
.txsjTime(attass.getReminderTime()).tsfs(String.join(",",attass.getPromptingMode())).isWpbsdk(attass.getAttRemind()).kqkssjTime(attass.getNewAttTime()) .txsjTime(attass.getReminderTime()).tsfs(String.join(",",attass.getPromptingMode())).isWpbsdk(attass.getAttRemind()).kqkssjTime(attass.getNewAttTime())
.zsgzsc(attass.getLeastworkTime()).zcgzsc(attass.getNormalWorkTime()).jbzdsc(attass.getMaxOvertimeTime()).overtimeRulesId(attass.getOvertimeRulesId()).build(); .zsgzsc(attass.getLeastworkTime()).zcgzsc(attass.getNormalWorkTime()).jbzdsc(attass.getMaxOvertimeTime()).overtimeRulesId(attass.getOvertimeRulesId())
.restdayclock(attass.getRestdayclock()).build();
// if (!attgro.insertOrUpdate()) // if (!attgro.insertOrUpdate())
if (!attgro.insert()) if (!attgro.insert())
......
src/main/java/cn/timer/api/dto/kqmk/AttendanceAssistantDto.java
...@@ -54,4 +54,6 @@ public class AttendanceAssistantDto implements Serializable{ ...@@ -54,4 +54,6 @@ public class AttendanceAssistantDto implements Serializable{
int overtimeRulesId;//加班id int overtimeRulesId;//加班id
int fieldpersonnel;//外勤 int fieldpersonnel;//外勤
int restdayclock;//休息日打卡
} }
src/main/java/cn/timer/api/dto/kqmk/KqglMainKqzDto.java
...@@ -81,6 +81,9 @@ public class KqglMainKqzDto { ...@@ -81,6 +81,9 @@ public class KqglMainKqzDto {
@ApiModelProperty(value="加班规则 加班规则",example="101") @ApiModelProperty(value="加班规则 加班规则",example="101")
private Integer overtimeRulesId; private Integer overtimeRulesId;
@ApiModelProperty(value="休息日打卡开关 0:关 1：开",example="101")
private Integer restdayclock;
@ApiModelProperty(value = "考勤组人员数", example = "100") @ApiModelProperty(value = "考勤组人员数", example = "100")
private Integer kqznum; private Integer kqznum;
......
src/main/resources/mapping/kqgl/AttendanceGroupMapper.xml
...@@ -33,6 +33,8 @@ ...@@ -33,6 +33,8 @@
<result column="overtimeRulesName" property="overtimeRulesName" /> <result column="overtimeRulesName" property="overtimeRulesName" />
<result column="restdayclock" property="restdayclock" />
<collection property="kqzdkfslist" ofType="cn.timer.api.bean.kqgl.AttGroupBinPunchMode"> <collection property="kqzdkfslist" ofType="cn.timer.api.bean.kqgl.AttGroupBinPunchMode">
<result column="kqzId" property="kqzId" jdbcType="INTEGER" /> <result column="kqzId" property="kqzId" jdbcType="INTEGER" />
<result column="type" property="type" jdbcType="INTEGER" /> <result column="type" property="type" jdbcType="INTEGER" />
...@@ -95,7 +97,7 @@ ...@@ -95,7 +97,7 @@
<sql id="Base_Column_List" > <sql id="Base_Column_List" >
id, name, kqbz, pbfs, qyid, is_fdjjr, kqkssj_time, zsgzsc, zcgzsc, jbzdsc, is_dqtx, id, name, kqbz, pbfs, qyid, is_fdjjr, kqkssj_time, zsgzsc, zcgzsc, jbzdsc, is_dqtx,
txry, txfs, txxhts, txsj_time, tsfs, is_wpbsdk,sybc,is_xzbcdk,is_wq,overtime_rules_id txry, txfs, txxhts, txsj_time, tsfs, is_wpbsdk,sybc,is_xzbcdk,is_wq,overtime_rules_id,restdayclock
</sql> </sql>
<select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" > <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
select kqz.*, select kqz.*,
...@@ -113,14 +115,14 @@ ...@@ -113,14 +115,14 @@
kqkssj_time, zsgzsc, zcgzsc, kqkssj_time, zsgzsc, zcgzsc,
jbzdsc, is_dqtx, txry, jbzdsc, is_dqtx, txry,
txfs, txxhts, txsj_time, txfs, txxhts, txsj_time,
tsfs, is_wpbsdk,sybc,is_xzbcdk,is_wq) tsfs, is_wpbsdk,sybc,is_xzbcdk,is_wq,restdayclock)
values (#{id,jdbcType=INTEGER}, #{name,jdbcType=VARCHAR}, #{kqbz,jdbcType=VARCHAR}, values (#{id,jdbcType=INTEGER}, #{name,jdbcType=VARCHAR}, #{kqbz,jdbcType=VARCHAR},
#{pbfs,jdbcType=INTEGER}, #{qyid,jdbcType=INTEGER}, #{isFdjjr,jdbcType=INTEGER}, #{pbfs,jdbcType=INTEGER}, #{qyid,jdbcType=INTEGER}, #{isFdjjr,jdbcType=INTEGER},
#{kqkssjTime,jdbcType=VARCHAR}, #{zsgzsc,jdbcType=VARCHAR}, #{zcgzsc,jdbcType=VARCHAR}, #{kqkssjTime,jdbcType=VARCHAR}, #{zsgzsc,jdbcType=VARCHAR}, #{zcgzsc,jdbcType=VARCHAR},
#{jbzdsc,jdbcType=VARCHAR}, #{isDqtx,jdbcType=INTEGER}, #{txry,jdbcType=VARCHAR}, #{jbzdsc,jdbcType=VARCHAR}, #{isDqtx,jdbcType=INTEGER}, #{txry,jdbcType=VARCHAR},
#{txfs,jdbcType=INTEGER}, #{txxhts,jdbcType=INTEGER}, #{txsjTime,jdbcType=VARCHAR}, #{txfs,jdbcType=INTEGER}, #{txxhts,jdbcType=INTEGER}, #{txsjTime,jdbcType=VARCHAR},
#{tsfs,jdbcType=VARCHAR}, #{isWpbsdk,jdbcType=INTEGER}, #{sybc,jdbcType=VARCHAR}, #{tsfs,jdbcType=VARCHAR}, #{isWpbsdk,jdbcType=INTEGER}, #{sybc,jdbcType=VARCHAR},
#{isXzbcdk,jdbcType=INTEGER},#{isWq,jdbcType=INTEGER}) #{isXzbcdk,jdbcType=INTEGER},#{isWq,jdbcType=INTEGER},#{restdayclock,jdbcType=INTEGER})
</insert> </insert>
<insert id="insertSelective" parameterType="cn.timer.api.bean.kqgl.AttendanceGroup" useGeneratedKeys="true" keyProperty="id"> <insert id="insertSelective" parameterType="cn.timer.api.bean.kqgl.AttendanceGroup" useGeneratedKeys="true" keyProperty="id">
insert into kqgl_main_kqz insert into kqgl_main_kqz
...@@ -186,6 +188,9 @@ ...@@ -186,6 +188,9 @@
<if test="overtimeRulesId != null" > <if test="overtimeRulesId != null" >
overtime_rules_id, overtime_rules_id,
</if> </if>
<if test="restdayclock != null" >
restdayclock,
</if>
</trim> </trim>
<trim prefix="values (" suffix=")" suffixOverrides="," > <trim prefix="values (" suffix=")" suffixOverrides="," >
...@@ -249,6 +254,9 @@ ...@@ -249,6 +254,9 @@
<if test="overtimeRulesId != null" > <if test="overtimeRulesId != null" >
#{overtimeRulesId,jdbcType=INTEGER}, #{overtimeRulesId,jdbcType=INTEGER},
</if> </if>
<if test="restdayclock != null" >
#{restdayclock,jdbcType=INTEGER},
</if>
</trim> </trim>
</insert> </insert>
<update id="updateByPrimaryKeySelective" parameterType="cn.timer.api.bean.kqgl.AttendanceGroup" > <update id="updateByPrimaryKeySelective" parameterType="cn.timer.api.bean.kqgl.AttendanceGroup" >
...@@ -314,6 +322,9 @@ ...@@ -314,6 +322,9 @@
<if test="overtimeRulesId != null" > <if test="overtimeRulesId != null" >
overtime_rules_id = #{overtimeRulesId,jdbcType=INTEGER}, overtime_rules_id = #{overtimeRulesId,jdbcType=INTEGER},
</if> </if>
<if test="restdayclock != null" >
restdayclock = #{restdayclock,jdbcType=INTEGER},
</if>
</set> </set>
where id = #{id,jdbcType=INTEGER} where id = #{id,jdbcType=INTEGER}
</update> </update>
...@@ -338,7 +349,8 @@ ...@@ -338,7 +349,8 @@
sybc = #{sybc,jdbcType=VARCHAR}, sybc = #{sybc,jdbcType=VARCHAR},
is_xzbcdk = #{isXzbcdk,jdbcType=INTEGER}, is_xzbcdk = #{isXzbcdk,jdbcType=INTEGER},
is_wq = #{isWq,jdbcType=INTEGER}, is_wq = #{isWq,jdbcType=INTEGER},
overtime_rules_id = #{overtimeRulesId,jdbcType=INTEGER} overtime_rules_id = #{overtimeRulesId,jdbcType=INTEGER},
restdayclock = #{restdayclock,jdbcType=INTEGER}
where id = #{id,jdbcType=INTEGER} where id = #{id,jdbcType=INTEGER}
</update> </update>
......
src/main/resources/mapping/kqmk/KqglMainKqzMapper.xml
...@@ -25,6 +25,7 @@ ...@@ -25,6 +25,7 @@
<result column="is_xzbcdk" property="isXzbcdk" /> <result column="is_xzbcdk" property="isXzbcdk" />
<result column="is_wq" property="isWq" /> <result column="is_wq" property="isWq" />
<result column="overtime_rules_id" property="overtimeRulesId" /> <result column="overtime_rules_id" property="overtimeRulesId" />
<result column="restdayclock" property="restdayclock" />
</resultMap> </resultMap>
<resultMap id="AuxiliaryMap" type="cn.timer.api.dto.kqmk.KqglMainKqzDto" > <resultMap id="AuxiliaryMap" type="cn.timer.api.dto.kqmk.KqglMainKqzDto" >
...@@ -82,7 +83,8 @@ ...@@ -82,7 +83,8 @@
sybc, sybc,
is_xzbcdk, is_xzbcdk,
is_wq, is_wq,
overtime_rules_id overtime_rules_id,
restdayclock
</sql> </sql>
<sql id="Base_Column_List_Alias"> <sql id="Base_Column_List_Alias">
...@@ -106,7 +108,8 @@ ...@@ -106,7 +108,8 @@
sybc KqglMainKqz_sybc, sybc KqglMainKqz_sybc,
is_xzbcdk KqglMainKqz_is_xzbcdk, is_xzbcdk KqglMainKqz_is_xzbcdk,
is_wq KqglMainKqz_is_wq, is_wq KqglMainKqz_is_wq,
overtime_rules_id KqglMainKqz_overtime_rules_id overtime_rules_id KqglMainKqz_overtime_rules_id,
restdayclock KqglMainKqz_restdayclock
</sql> </sql>
<sql id="Base_Column_List_a"> <sql id="Base_Column_List_a">
...@@ -130,7 +133,8 @@ ...@@ -130,7 +133,8 @@
a.sybc, a.sybc,
a.is_xzbcdk, a.is_xzbcdk,
a.is_wq, a.is_wq,
a.overtime_rules_id a.overtime_rules_id,
a.restdayclock
</sql> </sql>
<select id="selectAttGroupMachineByQyid" resultMap="AuxiliaryMap"> <select id="selectAttGroupMachineByQyid" resultMap="AuxiliaryMap">
......
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