add:考勤打卡

sop-business/src/main/java/com/qmth/sop/business/service/TBDingService.java

@@ -3,7 +3,6 @@ package com.qmth.sop.business.service;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.qmth.sop.business.bean.dto.DateFormDto;
-import com.qmth.sop.business.bean.dto.SopCrmInfo;
 import com.qmth.sop.business.bean.params.DingSaveParam;
 import com.qmth.sop.business.bean.result.*;
 import com.qmth.sop.business.entity.TBDing;
@@ -37,12 +36,11 @@ public interface TBDingService extends IService<TBDing> {
     /**
      * 考勤结果统计
      *
-     * @param serviceUnitId  服务单元id
-     * @param sopNo          sop单号
-     * @param userArchivesId 档案id
+     * @param sopNo  sop单号
+     * @param userId 用户id
      * @return 考勤结果统计
      */
-    DingStatisticResult findDingStatistic(Long serviceUnitId, String sopNo, Long userArchivesId);
+    DingStatisticResult findDingStatistic(String sopNo, Long userId);
 
     /**
      * 保存打卡记录
@@ -78,6 +76,4 @@ public interface TBDingService extends IService<TBDing> {
      * @return 应签到日期
      */
     DateFormDto buildSignDateFormBySop(String sopNo);
-
-
 }

sop-business/src/main/java/com/qmth/sop/business/service/impl/TBDingServiceImpl.java

@@ -78,7 +78,7 @@ public class TBDingServiceImpl extends ServiceImpl<TBDingMapper, TBDing> impleme
     }
 
     @Override
-    public DingStatisticResult findDingStatistic(Long serviceUnitId, String sopNo, Long userArchivesId) {
+    public DingStatisticResult findDingStatistic(String sopNo, Long userId) {
         // 根据sopNo查询日期表单
         DateFormDto dateFormDto = this.buildSignDateFormBySop(sopNo);
 
@@ -91,9 +91,8 @@ public class TBDingServiceImpl extends ServiceImpl<TBDingMapper, TBDing> impleme
             Boolean sopIsEnd = dateFormDto.getSopIsEnd();
 
             List<TBDing> tbDingList = this.list(new QueryWrapper<TBDing>().lambda()
-                    .eq(TBDing::getServiceId, serviceUnitId)
                     .eq(TBDing::getSopNo, sopNo)
-                    .eq(TBDing::getUserArchivesId, userArchivesId)
+                    .eq(TBDing::getUserId, userId)
                     .orderByAsc(TBDing::getId));
 
             // 签到表

sop-server/src/main/java/com/qmth/sop/server/api/TBDingController.java

@@ -4,28 +4,27 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.qmth.boot.api.annotation.Aac;
 import com.qmth.boot.api.constant.ApiConstant;
-import com.qmth.sop.business.bean.result.TBDingAttendanceCountResult;
-import com.qmth.sop.business.bean.result.TBDingAttendanceResult;
-import com.qmth.sop.business.bean.result.TBDingCountQueryResult;
-import com.qmth.sop.business.bean.result.TBDingCountResult;
+import com.qmth.sop.business.annotation.OperationLog;
+import com.qmth.sop.business.bean.params.DingSaveParam;
+import com.qmth.sop.business.bean.params.ServiceUnitParam;
+import com.qmth.sop.business.bean.result.*;
+import com.qmth.sop.business.entity.SysUser;
 import com.qmth.sop.business.entity.TBTask;
 import com.qmth.sop.business.service.TBDingService;
 import com.qmth.sop.business.service.TBTaskService;
 import com.qmth.sop.business.templete.execute.AsyncDingAttendanceExportService;
 import com.qmth.sop.business.templete.execute.AsyncDingCountExportService;
 import com.qmth.sop.common.contant.SystemConstant;
-import com.qmth.sop.common.enums.DingResultEnum;
-import com.qmth.sop.common.enums.InOutTypeEnum;
-import com.qmth.sop.common.enums.TaskTypeEnum;
+import com.qmth.sop.common.enums.*;
 import com.qmth.sop.common.util.Result;
 import com.qmth.sop.common.util.ResultUtil;
+import com.qmth.sop.common.util.ServletUtil;
 import io.swagger.annotations.*;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
+import javax.validation.Valid;
 import javax.validation.constraints.Max;
 import javax.validation.constraints.Min;
 import java.util.Map;
@@ -118,7 +117,7 @@ public class TBDingController {
         return ResultUtil.ok(tbTask.getId());
     }
 
-   
+
     @ApiOperation(value = "考勤明细查询接口")
     @RequestMapping(value = "/attendance/query", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "考勤明细查询结果", response = TBDingAttendanceResult.class)})
@@ -134,12 +133,12 @@ public class TBDingController {
             @ApiParam(value = "考勤结果", required = false) @RequestParam(required = false) DingResultEnum status,
             @ApiParam(value = "分页页码", required = true) @RequestParam @Min(SystemConstant.PAGE_NUMBER_MIN) Integer pageNumber,
             @ApiParam(value = "分页数", required = true) @RequestParam @Min(SystemConstant.PAGE_SIZE_MIN) @Max(SystemConstant.PAGE_SIZE_MAX) Integer pageSize) {
-        IPage<TBDingAttendanceResult> resultIPage = tBDingService.attendanceQuery(new Page<>(pageNumber, pageSize), serviceId,userName,startTime,endTime, supplierId, custom, sopNo, type,status);
+        IPage<TBDingAttendanceResult> resultIPage = tBDingService.attendanceQuery(new Page<>(pageNumber, pageSize), serviceId, userName, startTime, endTime, supplierId, custom, sopNo, type, status);
 
         return ResultUtil.ok(resultIPage);
     }
 
-   
+
     @ApiOperation(value = "考勤明细统计接口")
     @RequestMapping(value = "/attendance/count", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "考勤明细统计结果", response = TBDingAttendanceCountResult.class)})
@@ -151,12 +150,12 @@ public class TBDingController {
                                   @ApiParam(value = "客户名称（模糊查询）", required = false) @RequestParam(required = false) String custom,
                                   @ApiParam(value = "SOP流水号（模糊查询）", required = false) @RequestParam(required = false) String sopNo
     ) {
-        TBDingAttendanceCountResult result = tBDingService.attendanceCount(serviceId,userName,startTime,endTime, supplierId, custom, sopNo);
+        TBDingAttendanceCountResult result = tBDingService.attendanceCount(serviceId, userName, startTime, endTime, supplierId, custom, sopNo);
 
         return ResultUtil.ok(result);
     }
 
-   
+
 //    @ApiOperation(value = "考勤明细导出")
 //    @RequestMapping(value = "/attendance/export", method = RequestMethod.POST)
 //    @ApiResponses({@ApiResponse(code = 200, message = "返回信息", response = Object.class)})
@@ -185,4 +184,34 @@ public class TBDingController {
 //        return ResultUtil.ok(tbTask.getId());
 //    }
 
+    @ApiOperation(value = "考勤打卡信息")
+    @RequestMapping(value = "/ding_info", method = RequestMethod.POST)
+    @ApiResponses({@ApiResponse(code = 200, message = "查询成功", response = DingElementResult.class)})
+    @OperationLog
+    public Result findDingInfo(@ApiParam(value = "sop单号", required = true) @RequestParam String sopNo) {
+        SysUser requestUser = (SysUser) ServletUtil.getRequestUser();
+        return ResultUtil.ok(tBDingService.findDingElements(sopNo, requestUser.getId()));
+    }
+
+    @ApiOperation(value = "考勤结果统计")
+    @RequestMapping(value = "/ding_statistic", method = RequestMethod.POST)
+    @ApiResponses({@ApiResponse(code = 200, message = "查询成功", response = DingStatisticResult.class)})
+    @OperationLog
+    public Result findDingStatistic(@ApiParam(value = "sop单号", required = true) @RequestParam String sopNo) {
+        SysUser requestUser = (SysUser) ServletUtil.getRequestUser();
+        return ResultUtil.ok(tBDingService.findDingStatistic(sopNo, requestUser.getId()));
+    }
+
+    @ApiOperation(value = "考勤打卡")
+    @RequestMapping(value = "/ding_save", method = RequestMethod.POST)
+    @ApiResponses({@ApiResponse(code = 200, message = "更新成功", response = Result.class)})
+    @OperationLog
+    public Result dingSave(@Valid @RequestBody DingSaveParam dingSaveParam, BindingResult bindingResult) {
+        if (bindingResult.hasErrors()) {
+            return ResultUtil.error(bindingResult.getAllErrors().get(0).getDefaultMessage());
+        }
+        SysUser requestUser = (SysUser) ServletUtil.getRequestUser();
+        tBDingService.dingSave(dingSaveParam, requestUser.getId());
+        return ResultUtil.ok();
+    }
 }

sop-server/src/main/java/com/qmth/sop/server/api/TBServiceController.java

@@ -5,7 +5,6 @@ import com.qmth.boot.api.constant.ApiConstant;
 import com.qmth.sop.business.annotation.OperationLog;
 import com.qmth.sop.business.bean.params.ServiceUnitParam;
 import com.qmth.sop.business.bean.result.ServiceUnitResult;
-import com.qmth.sop.business.bean.result.SysLogResult;
 import com.qmth.sop.business.entity.SysUser;
 import com.qmth.sop.business.service.TBServiceService;
 import com.qmth.sop.common.contant.SystemConstant;