Merge branch 'lal' into 'develop'

提交

See merge request 8timerv2/8timerapiv200!84

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

@@ -41,7 +41,7 @@ public class KqglAssoLeaveRules extends Model<KqglAssoLeaveRules> {
 	private String name;
 	private String name;
 
 
 	@ApiModelProperty(value = "请假单位 ", example = "1：按天请假；2：按半天；3：按小时")
 	@ApiModelProperty(value = "请假单位 ", example = "1：按天请假；2：按半天；3：按小时")
-	private String company;
+	private Integer company;
 
 
 	@ApiModelProperty(value = "假期类型 ", example = "1：系统项；2：自定义项")
 	@ApiModelProperty(value = "假期类型 ", example = "1：系统项；2：自定义项")
 	private Integer leaveType;
 	private Integer leaveType;

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

@@ -365,7 +365,7 @@ public class TimeCardController {
 		KqglAssoLeaveRules rules = KqglAssoLeaveRules.builder().id(id).build().selectById();
 		KqglAssoLeaveRules rules = KqglAssoLeaveRules.builder().id(id).build().selectById();
 		overrule.setRules(rules);
 		overrule.setRules(rules);
 		List<KqglAssoRulesVice> vice = new LambdaQueryChainWrapper<KqglAssoRulesVice>(kqglassorulesvicemapper).eq(KqglAssoRulesVice::getLeaveRulesId, id).list();
 		List<KqglAssoRulesVice> vice = new LambdaQueryChainWrapper<KqglAssoRulesVice>(kqglassorulesvicemapper).eq(KqglAssoRulesVice::getLeaveRulesId, id).list();
-		overrule.setVice(vice);		
+		overrule.setRange(vice);		
 		return ResultUtil.data(overrule,"操作成功!");
 		return ResultUtil.data(overrule,"操作成功!");
 	}
 	}
 	
 	

src/main/java/cn/timer/api/dto/kqmk/KqglAssoLeaveRulesDto.java

@@ -22,7 +22,7 @@ public class KqglAssoLeaveRulesDto {
 	private String name;
 	private String name;
 
 
 	@ApiModelProperty(value = "请假单位 ", example = "1：按天请假；2：按半天；3：按小时")
 	@ApiModelProperty(value = "请假单位 ", example = "1：按天请假；2：按半天；3：按小时")
-	private String company;
+	private Integer company;
 
 
 	@ApiModelProperty(value = "假期类型 ", example = "1：系统项；2：自定义项")
 	@ApiModelProperty(value = "假期类型 ", example = "1：系统项；2：自定义项")
 	private Integer leaveType;
 	private Integer leaveType;

src/main/java/cn/timer/api/dto/kqmk/VacationInformationDto.java

@@ -20,6 +20,6 @@ public class VacationInformationDto {
 	KqglAssoLeaveRules rules;
 	KqglAssoLeaveRules rules;
 
 
 	@ApiModelProperty(value = "假期规则-适用范围 ", example = "字段说明")
 	@ApiModelProperty(value = "假期规则-适用范围 ", example = "字段说明")
-	List<KqglAssoRulesVice> vice;
+	List<KqglAssoRulesVice> range;
 
 
 }
 }