Merge branch 'dev_v1.0.1' into dev_1.0.4

merge

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

@@ -78,7 +78,7 @@ public class TBDingController {
     public Result query(
             @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 submitUserId,
+            @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,
@@ -86,7 +86,7 @@ public class TBDingController {
             @ApiParam(value = "违规工时", required = false) @RequestParam(required = false) Long days,
             @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<TBDingSubmitQueryResult> resultIPage = tBDingService.query(new Page<>(pageNumber, pageSize), serviceId, Objects.nonNull(status) ? status.name() : "", submitUserId, userName, supplierId, custom, sopNo, days);
+        IPage<TBDingSubmitQueryResult> resultIPage = tBDingService.query(new Page<>(pageNumber, pageSize), serviceId, Objects.nonNull(status) ? status.name() : "", createId, userName, supplierId, custom, sopNo, days);
 
         return ResultUtil.ok(resultIPage);
     }

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

@@ -1,7 +1,6 @@
 package com.qmth.sop.server.api;
 
 import com.qmth.boot.api.constant.ApiConstant;
-import com.qmth.sop.common.annotation.OperationLog;
 import com.qmth.sop.business.bean.params.DingSubmitParam;
 import com.qmth.sop.business.bean.query.DingSubmitQuery;
 import com.qmth.sop.business.bean.result.DingSubmitResult;
@@ -9,6 +8,7 @@ import com.qmth.sop.business.entity.TBTask;
 import com.qmth.sop.business.service.TBDingSubmitService;
 import com.qmth.sop.business.service.TBTaskService;
 import com.qmth.sop.business.templete.execute.AsyncDingSubmitExportService;
+import com.qmth.sop.common.annotation.OperationLog;
 import com.qmth.sop.common.contant.SystemConstant;
 import com.qmth.sop.common.enums.LogTypeEnum;
 import com.qmth.sop.common.enums.TaskTypeEnum;
@@ -34,60 +34,52 @@ import java.util.Map;
 @RestController
 @RequestMapping(ApiConstant.DEFAULT_URI_PREFIX + SystemConstant.PREFIX_URL_DING_SUBMIT)
 public class TBDingSubmitController {
+
     @Resource
     private TBDingSubmitService tbDingSubmitService;
+
     @Resource
     private TBTaskService tbTaskService;
+
     @Resource
     private AsyncDingSubmitExportService asyncDingSubmitExportService;
 
     @ApiOperation(value = "考勤提交-分页查询")
     @RequestMapping(value = "/page", method = RequestMethod.POST)
-    @ApiResponses({@ApiResponse(code = 200, message = "查询成功", response = DingSubmitResult.class)})
-    public Result findDingSubmitPage(@ApiParam(value = "服务单元id") @RequestParam(required = false) String serviceUnitId,
-                                     @ApiParam(value = "考勤提交状态") @RequestParam(required = false) String dingSubmitStatusDesc,
-                                     @ApiParam(value = "提交人id") @RequestParam(required = false) String submitUserId,
-                                     @ApiParam(value = "档案名称") @RequestParam(required = false) String archivesName,
-                                     @ApiParam(value = "供应商id") @RequestParam(required = false) String supplierId,
-                                     @ApiParam(value = "客户名") @RequestParam(required = false) String customName,
-                                     @ApiParam(value = "sop号") @RequestParam(required = false) String sopNo,
-                                     @ApiParam(value = "违规工时限制") @RequestParam(required = false) Integer violationHoursLimit,
-                                     @ApiParam(value = "需处理异常考勤限制") @RequestParam(required = false) Integer dingExceptionLimit,
-                                     @ApiParam(value = "补卡限制") @RequestParam(required = false) Integer remainLimit,
-                                     @ApiParam(value = "异常限制") @RequestParam(required = false) Integer exceptionLimit,
-                                     @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) {
+    @ApiResponses({ @ApiResponse(code = 200, message = "查询成功", response = DingSubmitResult.class) })
+    public Result findDingSubmitPage(@ApiParam(value = "服务单元id") @RequestParam(required = false) String serviceUnitId, @ApiParam(value = "考勤提交状态") @RequestParam(required = false) String dingSubmitStatusDesc,
+            @ApiParam(value = "提交人id") @RequestParam(required = false) String submitUserId, @ApiParam(value = "档案名称") @RequestParam(required = false) String archivesName,
+            @ApiParam(value = "供应商id") @RequestParam(required = false) String supplierId, @ApiParam(value = "客户名") @RequestParam(required = false) String customName,
+            @ApiParam(value = "sop号") @RequestParam(required = false) String sopNo, @ApiParam(value = "违规工时限制") @RequestParam(required = false) Integer violationHoursLimit,
+            @ApiParam(value = "需处理异常考勤限制") @RequestParam(required = false) Integer dingExceptionLimit,
+            @ApiParam(value = "异常限制") @RequestParam(required = false) Integer exceptionLimit, @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) {
 
         return ResultUtil.ok(tbDingSubmitService.findDingSubmitPage(SystemConstant.convertIdToLong(serviceUnitId),
                 dingSubmitStatusDesc, SystemConstant.convertIdToLong(submitUserId), archivesName,
-                SystemConstant.convertIdToLong(supplierId), customName, sopNo, violationHoursLimit,
-                dingExceptionLimit, remainLimit, exceptionLimit, pageNumber, pageSize));
+                SystemConstant.convertIdToLong(supplierId), customName, sopNo, violationHoursLimit, dingExceptionLimit,
+                exceptionLimit, pageNumber, pageSize));
     }
 
     @ApiOperation(value = "考勤提交-小计")
     @RequestMapping(value = "/sub_total", method = RequestMethod.POST)
-    @ApiResponses({@ApiResponse(code = 200, message = "查询成功", response = DingSubmitResult.class)})
+    @ApiResponses({ @ApiResponse(code = 200, message = "查询成功", response = DingSubmitResult.class) })
     public Result findDingSubmitSubTotal(@ApiParam(value = "服务单元id") @RequestParam(required = false) String serviceUnitId,
-                                         @ApiParam(value = "考勤提交状态") @RequestParam(required = false) String dingSubmitStatusDesc,
-                                         @ApiParam(value = "提交人id") @RequestParam(required = false) String submitUserId,
-                                         @ApiParam(value = "档案名称") @RequestParam(required = false) String archivesName,
-                                         @ApiParam(value = "供应商id") @RequestParam(required = false) String supplierId,
-                                         @ApiParam(value = "客户名") @RequestParam(required = false) String customName,
-                                         @ApiParam(value = "sop号") @RequestParam(required = false) String sopNo,
-                                         @ApiParam(value = "违规工时限制") @RequestParam(required = false) Integer violationHoursLimit,
-                                         @ApiParam(value = "需处理异常考勤限制") @RequestParam(required = false) Integer dingExceptionLimit,
-                                         @ApiParam(value = "补卡限制") @RequestParam(required = false) Integer remainLimit,
-                                         @ApiParam(value = "异常限制") @RequestParam(required = false) Integer exceptionLimit) {
+            @ApiParam(value = "考勤提交状态") @RequestParam(required = false) String dingSubmitStatusDesc, @ApiParam(value = "提交人id") @RequestParam(required = false) String submitUserId,
+            @ApiParam(value = "档案名称") @RequestParam(required = false) String archivesName, @ApiParam(value = "供应商id") @RequestParam(required = false) String supplierId,
+            @ApiParam(value = "客户名") @RequestParam(required = false) String customName, @ApiParam(value = "sop号") @RequestParam(required = false) String sopNo,
+            @ApiParam(value = "违规工时限制") @RequestParam(required = false) Integer violationHoursLimit, @ApiParam(value = "需处理异常考勤限制") @RequestParam(required = false) Integer dingExceptionLimit,
+            @ApiParam(value = "异常限制") @RequestParam(required = false) Integer exceptionLimit) {
 
         return ResultUtil.ok(tbDingSubmitService.findDingSubmitSubTotal(SystemConstant.convertIdToLong(serviceUnitId),
                 dingSubmitStatusDesc, SystemConstant.convertIdToLong(submitUserId), archivesName,
-                SystemConstant.convertIdToLong(supplierId), customName, sopNo, violationHoursLimit,
-                dingExceptionLimit, remainLimit, exceptionLimit));
+                SystemConstant.convertIdToLong(supplierId), customName, sopNo, violationHoursLimit, dingExceptionLimit,
+                exceptionLimit));
     }
 
     @ApiOperation(value = "考勤提交-批量提交")
     @RequestMapping(value = "/submit_batch", method = RequestMethod.POST)
-    @ApiResponses({@ApiResponse(code = 200, message = "更新成功", response = Result.class)})
+    @ApiResponses({ @ApiResponse(code = 200, message = "更新成功", response = Result.class) })
     @OperationLog(logType = LogTypeEnum.EDIT)
     public Result submitBatch(@Valid @RequestBody List<DingSubmitParam> dingSubmitParamList, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -99,7 +91,7 @@ public class TBDingSubmitController {
 
     @ApiOperation(value = "考勤提交-考勤撤回")
     @RequestMapping(value = "/apply_withdraw", method = RequestMethod.POST)
-    @ApiResponses({@ApiResponse(code = 200, message = "更新成功", response = Result.class)})
+    @ApiResponses({ @ApiResponse(code = 200, message = "更新成功", response = Result.class) })
     @OperationLog(logType = LogTypeEnum.UPDATE)
     public Result applyWithdraw(@Valid @RequestBody DingSubmitParam dingSubmitParam, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -111,7 +103,7 @@ public class TBDingSubmitController {
 
     @ApiOperation(value = "考勤提交-取消撤回")
     @RequestMapping(value = "/cancel_withdraw", method = RequestMethod.POST)
-    @ApiResponses({@ApiResponse(code = 200, message = "更新成功", response = Result.class)})
+    @ApiResponses({ @ApiResponse(code = 200, message = "更新成功", response = Result.class) })
     @OperationLog(logType = LogTypeEnum.UPDATE)
     public Result submitBatch(@Valid @RequestBody DingSubmitParam dingSubmitParam, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -123,29 +115,23 @@ public class TBDingSubmitController {
 
     @ApiOperation(value = "考勤提交-同意撤回")
     @RequestMapping(value = "/agree_withdraw", method = RequestMethod.POST)
-    @ApiResponses({@ApiResponse(code = 200, message = "更新成功", response = Result.class)})
+    @ApiResponses({ @ApiResponse(code = 200, message = "更新成功", response = Result.class) })
     @OperationLog(logType = LogTypeEnum.UPDATE)
     public Result agreeWithdraw(@ApiParam(value = "考勤提交记录id", required = true) @RequestParam() String dingSubmitId) {
         tbDingSubmitService.agreeWithdraw(SystemConstant.convertIdToLong(dingSubmitId));
         return ResultUtil.ok();
     }
 
-
     @ApiOperation(value = "考勤提交-批量导出")
     @RequestMapping(value = "/export", method = RequestMethod.POST)
-    @ApiResponses({@ApiResponse(code = 200, message = "返回信息", response = Object.class)})
+    @ApiResponses({ @ApiResponse(code = 200, message = "返回信息", response = Object.class) })
     @OperationLog(logType = LogTypeEnum.EXPORT)
-    public Result exportDingSubmit(@ApiParam(value = "服务单元id") @RequestParam(required = false) String serviceUnitId,
-                                   @ApiParam(value = "考勤提交状态") @RequestParam(required = false) String dingSubmitStatusDesc,
-                                   @ApiParam(value = "提交人id") @RequestParam(required = false) String submitUserId,
-                                   @ApiParam(value = "档案名称") @RequestParam(required = false) String archivesName,
-                                   @ApiParam(value = "供应商id") @RequestParam(required = false) String supplierId,
-                                   @ApiParam(value = "客户名") @RequestParam(required = false) String customName,
-                                   @ApiParam(value = "sop号") @RequestParam(required = false) String sopNo,
-                                   @ApiParam(value = "违规工时限制") @RequestParam(required = false) Integer violationHoursLimit,
-                                   @ApiParam(value = "需处理异常考勤限制") @RequestParam(required = false) Integer dingExceptionLimit,
-                                   @ApiParam(value = "补卡限制") @RequestParam(required = false) Integer remainLimit,
-                                   @ApiParam(value = "异常限制") @RequestParam(required = false) Integer exceptionLimit) throws Exception {
+    public Result exportDingSubmit(@ApiParam(value = "服务单元id") @RequestParam(required = false) String serviceUnitId, @ApiParam(value = "考勤提交状态") @RequestParam(required = false) String dingSubmitStatusDesc,
+            @ApiParam(value = "提交人id") @RequestParam(required = false) String submitUserId, @ApiParam(value = "档案名称") @RequestParam(required = false) String archivesName,
+            @ApiParam(value = "供应商id") @RequestParam(required = false) String supplierId, @ApiParam(value = "客户名") @RequestParam(required = false) String customName,
+            @ApiParam(value = "sop号") @RequestParam(required = false) String sopNo, @ApiParam(value = "违规工时限制") @RequestParam(required = false) Integer violationHoursLimit,
+            @ApiParam(value = "需处理异常考勤限制") @RequestParam(required = false) Integer dingExceptionLimit,
+            @ApiParam(value = "异常限制") @RequestParam(required = false) Integer exceptionLimit) throws Exception {
         Map<String, Object> map = tbTaskService.saveTask(TaskTypeEnum.DING_SUBMIT_EXPORT);
         DingSubmitQuery query = new DingSubmitQuery();
         query.setServiceUnitId(SystemConstant.convertIdToLong(serviceUnitId));
@@ -157,7 +143,6 @@ public class TBDingSubmitController {
         query.setSopNo(sopNo);
         query.setViolationHoursLimit(violationHoursLimit);
         query.setDingExceptionLimit(dingExceptionLimit);
-        query.setRemainLimit(remainLimit);
         query.setExceptionLimit(exceptionLimit);
         map.put(SystemConstant.QUERY, query);
 

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

@@ -31,24 +31,15 @@ public interface TBDingSubmitMapper extends BaseMapper<TBDingSubmit> {
      * @param sopNo                sop号
      * @param violationHoursLimit  违规工时限制
      * @param dingExceptionLimit   需处理异常考勤限制
-     * @param remainLimit          补卡限制
      * @param exceptionLimit       异常限制
      * @param dpr                  数据权限
      * @return 考勤提交分页查询结果
      */
-    IPage<DingSubmitResult> findDingSubmitPage(@Param("iPage") Page<DingSubmitResult> iPage,
-                                               @Param("serviceUnitId") Long serviceUnitId,
-                                               @Param("dingSubmitStatusList") List<DingSubmitStatusEnum> dingSubmitStatusList,
-                                               @Param("submitUserId") Long submitUserId,
-                                               @Param("archivesName") String archivesName,
-                                               @Param("supplierId") Long supplierId,
-                                               @Param("customName") String customName,
-                                               @Param("sopNo") String sopNo,
-                                               @Param("violationHoursLimit") Integer violationHoursLimit,
-                                               @Param("dingExceptionLimit") Integer dingExceptionLimit,
-                                               @Param("remainLimit") Integer remainLimit,
-                                               @Param("exceptionLimit") Integer exceptionLimit,
-                                               @Param("dpr") DataPermissionDto dpr);
+    IPage<DingSubmitResult> findDingSubmitPage(@Param("iPage") Page<DingSubmitResult> iPage, @Param("serviceUnitId") Long serviceUnitId,
+            @Param("dingSubmitStatusList") List<DingSubmitStatusEnum> dingSubmitStatusList, @Param("submitUserId") Long submitUserId,
+            @Param("archivesName") String archivesName, @Param("supplierId") Long supplierId, @Param("customName") String customName,
+            @Param("sopNo") String sopNo, @Param("violationHoursLimit") Integer violationHoursLimit, @Param("dingExceptionLimit") Integer dingExceptionLimit,
+            @Param("exceptionLimit") Integer exceptionLimit, @Param("dpr") DataPermissionDto dpr);
 
     /**
      * 考勤提交列表查询
@@ -63,22 +54,13 @@ public interface TBDingSubmitMapper extends BaseMapper<TBDingSubmit> {
      * @param sopNo                sop号
      * @param violationHoursLimit  违规工时限制
      * @param dingExceptionLimit   需处理异常考勤限制
-     * @param remainLimit          补卡限制
      * @param exceptionLimit       异常限制
      * @param dpr                  数据权限
      * @return 考勤提交分页查询结果
      */
-    List<DingSubmitResult> findDingSubmitList(@Param("serviceUnitId") Long serviceUnitId,
-                                              @Param("dingSubmitStatusList") List<DingSubmitStatusEnum> dingSubmitStatusList,
-                                              @Param("submitUserId") Long submitUserId,
-                                              @Param("archivesId") Long archivesId,
-                                              @Param("archivesName") String archivesName,
-                                              @Param("supplierId") Long supplierId,
-                                              @Param("customName") String customName,
-                                              @Param("sopNo") String sopNo,
-                                              @Param("violationHoursLimit") Integer violationHoursLimit,
-                                              @Param("dingExceptionLimit") Integer dingExceptionLimit,
-                                              @Param("remainLimit") Integer remainLimit,
-                                              @Param("exceptionLimit") Integer exceptionLimit,
-                                              @Param("dpr") DataPermissionDto dpr);
+    List<DingSubmitResult> findDingSubmitList(@Param("serviceUnitId") Long serviceUnitId, @Param("dingSubmitStatusList") List<DingSubmitStatusEnum> dingSubmitStatusList,
+            @Param("submitUserId") Long submitUserId, @Param("archivesId") Long archivesId, @Param("archivesName") String archivesName,
+            @Param("supplierId") Long supplierId, @Param("customName") String customName, @Param("sopNo") String sopNo,
+            @Param("violationHoursLimit") Integer violationHoursLimit, @Param("dingExceptionLimit") Integer dingExceptionLimit,
+            @Param("exceptionLimit") Integer exceptionLimit, @Param("dpr") DataPermissionDto dpr);
 }

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

@@ -16,6 +16,7 @@ import java.util.List;
  * @Date: 2023-08-25
  */
 public interface TBDingSubmitService extends IService<TBDingSubmit> {
+
     /**
      * 考勤提交分页查询
      *
@@ -28,16 +29,13 @@ public interface TBDingSubmitService extends IService<TBDingSubmit> {
      * @param sopNo                sop号
      * @param violationHoursLimit  违规工时限制
      * @param dingExceptionLimit   需处理异常考勤限制
-     * @param remainLimit          补卡限制
      * @param exceptionLimit       异常限制
      * @param pageNumber           分页页数
      * @param pageSize             分页容量
      * @return 考勤提交分页查询结果
      */
     IPage<DingSubmitResult> findDingSubmitPage(Long serviceUnitId, String dingSubmitStatusDesc, Long submitUserId,
-                                               String archivesName, Long supplierId, String customName, String sopNo,
-                                               Integer violationHoursLimit, Integer dingExceptionLimit,
-                                               Integer remainLimit, Integer exceptionLimit, Integer pageNumber, Integer pageSize);
+            String archivesName, Long supplierId, String customName, String sopNo, Integer violationHoursLimit, Integer dingExceptionLimit, Integer exceptionLimit, Integer pageNumber, Integer pageSize);
 
     /**
      * 考勤提交小计
@@ -51,14 +49,11 @@ public interface TBDingSubmitService extends IService<TBDingSubmit> {
      * @param sopNo                sop号
      * @param violationHoursLimit  违规工时限制
      * @param dingExceptionLimit   需处理异常考勤限制
-     * @param remainLimit          补卡限制
      * @param exceptionLimit       异常限制
      * @return 考勤提交小计结果
      */
     DingSubmitSubTotalResult findDingSubmitSubTotal(Long serviceUnitId, String dingSubmitStatusDesc, Long submitUserId,
-                                                    String archivesName, Long supplierId, String customName, String sopNo,
-                                                    Integer violationHoursLimit, Integer dingExceptionLimit,
-                                                    Integer remainLimit, Integer exceptionLimit);
+            String archivesName, Long supplierId, String customName, String sopNo, Integer violationHoursLimit, Integer dingExceptionLimit, Integer exceptionLimit);
 
     /**
      * 考勤批量提交
@@ -99,14 +94,10 @@ public interface TBDingSubmitService extends IService<TBDingSubmit> {
      * @param customName           客户名
      * @param sopNo                sop号
      * @param violationHoursLimit  违规工时限制
-     * @param dingExceptionLimit   需处理异常考勤限制
-     * @param remainLimit          补卡限制
      * @param exceptionLimit       异常限制
      * @param requestUserId        请求的用户id
      * @return 考勤提交小计结果
      */
     List<DingSubmitExportDto> findDingSubmitExportList(Long serviceUnitId, String dingSubmitStatusDesc, Long submitUserId,
-                                                       String archivesName, Long supplierId, String customName, String sopNo,
-                                                       Integer violationHoursLimit, Integer dingExceptionLimit,
-                                                       Integer remainLimit, Integer exceptionLimit, Long requestUserId);
+            String archivesName, Long supplierId, String customName, String sopNo, Integer violationHoursLimit, Integer dingExceptionLimit, Integer exceptionLimit, Long requestUserId);
 }

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

@@ -38,22 +38,22 @@ import java.util.stream.Stream;
  */
 @Service
 public class TBDingSubmitServiceImpl extends ServiceImpl<TBDingSubmitMapper, TBDingSubmit> implements TBDingSubmitService {
+
     @Resource
     private SysUserService sysUserService;
+
     @Resource
     private TBDingServiceImpl tbDingService;
 
     @Override
     public IPage<DingSubmitResult> findDingSubmitPage(Long serviceUnitId, String dingSubmitStatusDesc, Long submitUserId,
-                                                      String archivesName, Long supplierId, String customName, String sopNo,
-                                                      Integer violationHoursLimit, Integer dingExceptionLimit, Integer remainLimit, Integer exceptionLimit,
-                                                      Integer pageNumber, Integer pageSize) {
+            String archivesName, Long supplierId, String customName, String sopNo, Integer violationHoursLimit, Integer dingExceptionLimit, Integer exceptionLimit,
+            Integer pageNumber, Integer pageSize) {
 
         List<DingSubmitStatusEnum> dingSubmitStatusEnumList = new ArrayList<>();
         if (dingSubmitStatusDesc != null && dingSubmitStatusDesc.length() > 0) {
             dingSubmitStatusEnumList = Arrays.stream(DingSubmitStatusEnum.values())
-                    .filter(e -> e.getDingSubmitQuery().equals(dingSubmitStatusDesc))
-                    .collect(Collectors.toList());
+                    .filter(e -> e.getDingSubmitQuery().equals(dingSubmitStatusDesc)).collect(Collectors.toList());
         }
         archivesName = SystemConstant.translateSpecificSign(archivesName);
         customName = SystemConstant.translateSpecificSign(customName);
@@ -68,8 +68,9 @@ public class TBDingSubmitServiceImpl extends ServiceImpl<TBDingSubmitMapper, TBD
             }
             supplierId = userSupplierId;
         }
-        IPage<DingSubmitResult> page = this.baseMapper.findDingSubmitPage(new Page<>(pageNumber, pageSize), serviceUnitId, dingSubmitStatusEnumList,
-                submitUserId, archivesName, supplierId, customName, sopNo, violationHoursLimit, dingExceptionLimit, remainLimit, exceptionLimit, dpr);
+        IPage<DingSubmitResult> page = this.baseMapper.findDingSubmitPage(new Page<>(pageNumber, pageSize),
+                serviceUnitId, dingSubmitStatusEnumList, submitUserId, archivesName, supplierId, customName, sopNo,
+                violationHoursLimit, dingExceptionLimit, exceptionLimit, dpr);
         for (DingSubmitResult record : page.getRecords()) {
             record.setRemainCount(tbDingService.findRemainCount(record.getUserId(), record.getSopNo()));
         }
@@ -78,14 +79,11 @@ public class TBDingSubmitServiceImpl extends ServiceImpl<TBDingSubmitMapper, TBD
 
     @Override
     public DingSubmitSubTotalResult findDingSubmitSubTotal(Long serviceUnitId, String dingSubmitStatusDesc, Long submitUserId,
-                                                           String archivesName, Long supplierId, String customName, String sopNo,
-                                                           Integer violationHoursLimit, Integer dingExceptionLimit,
-                                                           Integer remainLimit, Integer exceptionLimit) {
+            String archivesName, Long supplierId, String customName, String sopNo, Integer violationHoursLimit, Integer dingExceptionLimit, Integer exceptionLimit) {
         List<DingSubmitStatusEnum> dingSubmitStatusEnumList = new ArrayList<>();
         if (dingSubmitStatusDesc != null && dingSubmitStatusDesc.length() > 0) {
             dingSubmitStatusEnumList = Arrays.stream(DingSubmitStatusEnum.values())
-                    .filter(e -> e.getSubmitDesc().equals(dingSubmitStatusDesc))
-                    .collect(Collectors.toList());
+                    .filter(e -> e.getSubmitDesc().equals(dingSubmitStatusDesc)).collect(Collectors.toList());
         }
         archivesName = SystemConstant.translateSpecificSign(archivesName);
         customName = SystemConstant.translateSpecificSign(customName);
@@ -101,18 +99,18 @@ public class TBDingSubmitServiceImpl extends ServiceImpl<TBDingSubmitMapper, TBD
             supplierId = userSupplierId;
         }
 
-        List<DingSubmitResult> dingSubmitResultList = this.baseMapper.findDingSubmitList(serviceUnitId, dingSubmitStatusEnumList,
-                submitUserId, null, archivesName, supplierId, customName, sopNo, violationHoursLimit, dingExceptionLimit, remainLimit, exceptionLimit, dpr);
+        List<DingSubmitResult> dingSubmitResultList = this.baseMapper.findDingSubmitList(serviceUnitId,
+                dingSubmitStatusEnumList, submitUserId, null, archivesName, supplierId, customName, sopNo,
+                violationHoursLimit, dingExceptionLimit, exceptionLimit, dpr);
 
         Integer dingCount = dingSubmitResultList.size();
-        Integer willSubmitCount = Math.toIntExact(dingSubmitResultList.stream().filter(e -> e.getSubmitStatus().getSubmitDesc().equals("待提交")).count());
-        Integer submitCount = Math.toIntExact(dingSubmitResultList.stream().filter(e -> e.getSubmitStatus().getSubmitDesc().equals("已提交")).count());
+        Integer willSubmitCount = Math.toIntExact(
+                dingSubmitResultList.stream().filter(e -> e.getSubmitStatus().getSubmitDesc().equals("待提交")).count());
+        Integer submitCount = Math.toIntExact(
+                dingSubmitResultList.stream().filter(e -> e.getSubmitStatus().getSubmitDesc().equals("已提交")).count());
         Integer totalActualDays = dingSubmitResultList.stream().mapToInt(DingSubmitResult::getActualDays).sum();
-        Double totalWorkHours = dingSubmitResultList.stream()
-                .map(e -> new BigDecimal(String.valueOf(e.getWorkHours())))
-                .reduce(BigDecimal::add)
-                .orElse(BigDecimal.ZERO)
-                .doubleValue();
+        Double totalWorkHours = dingSubmitResultList.stream().map(e -> new BigDecimal(String.valueOf(e.getWorkHours())))
+                .reduce(BigDecimal::add).orElse(BigDecimal.ZERO).doubleValue();
         DingSubmitSubTotalResult dingSubmitSubTotalResult = new DingSubmitSubTotalResult();
         dingSubmitSubTotalResult.setDingCount(dingCount);
         dingSubmitSubTotalResult.setWillSubmitCount(willSubmitCount);
@@ -136,29 +134,30 @@ public class TBDingSubmitServiceImpl extends ServiceImpl<TBDingSubmitMapper, TBD
             Long serviceUnitId = dingSubmitParam.getServiceUnitId();
             String sopNo = dingSubmitParam.getSopNo();
             Long userArchivesId = dingSubmitParam.getUserArchivesId();
-            List<DingSubmitResult> dingSubmitResultList = this.baseMapper.findDingSubmitList(serviceUnitId, null,
-                    null, userArchivesId, null, null, null, sopNo,
-                    null, null, null, null, null);
+            List<DingSubmitResult> dingSubmitResultList = this.baseMapper.findDingSubmitList(serviceUnitId, null, null,
+                    userArchivesId, null, null, null, sopNo, null, null, null, null);
 
             if (dingSubmitResultList.size() != 1) {
-                throw ExceptionResultEnum.ERROR.exception(String.format("未找到服务单元id为[%s],sop流水号为[%s],用户档案号为[%s]的考勤信息", serviceUnitId, sopNo, userArchivesId));
+                throw ExceptionResultEnum.ERROR.exception(
+                        String.format("未找到服务单元id为[%s],sop流水号为[%s],用户档案号为[%s]的考勤信息", serviceUnitId, sopNo, userArchivesId));
             }
             DingSubmitResult dingSubmitResult = dingSubmitResultList.get(0);
             String serviceUnitName = dingSubmitResult.getServiceUnitName();
             String userArchivesName = dingSubmitResult.getArchivesName();
 
-
             // 条件1 - 提交必须是待提交状态
             DingSubmitStatusEnum submitStatus = dingSubmitResult.getSubmitStatus();
             if (!dingSubmitStatusEnumList.contains(submitStatus)) {
-                throw ExceptionResultEnum.ERROR.exception(String.format("服务单元为[%s],sop流水号为[%s],用户档案为[%s]的考勤的提交状态为[%s],不能提交",
-                        serviceUnitName, sopNo, userArchivesName, submitStatus.getSubmitDesc()));
+                throw ExceptionResultEnum.ERROR.exception(
+                        String.format("服务单元为[%s],sop流水号为[%s],用户档案为[%s]的考勤的提交状态为[%s],不能提交", serviceUnitName, sopNo,
+                                userArchivesName, submitStatus.getSubmitDesc()));
             }
             // 条件2 - 待处理的异常数为0
             Integer exceptionCount = dingSubmitResult.getExceptionCount();
             if (exceptionCount != 0) {
-                throw ExceptionResultEnum.ERROR.exception(String.format("服务单元为[%s],sop流水号为[%s],用户档案为[%s]的考勤待处理异常数为[%s],不能提交",
-                        serviceUnitName, sopNo, userArchivesName, exceptionCount));
+                throw ExceptionResultEnum.ERROR.exception(
+                        String.format("服务单元为[%s],sop流水号为[%s],用户档案为[%s]的考勤待处理异常数为[%s],不能提交", serviceUnitName, sopNo,
+                                userArchivesName, exceptionCount));
             }
 
             Long submitId = dingSubmitResult.getSubmitId();
@@ -195,9 +194,8 @@ public class TBDingSubmitServiceImpl extends ServiceImpl<TBDingSubmitMapper, TBD
         Long serviceUnitId = dingSubmitParam.getServiceUnitId();
         String sopNo = dingSubmitParam.getSopNo();
         Long userArchivesId = dingSubmitParam.getUserArchivesId();
-        List<DingSubmitResult> dingSubmitResultList = this.baseMapper.findDingSubmitList(serviceUnitId, null,
-                null, userArchivesId, null, null, null, sopNo,
-                null, null, null, null, null);
+        List<DingSubmitResult> dingSubmitResultList = this.baseMapper.findDingSubmitList(serviceUnitId, null, null,
+                userArchivesId, null, null, null, sopNo, null, null, null, null);
 
         if (dingSubmitResultList.size() != 1) {
             throw ExceptionResultEnum.ERROR.exception(String.format("未找到服务单元id为[%s],sop流水号为[%s],用户档案号为[%s]的考勤信息", serviceUnitId, sopNo, userArchivesId));
@@ -208,8 +206,9 @@ public class TBDingSubmitServiceImpl extends ServiceImpl<TBDingSubmitMapper, TBD
 
         DingSubmitStatusEnum submitStatus = dingSubmitResult.getSubmitStatus();
         if (!DingSubmitStatusEnum.ALREADY_SUBMIT.equals(submitStatus)) {
-            throw ExceptionResultEnum.ERROR.exception(String.format("服务单元为[%s],sop流水号为[%s],用户档案为[%s]的考勤的提交状态为[%s],不能申请撤回",
-                    serviceUnitName, sopNo, userArchivesName, submitStatus.getSubmitDesc()));
+            throw ExceptionResultEnum.ERROR.exception(
+                    String.format("服务单元为[%s],sop流水号为[%s],用户档案为[%s]的考勤的提交状态为[%s],不能申请撤回", serviceUnitName, sopNo,
+                            userArchivesName, submitStatus.getSubmitDesc()));
         }
 
         Long submitId = dingSubmitResult.getSubmitId();
@@ -245,9 +244,8 @@ public class TBDingSubmitServiceImpl extends ServiceImpl<TBDingSubmitMapper, TBD
         Long serviceUnitId = dingSubmitParam.getServiceUnitId();
         String sopNo = dingSubmitParam.getSopNo();
         Long userArchivesId = dingSubmitParam.getUserArchivesId();
-        List<DingSubmitResult> dingSubmitResultList = this.baseMapper.findDingSubmitList(serviceUnitId, null,
-                null, userArchivesId, null, null, null, sopNo,
-                null, null, null, null, null);
+        List<DingSubmitResult> dingSubmitResultList = this.baseMapper.findDingSubmitList(serviceUnitId, null, null,
+                userArchivesId, null, null, null, sopNo, null, null, null, null);
 
         if (dingSubmitResultList.size() != 1) {
             throw ExceptionResultEnum.ERROR.exception(String.format("未找到服务单元id为[%s],sop流水号为[%s],用户档案号为[%s]的考勤信息", serviceUnitId, sopNo, userArchivesId));
@@ -258,8 +256,9 @@ public class TBDingSubmitServiceImpl extends ServiceImpl<TBDingSubmitMapper, TBD
 
         DingSubmitStatusEnum submitStatus = dingSubmitResult.getSubmitStatus();
         if (!DingSubmitStatusEnum.APPLY_WITHDRAW.equals(submitStatus)) {
-            throw ExceptionResultEnum.ERROR.exception(String.format("服务单元为[%s],sop流水号为[%s],用户档案为[%s]的考勤的提交状态为[%s],不能申请撤回",
-                    serviceUnitName, sopNo, userArchivesName, submitStatus.getSubmitDesc()));
+            throw ExceptionResultEnum.ERROR.exception(
+                    String.format("服务单元为[%s],sop流水号为[%s],用户档案为[%s]的考勤的提交状态为[%s],不能申请撤回", serviceUnitName, sopNo,
+                            userArchivesName, submitStatus.getSubmitDesc()));
         }
 
         Long submitId = dingSubmitResult.getSubmitId();
@@ -303,12 +302,12 @@ public class TBDingSubmitServiceImpl extends ServiceImpl<TBDingSubmitMapper, TBD
     }
 
     @Override
-    public List<DingSubmitExportDto> findDingSubmitExportList(Long serviceUnitId, String dingSubmitStatusDesc, Long submitUserId, String archivesName, Long supplierId, String customName, String sopNo, Integer violationHoursLimit, Integer dingExceptionLimit, Integer remainLimit, Integer exceptionLimit, Long requestUserId) {
+    public List<DingSubmitExportDto> findDingSubmitExportList(Long serviceUnitId, String dingSubmitStatusDesc, Long submitUserId, String archivesName, Long supplierId, String customName, String sopNo,
+            Integer violationHoursLimit, Integer dingExceptionLimit, Integer exceptionLimit, Long requestUserId) {
         List<DingSubmitStatusEnum> dingSubmitStatusEnumList = new ArrayList<>();
         if (dingSubmitStatusDesc != null && dingSubmitStatusDesc.length() > 0) {
             dingSubmitStatusEnumList = Arrays.stream(DingSubmitStatusEnum.values())
-                    .filter(e -> e.getDingSubmitQuery().equals(dingSubmitStatusDesc))
-                    .collect(Collectors.toList());
+                    .filter(e -> e.getDingSubmitQuery().equals(dingSubmitStatusDesc)).collect(Collectors.toList());
         }
         archivesName = SystemConstant.translateSpecificSign(archivesName);
         customName = SystemConstant.translateSpecificSign(customName);
@@ -324,9 +323,9 @@ public class TBDingSubmitServiceImpl extends ServiceImpl<TBDingSubmitMapper, TBD
             supplierId = userSupplierId;
         }
 
-        List<DingSubmitResult> dingSubmitResultList = this.baseMapper.findDingSubmitList(serviceUnitId, dingSubmitStatusEnumList,
-                submitUserId, null, archivesName, supplierId, customName, sopNo, violationHoursLimit, dingExceptionLimit,
-                remainLimit, exceptionLimit, dpr);
+        List<DingSubmitResult> dingSubmitResultList = this.baseMapper.findDingSubmitList(serviceUnitId,
+                dingSubmitStatusEnumList, submitUserId, null, archivesName, supplierId, customName, sopNo,
+                violationHoursLimit, dingExceptionLimit, exceptionLimit, dpr);
 
         return dingSubmitResultList.stream().flatMap(e -> {
             DingSubmitExportDto dto = new DingSubmitExportDto();
@@ -335,10 +334,10 @@ public class TBDingSubmitServiceImpl extends ServiceImpl<TBDingSubmitMapper, TBD
             dto.setCustomName(e.getCustomName());
             dto.setProvince(e.getProvince());
             dto.setCity(e.getCity());
-            if (e.getApproachTime() != null && e.getApproachTime() > 0){
+            if (e.getApproachTime() != null && e.getApproachTime() > 0) {
                 dto.setApproachTime(DateDisposeUtils.getDateStr(e.getApproachTime()));
             }
-            if (e.getDepartureTime() != null && e.getDepartureTime() > 0){
+            if (e.getDepartureTime() != null && e.getDepartureTime() > 0) {
                 dto.setDepartureTime(DateDisposeUtils.getDateStr(e.getDepartureTime()));
             }
             dto.setArchivesInfo(e.getArchivesInfo());
@@ -355,7 +354,7 @@ public class TBDingSubmitServiceImpl extends ServiceImpl<TBDingSubmitMapper, TBD
             dto.setExceptionCount(e.getExceptionCount());
             dto.setSubmitStatus(e.getSubmitStatus().getSubmitDesc());
             dto.setSubmitUserName(e.getSubmitUserName());
-            if (e.getSubmitTime() != null && e.getSubmitTime() > 0){
+            if (e.getSubmitTime() != null && e.getSubmitTime() > 0) {
                 dto.setSubmitTime(DateDisposeUtils.getDateStr(e.getSubmitTime()));
             }
             return Stream.of(dto);

sop-business/src/main/java/com/qmth/sop/business/templete/execute/AsyncDingSubmitExportService.java

@@ -33,7 +33,9 @@ import java.util.StringJoiner;
  */
 @Service
 public class AsyncDingSubmitExportService extends AsyncExportTaskTemplete {
+
     private final static Logger log = LoggerFactory.getLogger(AsyncDingSubmitExportService.class);
+
     public static final String OBJ_TITLE = "考勤提交信息";
 
     @Resource
@@ -45,8 +47,9 @@ public class AsyncDingSubmitExportService extends AsyncExportTaskTemplete {
     @Override
     public Result exportTask(Map<String, Object> map) throws Exception {
         TBTask tbTask = (TBTask) map.get(SystemConstant.TASK);
-        StringJoiner stringJoinerSummary = new StringJoiner("\n")
-                .add(MessageFormat.format("{0}{1}{2}", DateUtil.format(new Date(), SystemConstant.DEFAULT_DATE_PATTERN), BEGIN_TITLE, OBJ_TITLE));
+        StringJoiner stringJoinerSummary = new StringJoiner("\n").add(
+                MessageFormat.format("{0}{1}{2}", DateUtil.format(new Date(), SystemConstant.DEFAULT_DATE_PATTERN),
+                        BEGIN_TITLE, OBJ_TITLE));
         tbTask.setStatus(TaskStatusEnum.RUNNING);
         tbTask.setSummary(stringJoinerSummary.toString());
         tbTaskService.updateById(tbTask);
@@ -54,14 +57,16 @@ public class AsyncDingSubmitExportService extends AsyncExportTaskTemplete {
             Map<String, Object> result = taskLogicService.executeExportDingSubmitLogic(map);
             List<DingSubmitExportDto> dingSubmitExportDtoList = (List<DingSubmitExportDto>) result.get(SystemConstant.EXCEL_DATA);
             BasicAttachment basicAttachment = (BasicAttachment) result.get(SystemConstant.EXCEL_ATTACHMENT);
-            stringJoinerSummary.add(MessageFormat.format("{0}{1}{2}{3}", DateUtil.format(new Date(), SystemConstant.DEFAULT_DATE_PATTERN), FINISH_TITLE, !CollectionUtils.isEmpty(dingSubmitExportDtoList) ? dingSubmitExportDtoList.size() : 0, FINISH_SIZE));
+            stringJoinerSummary.add(MessageFormat.format("{0}{1}{2}{3}", DateUtil.format(new Date(), SystemConstant.DEFAULT_DATE_PATTERN), FINISH_TITLE,
+                    !CollectionUtils.isEmpty(dingSubmitExportDtoList) ? dingSubmitExportDtoList.size() : 0, FINISH_SIZE));
 
             tbTask.setImportFileName(TaskTypeEnum.DING_SUBMIT_EXPORT.getTitle());
             tbTask.setResultFilePath(basicAttachment.getPath());
             tbTask.setResult(TaskResultEnum.SUCCESS);
         } catch (Exception e) {
             log.error(SystemConstant.LOG_ERROR, e);
-            stringJoinerSummary.add(MessageFormat.format("{0}{1}{2}{3}", DateUtil.format(new Date(), SystemConstant.DEFAULT_DATE_PATTERN), EXCEPTION_TITLE, EXCEPTION_DATA, e.getMessage()));
+            stringJoinerSummary.add(MessageFormat.format("{0}{1}{2}{3}", DateUtil.format(new Date(), SystemConstant.DEFAULT_DATE_PATTERN), EXCEPTION_TITLE, EXCEPTION_DATA,
+                    e.getMessage()));
             tbTask.setResult(TaskResultEnum.ERROR);
             if (e instanceof ApiException) {
                 ResultUtil.error((ApiException) e, ((ApiException) e).getCode(), e.getMessage());

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

@@ -504,13 +504,12 @@ public class TaskLogicServiceImpl implements TaskLogicService {
             String sopNo = query.getSopNo();
             Integer violationHoursLimit = query.getViolationHoursLimit();
             Integer dingExceptionLimit = query.getDingExceptionLimit();
-            Integer remainLimit = query.getRemainLimit();
             Integer exceptionLimit = query.getExceptionLimit();
 
             SysUser requestUser = (SysUser) map.get(SystemConstant.USER);
 
             List<DingSubmitExportDto> dingSubmitExportDtoList = tbDingSubmitService.findDingSubmitExportList(serviceUnitId, dingSubmitStatusDesc,
-                    submitUserId, archivesName, supplierId, customName, sopNo, violationHoursLimit, dingExceptionLimit, remainLimit, exceptionLimit, requestUser.getId());
+                    submitUserId, archivesName, supplierId, customName, sopNo, violationHoursLimit, dingExceptionLimit, exceptionLimit, requestUser.getId());
             //数据读取逻辑end
             EasyExcel.write(fileTemp, DingSubmitExportDto.class).sheet("考勤提交导出").doWrite(dingSubmitExportDtoList);
 

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

@@ -193,7 +193,6 @@
             tbuas.user_archives_id = tbua.id
             left join sys_supplier ss on
             ss.id = tbuas.supplier_id
-            left join ACT_HI_TASKINST aht on aht.PROC_INST_ID_ = tffa.flow_id
         <where> 1 = 1 and tfcf.type = 'DING_EXCEPTION_FLOW'
             and tffa.status in ('AUDITING','REJECT','FINISH')
             and tbs.status = 'PUBLISH'

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

@@ -47,7 +47,7 @@
                     and d.submit_status = #{status}
                 </if>
                 <if test="createId != null and createId != ''">
-                    and d.submit_user_id = #{create_id}
+                    and d.submit_user_id = #{createId}
                 </if>
                 <if test="userName != null and userName != ''">
                     and ua.name like concat('%', #{userName} , '%')
@@ -114,7 +114,7 @@
                 and d.service_id = #{serviceId}
             </if>
             <if test="createId != null and createId != ''">
-                and d.submit_user_id = #{create_id}
+                and d.submit_user_id = #{createId}
             </if>
             <if test="userName != null and userName != ''">
                 and ua.name like concat('%', #{userName} , '%')

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

@@ -123,9 +123,6 @@
             <if test="dingExceptionLimit != null">
                 AND main.dingExceptionCount > #{dingExceptionLimit}
             </if>
-            <if test="remainLimit != null">
-                AND main.remainCount > #{remainLimit}
-            </if>
             <if test="exceptionLimit != null">
                 AND main.exceptionCount > #{exceptionLimit}
             </if>
@@ -278,9 +275,6 @@
             <if test="dingExceptionLimit != null">
                 AND main.dingExceptionCount > #{dingExceptionLimit}
             </if>
-            <if test="remainLimit != null">
-                AND main.remainCount > #{remainLimit}
-            </if>
             <if test="exceptionLimit != null">
                 AND main.exceptionCount > #{exceptionLimit}
             </if>