Merge branch 'lal' into 'develop'

Lal

See merge request 8timerv2/8timerapiv200!312

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

@@ -2758,16 +2758,10 @@ public class TimeCardController {
 	@GetMapping(value = "/worktable_attendance_from/{date}")
 	@ApiOperation(value = "999:工作台考勤表格", httpMethod = "GET", notes = "查询数据")
 	public Result<Object> worktable_attendance_from(@CurrentUser UserBean userBean,@PathVariable("date") String date) throws ParseException {
-		
 		CalendarTableDataDto tabl = CalendarTableDataDto.builder().build();
-		
 		String belongyear = null;
 		String belongmonth = null;
-		
 		String ttstr = null;//
-		
-		
-		
 		if(date == null || ("").equals(date)) {
 			belongyear = new SimpleDateFormat("yyyy").format(new Date());
 			belongmonth = new SimpleDateFormat("MM").format(new Date());
@@ -2777,16 +2771,11 @@ public class TimeCardController {
 			belongmonth = date.substring(5, 7);
 			ttstr = date;
 		}
-		
-		
 		//1:加班 2:请假 3:出差 4:外出 5:补卡
 		KqglAssoRelationSummary sums = kqglassorelationsummarymapper.selectTabledata(userBean.getEmpNum(), 1, ttstr);
-		
 		KqglAssoRelationSummary qjj = kqglassorelationsummarymapper.selectTabledata(userBean.getEmpNum(), 2, ttstr);
-		
 		KqglAssoRelationSummary cxx = kqglassorelationsummarymapper.selectTabledata(userBean.getEmpNum(), 3, ttstr);
 		
-		
 		KqglAssoMonthPunchSummary punsum = KqglAssoMonthPunchSummary.builder().build().selectOne(new QueryWrapper<KqglAssoMonthPunchSummary>().lambda().eq(KqglAssoMonthPunchSummary::getNum, userBean.getEmpNum())
 				.eq(KqglAssoMonthPunchSummary::getOrgCode, userBean.getOrgCode()).eq(KqglAssoMonthPunchSummary::getBelongYear, belongyear).eq(KqglAssoMonthPunchSummary::getBelongMonth, belongmonth));
 		Double compensatoryleave = 0d;
@@ -2794,7 +2783,6 @@ public class TimeCardController {
 			compensatoryleave = punsum.getWorkingTurnCompenLeave() + punsum.getRestTurnCompenLeave() + punsum.getHolidayTurnCompenLeave();
 		}
 		
-		
 		tabl.setAttendance(punsum == null ? "" : String.valueOf(punsum.getDaysOnDuty()));// 应出勤
 		tabl.setAttended(punsum == null ? "" : String.valueOf(punsum.getActualAttDays()));// 已出勤
 		tabl.setLeave(qjj == null ? "" : String.valueOf(qjj.getDuration()));// 请假

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

@@ -52,8 +52,8 @@ public class ClockCollectData implements Serializable {
 	@ApiModelProperty(value = "班次id", example = "无排班时 为“0”")
 	private Integer shifid;
 
-	@ApiModelProperty(value = "打卡状态", example = "状态，1:正常 2：异常 3：补卡 4：请假")
-	private Integer status;
+//	@ApiModelProperty(value = "打卡状态", example = "状态，1:正常 2：异常 3：补卡 4：请假")
+//	private Integer status;
 
 	@ApiModelProperty(value = "手机唯一ID", example = "字段说明")
 	private String registrationid;

src/main/java/cn/timer/api/utils/router/business/EvectionBusiness.java

@@ -44,9 +44,9 @@ public class EvectionBusiness extends SpmkAssoBusiness {
 		// 时长
 		String longTime = ObjectUtil.isNull(jsonObj.get("__longTime",FromData.class)) ? null : jsonObj.get("__longTime",FromData.class).getValue();
 		// 出差事由
-		String businessTrip = ObjectUtil.isNull(jsonObj.get("__businessTrip",FromData.class)) ? null : jsonObj.get("__businessTrip",FromData.class).getValue();
+//		String businessTrip = ObjectUtil.isNull(jsonObj.get("__businessTrip",FromData.class)) ? null : jsonObj.get("__businessTrip",FromData.class).getValue();
 		// 上传文件
-		String UploadAttachment = ObjectUtil.isNull(jsonObj.get("UploadAttachment",FromData.class)) ? null : jsonObj.get("UploadAttachment",FromData.class).getValue();
+//		String UploadAttachment = ObjectUtil.isNull(jsonObj.get("UploadAttachment",FromData.class)) ? null : jsonObj.get("UploadAttachment",FromData.class).getValue();
 		System.out.println(approveId);
 		AttEvectionApprovalDto eaD = AttEvectionApprovalDto
 				.builder()

src/main/java/cn/timer/api/utils/router/business/GoOutBusiness.java

@@ -40,9 +40,9 @@ public class GoOutBusiness extends SpmkAssoBusiness {
 		// 时长
 		String longTime = jsonObj.get("__longTime",FromData.class).getValue();
 		// 出差事由
-		String businessTrip = jsonObj.get("__businessTrip",FromData.class).getValue();
+//		String businessTrip = jsonObj.get("__businessTrip",FromData.class).getValue();
 		// 上传文件
-		String UploadAttachment = jsonObj.get("UploadAttachment",FromData.class).getValue();
+//		String UploadAttachment = jsonObj.get("UploadAttachment",FromData.class).getValue();
 		
 		AttEvectionApprovalDto eaD = AttEvectionApprovalDto
 				.builder()

src/main/java/cn/timer/api/utils/router/business/WorkOvertimeBusiness.java

@@ -44,7 +44,7 @@ public class WorkOvertimeBusiness extends SpmkAssoBusiness {
 		// 加班补偿方式 -前端传中文
 		String compensate = ObjectUtil.isNull(jsonObj.get("__compensate",FromData.class)) ? null : jsonObj.get("__compensate",FromData.class).getValue();
 		// 加班原因
-		String OvertimeReason = ObjectUtil.isNull(jsonObj.get("__OvertimeReason",FromData.class)) ? null : jsonObj.get("__OvertimeReason",FromData.class).getValue();
+//		String OvertimeReason = ObjectUtil.isNull(jsonObj.get("__OvertimeReason",FromData.class)) ? null : jsonObj.get("__OvertimeReason",FromData.class).getValue();
 		// 加班类型-前端未给
 		String workOvertimeType = ObjectUtil.isNull(jsonObj.get("__workOvertimeType",FromData.class)) ? null : jsonObj.get("__workOvertimeType",FromData.class).getValue();
 		// 上传文件