Merge branch 'lal' into 'develop'

Lal

See merge request 8timerv2/8timerapiv200!309

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

@@ -9,6 +9,8 @@ import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
+import javax.management.Query;
+
 import org.codehaus.jettison.json.JSONObject;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -1415,6 +1417,15 @@ public class TimeCardController {
 		return ResultUtil.data(attgro,"操作成功!");
 	}
 	
+	@GetMapping(value="/Overtime_rule_default")
+	@ApiOperation(value = "获取当前公司的默认加班规则", httpMethod = "GET", notes = "接口发布说明")
+	public Result<Object> Overtime_rule_default(@CurrentUser UserBean userBean) {
+		
+		KqglAssoOvertimeRules defovwe = KqglAssoOvertimeRules.builder().build().selectOne(new QueryWrapper<KqglAssoOvertimeRules>().lambda().eq(KqglAssoOvertimeRules::getOrgCode, userBean.getOrgCode())
+				.eq(KqglAssoOvertimeRules::getOvertimeruledefault, 1));
+		
+		return ResultUtil.data(defovwe,"操作成功!");
+	}
 	
 	
 	/**