提交

src/main/java/cn/timer/api/bean/kqgl/UserAttendanceRel.java

@@ -19,4 +19,5 @@ public class UserAttendanceRel implements Serializable{
 	private Integer qyid;
 	private Integer qyid;
 
 
 	private String empnum;
 	private String empnum;
+	private String empname;
 }
 }
\ No newline at end of file

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

@@ -1005,6 +1005,7 @@ public class TimeCardController {
 				.isDqtx(attass.getAttRemind()).txry(String.join(",",attass.getAttRemindUserids())).txfs(attass.getAdvanceDays()).txxhts(attass.getRemCycleDays())
 				.isDqtx(attass.getAttRemind()).txry(String.join(",",attass.getAttRemindUserids())).txfs(attass.getAdvanceDays()).txxhts(attass.getRemCycleDays())
 				.txsjTime(attass.getReminderTime()).tsfs(String.join(",",attass.getPromptingMode())).isWpbsdk(attass.getAttRemind()).kqkssjTime(attass.getNewAttTime())
 				.txsjTime(attass.getReminderTime()).tsfs(String.join(",",attass.getPromptingMode())).isWpbsdk(attass.getAttRemind()).kqkssjTime(attass.getNewAttTime())
 				.zsgzsc(attass.getLeastworkTime()).zcgzsc(attass.getNormalWorkTime()).jbzdsc(attass.getMaxOvertimeTime()).overtimeRulesId(attass.getOvertimeRulesId()).build();
 				.zsgzsc(attass.getLeastworkTime()).zcgzsc(attass.getNormalWorkTime()).jbzdsc(attass.getMaxOvertimeTime()).overtimeRulesId(attass.getOvertimeRulesId()).build();
+		
 //		if (!attgro.insertOrUpdate()) 
 //		if (!attgro.insertOrUpdate()) 
 		if (!attgro.insert()) 
 		if (!attgro.insert()) 
 			return ResultUtil.error("操作失败--新增考勤组");
 			return ResultUtil.error("操作失败--新增考勤组");
@@ -1012,6 +1013,9 @@ public class TimeCardController {
 		Integer attid = attgro.getId();
 		Integer attid = attgro.getId();
 		Console.log("新增--考勤组id: " + attid);
 		Console.log("新增--考勤组id: " + attid);
 		
 		
+		//添加加班规则
+		KqglAssoOvertimeRange.builder().overtimeRulesId(attass.getOvertimeRulesId()).attgroupId(attid).build().insert();
+		
 		List<KqglAssoKqzdkfs> kqzdkfslist = new ArrayList<KqglAssoKqzdkfs>();
 		List<KqglAssoKqzdkfs> kqzdkfslist = new ArrayList<KqglAssoKqzdkfs>();
 		String[] attmac = attass.getAttmachines();//考勤机 
 		String[] attmac = attass.getAttmachines();//考勤机 
 		if(attmac.length>0){
 		if(attmac.length>0){
@@ -1885,6 +1889,19 @@ public class TimeCardController {
 	}
 	}
 	
 	
 	
 	
+	/**
+	 * 获取考勤组所需加班规则
+	 */
+	@GetMapping(value="/attovertimerules")
+	@ApiOperation(value = "获取考勤组所需加班规则", httpMethod = "GET", notes = "接口发布说明")
+	@ApiOperationSupport(order = 15)
+	public Result<Object> getAttOvertimeRules(@CurrentUser UserBean userBean){
+		
+		List<KqglAssoOvertimeRules> attoverrul = new LambdaQueryChainWrapper<KqglAssoOvertimeRules>(kqglassoovertimerulesmapper).eq(KqglAssoOvertimeRules::getOrgCode, userBean.getOrgCode()).list();
+		
+        return ResultUtil.data(attoverrul,"操作成功!");
+	}
+	
 //	@GetMapping(value = "/summary_report")
 //	@GetMapping(value = "/summary_report")
 //	@ApiOperation(value = "考勤汇总报表(暂时不用)", httpMethod = "GET", notes = "接口发布说明")
 //	@ApiOperation(value = "考勤汇总报表(暂时不用)", httpMethod = "GET", notes = "接口发布说明")
 //	public Result<Object> attendance_summary_report() {
 //	public Result<Object> attendance_summary_report() {

src/main/resources/mapping/kqgl/UserAttendanceRelMapper.xml

@@ -8,6 +8,7 @@
     <result column="qyid" property="qyid" jdbcType="INTEGER" />
     <result column="qyid" property="qyid" jdbcType="INTEGER" />
     
     
     <result column="empnum" property="empnum" jdbcType="VARCHAR" />
     <result column="empnum" property="empnum" jdbcType="VARCHAR" />
+    <result column="empname" property="empname" jdbcType="VARCHAR" />
   </resultMap>
   </resultMap>
   <sql id="Base_Column_List" >
   <sql id="Base_Column_List" >
     id, kqzid, userid, qyid
     id, kqzid, userid, qyid
@@ -107,7 +108,8 @@
   
   
   <select id="selectAttendanceOfficerByKqzid" resultMap="BaseResultMap">
   <select id="selectAttendanceOfficerByKqzid" resultMap="BaseResultMap">
 		select yhkqz.*,
 		select yhkqz.*,
-			us.emp_num as empnum 
+			us.emp_num as empnum,
+			us.name as empname
 			from kqgl_asso_yhkqz yhkqz
 			from kqgl_asso_yhkqz yhkqz
 		LEFT JOIN yggl_main_emp as us on us.emp_num = yhkqz.userid and us.org_code = #{orgcode}
 		LEFT JOIN yggl_main_emp as us on us.emp_num = yhkqz.userid and us.org_code = #{orgcode}
 		where yhkqz.kqzid = #{kqzid,jdbcType=INTEGER}
 		where yhkqz.kqzid = #{kqzid,jdbcType=INTEGER}