Commit 5b95a1a9 by lal Committed by chenzg

提交

parent 37bb9a15
...@@ -107,7 +107,7 @@ public class KqglAssoOvertimeRulesM extends Model<KqglAssoOvertimeRulesM> { ...@@ -107,7 +107,7 @@ public class KqglAssoOvertimeRulesM extends Model<KqglAssoOvertimeRulesM> {
private String holidaysThree; private String holidaysThree;
@ApiModelProperty(value = "创建时间 创建时间", example = "101") @ApiModelProperty(value = "创建时间 创建时间", example = "101")
private Integer createTime; private Long createTime;
@ApiModelProperty(value = "创建人员 创建人员", example = "101") @ApiModelProperty(value = "创建人员 创建人员", example = "101")
private Integer createUserid; private Integer createUserid;
......
...@@ -641,7 +641,7 @@ public class LoginController { ...@@ -641,7 +641,7 @@ public class LoginController {
KqglAssoOvertimeRules Rules = KqglAssoOvertimeRules.builder().build(); KqglAssoOvertimeRules Rules = KqglAssoOvertimeRules.builder().build();
Rules.setOrgCode(qyzxEntInfoM.getId()); Rules.setOrgCode(qyzxEntInfoM.getId());
BeanUtil.copyProperties(jbgzdef, Rules , "orgCode"); BeanUtil.copyProperties(jbgzdef, Rules , "orgCode");
Rules.insert();
//假期规则初始化 //假期规则初始化
String current_time = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()); String current_time = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
......
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