Merge branch 'lal' into 'develop'

提交

See merge request 8timerv2/8timerapiv200!146

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

@@ -95,6 +95,7 @@ import cn.timer.api.dto.kqmk.AttendanceAssistantDto;
 import cn.timer.api.dto.kqmk.AttendanceSummaryQueryDto;
 import cn.timer.api.dto.kqmk.AttendanceSummaryQueryDto;
 import cn.timer.api.dto.kqmk.AttqueryCriteriaDto;
 import cn.timer.api.dto.kqmk.AttqueryCriteriaDto;
 import cn.timer.api.dto.kqmk.CompensateDto;
 import cn.timer.api.dto.kqmk.CompensateDto;
+import cn.timer.api.dto.kqmk.DailyDetailsDto;
 import cn.timer.api.dto.kqmk.EmployeeLeaveBalanceDto;
 import cn.timer.api.dto.kqmk.EmployeeLeaveBalanceDto;
 import cn.timer.api.dto.kqmk.IndividualOvertimeRuleDto;
 import cn.timer.api.dto.kqmk.IndividualOvertimeRuleDto;
 import cn.timer.api.dto.kqmk.KqglAssoLeaveRulesDto;
 import cn.timer.api.dto.kqmk.KqglAssoLeaveRulesDto;
@@ -2033,6 +2034,38 @@ public class TimeCardController {
 				return ResultUtil.data(pageAs, listAs, "操作成功!");
 				return ResultUtil.data(pageAs, listAs, "操作成功!");
 	}
 	}
 	
 	
+	@PostMapping(value = "/Daily_details")
+	@ApiOperation(value = "获取考勤每日详情数据", httpMethod = "POST", notes = "接口发布说明")
+	public Result<Object> DailydetailsList(@CurrentUser UserBean userBean, @Validated @RequestBody AttendanceSummaryQueryDto attesummqueto) throws ParseException {
+		
+		IPage<DailyDetailsDto> page = new Page<DailyDetailsDto>(
+				attesummqueto.getCurrentPage() == null ? 1 : attesummqueto.getCurrentPage(),
+				attesummqueto.getTotalPage() == null ? 10 : attesummqueto.getTotalPage());
+				attesummqueto.setOrgCode(userBean.getOrgCode());
+				
+				String year = null,month = null,time = null;
+				if(attesummqueto.getTimes() != null && !("").equals(attesummqueto.getTimes())) {
+					year = attesummqueto.getTimes().substring(0, 4);
+					month = attesummqueto.getTimes().substring(5, 7);
+					time = attesummqueto.getTimes();
+				}else {
+					year =  new SimpleDateFormat("yyyy").format(new Date()).toString();
+					month = new SimpleDateFormat("MM").format(new Date()).toString();
+					
+					time = new SimpleDateFormat("yyyy-MM-dd").format(new Date()).toString();
+				}
+				
+				attesummqueto.setYear(year);
+				attesummqueto.setMonth(month);
+				attesummqueto.setTimes(time);
+				// 缺-部门id 搜索
+				IPage<DailyDetailsDto> pageAs = kqglassomonthpunchsummarymapper.Dailydetails(page, attesummqueto);
+				List<DailyDetailsDto> listAs = pageAs.getRecords();
+				return ResultUtil.data(pageAs, listAs, "操作成功!");
+		
+		
+	}
+	
 	
 	
 //	@GetMapping(value = "/summary_report")
 //	@GetMapping(value = "/summary_report")
 //	@ApiOperation(value = "考勤汇总报表(暂时不用)", httpMethod = "GET", notes = "接口发布说明")
 //	@ApiOperation(value = "考勤汇总报表(暂时不用)", httpMethod = "GET", notes = "接口发布说明")

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

@@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 
 
 import cn.timer.api.bean.kqmk.KqglAssoMonthPunchSummary;
 import cn.timer.api.bean.kqmk.KqglAssoMonthPunchSummary;
 import cn.timer.api.dto.kqmk.AttendanceSummaryQueryDto;
 import cn.timer.api.dto.kqmk.AttendanceSummaryQueryDto;
+import cn.timer.api.dto.kqmk.DailyDetailsDto;
 import cn.timer.api.dto.kqmk.KqglAssoMonthPunchSummaryDto;
 import cn.timer.api.dto.kqmk.KqglAssoMonthPunchSummaryDto;
 
 
 /**
 /**
@@ -19,4 +20,6 @@ import cn.timer.api.dto.kqmk.KqglAssoMonthPunchSummaryDto;
 public interface KqglAssoMonthPunchSummaryMapper extends BaseMapper<KqglAssoMonthPunchSummary> {
 public interface KqglAssoMonthPunchSummaryMapper extends BaseMapper<KqglAssoMonthPunchSummary> {
 	
 	
 	IPage<KqglAssoMonthPunchSummaryDto> AttendanceSummaryData(IPage<KqglAssoMonthPunchSummaryDto> page,@Param("param") AttendanceSummaryQueryDto attendancesummaryquerydto);
 	IPage<KqglAssoMonthPunchSummaryDto> AttendanceSummaryData(IPage<KqglAssoMonthPunchSummaryDto> page,@Param("param") AttendanceSummaryQueryDto attendancesummaryquerydto);
+	
+	IPage<DailyDetailsDto> Dailydetails(IPage<DailyDetailsDto> page,@Param("param") AttendanceSummaryQueryDto attendancesummaryquerydto);
 }
 }

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

+package cn.timer.api.dto.kqmk;
+
+import java.util.List;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class DailyDetailsDto {
+
+	private String name;// 姓名
+	private Integer num;// 工号
+	private String dept;// 部门
+	private String post;// 岗位
+	private String attname;// 考勤组名称
+	private String attdate;// 考勤日期
+	private Integer userid;// 用户ID
+	private String data;// 日期
+	private String sbdk1;// 上班1打卡时间
+	private Integer sbdk1jg;// 上班1打卡结果
+	private String xbdk1;// 下班1打卡时间
+	private Integer xbdk1jg;// 下班1打卡结果
+	private String sbdk2;// 上班2打卡时间
+	private Integer sbdk2jg;// 上班2打卡结果
+	private String xbdk2;// 下班2打卡时间
+	private Integer xbdk2jg;// 下班2打卡结果
+	private String sbdk3;// 上班3打卡时间
+	private Integer sbdk3jg;// 上班3打卡结果
+	private String xbdk3;// 下班3打卡时间
+	private Integer xbdk3jg;// 下班3打卡结果
+	private Integer ydkcs;// 应打卡次数
+	private Integer gzsc;// 工作时长
+	private Integer qyid;// 企业id
+	private String dksj;// 打卡时间
+	private Integer yzcdcs;// 严重迟到次数
+	private Integer yzcdsc;// 严重迟到时长（分钟）
+	private Integer kgcdfzs;// 旷工迟到次数
+	private String daysonduty;// 应出勤天数
+	private String daysoff;// 休息天数
+	private String lengthbusinesstrip;// 出差时长
+	private String timeout;// 外出时长
+	private String totalovertimehours;// 加班总时长
+	private String workingturncompenleave;// 工作日（转调休）
+	private String restturncompenleave;// 休息日（转调休）
+	private String holidayturncompenleave;// 节假日（转调休）
+	private String workingtransferovertime;// 工作日（转加班费）
+	private String resttransferovertime;// 休息日（转加班费）
+	private String holidaytransferovertime;// 节假日（转加班费）
+	private Integer leaverulesid;//
+	private String duration;//
+	
+	@ApiModelProperty(value = "表数据", example = "字段说明")
+	List<BalanceSheetDataDto> balanceTo;
+}

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

@@ -43,6 +43,8 @@ public class KqglAssoMonthPunchSummaryDto {
 
 
 	@ApiModelProperty(value = "考勤组id 考勤组id", example = "101")
 	@ApiModelProperty(value = "考勤组id 考勤组id", example = "101")
 	private Integer attGroup;
 	private Integer attGroup;
+	
+	private String attname;
 
 
 	@ApiModelProperty(value = "班次id 班次id", example = "101")
 	@ApiModelProperty(value = "班次id 班次id", example = "101")
 	private Integer shift;
 	private Integer shift;