From 01ffbe31d049dc3880a431fd4da7ac36b30abff4 Mon Sep 17 00:00:00 2001
From: lal <lalqqhy@163.com>
Date: Sat, 20 Jun 2020 17:56:28 +0800
Subject: [PATCH] 提交
---
src/main/java/cn/timer/api/bean/kqmk/KqglAssoOvertimeRules.java | 7 +++++++
src/main/java/cn/timer/api/controller/kqgl/TimeCardController.java | 2 +-
src/main/java/cn/timer/api/dto/kqmk/KqglAssoOvertimeRulesDto.java | 7 +++++++
src/main/resources/mapping/kqmk/KqglAssoOvertimeRulesMapper.xml | 4 ++++
4 files changed, 19 insertions(+), 1 deletion(-)
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 9a73b63..88ff4f6 100644
--- a/src/main/java/cn/timer/api/bean/kqmk/KqglAssoOvertimeRules.java
+++ b/src/main/java/cn/timer/api/bean/kqmk/KqglAssoOvertimeRules.java
@@ -114,5 +114,12 @@ public class KqglAssoOvertimeRules extends Model<KqglAssoOvertimeRules> {
@ApiModelProperty(value = "企业组织代码 企业组织代码", example = "117")
private Integer orgCode;
+
+ @ApiModelProperty(value = "", example = "")
+ private Integer work;
+ @ApiModelProperty(value = "", example = "")
+ private Integer rest;
+ @ApiModelProperty(value = "", example = "")
+ private Integer holidays;
}
\ No newline at end of file
diff --git a/src/main/java/cn/timer/api/controller/kqgl/TimeCardController.java b/src/main/java/cn/timer/api/controller/kqgl/TimeCardController.java
index d3018ce..deb27d4 100644
--- a/src/main/java/cn/timer/api/controller/kqgl/TimeCardController.java
+++ b/src/main/java/cn/timer/api/controller/kqgl/TimeCardController.java
@@ -364,7 +364,7 @@ public class TimeCardController {
vice.setOverType(rest[p].getOvertype());
overtimes.add(vice);
}else {
- break;
+ continue;
}
}
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 436881b..71ea9c8 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,13 @@ public class KqglAssoOvertimeRulesDto {
@ApiModelProperty(value = "企业组织代码 企业组织代码", example = "117")
private Integer orgCode;
+ @ApiModelProperty(value = "", example = "0")
+ private Integer work;
+ @ApiModelProperty(value = "", example = "0")
+ private Integer rest;
+ @ApiModelProperty(value = "", example = "0")
+ private Integer holidays;
+
@ApiModelProperty(value = "扣除休息时间段", example = "12:00-13:30")
private StartTimeRestDto[] starttime;
diff --git a/src/main/resources/mapping/kqmk/KqglAssoOvertimeRulesMapper.xml b/src/main/resources/mapping/kqmk/KqglAssoOvertimeRulesMapper.xml
index fd37573..8a3d1cd 100644
--- a/src/main/resources/mapping/kqmk/KqglAssoOvertimeRulesMapper.xml
+++ b/src/main/resources/mapping/kqmk/KqglAssoOvertimeRulesMapper.xml
@@ -31,6 +31,10 @@
<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" />
</resultMap>
<sql id="Base_Column_List">
--
libgit2 0.26.0