diff --git a/src/main/java/cn/timer/api/bean/kqmk/KqglAssoOvertimeRules.java b/src/main/java/cn/timer/api/bean/kqmk/KqglAssoOvertimeRules.java
index 88ff4f6..fa31df4 100644
--- a/src/main/java/cn/timer/api/bean/kqmk/KqglAssoOvertimeRules.java
+++ b/src/main/java/cn/timer/api/bean/kqmk/KqglAssoOvertimeRules.java
@@ -115,6 +115,9 @@ public class KqglAssoOvertimeRules extends Model<KqglAssoOvertimeRules> {
@ApiModelProperty(value = "企业组织代码 企业组织代码", example = "117")
private Integer orgCode;
+ @ApiModelProperty(value = "是否为默认（0：否，1：是）", example = "0")
+ private Integer overtimeruledefault;
+
@ApiModelProperty(value = "", example = "")
private Integer work;
@ApiModelProperty(value = "", example = "")
diff --git a/src/main/java/cn/timer/api/bean/kqmk/KqglAssoOvertimeRulesM.java b/src/main/java/cn/timer/api/bean/kqmk/KqglAssoOvertimeRulesM.java
new file mode 100644
index 0000000..5624626
--- /dev/null
+++ b/src/main/java/cn/timer/api/bean/kqmk/KqglAssoOvertimeRulesM.java
@@ -0,0 +1,130 @@
+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 Tang 2020-07-04
+ */
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@Table(name = "kqgl_asso_overtime_rules_m")
+@ApiModel("加班规则")
+public class KqglAssoOvertimeRulesM extends Model<KqglAssoOvertimeRulesM> {
+
+ /**
+ *
+ */
+ private static final long serialVersionUID = 1L;
+
+ @Id
+ @GeneratedValue
+ @TableId(type = IdType.AUTO)
+ @ApiModelProperty(value = "加班规则编号 加班规则编号", example = "101")
+ private Integer id;
+
+ @ApiModelProperty(value = "规则名称 ", example = "规则名称")
+ private String name;
+
+ @ApiModelProperty(value = "应用范围（0：全公司 >0:考勤组id）", example = "101")
+ private Integer appliedScope;
+
+ @ApiModelProperty(value = "工作日是否允许加班 0：否；1：是", example = "101")
+ private Integer isWorkovertime;
+
+ @ApiModelProperty(value = "计算方式 1：按审批时长计算", example = "101")
+ private Integer workMode;
+
+ @ApiModelProperty(value = "扣除休息时间开关 0：关；1：开", example = "101")
+ private Integer workBuckleRest;
+
+ @ApiModelProperty(value = "计为调休或加班费开关 0：关；1：开", example = "101")
+ private Integer workSwitch;
+
+ @ApiModelProperty(value = "1：按n计为调休 ", example = "按1:n计为调休每年12月31日作废")
+ private String workOne;
+
+ @ApiModelProperty(value = "2：计为加班费 0：未选择；1：已选择", example = "101")
+ private Integer workTwo;
+
+ @ApiModelProperty(value = "3：多种选择 ", example = "员工申请加班时可选择，计为加班费或者按1:n计为调休时长")
+ private String workThree;
+
+ @ApiModelProperty(value = "休息日是否允许加班 0：否；1：是", example = "101")
+ private Integer isRestovertime;
+
+ @ApiModelProperty(value = "计算方式 1：按审批时长计算", example = "101")
+ private Integer restMode;
+
+ @ApiModelProperty(value = "扣除休息时间开关 0：关；1：开", example = "101")
+ private Integer restBuckleRest;
+
+ @ApiModelProperty(value = "计为调休或加班费开关 0：关；1：开", example = "101")
+ private Integer restSwitch;
+
+ @ApiModelProperty(value = "1：按n计为调休 ", example = "按1:n计为调休每年12月31日作废")
+ private String restOne;
+
+ @ApiModelProperty(value = "2：计为加班费 0：未选择；1：已选择", example = "101")
+ private Integer restTwo;
+
+ @ApiModelProperty(value = "3：多种选择 ", example = "员工申请加班时可选择，计为加班费或者按1:n计为调休时长")
+ private String restThree;
+
+ @ApiModelProperty(value = "节假日是否允许加班 0：否；1：是", example = "101")
+ private Integer isHolidays;
+
+ @ApiModelProperty(value = "计算方式 ", example = "1：按审批时长计算")
+ private Double holidaysMode;
+
+ @ApiModelProperty(value = "扣除休息时间开关 0：关；1：开", example = "101")
+ private Integer holidaysBuckleRest;
+
+ @ApiModelProperty(value = "计为调休或加班费开关 0：关；1：开", example = "101")
+ private Integer holidaysSwitch;
+
+ @ApiModelProperty(value = "1：按n计为调休 ", example = "按1:n计为调休每年12月31日作废")
+ private String holidaysOne;
+
+ @ApiModelProperty(value = "2：计为加班费 0：未选择；1：已选择", example = "101")
+ private Integer holidaysTwo;
+
+ @ApiModelProperty(value = "3：多种选择 ", example = "员工申请加班时可选择，计为加班费或者按1:n计为调休时长")
+ private String holidaysThree;
+
+ @ApiModelProperty(value = "创建时间 创建时间", example = "101")
+ private Integer createTime;
+
+ @ApiModelProperty(value = "创建人员 创建人员", example = "101")
+ private Integer createUserid;
+
+ @ApiModelProperty(value = "企业组织代码 企业组织代码", example = "101")
+ private Integer orgCode;
+
+ @ApiModelProperty(value = "work work", example = "101")
+ private Integer work;
+
+ @ApiModelProperty(value = "rest rest", example = "101")
+ private Integer rest;
+
+ @ApiModelProperty(value = "holidays holidays", example = "101")
+ private Integer holidays;
+
+ @ApiModelProperty(value = "是否为默认（0：否，1：是） 是否为默认（0：否，1：是）", example = "101")
+ private Integer overtimeruledefault;
+
+}
\ No newline at end of file
diff --git a/src/main/java/cn/timer/api/controller/LoginController.java b/src/main/java/cn/timer/api/controller/LoginController.java
index 98a84ec..2e1ec60 100644
--- a/src/main/java/cn/timer/api/controller/LoginController.java
+++ b/src/main/java/cn/timer/api/controller/LoginController.java
@@ -29,6 +29,7 @@ import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.StrUtil;
import cn.timer.api.aspect.lang.annotation.Log;
@@ -38,12 +39,12 @@ import cn.timer.api.bean.kqmk.KqglAssoLeaveEmployeeBalance;
import cn.timer.api.bean.kqmk.KqglAssoLeaveRules;
import cn.timer.api.bean.kqmk.KqglAssoLeaveRulesT;
import cn.timer.api.bean.kqmk.KqglAssoOvertimeBasics;
+import cn.timer.api.bean.kqmk.KqglAssoOvertimeRules;
+import cn.timer.api.bean.kqmk.KqglAssoOvertimeRulesM;
import cn.timer.api.bean.qyxx.CmsContent;
import cn.timer.api.bean.qyzx.QyzxEmpEntAsso;
import cn.timer.api.bean.qyzx.QyzxEmpLogin;
import cn.timer.api.bean.qyzx.QyzxEntInfoM;
-import cn.timer.api.bean.qyzx.QyzxSms;
-import cn.timer.api.bean.qyzx.businessService.QyzxRemainingQuantity;
import cn.timer.api.bean.yggl.YgglMainEmp;
import cn.timer.api.bean.zzgl.ZzglAuth;
import cn.timer.api.bean.zzgl.ZzglBmgwM;
@@ -58,6 +59,7 @@ import cn.timer.api.controller.jxgl.service.JxglService;
import cn.timer.api.controller.qyzx.service.RegisterHelper;
import cn.timer.api.controller.spmk.service.SpmkServiceImpl;
import cn.timer.api.dao.kqmk.KqglAssoLeaveRulesMapper;
+import cn.timer.api.dao.kqmk.KqglAssoOvertimeRulesMMapper;
import cn.timer.api.dao.qyzx.QyzxEmpEntAssoMapper;
import cn.timer.api.dao.qyzx.QyzxEmpLoginMapper;
import cn.timer.api.dao.yggl.YgglMainEmpMapper;
@@ -521,6 +523,8 @@ public class LoginController {
@Autowired
private KqglAssoLeaveRulesMapper kqglassoleaverulesmapper;
+ @Autowired
+ private KqglAssoOvertimeRulesMMapper kqglassoovertimerulesmmapper;
/**
* 注册企业
@@ -632,6 +636,11 @@ public class LoginController {
System.out.println("重复初始化数据！");
}
+ //建立初始化的加班规则
+ KqglAssoOvertimeRulesM jbgzdef = KqglAssoOvertimeRulesM.builder().build().selectOne(new QueryWrapper<KqglAssoOvertimeRulesM>().lambda().eq(KqglAssoOvertimeRulesM::getOvertimeruledefault, 1));
+ KqglAssoOvertimeRules Rules = KqglAssoOvertimeRules.builder().build();
+ Rules.setOrgCode(qyzxEntInfoM.getId());
+ BeanUtil.copyProperties(jbgzdef, Rules , "orgCode");
//假期规则初始化
diff --git a/src/main/java/cn/timer/api/dao/kqmk/KqglAssoOvertimeRulesMMapper.java b/src/main/java/cn/timer/api/dao/kqmk/KqglAssoOvertimeRulesMMapper.java
new file mode 100644
index 0000000..889129a
--- /dev/null
+++ b/src/main/java/cn/timer/api/dao/kqmk/KqglAssoOvertimeRulesMMapper.java
@@ -0,0 +1,17 @@
+package cn.timer.api.dao.kqmk;
+import org.springframework.stereotype.Repository;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+import cn.timer.api.bean.kqmk.KqglAssoOvertimeRulesM;
+
+/**
+* 加班规则
+* @author Tang 2020-07-04
+*/
+@Repository
+public interface KqglAssoOvertimeRulesMMapper extends BaseMapper<KqglAssoOvertimeRulesM> {
+
+
+
+}
diff --git a/src/main/java/cn/timer/api/dto/kqmk/KqglAssoOvertimeRulesDto.java b/src/main/java/cn/timer/api/dto/kqmk/KqglAssoOvertimeRulesDto.java
index 71ea9c8..1b09fbb 100644
--- a/src/main/java/cn/timer/api/dto/kqmk/KqglAssoOvertimeRulesDto.java
+++ b/src/main/java/cn/timer/api/dto/kqmk/KqglAssoOvertimeRulesDto.java
@@ -95,6 +95,9 @@ public class KqglAssoOvertimeRulesDto {
@ApiModelProperty(value = "企业组织代码 企业组织代码", example = "117")
private Integer orgCode;
+ @ApiModelProperty(value = "是否为默认（0：否，1：是）", example = "0")
+ private Integer overtimeruledefault;
+
@ApiModelProperty(value = "", example = "0")
private Integer work;
@ApiModelProperty(value = "", example = "0")
diff --git a/src/main/resources/mapping/kqmk/KqglAssoOvertimeRulesMMapper.xml b/src/main/resources/mapping/kqmk/KqglAssoOvertimeRulesMMapper.xml
new file mode 100644
index 0000000..bef4331
--- /dev/null
+++ b/src/main/resources/mapping/kqmk/KqglAssoOvertimeRulesMMapper.xml
@@ -0,0 +1,360 @@
+<?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.KqglAssoOvertimeRulesMMapper">
+
+ <resultMap id="BaseResultMap" type="cn.timer.api.bean.kqmk.KqglAssoOvertimeRulesM" >
+ <id column="id" property="id" />
+ <result column="name" property="name" />
+ <result column="applied_scope" property="appliedScope" />
+ <result column="is_workovertime" property="isWorkovertime" />
+ <result column="work_mode" property="workMode" />
+ <result column="work_buckle_rest" property="workBuckleRest" />
+ <result column="work_switch" property="workSwitch" />
+ <result column="work_one" property="workOne" />
+ <result column="work_two" property="workTwo" />
+ <result column="work_three" property="workThree" />
+ <result column="is_restovertime" property="isRestovertime" />
+ <result column="rest_mode" property="restMode" />
+ <result column="rest_buckle_rest" property="restBuckleRest" />
+ <result column="rest_switch" property="restSwitch" />
+ <result column="rest_one" property="restOne" />
+ <result column="rest_two" property="restTwo" />
+ <result column="rest_three" property="restThree" />
+ <result column="is_holidays" property="isHolidays" />
+ <result column="holidays_mode" property="holidaysMode" />
+ <result column="holidays_buckle_rest" property="holidaysBuckleRest" />
+ <result column="holidays_switch" property="holidaysSwitch" />
+ <result column="holidays_one" property="holidaysOne" />
+ <result column="holidays_two" property="holidaysTwo" />
+ <result column="holidays_three" property="holidaysThree" />
+ <result column="create_time" property="createTime" />
+ <result column="create_userid" property="createUserid" />
+ <result column="org_code" property="orgCode" />
+ <result column="work" property="work" />
+ <result column="rest" property="rest" />
+ <result column="holidays" property="holidays" />
+ <result column="overtimeruledefault" property="overtimeruledefault" />
+ </resultMap>
+
+ <sql id="Base_Column_List">
+ id,
+ name,
+ applied_scope,
+ is_workovertime,
+ work_mode,
+ work_buckle_rest,
+ work_switch,
+ work_one,
+ work_two,
+ work_three,
+ is_restovertime,
+ rest_mode,
+ rest_buckle_rest,
+ rest_switch,
+ rest_one,
+ rest_two,
+ rest_three,
+ is_holidays,
+ holidays_mode,
+ holidays_buckle_rest,
+ holidays_switch,
+ holidays_one,
+ holidays_two,
+ holidays_three,
+ create_time,
+ create_userid,
+ org_code,
+ work,
+ rest,
+ holidays,
+ overtimeruledefault
+ </sql>
+
+ <sql id="Base_Column_List_Alias">
+ id KqglAssoOvertimeRulesM_id,
+ name KqglAssoOvertimeRulesM_name,
+ applied_scope KqglAssoOvertimeRulesM_applied_scope,
+ is_workovertime KqglAssoOvertimeRulesM_is_workovertime,
+ work_mode KqglAssoOvertimeRulesM_work_mode,
+ work_buckle_rest KqglAssoOvertimeRulesM_work_buckle_rest,
+ work_switch KqglAssoOvertimeRulesM_work_switch,
+ work_one KqglAssoOvertimeRulesM_work_one,
+ work_two KqglAssoOvertimeRulesM_work_two,
+ work_three KqglAssoOvertimeRulesM_work_three,
+ is_restovertime KqglAssoOvertimeRulesM_is_restovertime,
+ rest_mode KqglAssoOvertimeRulesM_rest_mode,
+ rest_buckle_rest KqglAssoOvertimeRulesM_rest_buckle_rest,
+ rest_switch KqglAssoOvertimeRulesM_rest_switch,
+ rest_one KqglAssoOvertimeRulesM_rest_one,
+ rest_two KqglAssoOvertimeRulesM_rest_two,
+ rest_three KqglAssoOvertimeRulesM_rest_three,
+ is_holidays KqglAssoOvertimeRulesM_is_holidays,
+ holidays_mode KqglAssoOvertimeRulesM_holidays_mode,
+ holidays_buckle_rest KqglAssoOvertimeRulesM_holidays_buckle_rest,
+ holidays_switch KqglAssoOvertimeRulesM_holidays_switch,
+ holidays_one KqglAssoOvertimeRulesM_holidays_one,
+ holidays_two KqglAssoOvertimeRulesM_holidays_two,
+ holidays_three KqglAssoOvertimeRulesM_holidays_three,
+ create_time KqglAssoOvertimeRulesM_create_time,
+ create_userid KqglAssoOvertimeRulesM_create_userid,
+ org_code KqglAssoOvertimeRulesM_org_code,
+ work KqglAssoOvertimeRulesM_work,
+ rest KqglAssoOvertimeRulesM_rest,
+ holidays KqglAssoOvertimeRulesM_holidays,
+ overtimeruledefault KqglAssoOvertimeRulesM_overtimeruledefault
+ </sql>
+
+ <!--
+
+ <insert id="insert" useGeneratedKeys="true" keyColumn="id" parameterType="cn.timer.api.bean.kqmk.KqglAssoOvertimeRulesM">
+ INSERT INTO kqgl_asso_overtime_rules_m
+ <trim prefix="(" suffix=")" suffixOverrides=",">
+ <if test ='null != name'>
+ name,
+ </if>
+ <if test ='null != appliedScope'>
+ applied_scope,
+ </if>
+ <if test ='null != isWorkovertime'>
+ is_workovertime,
+ </if>
+ <if test ='null != workMode'>
+ work_mode,
+ </if>
+ <if test ='null != workBuckleRest'>
+ work_buckle_rest,
+ </if>
+ <if test ='null != workSwitch'>
+ work_switch,
+ </if>
+ <if test ='null != workOne'>
+ work_one,
+ </if>
+ <if test ='null != workTwo'>
+ work_two,
+ </if>
+ <if test ='null != workThree'>
+ work_three,
+ </if>
+ <if test ='null != isRestovertime'>
+ is_restovertime,
+ </if>
+ <if test ='null != restMode'>
+ rest_mode,
+ </if>
+ <if test ='null != restBuckleRest'>
+ rest_buckle_rest,
+ </if>
+ <if test ='null != restSwitch'>
+ rest_switch,
+ </if>
+ <if test ='null != restOne'>
+ rest_one,
+ </if>
+ <if test ='null != restTwo'>
+ rest_two,
+ </if>
+ <if test ='null != restThree'>
+ rest_three,
+ </if>
+ <if test ='null != isHolidays'>
+ is_holidays,
+ </if>
+ <if test ='null != holidaysMode'>
+ holidays_mode,
+ </if>
+ <if test ='null != holidaysBuckleRest'>
+ holidays_buckle_rest,
+ </if>
+ <if test ='null != holidaysSwitch'>
+ holidays_switch,
+ </if>
+ <if test ='null != holidaysOne'>
+ holidays_one,
+ </if>
+ <if test ='null != holidaysTwo'>
+ holidays_two,
+ </if>
+ <if test ='null != holidaysThree'>
+ holidays_three,
+ </if>
+ <if test ='null != createTime'>
+ create_time,
+ </if>
+ <if test ='null != createUserid'>
+ create_userid,
+ </if>
+ <if test ='null != orgCode'>
+ org_code,
+ </if>
+ <if test ='null != work'>
+ work,
+ </if>
+ <if test ='null != rest'>
+ rest,
+ </if>
+ <if test ='null != holidays'>
+ holidays,
+ </if>
+ <if test ='null != overtimeruledefault'>
+ overtimeruledefault
+ </if>
+ </trim>
+ <trim prefix="values (" suffix=")" suffixOverrides=",">
+ <if test ='null != name'>
+ #{name},
+ </if>
+ <if test ='null != appliedScope'>
+ #{appliedScope},
+ </if>
+ <if test ='null != isWorkovertime'>
+ #{isWorkovertime},
+ </if>
+ <if test ='null != workMode'>
+ #{workMode},
+ </if>
+ <if test ='null != workBuckleRest'>
+ #{workBuckleRest},
+ </if>
+ <if test ='null != workSwitch'>
+ #{workSwitch},
+ </if>
+ <if test ='null != workOne'>
+ #{workOne},
+ </if>
+ <if test ='null != workTwo'>
+ #{workTwo},
+ </if>
+ <if test ='null != workThree'>
+ #{workThree},
+ </if>
+ <if test ='null != isRestovertime'>
+ #{isRestovertime},
+ </if>
+ <if test ='null != restMode'>
+ #{restMode},
+ </if>
+ <if test ='null != restBuckleRest'>
+ #{restBuckleRest},
+ </if>
+ <if test ='null != restSwitch'>
+ #{restSwitch},
+ </if>
+ <if test ='null != restOne'>
+ #{restOne},
+ </if>
+ <if test ='null != restTwo'>
+ #{restTwo},
+ </if>
+ <if test ='null != restThree'>
+ #{restThree},
+ </if>
+ <if test ='null != isHolidays'>
+ #{isHolidays},
+ </if>
+ <if test ='null != holidaysMode'>
+ #{holidaysMode},
+ </if>
+ <if test ='null != holidaysBuckleRest'>
+ #{holidaysBuckleRest},
+ </if>
+ <if test ='null != holidaysSwitch'>
+ #{holidaysSwitch},
+ </if>
+ <if test ='null != holidaysOne'>
+ #{holidaysOne},
+ </if>
+ <if test ='null != holidaysTwo'>
+ #{holidaysTwo},
+ </if>
+ <if test ='null != holidaysThree'>
+ #{holidaysThree},
+ </if>
+ <if test ='null != createTime'>
+ #{createTime},
+ </if>
+ <if test ='null != createUserid'>
+ #{createUserid},
+ </if>
+ <if test ='null != orgCode'>
+ #{orgCode},
+ </if>
+ <if test ='null != work'>
+ #{work},
+ </if>
+ <if test ='null != rest'>
+ #{rest},
+ </if>
+ <if test ='null != holidays'>
+ #{holidays},
+ </if>
+ <if test ='null != overtimeruledefault'>
+ #{overtimeruledefault}
+ </if>
+ </trim>
+ </insert>
+
+ <delete id="delete" >
+ DELETE FROM kqgl_asso_overtime_rules_m
+ WHERE id = #{id}
+ </delete>
+
+ <update id="update" parameterType="cn.timer.api.bean.kqmk.KqglAssoOvertimeRulesM">
+ UPDATE kqgl_asso_overtime_rules_m
+ <set>
+ <if test ='null != name'>name = #{name},</if>
+ <if test ='null != appliedScope'>applied_scope = #{appliedScope},</if>
+ <if test ='null != isWorkovertime'>is_workovertime = #{isWorkovertime},</if>
+ <if test ='null != workMode'>work_mode = #{workMode},</if>
+ <if test ='null != workBuckleRest'>work_buckle_rest = #{workBuckleRest},</if>
+ <if test ='null != workSwitch'>work_switch = #{workSwitch},</if>
+ <if test ='null != workOne'>work_one = #{workOne},</if>
+ <if test ='null != workTwo'>work_two = #{workTwo},</if>
+ <if test ='null != workThree'>work_three = #{workThree},</if>
+ <if test ='null != isRestovertime'>is_restovertime = #{isRestovertime},</if>
+ <if test ='null != restMode'>rest_mode = #{restMode},</if>
+ <if test ='null != restBuckleRest'>rest_buckle_rest = #{restBuckleRest},</if>
+ <if test ='null != restSwitch'>rest_switch = #{restSwitch},</if>
+ <if test ='null != restOne'>rest_one = #{restOne},</if>
+ <if test ='null != restTwo'>rest_two = #{restTwo},</if>
+ <if test ='null != restThree'>rest_three = #{restThree},</if>
+ <if test ='null != isHolidays'>is_holidays = #{isHolidays},</if>
+ <if test ='null != holidaysMode'>holidays_mode = #{holidaysMode},</if>
+ <if test ='null != holidaysBuckleRest'>holidays_buckle_rest = #{holidaysBuckleRest},</if>
+ <if test ='null != holidaysSwitch'>holidays_switch = #{holidaysSwitch},</if>
+ <if test ='null != holidaysOne'>holidays_one = #{holidaysOne},</if>
+ <if test ='null != holidaysTwo'>holidays_two = #{holidaysTwo},</if>
+ <if test ='null != holidaysThree'>holidays_three = #{holidaysThree},</if>
+ <if test ='null != createTime'>create_time = #{createTime},</if>
+ <if test ='null != createUserid'>create_userid = #{createUserid},</if>
+ <if test ='null != orgCode'>org_code = #{orgCode},</if>
+ <if test ='null != work'>work = #{work},</if>
+ <if test ='null != rest'>rest = #{rest},</if>
+ <if test ='null != holidays'>holidays = #{holidays},</if>
+ <if test ='null != overtimeruledefault'>overtimeruledefault = #{overtimeruledefault}</if>
+ </set>
+ WHERE id = #{id}
+ </update>
+
+
+ <select id="load" resultMap="BaseResultMap">
+ SELECT <include refid="Base_Column_List" />
+ FROM kqgl_asso_overtime_rules_m
+ WHERE id = #{id}
+ </select>
+
+ <select id="pageList" resultMap="BaseResultMap">
+ SELECT <include refid="Base_Column_List" />
+ FROM kqgl_asso_overtime_rules_m
+ LIMIT #{offset}, #{pageSize}
+ </select>
+
+ <select id="pageListCount" resultType="java.lang.Integer">
+ SELECT count(1)
+ FROM kqgl_asso_overtime_rules_m
+ </select>
+
+ -->
+
+</mapper>
\ No newline at end of file
diff --git a/src/main/resources/mapping/kqmk/KqglAssoOvertimeRulesMapper.xml b/src/main/resources/mapping/kqmk/KqglAssoOvertimeRulesMapper.xml
index 8a3d1cd..449cf37 100644
--- a/src/main/resources/mapping/kqmk/KqglAssoOvertimeRulesMapper.xml
+++ b/src/main/resources/mapping/kqmk/KqglAssoOvertimeRulesMapper.xml
@@ -31,6 +31,7 @@
<result column="create_time" property="createTime" />
<result column="create_userid" property="createUserid" />
<result column="org_code" property="orgCode" />
+ <result column="overtimeruledefault" property="overtimeruledefault" />
<result column="work" property="work" />
<result column="rest" property="rest" />
@@ -64,261 +65,9 @@
holidays_three,
create_time,
create_userid,
- org_code
+ org_code,
+ overtimeruledefault
</sql>
- <sql id="Base_Column_List_Alias">
- id KqglAssoOvertimeRules_id,
- name KqglAssoOvertimeRules_name,
- applied_scope KqglAssoOvertimeRules_applied_scope,
- is_workovertime KqglAssoOvertimeRules_is_workovertime,
- work_mode KqglAssoOvertimeRules_work_mode,
- work_buckle_rest KqglAssoOvertimeRules_work_buckle_rest,
- work_switch KqglAssoOvertimeRules_work_switch,
- work_one KqglAssoOvertimeRules_work_one,
- work_two KqglAssoOvertimeRules_work_two,
- work_three KqglAssoOvertimeRules_work_three,
- is_restovertime KqglAssoOvertimeRules_is_restovertime,
- rest_mode KqglAssoOvertimeRules_rest_mode,
- rest_buckle_rest KqglAssoOvertimeRules_rest_buckle_rest,
- rest_switch KqglAssoOvertimeRules_rest_switch,
- rest_one KqglAssoOvertimeRules_rest_one,
- rest_two KqglAssoOvertimeRules_rest_two,
- rest_three KqglAssoOvertimeRules_rest_three,
- is_holidays KqglAssoOvertimeRules_is_holidays,
- holidays_mode KqglAssoOvertimeRules_holidays_mode,
- holidays_buckle_rest KqglAssoOvertimeRules_holidays_buckle_rest,
- holidays_switch KqglAssoOvertimeRules_holidays_switch,
- holidays_one KqglAssoOvertimeRules_holidays_one,
- holidays_two KqglAssoOvertimeRules_holidays_two,
- holidays_three KqglAssoOvertimeRules_holidays_three,
- create_time KqglAssoOvertimeRules_create_time,
- create_userid KqglAssoOvertimeRules_create_userid,
- org_code KqglAssoOvertimeRules_org_code
- </sql>
-
- <!--
-
- <insert id="insert" useGeneratedKeys="true" keyColumn="id" parameterType="cn.timer.api.bean.kqmk.KqglAssoOvertimeRules">
- INSERT INTO kqgl_asso_overtime_rules
- <trim prefix="(" suffix=")" suffixOverrides=",">
- <if test ='null != name'>
- name,
- </if>
- <if test ='null != appliedScope'>
- applied_scope,
- </if>
- <if test ='null != isWorkovertime'>
- is_workovertime,
- </if>
- <if test ='null != workMode'>
- work_mode,
- </if>
- <if test ='null != workBuckleRest'>
- work_buckle_rest,
- </if>
- <if test ='null != workSwitch'>
- work_switch,
- </if>
- <if test ='null != workOne'>
- work_one,
- </if>
- <if test ='null != workTwo'>
- work_two,
- </if>
- <if test ='null != workThree'>
- work_three,
- </if>
- <if test ='null != isRestovertime'>
- is_restovertime,
- </if>
- <if test ='null != restMode'>
- rest_mode,
- </if>
- <if test ='null != restBuckleRest'>
- rest_buckle_rest,
- </if>
- <if test ='null != restSwitch'>
- rest_switch,
- </if>
- <if test ='null != restOne'>
- rest_one,
- </if>
- <if test ='null != restTwo'>
- rest_two,
- </if>
- <if test ='null != restThree'>
- rest_three,
- </if>
- <if test ='null != isHolidays'>
- is_holidays,
- </if>
- <if test ='null != holidaysMode'>
- holidays_mode,
- </if>
- <if test ='null != holidaysBuckleRest'>
- holidays_buckle_rest,
- </if>
- <if test ='null != holidaysSwitch'>
- holidays_switch,
- </if>
- <if test ='null != holidaysOne'>
- holidays_one,
- </if>
- <if test ='null != holidaysTwo'>
- holidays_two,
- </if>
- <if test ='null != holidaysThree'>
- holidays_three,
- </if>
- <if test ='null != createTime'>
- create_time,
- </if>
- <if test ='null != createUserid'>
- create_userid,
- </if>
- <if test ='null != orgCode'>
- org_code
- </if>
- </trim>
- <trim prefix="values (" suffix=")" suffixOverrides=",">
- <if test ='null != name'>
- #{name},
- </if>
- <if test ='null != appliedScope'>
- #{appliedScope},
- </if>
- <if test ='null != isWorkovertime'>
- #{isWorkovertime},
- </if>
- <if test ='null != workMode'>
- #{workMode},
- </if>
- <if test ='null != workBuckleRest'>
- #{workBuckleRest},
- </if>
- <if test ='null != workSwitch'>
- #{workSwitch},
- </if>
- <if test ='null != workOne'>
- #{workOne},
- </if>
- <if test ='null != workTwo'>
- #{workTwo},
- </if>
- <if test ='null != workThree'>
- #{workThree},
- </if>
- <if test ='null != isRestovertime'>
- #{isRestovertime},
- </if>
- <if test ='null != restMode'>
- #{restMode},
- </if>
- <if test ='null != restBuckleRest'>
- #{restBuckleRest},
- </if>
- <if test ='null != restSwitch'>
- #{restSwitch},
- </if>
- <if test ='null != restOne'>
- #{restOne},
- </if>
- <if test ='null != restTwo'>
- #{restTwo},
- </if>
- <if test ='null != restThree'>
- #{restThree},
- </if>
- <if test ='null != isHolidays'>
- #{isHolidays},
- </if>
- <if test ='null != holidaysMode'>
- #{holidaysMode},
- </if>
- <if test ='null != holidaysBuckleRest'>
- #{holidaysBuckleRest},
- </if>
- <if test ='null != holidaysSwitch'>
- #{holidaysSwitch},
- </if>
- <if test ='null != holidaysOne'>
- #{holidaysOne},
- </if>
- <if test ='null != holidaysTwo'>
- #{holidaysTwo},
- </if>
- <if test ='null != holidaysThree'>
- #{holidaysThree},
- </if>
- <if test ='null != createTime'>
- #{createTime},
- </if>
- <if test ='null != createUserid'>
- #{createUserid},
- </if>
- <if test ='null != orgCode'>
- #{orgCode}
- </if>
- </trim>
- </insert>
-
- <delete id="delete" >
- DELETE FROM kqgl_asso_overtime_rules
- WHERE id = #{id}
- </delete>
-
- <update id="update" parameterType="cn.timer.api.bean.kqmk.KqglAssoOvertimeRules">
- UPDATE kqgl_asso_overtime_rules
- <set>
- <if test ='null != name'>name = #{name},</if>
- <if test ='null != appliedScope'>applied_scope = #{appliedScope},</if>
- <if test ='null != isWorkovertime'>is_workovertime = #{isWorkovertime},</if>
- <if test ='null != workMode'>work_mode = #{workMode},</if>
- <if test ='null != workBuckleRest'>work_buckle_rest = #{workBuckleRest},</if>
- <if test ='null != workSwitch'>work_switch = #{workSwitch},</if>
- <if test ='null != workOne'>work_one = #{workOne},</if>
- <if test ='null != workTwo'>work_two = #{workTwo},</if>
- <if test ='null != workThree'>work_three = #{workThree},</if>
- <if test ='null != isRestovertime'>is_restovertime = #{isRestovertime},</if>
- <if test ='null != restMode'>rest_mode = #{restMode},</if>
- <if test ='null != restBuckleRest'>rest_buckle_rest = #{restBuckleRest},</if>
- <if test ='null != restSwitch'>rest_switch = #{restSwitch},</if>
- <if test ='null != restOne'>rest_one = #{restOne},</if>
- <if test ='null != restTwo'>rest_two = #{restTwo},</if>
- <if test ='null != restThree'>rest_three = #{restThree},</if>
- <if test ='null != isHolidays'>is_holidays = #{isHolidays},</if>
- <if test ='null != holidaysMode'>holidays_mode = #{holidaysMode},</if>
- <if test ='null != holidaysBuckleRest'>holidays_buckle_rest = #{holidaysBuckleRest},</if>
- <if test ='null != holidaysSwitch'>holidays_switch = #{holidaysSwitch},</if>
- <if test ='null != holidaysOne'>holidays_one = #{holidaysOne},</if>
- <if test ='null != holidaysTwo'>holidays_two = #{holidaysTwo},</if>
- <if test ='null != holidaysThree'>holidays_three = #{holidaysThree},</if>
- <if test ='null != createTime'>create_time = #{createTime},</if>
- <if test ='null != createUserid'>create_userid = #{createUserid},</if>
- <if test ='null != orgCode'>org_code = #{orgCode}</if>
- </set>
- WHERE id = #{id}
- </update>
-
-
- <select id="load" resultMap="BaseResultMap">
- SELECT <include refid="Base_Column_List" />
- FROM kqgl_asso_overtime_rules
- WHERE id = #{id}
- </select>
-
- <select id="pageList" resultMap="BaseResultMap">
- SELECT <include refid="Base_Column_List" />
- FROM kqgl_asso_overtime_rules
- LIMIT #{offset}, #{pageSize}
- </select>
-
- <select id="pageListCount" resultType="java.lang.Integer">
- SELECT count(1)
- FROM kqgl_asso_overtime_rules
- </select>
-
- -->
</mapper>
\ No newline at end of file