提交

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

@@ -115,6 +115,9 @@ public class KqglAssoOvertimeRules extends Model<KqglAssoOvertimeRules> {
 	@ApiModelProperty(value = "企业组织代码 企业组织代码", example = "117")
 	@ApiModelProperty(value = "企业组织代码 企业组织代码", example = "117")
 	private Integer orgCode;
 	private Integer orgCode;
 	
 	
+	@ApiModelProperty(value = "是否为默认（0：否，1：是）", example = "0")
+	private Integer overtimeruledefault;
+	
 	@ApiModelProperty(value = "", example = "")
 	@ApiModelProperty(value = "", example = "")
 	private Integer work;
 	private Integer work;
 	@ApiModelProperty(value = "", example = "")
 	@ApiModelProperty(value = "", example = "")

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

+package cn.timer.api.bean.kqmk;
+
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @author Tang 2020-07-04
+ */
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@Table(name = "kqgl_asso_overtime_rules_m")
+@ApiModel("加班规则")
+public class KqglAssoOvertimeRulesM extends Model<KqglAssoOvertimeRulesM> {
+
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 1L;
+
+	@Id
+	@GeneratedValue
+	@TableId(type = IdType.AUTO)
+	@ApiModelProperty(value = "加班规则编号 加班规则编号", example = "101")
+	private Integer id;
+
+	@ApiModelProperty(value = "规则名称 ", example = "规则名称")
+	private String name;
+
+	@ApiModelProperty(value = "应用范围（0：全公司 >0:考勤组id）", example = "101")
+	private Integer appliedScope;
+
+	@ApiModelProperty(value = "工作日是否允许加班 0：否；1：是", example = "101")
+	private Integer isWorkovertime;
+
+	@ApiModelProperty(value = "计算方式 1：按审批时长计算", example = "101")
+	private Integer workMode;
+
+	@ApiModelProperty(value = "扣除休息时间开关 0：关；1：开", example = "101")
+	private Integer workBuckleRest;
+
+	@ApiModelProperty(value = "计为调休或加班费开关 0：关；1：开", example = "101")
+	private Integer workSwitch;
+
+	@ApiModelProperty(value = "1：按n计为调休 ", example = "按1:n计为调休每年12月31日作废")
+	private String workOne;
+
+	@ApiModelProperty(value = "2：计为加班费 0：未选择；1：已选择", example = "101")
+	private Integer workTwo;
+
+	@ApiModelProperty(value = "3：多种选择 ", example = "员工申请加班时可选择，计为加班费或者按1:n计为调休时长")
+	private String workThree;
+
+	@ApiModelProperty(value = "休息日是否允许加班 0：否；1：是", example = "101")
+	private Integer isRestovertime;
+
+	@ApiModelProperty(value = "计算方式 1：按审批时长计算", example = "101")
+	private Integer restMode;
+
+	@ApiModelProperty(value = "扣除休息时间开关 0：关；1：开", example = "101")
+	private Integer restBuckleRest;
+
+	@ApiModelProperty(value = "计为调休或加班费开关 0：关；1：开", example = "101")
+	private Integer restSwitch;
+
+	@ApiModelProperty(value = "1：按n计为调休 ", example = "按1:n计为调休每年12月31日作废")
+	private String restOne;
+
+	@ApiModelProperty(value = "2：计为加班费 0：未选择；1：已选择", example = "101")
+	private Integer restTwo;
+
+	@ApiModelProperty(value = "3：多种选择 ", example = "员工申请加班时可选择，计为加班费或者按1:n计为调休时长")
+	private String restThree;
+
+	@ApiModelProperty(value = "节假日是否允许加班 0：否；1：是", example = "101")
+	private Integer isHolidays;
+
+	@ApiModelProperty(value = "计算方式 ", example = "1：按审批时长计算")
+	private Double holidaysMode;
+
+	@ApiModelProperty(value = "扣除休息时间开关 0：关；1：开", example = "101")
+	private Integer holidaysBuckleRest;
+
+	@ApiModelProperty(value = "计为调休或加班费开关 0：关；1：开", example = "101")
+	private Integer holidaysSwitch;
+
+	@ApiModelProperty(value = "1：按n计为调休 ", example = "按1:n计为调休每年12月31日作废")
+	private String holidaysOne;
+
+	@ApiModelProperty(value = "2：计为加班费 0：未选择；1：已选择", example = "101")
+	private Integer holidaysTwo;
+
+	@ApiModelProperty(value = "3：多种选择 ", example = "员工申请加班时可选择，计为加班费或者按1:n计为调休时长")
+	private String holidaysThree;
+
+	@ApiModelProperty(value = "创建时间 创建时间", example = "101")
+	private Integer createTime;
+
+	@ApiModelProperty(value = "创建人员 创建人员", example = "101")
+	private Integer createUserid;
+
+	@ApiModelProperty(value = "企业组织代码 企业组织代码", example = "101")
+	private Integer orgCode;
+
+	@ApiModelProperty(value = "work work", example = "101")
+	private Integer work;
+
+	@ApiModelProperty(value = "rest rest", example = "101")
+	private Integer rest;
+
+	@ApiModelProperty(value = "holidays holidays", example = "101")
+	private Integer holidays;
+
+	@ApiModelProperty(value = "是否为默认（0：否，1：是） 是否为默认（0：否，1：是）", example = "101")
+	private Integer overtimeruledefault;
+
+}
\ No newline at end of file

src/main/java/cn/timer/api/controller/LoginController.java

@@ -29,6 +29,7 @@ import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
 import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 
 
+import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.timer.api.aspect.lang.annotation.Log;
 import cn.timer.api.aspect.lang.annotation.Log;
@@ -38,12 +39,12 @@ import cn.timer.api.bean.kqmk.KqglAssoLeaveEmployeeBalance;
 import cn.timer.api.bean.kqmk.KqglAssoLeaveRules;
 import cn.timer.api.bean.kqmk.KqglAssoLeaveRules;
 import cn.timer.api.bean.kqmk.KqglAssoLeaveRulesT;
 import cn.timer.api.bean.kqmk.KqglAssoLeaveRulesT;
 import cn.timer.api.bean.kqmk.KqglAssoOvertimeBasics;
 import cn.timer.api.bean.kqmk.KqglAssoOvertimeBasics;
+import cn.timer.api.bean.kqmk.KqglAssoOvertimeRules;
+import cn.timer.api.bean.kqmk.KqglAssoOvertimeRulesM;
 import cn.timer.api.bean.qyxx.CmsContent;
 import cn.timer.api.bean.qyxx.CmsContent;
 import cn.timer.api.bean.qyzx.QyzxEmpEntAsso;
 import cn.timer.api.bean.qyzx.QyzxEmpEntAsso;
 import cn.timer.api.bean.qyzx.QyzxEmpLogin;
 import cn.timer.api.bean.qyzx.QyzxEmpLogin;
 import cn.timer.api.bean.qyzx.QyzxEntInfoM;
 import cn.timer.api.bean.qyzx.QyzxEntInfoM;
-import cn.timer.api.bean.qyzx.QyzxSms;
-import cn.timer.api.bean.qyzx.businessService.QyzxRemainingQuantity;
 import cn.timer.api.bean.yggl.YgglMainEmp;
 import cn.timer.api.bean.yggl.YgglMainEmp;
 import cn.timer.api.bean.zzgl.ZzglAuth;
 import cn.timer.api.bean.zzgl.ZzglAuth;
 import cn.timer.api.bean.zzgl.ZzglBmgwM;
 import cn.timer.api.bean.zzgl.ZzglBmgwM;
@@ -58,6 +59,7 @@ import cn.timer.api.controller.jxgl.service.JxglService;
 import cn.timer.api.controller.qyzx.service.RegisterHelper;
 import cn.timer.api.controller.qyzx.service.RegisterHelper;
 import cn.timer.api.controller.spmk.service.SpmkServiceImpl;
 import cn.timer.api.controller.spmk.service.SpmkServiceImpl;
 import cn.timer.api.dao.kqmk.KqglAssoLeaveRulesMapper;
 import cn.timer.api.dao.kqmk.KqglAssoLeaveRulesMapper;
+import cn.timer.api.dao.kqmk.KqglAssoOvertimeRulesMMapper;
 import cn.timer.api.dao.qyzx.QyzxEmpEntAssoMapper;
 import cn.timer.api.dao.qyzx.QyzxEmpEntAssoMapper;
 import cn.timer.api.dao.qyzx.QyzxEmpLoginMapper;
 import cn.timer.api.dao.qyzx.QyzxEmpLoginMapper;
 import cn.timer.api.dao.yggl.YgglMainEmpMapper;
 import cn.timer.api.dao.yggl.YgglMainEmpMapper;
@@ -521,6 +523,8 @@ public class LoginController {
 
 
 	@Autowired
 	@Autowired
 	private KqglAssoLeaveRulesMapper kqglassoleaverulesmapper;
 	private KqglAssoLeaveRulesMapper kqglassoleaverulesmapper;
+	@Autowired
+	private KqglAssoOvertimeRulesMMapper kqglassoovertimerulesmmapper;
 
 
 	/**
 	/**
 	 * 注册企业
 	 * 注册企业
@@ -632,6 +636,11 @@ public class LoginController {
 				System.out.println("重复初始化数据！");
 				System.out.println("重复初始化数据！");
 			}
 			}
 			
 			
+			//建立初始化的加班规则
+			KqglAssoOvertimeRulesM jbgzdef = KqglAssoOvertimeRulesM.builder().build().selectOne(new QueryWrapper<KqglAssoOvertimeRulesM>().lambda().eq(KqglAssoOvertimeRulesM::getOvertimeruledefault, 1));
+			KqglAssoOvertimeRules Rules =  KqglAssoOvertimeRules.builder().build();
+			Rules.setOrgCode(qyzxEntInfoM.getId());
+			BeanUtil.copyProperties(jbgzdef, Rules , "orgCode");
 			
 			
 			
 			
 			//假期规则初始化
 			//假期规则初始化

src/main/java/cn/timer/api/dao/kqmk/KqglAssoOvertimeRulesMMapper.java

+package cn.timer.api.dao.kqmk;
+import org.springframework.stereotype.Repository;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+import cn.timer.api.bean.kqmk.KqglAssoOvertimeRulesM;
+
+/**
+*  加班规则
+* @author Tang 2020-07-04
+*/
+@Repository
+public interface KqglAssoOvertimeRulesMMapper extends BaseMapper<KqglAssoOvertimeRulesM> {
+
+
+
+}

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

@@ -95,6 +95,9 @@ public class KqglAssoOvertimeRulesDto {
 	@ApiModelProperty(value = "企业组织代码 企业组织代码", example = "117")
 	@ApiModelProperty(value = "企业组织代码 企业组织代码", example = "117")
 	private Integer orgCode;
 	private Integer orgCode;
 	
 	
+	@ApiModelProperty(value = "是否为默认（0：否，1：是）", example = "0")
+	private Integer overtimeruledefault;
+	
 	@ApiModelProperty(value = "", example = "0")
 	@ApiModelProperty(value = "", example = "0")
 	private Integer work;
 	private Integer work;
 	@ApiModelProperty(value = "", example = "0")
 	@ApiModelProperty(value = "", example = "0")