提交

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

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;
 				}
 				
 			}

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;
 	

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">