Skip to content

8
8timerapiv200
Commit 40d3442a by ilal Committed by chenzg
Options

提價

parent fc2fcb83
Showing with 29 additions and 10 deletions
src/main/java/cn/timer/api/bean/kqmk/KqglAssoOvertimeRules.java
...@@ -40,8 +40,8 @@ public class KqglAssoOvertimeRules extends Model<KqglAssoOvertimeRules> { ...@@ -40,8 +40,8 @@ public class KqglAssoOvertimeRules extends Model<KqglAssoOvertimeRules> {
@ApiModelProperty(value = "规则名称 ", example = "以审批时间计算加班") @ApiModelProperty(value = "规则名称 ", example = "以审批时间计算加班")
private String name; private String name;
@ApiModelProperty(value = "应用范围", example = "1") @ApiModelProperty(value = "应用范围", example = "（0：全公司 >0:考勤组id）")
private String appliedScope; private Integer appliedScope;
@ApiModelProperty(value = "工作日是否允许加班 0：否；1：是", example = "1") @ApiModelProperty(value = "工作日是否允许加班 0：否；1：是", example = "1")
private Integer isWorkovertime; private Integer isWorkovertime;
......
src/main/java/cn/timer/api/bean/kqmk/KqglMainKqz.java
...@@ -93,5 +93,8 @@ public class KqglMainKqz extends Model<KqglMainKqz> { ...@@ -93,5 +93,8 @@ public class KqglMainKqz extends Model<KqglMainKqz> {
@ApiModelProperty(value = "外勤 外勤", example = "101") @ApiModelProperty(value = "外勤 外勤", example = "101")
private Integer isWq; private Integer isWq;
@ApiModelProperty(value="加班规则 加班规则",example="101")
private Integer overtimeRulesId;
} }
\ No newline at end of file
src/main/java/cn/timer/api/dto/kqmk/KqglAssoOvertimeRulesDto.java
...@@ -20,8 +20,8 @@ public class KqglAssoOvertimeRulesDto { ...@@ -20,8 +20,8 @@ public class KqglAssoOvertimeRulesDto {
@ApiModelProperty(value = "规则名称 ", example = "以审批时间计算加班") @ApiModelProperty(value = "规则名称 ", example = "以审批时间计算加班")
private String name; private String name;
@ApiModelProperty(value = "应用范围", example = "1") @ApiModelProperty(value = "应用范围", example = "（0：全公司 >0:考勤组id）")
private String appliedScope; private Integer appliedScope;
@ApiModelProperty(value = "工作日是否允许加班 0：否；1：是", example = "1") @ApiModelProperty(value = "工作日是否允许加班 0：否；1：是", example = "1")
private Integer isWorkovertime; private Integer isWorkovertime;
......
src/main/java/cn/timer/api/dto/kqmk/KqglMainKqzDto.java
...@@ -74,6 +74,9 @@ public class KqglMainKqzDto { ...@@ -74,6 +74,9 @@ public class KqglMainKqzDto {
@ApiModelProperty(value = "外勤 外勤", example = "101") @ApiModelProperty(value = "外勤 外勤", example = "101")
private Integer isWq; private Integer isWq;
@ApiModelProperty(value="加班规则 加班规则",example="101")
private Integer overtimeRulesId;
@ApiModelProperty(value = "考勤组人员数", example = "100") @ApiModelProperty(value = "考勤组人员数", example = "100")
......
src/main/resources/mapping/kqmk/KqglMainKqzMapper.xml
...@@ -24,6 +24,7 @@ ...@@ -24,6 +24,7 @@
<result column="sybc" property="sybc" /> <result column="sybc" property="sybc" />
<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" />
</resultMap> </resultMap>
<resultMap id="AuxiliaryMap" type="cn.timer.api.dto.kqmk.KqglMainKqzDto" > <resultMap id="AuxiliaryMap" type="cn.timer.api.dto.kqmk.KqglMainKqzDto" >
...@@ -47,6 +48,7 @@ ...@@ -47,6 +48,7 @@
<result column="sybc" property="sybc" /> <result column="sybc" property="sybc" />
<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="kqznum" property="kqznum" /> <result column="kqznum" property="kqznum" />
<result column="pbfsnm" property="pbfsnm" /> <result column="pbfsnm" property="pbfsnm" />
...@@ -74,7 +76,8 @@ ...@@ -74,7 +76,8 @@
is_wpbsdk, is_wpbsdk,
sybc, sybc,
is_xzbcdk, is_xzbcdk,
is_wq is_wq,
overtime_rules_id
</sql> </sql>
<sql id="Base_Column_List_Alias"> <sql id="Base_Column_List_Alias">
...@@ -97,7 +100,8 @@ ...@@ -97,7 +100,8 @@
is_wpbsdk KqglMainKqz_is_wpbsdk, is_wpbsdk KqglMainKqz_is_wpbsdk,
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
</sql> </sql>
<sql id="Base_Column_List_a"> <sql id="Base_Column_List_a">
...@@ -120,7 +124,8 @@ ...@@ -120,7 +124,8 @@
a.is_wpbsdk, a.is_wpbsdk,
a.sybc, a.sybc,
a.is_xzbcdk, a.is_xzbcdk,
a.is_wq a.is_wq,
a.overtime_rules_id
</sql> </sql>
<select id="selectAttGroupMachineByQyid" resultMap="AuxiliaryMap"> <select id="selectAttGroupMachineByQyid" resultMap="AuxiliaryMap">
...@@ -223,7 +228,10 @@ ...@@ -223,7 +228,10 @@
is_xzbcdk, is_xzbcdk,
</if> </if>
<if test ='null != isWq'> <if test ='null != isWq'>
is_wq is_wq,
</if>
<if test ='null != overtimeRulesId'>
overtime_rules_id
</if> </if>
</trim> </trim>
<trim prefix="values (" suffix=")" suffixOverrides=","> <trim prefix="values (" suffix=")" suffixOverrides=",">
...@@ -282,7 +290,10 @@ ...@@ -282,7 +290,10 @@
#{isXzbcdk}, #{isXzbcdk},
</if> </if>
<if test ='null != isWq'> <if test ='null != isWq'>
#{isWq} #{isWq},
</if>
<if test ='null != overtimeRulesId'>
#{overtimeRulesId}
</if> </if>
</trim> </trim>
</insert> </insert>
...@@ -313,7 +324,8 @@ ...@@ -313,7 +324,8 @@
<if test ='null != isWpbsdk'>is_wpbsdk = #{isWpbsdk},</if> <if test ='null != isWpbsdk'>is_wpbsdk = #{isWpbsdk},</if>
<if test ='null != sybc'>sybc = #{sybc},</if> <if test ='null != sybc'>sybc = #{sybc},</if>
<if test ='null != isXzbcdk'>is_xzbcdk = #{isXzbcdk},</if> <if test ='null != isXzbcdk'>is_xzbcdk = #{isXzbcdk},</if>
<if test ='null != isWq'>is_wq = #{isWq}</if> <if test ='null != isWq'>is_wq = #{isWq},</if>
<if test ='null != overtimeRulesId'>overtime_rules_id = #{overtimeRulesId}</if>
</set> </set>
WHERE id = #{id} WHERE id = #{id}
</update> </update>
......
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