Merge branch 'lal' into 'develop'

Lal

See merge request 8timerv2/8timerapiv200!128

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

@@ -36,11 +36,8 @@ import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.lang.Console;
-import cn.timer.api.bean.kqgl.AttGroupBinPunchMode;
-import cn.timer.api.bean.kqgl.AttendanceMachine;
 import cn.timer.api.bean.kqgl.PunchCardDetails;
 import cn.timer.api.bean.kqgl.PunchRecord;
-import cn.timer.api.bean.kqgl.UserAttendanceRel;
 import cn.timer.api.bean.kqgl.UserEquiRelation;
 import cn.timer.api.bean.kqmk.KqglAssOvertimeVice;
 import cn.timer.api.bean.kqmk.KqglAssoBcsz;
@@ -68,7 +65,6 @@ import cn.timer.api.config.annotation.CurrentUser;
 import cn.timer.api.config.annotation.UserBean;
 import cn.timer.api.dao.kqgl.PunchCardDetailsMapper;
 import cn.timer.api.dao.kqgl.PunchRecordMapper;
-import cn.timer.api.dao.kqgl.UserAttendanceRelMapper;
 import cn.timer.api.dao.kqgl.UserEquiRelationMapper;
 import cn.timer.api.dao.kqmk.KqglAssOvertimeViceMapper;
 import cn.timer.api.dao.kqmk.KqglAssoBcszMapper;
@@ -88,7 +84,6 @@ import cn.timer.api.dao.kqmk.KqglAssoYhkqzMapper;
 import cn.timer.api.dao.kqmk.KqglAssoYhsbMapper;
 import cn.timer.api.dao.kqmk.KqglAssoZhoupaibanMapper;
 import cn.timer.api.dao.kqmk.KqglMainKqzMapper;
-import cn.timer.api.dto.kqgl.AttemacDto;
 import cn.timer.api.dto.kqmk.AttSchedulingDto;
 import cn.timer.api.dto.kqmk.AttendanceAssistantDto;
 import cn.timer.api.dto.kqmk.AttqueryCriteriaDto;
@@ -102,6 +97,7 @@ import cn.timer.api.dto.kqmk.KqglMainKqzDto;
 import cn.timer.api.dto.kqmk.KqzAttendanceGroupSearchDto;
 import cn.timer.api.dto.kqmk.LeaveTypeDto;
 import cn.timer.api.dto.kqmk.MachinememberDto;
+import cn.timer.api.dto.kqmk.ModifyEmployeeBalanceDto;
 import cn.timer.api.dto.kqmk.SetConditionsDto;
 import cn.timer.api.dto.kqmk.StartTimeRestDto;
 import cn.timer.api.dto.kqmk.VacationInformationDto;
@@ -1851,6 +1847,20 @@ public class TimeCardController {
 	}
 	
 	
+	/**
+	 * 	根据用户id和假期id查询余额具体数据
+	 */
+	@PostMapping(value = "/modify_employee_balance")
+	@ApiOperation(value = "根据用户id和假期id查询余额具体数据", httpMethod = "POST", notes = "接口发布说明")
+//	@ApiOperationSupport(order = 45)
+	public Result<Object> ModifyEmployeeBalance(@RequestBody ModifyEmployeeBalanceDto bala) {
+		
+//		List<KqglAssoOvertimeRange> overtim = kqglassoovertimerangemapper.selectList(new QueryWrapper<KqglAssoOvertimeRange>().lambda().eq(KqglAssoOvertimeRange::getOvertimeRulesId, listAs.get(i).getId()));
+		
+		List<KqglAssoLeaveBalance> ballist = kqglassoleavebalancemapper.selectList(new QueryWrapper<KqglAssoLeaveBalance>().lambda().eq(KqglAssoLeaveBalance::getLeaveRulesId, bala.getLeaverulesid()).eq(KqglAssoLeaveBalance::getUserid, bala.getEmpnum()));
+			
+		return ResultUtil.data(ballist,"操作成功!");
+	}
 	
 	
 	/**************************/

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

+package cn.timer.api.dto.kqmk;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class ModifyEmployeeBalanceDto {
+	private Integer empnum;
+
+	private Integer leaverulesid;
+}