fix: 工时统计 统计（count）

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

@@ -95,13 +95,14 @@ public class TBDingController {
     @RequestMapping(value = "/count", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "工时统计统计结果", response = TBDingCountResult.class)})
     public Result count(@ApiParam(value = "服务单元", required = false) @RequestParam(required = false) Long serviceId,
+                        @ApiParam(value = "提交状态", required = false) @RequestParam(required = false) DingSubmitStatusEnum status,
                         @ApiParam(value = "提交人", required = false) @RequestParam(required = false) Long createId,
                         @ApiParam(value = "姓名（模糊查询）", required = false) @RequestParam(required = false) String userName,
                         @ApiParam(value = "供应商", required = false) @RequestParam(required = false) Long supplierId,
                         @ApiParam(value = "客户名称（模糊查询）", required = false) @RequestParam(required = false) String custom,
                         @ApiParam(value = "SOP流水号（模糊查询）", required = false) @RequestParam(required = false) String sopNo
     ) {
-        TBDingCountResult result = tBDingService.count(serviceId, createId, userName, supplierId, custom, sopNo);
+        TBDingCountResult result = tBDingService.count(serviceId, Objects.nonNull(status) ? status.name() : "", createId, userName, supplierId, custom, sopNo);
 
         return ResultUtil.ok(result);
     }

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

@@ -34,7 +34,7 @@ public interface TBDingMapper extends BaseMapper<TBDing> {
 
     List<TBDingSubmitQueryResult> query(@Param("serviceId") Long serviceId, @Param("status") String status, @Param("createId") Long createId, @Param("userName") String userName, @Param("supplierId") Long supplierId, @Param("custom") String custom, @Param("sopNo") String sopNo, @Param("days") Long days, @Param("dpr") DataPermissionDto dpr);
 
-    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, @Param("dpr") DataPermissionDto dpr);
+    TBDingCountResult count(@Param("serviceId") Long serviceId,@Param("status") String status, @Param("createId") Long createId, @Param("userName") String userName, @Param("supplierId") Long supplierId, @Param("custom") String custom, @Param("sopNo") String sopNo, @Param("dpr") DataPermissionDto dpr);
 
     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("dpr")DataPermissionDto dpr,@Param("abnormal")Long abnormal);
 

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

@@ -8,6 +8,7 @@ import com.qmth.sop.business.bean.result.*;
 import com.qmth.sop.business.entity.SysUser;
 import com.qmth.sop.business.entity.TBDing;
 import com.qmth.sop.common.enums.DingResultEnum;
+import com.qmth.sop.common.enums.DingSubmitStatusEnum;
 import com.qmth.sop.common.enums.InOutTypeEnum;
 
 import java.io.IOException;
@@ -63,7 +64,7 @@ public interface TBDingService extends IService<TBDing> {
 
     List<TBDingSubmitQueryResult> query(SysUser requestUser, Long serviceId, String status, Long createId, String userName, Long supplierId, String custom, String sopNo, Long days);
 
-    TBDingCountResult count(Long serviceId, Long createId, String userName, Long supplierId, String custom, String sopNo);
+    TBDingCountResult count(Long serviceId, String status, 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);
 

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

@@ -462,7 +462,7 @@ public class TBDingServiceImpl extends ServiceImpl<TBDingMapper, TBDing> impleme
     }
 
     @Override
-    public TBDingCountResult count(Long serviceId, Long createId, String userName, Long supplierId, String custom, String sopNo) {
+    public TBDingCountResult count(Long serviceId,String status, Long createId, String userName, Long supplierId, String custom, String sopNo) {
         SysUser requestUser = (SysUser) ServletUtil.getRequestUser();
         Long userId = requestUser.getId();
         DataPermissionDto dpr = sysUserService.buildUserDataPermission(userId);
@@ -474,7 +474,7 @@ public class TBDingServiceImpl extends ServiceImpl<TBDingMapper, TBDing> impleme
             }
             supplierId = userSupplierId;
         }
-        return this.baseMapper.count(serviceId, createId, userName, supplierId, custom, sopNo, dpr);
+        return this.baseMapper.count(serviceId,status, createId, userName, supplierId, custom, sopNo, dpr);
     }
 
     @Override

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

@@ -113,6 +113,9 @@
             <if test="serviceId != null and serviceId != ''">
                 and d.service_id = #{serviceId}
             </if>
+            <if test="status != null and status != ''">
+                and d.submit_status = #{status}
+            </if>
             <if test="createId != null and createId != ''">
                 and d.submit_user_id = #{createId}
             </if>