java/Robotaxi.git

			@@ -50,7 +50,7 @@

			@ApiOperation(value = "上班打卡", tags = "运维APP-排班与考勤")
			@PostMapping("/maintenance-app/api/v1/clock/clockIn")
			public R<String> clockIn(@RequestBody ClockDTO dto) {
			public R<Integer> clockIn(@RequestBody ClockDTO dto) {
			Long id = tokenService.getLoginOperationUser().getId();
			dto.setOperationsUserId(id);
			return xpClockInService.clockIn(dto);
			@@ -69,7 +69,7 @@

			@ApiOperation(value = "下班打卡", tags = "运维APP-排班与考勤")
			@PostMapping("/maintenance-app/api/v1/clock/clockOut")
			public R<String> clockOut(@RequestBody ClockDTO dto) {
			public R<Integer> clockOut(@RequestBody ClockDTO dto) {
			Long id = tokenService.getLoginOperationUser().getId();
			dto.setOperationsUserId(id);
			return xpClockInService.clockOut(dto);
			@@ -103,16 +103,6 @@
			@PostMapping("/api/v1/clock/exportClockInStatisticsDetails")
			public void exportClockInStatisticsDetails(@RequestBody ClockInStatisticsDetailsVo query, HttpServletResponse response) {
			xpClockInService.exportClockInStatisticsDetails(query, response);
			}


			@ApiOperation(value = "获取打卡详情", tags = "运维APP-排班与考勤")
			@PostMapping("/maintenance-app/api/v1/clock/getClockInfo")
			public R<XpClockIn> getClockInfo(){
			Long id = tokenService.getLoginOperationUser().getId();
			XpClockIn one = xpClockInService.getOne(new QueryWrapper<XpClockIn>().eq("app_user_id", id)
			.eq("is_deleted", 0).last(" and DATE(create_time) = DATE(NOW())"));
			return R.ok(one);
			}

			}

			@@ -35,7 +35,7 @@
			* @param dto
			* @return
			*/
			R<String> clockIn(ClockDTO dto);
			R<Integer> clockIn(ClockDTO dto);

			/**
			* 下班打卡
			@@ -43,7 +43,7 @@
			* @param dto
			* @return
			*/
			R<String> clockOut(ClockDTO dto);
			R<Integer> clockOut(ClockDTO dto);
			/**
			* 检查用户是否上班中
			* @param appUserId 用户ID

			@@ -116,7 +116,7 @@
			}

			@Override
			public R<String> clockIn(ClockDTO dto) {
			public R<Integer> clockIn(ClockDTO dto) {

			XpCheckLocation xpCheckLocation = xpCheckLocationMapper.selectById(dto.getLocationId());
			if (null == xpCheckLocation) {
			@@ -160,11 +160,11 @@
			}
			this.save(xpClockIn);
			sendAgreementUpdateNotification(now);
			return R.ok();
			return R.ok(xpClockIn.getClockInResult());
			}

			@Override
			public R<String> clockOut(ClockDTO dto) {
			public R<Integer> clockOut(ClockDTO dto) {

			XpCheckLocation xpCheckLocation = xpCheckLocationMapper.selectById(dto.getLocationId());
			if (null == xpCheckLocation) {
			@@ -214,7 +214,7 @@
			xpClockIn.setAppUserId(null);
			this.updateById(xpClockIn);
			sendAgreementUpdateNotification(now);
			return R.ok();
			return R.ok(xpClockIn.getClockOutResult());
			}

			@Override

	xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/controller/XpClockInController.java	14 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/service/IXpClockInService.java	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/service/impl/XpClockInServiceImpl.java	8 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史