Merge branch 'lal' into 'develop'

Lal

See merge request 8timerv2/8timerapiv200!94

src/main/java/cn/timer/api/bean/kqgl/AttendanceAssistant.java

@@ -49,5 +49,7 @@ public class AttendanceAssistant implements Serializable{
 
 	String attgroupid;
 	
+	int overtimeRulesId;//加班id
+	
 	int fieldpersonnel;//外勤
 }

src/main/java/cn/timer/api/bean/kqgl/AttendanceGroup.java

@@ -43,6 +43,7 @@ public class AttendanceGroup implements Serializable{
 	private String dkfs;// 打卡方式
 
 	private Integer isWq;//外勤
+	private Integer overtimeRulesId;
 	
 	private Integer kqjid;
 

src/main/java/cn/timer/api/bean/kqmk/KqglAssoMonthPunchSummary.java

+package cn.timer.api.bean.kqmk;
+
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @author lal 2020-05-15
+ */
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@Table(name = "kqgl_asso_month_punch_summary")
+@ApiModel("打卡月汇总")
+public class KqglAssoMonthPunchSummary extends Model<KqglAssoMonthPunchSummary> {
+
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 1L;
+
+	@Id
+	@GeneratedValue
+	@TableId(type = IdType.AUTO)
+	@ApiModelProperty(value = "id id", example = "101")
+	private Integer id;
+
+	@ApiModelProperty(value = "姓名 ", example = "姓名")
+	private String name;
+
+	@ApiModelProperty(value = "工号 工号", example = "101")
+	private Integer num;
+
+	@ApiModelProperty(value = "部门 ", example = "部门")
+	private String dept;
+
+	@ApiModelProperty(value = "职位 ", example = "职位")
+	private String post;
+
+	@ApiModelProperty(value = "考勤组id 考勤组id", example = "101")
+	private Integer attGroup;
+
+	@ApiModelProperty(value = "班次id 班次id", example = "101")
+	private Integer shift;
+
+	@ApiModelProperty(value = "应出勤天数 ", example = "应出勤天数")
+	private Double daysOnDuty;
+
+	@ApiModelProperty(value = "实际出勤天数 ", example = "实际出勤天数")
+	private Double actualAttDays;
+
+	@ApiModelProperty(value = "休息天数 ", example = "休息天数")
+	private Double daysOff;
+
+	@ApiModelProperty(value = "工作时长（分钟） ", example = "工作时长（分钟）")
+	private Double workingHours;
+
+	@ApiModelProperty(value = "迟到次数 ", example = "迟到次数")
+	private Double lateTimes;
+
+	@ApiModelProperty(value = "迟到时长（分钟） ", example = "迟到时长（分钟）")
+	private Double lateHours;
+
+	@ApiModelProperty(value = "严重迟到次数 ", example = "严重迟到次数")
+	private Double seriousLateTimes;
+
+	@ApiModelProperty(value = "严重迟到时长（分钟） ", example = "严重迟到时长（分钟）")
+	private Double seriousLateHours;
+
+	@ApiModelProperty(value = "旷工迟到次数 ", example = "旷工迟到次数")
+	private Double absenLateTimes;
+
+	@ApiModelProperty(value = "早退次数 ", example = "早退次数")
+	private Double earlyLeaveTimes;
+
+	@ApiModelProperty(value = "早退时长（分钟） ", example = "早退时长（分钟）")
+	private Double lengthEarlyLeave;
+
+	@ApiModelProperty(value = "上班缺卡次数 ", example = "上班缺卡次数")
+	private Double numberWorkCardShortage;
+
+	@ApiModelProperty(value = "下班缺卡次数 ", example = "下班缺卡次数")
+	private Double numberDutyCardShortage;
+
+	@ApiModelProperty(value = "旷工天数 ", example = "旷工天数")
+	private Double absenteeismDays;
+
+	@ApiModelProperty(value = "出差时长 ", example = "出差时长")
+	private Double lengthBusinessTrip;
+
+	@ApiModelProperty(value = "外出时长 ", example = "外出时长")
+	private Double timeOut;
+
+	@ApiModelProperty(value = "加班总时长 ", example = "加班总时长")
+	private Double totalOvertimeHours;
+
+	@ApiModelProperty(value = "工作日（转调休） ", example = "工作日（转调休）")
+	private Double workingTurnCompenLeave;
+
+	@ApiModelProperty(value = "休息日（转调休） ", example = "休息日（转调休）")
+	private Double restTurnCompenLeave;
+
+	@ApiModelProperty(value = "节假日（转调休） ", example = "节假日（转调休）")
+	private Double holidayTurnCompenLeave;
+
+	@ApiModelProperty(value = "工作日（转加班费） ", example = "工作日（转加班费）")
+	private Double workingTransferOvertime;
+
+	@ApiModelProperty(value = "休息日（转加班费） ", example = "休息日（转加班费）")
+	private Double restTransferOvertime;
+
+	@ApiModelProperty(value = "节假日（转加班费） ", example = "节假日（转加班费）")
+	private Double holidayTransferOvertime;
+
+	@ApiModelProperty(value = "day1 ", example = "day1")
+	private String day1;
+
+	@ApiModelProperty(value = "day2 ", example = "day2")
+	private String day2;
+
+	@ApiModelProperty(value = "day3 ", example = "day3")
+	private String day3;
+
+	@ApiModelProperty(value = "day4 ", example = "day4")
+	private String day4;
+
+	@ApiModelProperty(value = "day5 ", example = "day5")
+	private String day5;
+
+	@ApiModelProperty(value = "day6 ", example = "day6")
+	private String day6;
+
+	@ApiModelProperty(value = "day7 ", example = "day7")
+	private String day7;
+
+	@ApiModelProperty(value = "day8 ", example = "day8")
+	private String day8;
+
+	@ApiModelProperty(value = "day9 ", example = "day9")
+	private String day9;
+
+	@ApiModelProperty(value = "day10 ", example = "day10")
+	private String day10;
+
+	@ApiModelProperty(value = "day11 ", example = "day11")
+	private String day11;
+
+	@ApiModelProperty(value = "day12 ", example = "day12")
+	private String day12;
+
+	@ApiModelProperty(value = "day13 ", example = "day13")
+	private String day13;
+
+	@ApiModelProperty(value = "day14 ", example = "day14")
+	private String day14;
+
+	@ApiModelProperty(value = "day15 ", example = "day15")
+	private String day15;
+
+	@ApiModelProperty(value = "day16 ", example = "day16")
+	private String day16;
+
+	@ApiModelProperty(value = "day17 ", example = "day17")
+	private String day17;
+
+	@ApiModelProperty(value = "day18 ", example = "day18")
+	private String day18;
+
+	@ApiModelProperty(value = "day19 ", example = "day19")
+	private String day19;
+
+	@ApiModelProperty(value = "day20 ", example = "day20")
+	private String day20;
+
+	@ApiModelProperty(value = "day21 ", example = "day21")
+	private String day21;
+
+	@ApiModelProperty(value = "day22 ", example = "day22")
+	private String day22;
+
+	@ApiModelProperty(value = "day23 ", example = "day23")
+	private String day23;
+
+	@ApiModelProperty(value = "day24 ", example = "day24")
+	private String day24;
+
+	@ApiModelProperty(value = "day25 ", example = "day25")
+	private String day25;
+
+	@ApiModelProperty(value = "day26 ", example = "day26")
+	private String day26;
+
+	@ApiModelProperty(value = "day27 ", example = "day27")
+	private String day27;
+
+	@ApiModelProperty(value = "day28 ", example = "day28")
+	private String day28;
+
+	@ApiModelProperty(value = "day29 ", example = "day29")
+	private String day29;
+
+	@ApiModelProperty(value = "day30 ", example = "day30")
+	private String day30;
+
+	@ApiModelProperty(value = "day31 ", example = "day31")
+	private String day31;
+
+	@ApiModelProperty(value = "年 年", example = "101")
+	private Integer belongYear;
+
+	@ApiModelProperty(value = "月 月", example = "101")
+	private Integer belongMonth;
+
+	@ApiModelProperty(value = "企业组织代码 企业组织代码", example = "101")
+	private Integer orgCode;
+
+	@ApiModelProperty(value = "最后修改时间 最后修改时间", example = "101")
+	private Integer lastModified;
+
+}
\ No newline at end of file

src/main/java/cn/timer/api/controller/kqgl/AttController.java

@@ -1437,6 +1437,7 @@ public class AttController {
 				attgro.setZcgzsc(attass.getNormalWorkTime());//正常工作时长（自由工时专用）
 				attgro.setJbzdsc(attass.getMaxOvertimeTime());//加班最大时长（自由工时专用）
 			}
+			attgro.setOvertimeRulesId(attass.getOvertimeRulesId());//加班规则ID
 			attendancegroupservice.updateByPrimaryKeySelective(attgro);
 			
 			/*********/

src/main/java/cn/timer/api/controller/kqgl/ClockInController.java

@@ -16,7 +16,6 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 
 import cn.hutool.json.JSONObject;
@@ -25,6 +24,7 @@ import cn.timer.api.bean.kqmk.KqglAssoDkjl;
 import cn.timer.api.bean.kqmk.KqglAssoDkmx;
 import cn.timer.api.bean.kqmk.KqglAssoKqj;
 import cn.timer.api.bean.kqmk.KqglAssoKqzdkfs;
+import cn.timer.api.bean.kqmk.KqglAssoMonthPunchSummary;
 import cn.timer.api.bean.kqmk.KqglAssoTeshu;
 import cn.timer.api.bean.kqmk.KqglAssoZhoupaiban;
 import cn.timer.api.bean.kqmk.KqglMainKqz;
@@ -32,7 +32,6 @@ import cn.timer.api.bean.yggl.YgglMainEmp;
 import cn.timer.api.config.exception.CustomException;
 import cn.timer.api.dao.kqmk.KqglAssoPbmxMapper;
 import cn.timer.api.dao.kqmk.KqglMainKqzMapper;
-import cn.timer.api.dao.yggl.YgglMainEmpMapper;
 import cn.timer.api.dto.kqmk.AttLateLate;
 import cn.timer.api.dto.kqmk.AttSchedule;
 import cn.timer.api.dto.kqmk.AttendanceCardListDto;
@@ -49,10 +48,8 @@ import io.swagger.annotations.ApiOperation;
 @Transactional
 @RequestMapping(value = "/kqdk", produces = { "application/json", "multipart/form-data" })
 public class ClockInController {
-
 	@Autowired
 	private KqglMainKqzMapper kqglmainkqzmapper;
-	
 	/**
 	 * 考勤打卡
 	 * 
@@ -65,24 +62,18 @@ public class ClockInController {
 	@ApiOperationSupport(order = 1)
 	public Result<Object> punchclock(@RequestParam String json) throws Exception {
 		JSONObject jsonArray = new JSONObject(json);
-		String asDevId = jsonArray.get("dev_id").toString();
-		String asUserId = jsonArray.get("user_id").toString();
-		String asVerifyMode = jsonArray.get("verify_mode").toString();
-		String asIOMode = "0";
-		String sStdIoTime = jsonArray.get("io_time").toString();
-		
+		String asDevId = jsonArray.get("dev_id").toString();//考勤机编码
+		String asUserId = jsonArray.get("user_id").toString();//打卡用户id
+		String asVerifyMode = jsonArray.get("verify_mode").toString();//考勤机打卡方式(1:指纹;20:人脸;40:掌纹;60:密码(猜的^v^))
+		String sStdIoTime = jsonArray.get("io_time").toString();//打卡时间
 		KqglAssoKqj kqjdev = KqglAssoKqj.builder().build().selectOne(new QueryWrapper<KqglAssoKqj>().lambda().eq(KqglAssoKqj::getCode, asDevId));
-		
 		if (kqjdev == null) 
 			return ResultUtil.error("考勤机不存在！");
-		
 //		YgglMainEmp user = new LambdaQueryChainWrapper<YgglMainEmp>(ygglmainempmapper).eq(YgglMainEmp::getEmpNum, asUserId).eq(YgglMainEmp::getOrgCode, kqjdev.getQyid()).one();
 		YgglMainEmp user = YgglMainEmp.builder().build().selectOne(new QueryWrapper<YgglMainEmp>().lambda().eq(YgglMainEmp::getEmpNum, asUserId).eq(YgglMainEmp::getOrgCode, kqjdev.getQyid()));
-		
 		if(user != null) {
-			int qyid = user.getOrgCode();//坏小孩【企业id】
-			int userid = user.getEmpNum();//用户id	
-			
+			int qyid = user.getOrgCode();
+			int userid = user.getEmpNum();
 			KqglMainKqz attgro = kqglmainkqzmapper.getAttendanceGroupInformationByUserid(userid,qyid); //考勤组信息
 			//pbfs;// 排班方式 1：固定排班；2：自由排班；3：自由工时
 			if(attgro != null) {
@@ -248,6 +239,12 @@ public class ClockInController {
 								 KqglAssoDkmx.builder().id(dkmc.getId()).build().updateById();
 							 }
 						 }
+						 
+						 //具体打卡时间入汇总表(打卡成功才会录入汇总表)
+						 KqglAssoMonthPunchSummary summary = KqglAssoMonthPunchSummary.builder().build();
+						 
+					 }else {
+						 System.out.println("当前打卡时间不在范围内");
 					 }
 					
 					//原始打卡记录数据录入**************************************************************************************************************************************
@@ -282,7 +279,7 @@ public class ClockInController {
 					long attime;
 					if(punchcardtime == 0 && !isRange){attime = new Date().getTime();}else{attime = punchcardtime;}// 考勤时间(应打卡时间)
 					String remarks = "";
-					if(("1").equals(asVerifyMode)) {remarks = "考勤机指纹打卡";}else if(("20").equals(asVerifyMode)) {remarks = "考勤机人脸打卡";}
+					if(("1").equals(asVerifyMode)) {remarks = "考勤机指纹打卡";}else if(("20").equals(asVerifyMode)) {remarks = "考勤机人脸打卡";}else if(("40").equals(asVerifyMode)) {remarks = "考勤机掌纹打卡";}else if(("60").equals(asVerifyMode)) {remarks = "考勤机密码打卡";}
 					//cardtype--1：GPS，2：WIFI，3：考勤机
 					KqglAssoDkjl pre = KqglAssoDkjl.builder().dktime(time_).results(results).userId(userid).type(type).status(status).sort(atttype)
 							.cardType(3).qyid(qyid).attdate(attdate_+" "+ClockInTool.dateToWeek2(putime)).attime(attime).dkmxid(dkmx).bcid(clockt.getShifid()).remarks(remarks).punchmode(Integer.valueOf(asVerifyMode))

src/main/java/cn/timer/api/dao/kqmk/KqglAssoMonthPunchSummaryMapper.java

+package cn.timer.api.dao.kqmk;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.springframework.stereotype.Repository;
+
+import cn.timer.api.bean.kqmk.KqglAssoMonthPunchSummary;
+
+/**
+ * 打卡月汇总
+ * 
+ * @author Tang 2020-05-15
+ */
+@Repository
+public interface KqglAssoMonthPunchSummaryMapper extends BaseMapper<KqglAssoMonthPunchSummary> {
+
+}

src/main/resources/mapping/kqgl/AttendanceGroupMapper.xml

@@ -29,6 +29,7 @@
     <result column="dkfs" property="dkfs" jdbcType="VARCHAR" />
     <result column="kqjid" property="kqjid" jdbcType="INTEGER" />
     <result column="is_wq" property="isWq" jdbcType="INTEGER" />
+    <result column="overtime_rules_id" property="overtimeRulesId" />
     
     <collection property="kqzdkfslist" ofType="cn.timer.api.bean.kqgl.AttGroupBinPunchMode">
    		<result column="kqzId" property="kqzId" jdbcType="INTEGER" />
@@ -92,7 +93,7 @@
   
   <sql id="Base_Column_List" >
     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
+    txry, txfs, txxhts, txsj_time, tsfs, is_wpbsdk,sybc,is_xzbcdk,is_wq,overtime_rules_id
   </sql>
   <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
     select 
@@ -180,6 +181,9 @@
       <if test="isWq != null" >
         is_wq,
       </if>
+      <if test="overtimeRulesId != null" >
+        overtime_rules_id,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides="," >
       
@@ -240,6 +244,9 @@
       <if test="isWq != null" >
         #{isWq,jdbcType=INTEGER},
       </if>
+      <if test="overtimeRulesId != null" >
+        #{overtimeRulesId,jdbcType=INTEGER},
+      </if>
     </trim>
   </insert>
   <update id="updateByPrimaryKeySelective" parameterType="cn.timer.api.bean.kqgl.AttendanceGroup" >
@@ -302,6 +309,9 @@
       <if test="isWq != null" >
         is_wq = #{isWq,jdbcType=INTEGER},
       </if>
+      <if test="overtimeRulesId != null" >
+        overtime_rules_id = #{overtimeRulesId,jdbcType=INTEGER},
+      </if>
     </set>
     where id = #{id,jdbcType=INTEGER}
   </update>
@@ -325,7 +335,8 @@
       is_wpbsdk = #{isWpbsdk,jdbcType=INTEGER},
       sybc = #{sybc,jdbcType=VARCHAR},
       is_xzbcdk = #{isXzbcdk,jdbcType=INTEGER},
-      is_wq = #{isWq,jdbcType=INTEGER}
+      is_wq = #{isWq,jdbcType=INTEGER},
+      overtime_rules_id = #{overtimeRulesId,jdbcType=INTEGER}
     where id = #{id,jdbcType=INTEGER}
   </update>
   

src/main/resources/mapping/kqmk/KqglAssoMonthPunchSummaryMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cn.timer.api.dao.kqmk.KqglAssoMonthPunchSummaryMapper">
+
+    <resultMap id="BaseResultMap" type="cn.timer.api.bean.kqmk.KqglAssoMonthPunchSummary" >
+                <id column="id" property="id" />
+                <result column="name" property="name" />
+                <result column="num" property="num" />
+                <result column="dept" property="dept" />
+                <result column="post" property="post" />
+                <result column="att_group" property="attGroup" />
+                <result column="shift" property="shift" />
+                <result column="days_on_duty" property="daysOnDuty" />
+                <result column="actual_att_days" property="actualAttDays" />
+                <result column="days_off" property="daysOff" />
+                <result column="working_hours" property="workingHours" />
+                <result column="late_times" property="lateTimes" />
+                <result column="late_hours" property="lateHours" />
+                <result column="serious_late_times" property="seriousLateTimes" />
+                <result column="serious_late_hours" property="seriousLateHours" />
+                <result column="absen_late_times" property="absenLateTimes" />
+                <result column="early_leave_times" property="earlyLeaveTimes" />
+                <result column="length_early_leave" property="lengthEarlyLeave" />
+                <result column="number_work_card_shortage" property="numberWorkCardShortage" />
+                <result column="number_duty_card_shortage" property="numberDutyCardShortage" />
+                <result column="absenteeism_days" property="absenteeismDays" />
+                <result column="length_business_trip" property="lengthBusinessTrip" />
+                <result column="time_out" property="timeOut" />
+                <result column="total_overtime_hours" property="totalOvertimeHours" />
+                <result column="working_turn_compen_leave" property="workingTurnCompenLeave" />
+                <result column="rest_turn_compen_leave" property="restTurnCompenLeave" />
+                <result column="holiday_turn_compen_leave" property="holidayTurnCompenLeave" />
+                <result column="working_transfer_overtime" property="workingTransferOvertime" />
+                <result column="rest_transfer_overtime" property="restTransferOvertime" />
+                <result column="holiday_transfer_overtime" property="holidayTransferOvertime" />
+                <result column="day1" property="day1" />
+                <result column="day2" property="day2" />
+                <result column="day3" property="day3" />
+                <result column="day4" property="day4" />
+                <result column="day5" property="day5" />
+                <result column="day6" property="day6" />
+                <result column="day7" property="day7" />
+                <result column="day8" property="day8" />
+                <result column="day9" property="day9" />
+                <result column="day10" property="day10" />
+                <result column="day11" property="day11" />
+                <result column="day12" property="day12" />
+                <result column="day13" property="day13" />
+                <result column="day14" property="day14" />
+                <result column="day15" property="day15" />
+                <result column="day16" property="day16" />
+                <result column="day17" property="day17" />
+                <result column="day18" property="day18" />
+                <result column="day19" property="day19" />
+                <result column="day20" property="day20" />
+                <result column="day21" property="day21" />
+                <result column="day22" property="day22" />
+                <result column="day23" property="day23" />
+                <result column="day24" property="day24" />
+                <result column="day25" property="day25" />
+                <result column="day26" property="day26" />
+                <result column="day27" property="day27" />
+                <result column="day28" property="day28" />
+                <result column="day29" property="day29" />
+                <result column="day30" property="day30" />
+                <result column="day31" property="day31" />
+                <result column="belong_year" property="belongYear" />
+                <result column="belong_month" property="belongMonth" />
+                <result column="org_code" property="orgCode" />
+                <result column="last_modified" property="lastModified" />
+    </resultMap>
+
+    <sql id="Base_Column_List">
+                id,
+                name,
+                num,
+                dept,
+                post,
+                att_group,
+                shift,
+                days_on_duty,
+                actual_att_days,
+                days_off,
+                working_hours,
+                late_times,
+                late_hours,
+                serious_late_times,
+                serious_late_hours,
+                absen_late_times,
+                early_leave_times,
+                length_early_leave,
+                number_work_card_shortage,
+                number_duty_card_shortage,
+                absenteeism_days,
+                length_business_trip,
+                time_out,
+                total_overtime_hours,
+                working_turn_compen_leave,
+                rest_turn_compen_leave,
+                holiday_turn_compen_leave,
+                working_transfer_overtime,
+                rest_transfer_overtime,
+                holiday_transfer_overtime,
+                day1,
+                day2,
+                day3,
+                day4,
+                day5,
+                day6,
+                day7,
+                day8,
+                day9,
+                day10,
+                day11,
+                day12,
+                day13,
+                day14,
+                day15,
+                day16,
+                day17,
+                day18,
+                day19,
+                day20,
+                day21,
+                day22,
+                day23,
+                day24,
+                day25,
+                day26,
+                day27,
+                day28,
+                day29,
+                day30,
+                day31,
+                belong_year,
+                belong_month,
+                org_code,
+                last_modified
+    </sql>
+    
+    <sql id="Base_Column_List_Alias">
+                id KqglAssoMonthPunchSummary_id,
+                name KqglAssoMonthPunchSummary_name,
+                num KqglAssoMonthPunchSummary_num,
+                dept KqglAssoMonthPunchSummary_dept,
+                post KqglAssoMonthPunchSummary_post,
+                att_group KqglAssoMonthPunchSummary_att_group,
+                shift KqglAssoMonthPunchSummary_shift,
+                days_on_duty KqglAssoMonthPunchSummary_days_on_duty,
+                actual_att_days KqglAssoMonthPunchSummary_actual_att_days,
+                days_off KqglAssoMonthPunchSummary_days_off,
+                working_hours KqglAssoMonthPunchSummary_working_hours,
+                late_times KqglAssoMonthPunchSummary_late_times,
+                late_hours KqglAssoMonthPunchSummary_late_hours,
+                serious_late_times KqglAssoMonthPunchSummary_serious_late_times,
+                serious_late_hours KqglAssoMonthPunchSummary_serious_late_hours,
+                absen_late_times KqglAssoMonthPunchSummary_absen_late_times,
+                early_leave_times KqglAssoMonthPunchSummary_early_leave_times,
+                length_early_leave KqglAssoMonthPunchSummary_length_early_leave,
+                number_work_card_shortage KqglAssoMonthPunchSummary_number_work_card_shortage,
+                number_duty_card_shortage KqglAssoMonthPunchSummary_number_duty_card_shortage,
+                absenteeism_days KqglAssoMonthPunchSummary_absenteeism_days,
+                length_business_trip KqglAssoMonthPunchSummary_length_business_trip,
+                time_out KqglAssoMonthPunchSummary_time_out,
+                total_overtime_hours KqglAssoMonthPunchSummary_total_overtime_hours,
+                working_turn_compen_leave KqglAssoMonthPunchSummary_working_turn_compen_leave,
+                rest_turn_compen_leave KqglAssoMonthPunchSummary_rest_turn_compen_leave,
+                holiday_turn_compen_leave KqglAssoMonthPunchSummary_holiday_turn_compen_leave,
+                working_transfer_overtime KqglAssoMonthPunchSummary_working_transfer_overtime,
+                rest_transfer_overtime KqglAssoMonthPunchSummary_rest_transfer_overtime,
+                holiday_transfer_overtime KqglAssoMonthPunchSummary_holiday_transfer_overtime,
+                day1 KqglAssoMonthPunchSummary_day1,
+                day2 KqglAssoMonthPunchSummary_day2,
+                day3 KqglAssoMonthPunchSummary_day3,
+                day4 KqglAssoMonthPunchSummary_day4,
+                day5 KqglAssoMonthPunchSummary_day5,
+                day6 KqglAssoMonthPunchSummary_day6,
+                day7 KqglAssoMonthPunchSummary_day7,
+                day8 KqglAssoMonthPunchSummary_day8,
+                day9 KqglAssoMonthPunchSummary_day9,
+                day10 KqglAssoMonthPunchSummary_day10,
+                day11 KqglAssoMonthPunchSummary_day11,
+                day12 KqglAssoMonthPunchSummary_day12,
+                day13 KqglAssoMonthPunchSummary_day13,
+                day14 KqglAssoMonthPunchSummary_day14,
+                day15 KqglAssoMonthPunchSummary_day15,
+                day16 KqglAssoMonthPunchSummary_day16,
+                day17 KqglAssoMonthPunchSummary_day17,
+                day18 KqglAssoMonthPunchSummary_day18,
+                day19 KqglAssoMonthPunchSummary_day19,
+                day20 KqglAssoMonthPunchSummary_day20,
+                day21 KqglAssoMonthPunchSummary_day21,
+                day22 KqglAssoMonthPunchSummary_day22,
+                day23 KqglAssoMonthPunchSummary_day23,
+                day24 KqglAssoMonthPunchSummary_day24,
+                day25 KqglAssoMonthPunchSummary_day25,
+                day26 KqglAssoMonthPunchSummary_day26,
+                day27 KqglAssoMonthPunchSummary_day27,
+                day28 KqglAssoMonthPunchSummary_day28,
+                day29 KqglAssoMonthPunchSummary_day29,
+                day30 KqglAssoMonthPunchSummary_day30,
+                day31 KqglAssoMonthPunchSummary_day31,
+                belong_year KqglAssoMonthPunchSummary_belong_year,
+                belong_month KqglAssoMonthPunchSummary_belong_month,
+                org_code KqglAssoMonthPunchSummary_org_code,
+                last_modified KqglAssoMonthPunchSummary_last_modified
+    </sql>
+
+	<!-- 
+
+    <insert id="insert" useGeneratedKeys="true" keyColumn="id" parameterType="cn.timer.api.bean.kqmk.KqglAssoMonthPunchSummary">
+        INSERT INTO kqgl_asso_month_punch_summary
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+                        <if test ='null != name'>
+                        name,
+                        </if>
+                        <if test ='null != num'>
+                        num,
+                        </if>
+                        <if test ='null != dept'>
+                        dept,
+                        </if>
+                        <if test ='null != post'>
+                        post,
+                        </if>
+                        <if test ='null != attGroup'>
+                        att_group,
+                        </if>
+                        <if test ='null != shift'>
+                        shift,
+                        </if>
+                        <if test ='null != daysOnDuty'>
+                        days_on_duty,
+                        </if>
+                        <if test ='null != actualAttDays'>
+                        actual_att_days,
+                        </if>
+                        <if test ='null != daysOff'>
+                        days_off,
+                        </if>
+                        <if test ='null != workingHours'>
+                        working_hours,
+                        </if>
+                        <if test ='null != lateTimes'>
+                        late_times,
+                        </if>
+                        <if test ='null != lateHours'>
+                        late_hours,
+                        </if>
+                        <if test ='null != seriousLateTimes'>
+                        serious_late_times,
+                        </if>
+                        <if test ='null != seriousLateHours'>
+                        serious_late_hours,
+                        </if>
+                        <if test ='null != absenLateTimes'>
+                        absen_late_times,
+                        </if>
+                        <if test ='null != earlyLeaveTimes'>
+                        early_leave_times,
+                        </if>
+                        <if test ='null != lengthEarlyLeave'>
+                        length_early_leave,
+                        </if>
+                        <if test ='null != numberWorkCardShortage'>
+                        number_work_card_shortage,
+                        </if>
+                        <if test ='null != numberDutyCardShortage'>
+                        number_duty_card_shortage,
+                        </if>
+                        <if test ='null != absenteeismDays'>
+                        absenteeism_days,
+                        </if>
+                        <if test ='null != lengthBusinessTrip'>
+                        length_business_trip,
+                        </if>
+                        <if test ='null != timeOut'>
+                        time_out,
+                        </if>
+                        <if test ='null != totalOvertimeHours'>
+                        total_overtime_hours,
+                        </if>
+                        <if test ='null != workingTurnCompenLeave'>
+                        working_turn_compen_leave,
+                        </if>
+                        <if test ='null != restTurnCompenLeave'>
+                        rest_turn_compen_leave,
+                        </if>
+                        <if test ='null != holidayTurnCompenLeave'>
+                        holiday_turn_compen_leave,
+                        </if>
+                        <if test ='null != workingTransferOvertime'>
+                        working_transfer_overtime,
+                        </if>
+                        <if test ='null != restTransferOvertime'>
+                        rest_transfer_overtime,
+                        </if>
+                        <if test ='null != holidayTransferOvertime'>
+                        holiday_transfer_overtime,
+                        </if>
+                        <if test ='null != day1'>
+                        day1,
+                        </if>
+                        <if test ='null != day2'>
+                        day2,
+                        </if>
+                        <if test ='null != day3'>
+                        day3,
+                        </if>
+                        <if test ='null != day4'>
+                        day4,
+                        </if>
+                        <if test ='null != day5'>
+                        day5,
+                        </if>
+                        <if test ='null != day6'>
+                        day6,
+                        </if>
+                        <if test ='null != day7'>
+                        day7,
+                        </if>
+                        <if test ='null != day8'>
+                        day8,
+                        </if>
+                        <if test ='null != day9'>
+                        day9,
+                        </if>
+                        <if test ='null != day10'>
+                        day10,
+                        </if>
+                        <if test ='null != day11'>
+                        day11,
+                        </if>
+                        <if test ='null != day12'>
+                        day12,
+                        </if>
+                        <if test ='null != day13'>
+                        day13,
+                        </if>
+                        <if test ='null != day14'>
+                        day14,
+                        </if>
+                        <if test ='null != day15'>
+                        day15,
+                        </if>
+                        <if test ='null != day16'>
+                        day16,
+                        </if>
+                        <if test ='null != day17'>
+                        day17,
+                        </if>
+                        <if test ='null != day18'>
+                        day18,
+                        </if>
+                        <if test ='null != day19'>
+                        day19,
+                        </if>
+                        <if test ='null != day20'>
+                        day20,
+                        </if>
+                        <if test ='null != day21'>
+                        day21,
+                        </if>
+                        <if test ='null != day22'>
+                        day22,
+                        </if>
+                        <if test ='null != day23'>
+                        day23,
+                        </if>
+                        <if test ='null != day24'>
+                        day24,
+                        </if>
+                        <if test ='null != day25'>
+                        day25,
+                        </if>
+                        <if test ='null != day26'>
+                        day26,
+                        </if>
+                        <if test ='null != day27'>
+                        day27,
+                        </if>
+                        <if test ='null != day28'>
+                        day28,
+                        </if>
+                        <if test ='null != day29'>
+                        day29,
+                        </if>
+                        <if test ='null != day30'>
+                        day30,
+                        </if>
+                        <if test ='null != day31'>
+                        day31,
+                        </if>
+                        <if test ='null != belongYear'>
+                        belong_year,
+                        </if>
+                        <if test ='null != belongMonth'>
+                        belong_month,
+                        </if>
+                        <if test ='null != orgCode'>
+                        org_code,
+                        </if>
+                        <if test ='null != lastModified'>
+                        last_modified
+                        </if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+                        <if test ='null != name'>
+                        #{name},
+                        </if>
+                        <if test ='null != num'>
+                        #{num},
+                        </if>
+                        <if test ='null != dept'>
+                        #{dept},
+                        </if>
+                        <if test ='null != post'>
+                        #{post},
+                        </if>
+                        <if test ='null != attGroup'>
+                        #{attGroup},
+                        </if>
+                        <if test ='null != shift'>
+                        #{shift},
+                        </if>
+                        <if test ='null != daysOnDuty'>
+                        #{daysOnDuty},
+                        </if>
+                        <if test ='null != actualAttDays'>
+                        #{actualAttDays},
+                        </if>
+                        <if test ='null != daysOff'>
+                        #{daysOff},
+                        </if>
+                        <if test ='null != workingHours'>
+                        #{workingHours},
+                        </if>
+                        <if test ='null != lateTimes'>
+                        #{lateTimes},
+                        </if>
+                        <if test ='null != lateHours'>
+                        #{lateHours},
+                        </if>
+                        <if test ='null != seriousLateTimes'>
+                        #{seriousLateTimes},
+                        </if>
+                        <if test ='null != seriousLateHours'>
+                        #{seriousLateHours},
+                        </if>
+                        <if test ='null != absenLateTimes'>
+                        #{absenLateTimes},
+                        </if>
+                        <if test ='null != earlyLeaveTimes'>
+                        #{earlyLeaveTimes},
+                        </if>
+                        <if test ='null != lengthEarlyLeave'>
+                        #{lengthEarlyLeave},
+                        </if>
+                        <if test ='null != numberWorkCardShortage'>
+                        #{numberWorkCardShortage},
+                        </if>
+                        <if test ='null != numberDutyCardShortage'>
+                        #{numberDutyCardShortage},
+                        </if>
+                        <if test ='null != absenteeismDays'>
+                        #{absenteeismDays},
+                        </if>
+                        <if test ='null != lengthBusinessTrip'>
+                        #{lengthBusinessTrip},
+                        </if>
+                        <if test ='null != timeOut'>
+                        #{timeOut},
+                        </if>
+                        <if test ='null != totalOvertimeHours'>
+                        #{totalOvertimeHours},
+                        </if>
+                        <if test ='null != workingTurnCompenLeave'>
+                        #{workingTurnCompenLeave},
+                        </if>
+                        <if test ='null != restTurnCompenLeave'>
+                        #{restTurnCompenLeave},
+                        </if>
+                        <if test ='null != holidayTurnCompenLeave'>
+                        #{holidayTurnCompenLeave},
+                        </if>
+                        <if test ='null != workingTransferOvertime'>
+                        #{workingTransferOvertime},
+                        </if>
+                        <if test ='null != restTransferOvertime'>
+                        #{restTransferOvertime},
+                        </if>
+                        <if test ='null != holidayTransferOvertime'>
+                        #{holidayTransferOvertime},
+                        </if>
+                        <if test ='null != day1'>
+                        #{day1},
+                        </if>
+                        <if test ='null != day2'>
+                        #{day2},
+                        </if>
+                        <if test ='null != day3'>
+                        #{day3},
+                        </if>
+                        <if test ='null != day4'>
+                        #{day4},
+                        </if>
+                        <if test ='null != day5'>
+                        #{day5},
+                        </if>
+                        <if test ='null != day6'>
+                        #{day6},
+                        </if>
+                        <if test ='null != day7'>
+                        #{day7},
+                        </if>
+                        <if test ='null != day8'>
+                        #{day8},
+                        </if>
+                        <if test ='null != day9'>
+                        #{day9},
+                        </if>
+                        <if test ='null != day10'>
+                        #{day10},
+                        </if>
+                        <if test ='null != day11'>
+                        #{day11},
+                        </if>
+                        <if test ='null != day12'>
+                        #{day12},
+                        </if>
+                        <if test ='null != day13'>
+                        #{day13},
+                        </if>
+                        <if test ='null != day14'>
+                        #{day14},
+                        </if>
+                        <if test ='null != day15'>
+                        #{day15},
+                        </if>
+                        <if test ='null != day16'>
+                        #{day16},
+                        </if>
+                        <if test ='null != day17'>
+                        #{day17},
+                        </if>
+                        <if test ='null != day18'>
+                        #{day18},
+                        </if>
+                        <if test ='null != day19'>
+                        #{day19},
+                        </if>
+                        <if test ='null != day20'>
+                        #{day20},
+                        </if>
+                        <if test ='null != day21'>
+                        #{day21},
+                        </if>
+                        <if test ='null != day22'>
+                        #{day22},
+                        </if>
+                        <if test ='null != day23'>
+                        #{day23},
+                        </if>
+                        <if test ='null != day24'>
+                        #{day24},
+                        </if>
+                        <if test ='null != day25'>
+                        #{day25},
+                        </if>
+                        <if test ='null != day26'>
+                        #{day26},
+                        </if>
+                        <if test ='null != day27'>
+                        #{day27},
+                        </if>
+                        <if test ='null != day28'>
+                        #{day28},
+                        </if>
+                        <if test ='null != day29'>
+                        #{day29},
+                        </if>
+                        <if test ='null != day30'>
+                        #{day30},
+                        </if>
+                        <if test ='null != day31'>
+                        #{day31},
+                        </if>
+                        <if test ='null != belongYear'>
+                        #{belongYear},
+                        </if>
+                        <if test ='null != belongMonth'>
+                        #{belongMonth},
+                        </if>
+                        <if test ='null != orgCode'>
+                        #{orgCode},
+                        </if>
+                        <if test ='null != lastModified'>
+                        #{lastModified}
+                        </if>
+        </trim>
+    </insert>
+
+    <delete id="delete" >
+        DELETE FROM kqgl_asso_month_punch_summary
+        WHERE id = #{id}
+    </delete>
+
+    <update id="update" parameterType="cn.timer.api.bean.kqmk.KqglAssoMonthPunchSummary">
+        UPDATE kqgl_asso_month_punch_summary
+        <set>
+                    <if test ='null != name'>name = #{name},</if>
+                    <if test ='null != num'>num = #{num},</if>
+                    <if test ='null != dept'>dept = #{dept},</if>
+                    <if test ='null != post'>post = #{post},</if>
+                    <if test ='null != attGroup'>att_group = #{attGroup},</if>
+                    <if test ='null != shift'>shift = #{shift},</if>
+                    <if test ='null != daysOnDuty'>days_on_duty = #{daysOnDuty},</if>
+                    <if test ='null != actualAttDays'>actual_att_days = #{actualAttDays},</if>
+                    <if test ='null != daysOff'>days_off = #{daysOff},</if>
+                    <if test ='null != workingHours'>working_hours = #{workingHours},</if>
+                    <if test ='null != lateTimes'>late_times = #{lateTimes},</if>
+                    <if test ='null != lateHours'>late_hours = #{lateHours},</if>
+                    <if test ='null != seriousLateTimes'>serious_late_times = #{seriousLateTimes},</if>
+                    <if test ='null != seriousLateHours'>serious_late_hours = #{seriousLateHours},</if>
+                    <if test ='null != absenLateTimes'>absen_late_times = #{absenLateTimes},</if>
+                    <if test ='null != earlyLeaveTimes'>early_leave_times = #{earlyLeaveTimes},</if>
+                    <if test ='null != lengthEarlyLeave'>length_early_leave = #{lengthEarlyLeave},</if>
+                    <if test ='null != numberWorkCardShortage'>number_work_card_shortage = #{numberWorkCardShortage},</if>
+                    <if test ='null != numberDutyCardShortage'>number_duty_card_shortage = #{numberDutyCardShortage},</if>
+                    <if test ='null != absenteeismDays'>absenteeism_days = #{absenteeismDays},</if>
+                    <if test ='null != lengthBusinessTrip'>length_business_trip = #{lengthBusinessTrip},</if>
+                    <if test ='null != timeOut'>time_out = #{timeOut},</if>
+                    <if test ='null != totalOvertimeHours'>total_overtime_hours = #{totalOvertimeHours},</if>
+                    <if test ='null != workingTurnCompenLeave'>working_turn_compen_leave = #{workingTurnCompenLeave},</if>
+                    <if test ='null != restTurnCompenLeave'>rest_turn_compen_leave = #{restTurnCompenLeave},</if>
+                    <if test ='null != holidayTurnCompenLeave'>holiday_turn_compen_leave = #{holidayTurnCompenLeave},</if>
+                    <if test ='null != workingTransferOvertime'>working_transfer_overtime = #{workingTransferOvertime},</if>
+                    <if test ='null != restTransferOvertime'>rest_transfer_overtime = #{restTransferOvertime},</if>
+                    <if test ='null != holidayTransferOvertime'>holiday_transfer_overtime = #{holidayTransferOvertime},</if>
+                    <if test ='null != day1'>day1 = #{day1},</if>
+                    <if test ='null != day2'>day2 = #{day2},</if>
+                    <if test ='null != day3'>day3 = #{day3},</if>
+                    <if test ='null != day4'>day4 = #{day4},</if>
+                    <if test ='null != day5'>day5 = #{day5},</if>
+                    <if test ='null != day6'>day6 = #{day6},</if>
+                    <if test ='null != day7'>day7 = #{day7},</if>
+                    <if test ='null != day8'>day8 = #{day8},</if>
+                    <if test ='null != day9'>day9 = #{day9},</if>
+                    <if test ='null != day10'>day10 = #{day10},</if>
+                    <if test ='null != day11'>day11 = #{day11},</if>
+                    <if test ='null != day12'>day12 = #{day12},</if>
+                    <if test ='null != day13'>day13 = #{day13},</if>
+                    <if test ='null != day14'>day14 = #{day14},</if>
+                    <if test ='null != day15'>day15 = #{day15},</if>
+                    <if test ='null != day16'>day16 = #{day16},</if>
+                    <if test ='null != day17'>day17 = #{day17},</if>
+                    <if test ='null != day18'>day18 = #{day18},</if>
+                    <if test ='null != day19'>day19 = #{day19},</if>
+                    <if test ='null != day20'>day20 = #{day20},</if>
+                    <if test ='null != day21'>day21 = #{day21},</if>
+                    <if test ='null != day22'>day22 = #{day22},</if>
+                    <if test ='null != day23'>day23 = #{day23},</if>
+                    <if test ='null != day24'>day24 = #{day24},</if>
+                    <if test ='null != day25'>day25 = #{day25},</if>
+                    <if test ='null != day26'>day26 = #{day26},</if>
+                    <if test ='null != day27'>day27 = #{day27},</if>
+                    <if test ='null != day28'>day28 = #{day28},</if>
+                    <if test ='null != day29'>day29 = #{day29},</if>
+                    <if test ='null != day30'>day30 = #{day30},</if>
+                    <if test ='null != day31'>day31 = #{day31},</if>
+                    <if test ='null != belongYear'>belong_year = #{belongYear},</if>
+                    <if test ='null != belongMonth'>belong_month = #{belongMonth},</if>
+                    <if test ='null != orgCode'>org_code = #{orgCode},</if>
+                    <if test ='null != lastModified'>last_modified = #{lastModified}</if>
+        </set>
+        WHERE id = #{id}
+    </update>
+
+
+    <select id="load" resultMap="BaseResultMap">
+        SELECT <include refid="Base_Column_List" />
+        FROM kqgl_asso_month_punch_summary
+        WHERE id = #{id}
+    </select>
+
+    <select id="pageList" resultMap="BaseResultMap">
+        SELECT <include refid="Base_Column_List" />
+        FROM kqgl_asso_month_punch_summary
+        LIMIT #{offset}, #{pageSize}
+    </select>
+
+    <select id="pageListCount" resultType="java.lang.Integer">
+        SELECT count(1)
+        FROM kqgl_asso_month_punch_summary
+    </select>
+
+	 -->
+
+</mapper>
\ No newline at end of file