考勤明细查询 api修改

sop-business/src/main/java/com/qmth/sop/business/mapper/TBDingMapper.java

@@ -36,9 +36,9 @@ public interface TBDingMapper extends BaseMapper<TBDing> {
 
     TBDingCountResult count(@Param("serviceId") Long serviceId, @Param("createId") Long createId, @Param("userName") String userName, @Param("supplierId") Long supplierId, @Param("custom") String custom, @Param("sopNo") String sopNo);
 
-    IPage<TBDingAttendanceResult> attendanceQuery(IPage<Map> iPage, @Param("serviceId") Long serviceId , @Param("userName") String userName, @Param("startTime") Long startTime, @Param("endTime") Long endTime, @Param("supplierId") Long supplierId, @Param("custom") String custom, @Param("sopNo") String sopNo, @Param("type") String type, @Param("status") String status, @Param("abnormal") Long abnormal);
+    IPage<TBDingAttendanceResult> attendanceQuery(IPage<Map> iPage, @Param("serviceId") Long serviceId , @Param("userName") String userName, @Param("startTime") Long startTime, @Param("endTime") Long endTime, @Param("supplierId") Long supplierId, @Param("custom") String custom, @Param("sopNo") String sopNo, @Param("type") String type, @Param("status") String status);
 
     TBDingAttendanceCountResult attendanceCount(@Param("serviceId") Long serviceId , @Param("userName") String userName , @Param("startTime") Long startTime, @Param("endTime") Long endTime, @Param("supplierId") Long supplierId, @Param("custom") String custom, @Param("sopNo") String sopNo);
 
-    List<TBDingAttendanceResult> attendanceQuery(@Param("serviceId") Long serviceId , @Param("userName") String userName, @Param("startTime") Long startTime, @Param("endTime") Long endTime, @Param("supplierId") Long supplierId, @Param("custom") String custom, @Param("sopNo") String sopNo, @Param("type") String type, @Param("status") String status, @Param("abnormal") Long abnormal);
+    List<TBDingAttendanceResult> attendanceQuery(@Param("serviceId") Long serviceId , @Param("userName") String userName, @Param("startTime") Long startTime, @Param("endTime") Long endTime, @Param("supplierId") Long supplierId, @Param("custom") String custom, @Param("sopNo") String sopNo, @Param("type") String type, @Param("status") String status);
 }

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

@@ -35,9 +35,9 @@ public interface TBDingService extends IService<TBDing>{
 
     TBDingCountResult count(Long serviceId, Long createId, String userName, Long supplierId, String custom, String sopNo);
 
-    IPage<TBDingAttendanceResult> attendanceQuery(IPage<Map> iPage, Long serviceId, String userName, Long startTime, Long endTime, Long supplierId, String custom, String sopNo, InOutTypeEnum type, DingResultEnum status, Long abnormal);
+    IPage<TBDingAttendanceResult> attendanceQuery(IPage<Map> iPage, Long serviceId, String userName, Long startTime, Long endTime, Long supplierId, String custom, String sopNo, InOutTypeEnum type, DingResultEnum status);
 
     TBDingAttendanceCountResult attendanceCount(Long serviceId, String userName, Long startTime, Long endTime, Long supplierId, String custom, String sopNo);
 
-    List<TBDingAttendanceResult> attendanceQuery(Long serviceId, String userName, Long startTime, Long endTime, Long supplierId, String custom, String sopNo, InOutTypeEnum type, DingResultEnum status, Long abnormal);
+    List<TBDingAttendanceResult> attendanceQuery(Long serviceId, String userName, Long startTime, Long endTime, Long supplierId, String custom, String sopNo, InOutTypeEnum type, DingResultEnum status);
 }

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

@@ -53,8 +53,8 @@ public class TBDingServiceImpl extends ServiceImpl<TBDingMapper, TBDing> impleme
     }
 
     @Override
-    public IPage<TBDingAttendanceResult> attendanceQuery(IPage<Map> iPage, Long serviceId, String userName, Long startTime, Long endTime, Long supplierId, String custom, String sopNo, InOutTypeEnum type, DingResultEnum status, Long abnormal) {
-        return this.baseMapper.attendanceQuery(iPage,serviceId,userName,startTime,endTime, supplierId, custom, sopNo, Objects.nonNull(type)?type.name():null,Objects.nonNull(status)?status.name():null,abnormal);
+    public IPage<TBDingAttendanceResult> attendanceQuery(IPage<Map> iPage, Long serviceId, String userName, Long startTime, Long endTime, Long supplierId, String custom, String sopNo, InOutTypeEnum type, DingResultEnum status) {
+        return this.baseMapper.attendanceQuery(iPage,serviceId,userName,startTime,endTime, supplierId, custom, sopNo, Objects.nonNull(type)?type.name():null,Objects.nonNull(status)?status.name():null);
     }
 
     @Override
@@ -63,7 +63,7 @@ public class TBDingServiceImpl extends ServiceImpl<TBDingMapper, TBDing> impleme
     }
 
     @Override
-    public List<TBDingAttendanceResult> attendanceQuery(Long serviceId, String userName, Long startTime, Long endTime, Long supplierId, String custom, String sopNo, InOutTypeEnum type, DingResultEnum status, Long abnormal) {
-        return this.baseMapper.attendanceQuery(serviceId,userName,startTime,endTime, supplierId, custom, sopNo, Objects.nonNull(type)?type.name():null,Objects.nonNull(status)?status.name():null,abnormal);
+    public List<TBDingAttendanceResult> attendanceQuery(Long serviceId, String userName, Long startTime, Long endTime, Long supplierId, String custom, String sopNo, InOutTypeEnum type, DingResultEnum status) {
+        return this.baseMapper.attendanceQuery(serviceId,userName,startTime,endTime, supplierId, custom, sopNo, Objects.nonNull(type)?type.name():null,Objects.nonNull(status)?status.name():null);
     }
 }

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

@@ -335,7 +335,7 @@ public class TaskLogicServiceImpl implements TaskLogicService {
         File fileTemp = null;
         try {
             fileTemp = SystemConstant.getFileTempVar(SystemConstant.XLSX_PREFIX);
-            List<TBDingAttendanceResult> tbDingAttendanceResults = tbDingService.attendanceQuery((Long) map.get("serviceId"), (String) map.get("userName"), (Long) map.get("startTime"), (Long) map.get("endTime"), (Long) map.get("supplierId"), (String) map.get("custom"), (String) map.get("sopNo"), (InOutTypeEnum) map.get("type"), (DingResultEnum) map.get("status"), (Long) map.get("abnormal"));
+            List<TBDingAttendanceResult> tbDingAttendanceResults = tbDingService.attendanceQuery((Long) map.get("serviceId"), (String) map.get("userName"), (Long) map.get("startTime"), (Long) map.get("endTime"), (Long) map.get("supplierId"), (String) map.get("custom"), (String) map.get("sopNo"), (InOutTypeEnum) map.get("type"), (DingResultEnum) map.get("status"));
 
 //            tbDingAttendanceResults.forEach(e -> {
 //                //e.setStatus(FlowStatusEnum.convertToEnum(e.getStatus()).getTitle());

sop-business/src/main/resources/mapper/TBDingMapper.xml

@@ -203,13 +203,6 @@
             <if test="status != null and status != ''">
                 and a.status = #{status}
             </if>
-
-<!--           @Param("abnormal") Long abnormal-->
-<!--            <if test="days != null and days != '' ">-->
-<!--                <![CDATA[-->
-<!--               and a.days > #{days}-->
-<!--               ]]>-->
-<!--            </if>-->
         </where>
 
     </select>

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

@@ -132,10 +132,9 @@ public class TBDingController {
             @ApiParam(value = "SOP流水号（模糊查询）", required = false) @RequestParam(required = false) String sopNo,
             @ApiParam(value = "考勤类型", required = false) @RequestParam(required = false) InOutTypeEnum type,
             @ApiParam(value = "考勤结果", required = false) @RequestParam(required = false) DingResultEnum status,
-//            @ApiParam(value = "考勤异常数(未实现)", required = false) @RequestParam(required = false) Long abnormal,
             @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,0l);
+        IPage<TBDingAttendanceResult> resultIPage = tBDingService.attendanceQuery(new Page<>(pageNumber, pageSize), serviceId,userName,startTime,endTime, supplierId, custom, sopNo, type,status);
 
         return ResultUtil.ok(resultIPage);
     }
@@ -181,7 +180,6 @@ public class TBDingController {
 //        map.putIfAbsent("sopNo", sopNo);
 //        map.putIfAbsent("type", type);
 //        map.putIfAbsent("status", status);
-//        map.putIfAbsent("abnormal", abnormal);
 //        asyncDingAttendanceExportService.exportTask(map);
 //        TBTask tbTask = (TBTask) map.get(SystemConstant.TASK);
 //        return ResultUtil.ok(tbTask.getId());