|
@@ -3,19 +3,19 @@ package com.qmth.sop.server.api;
|
|
|
import com.baomidou.mybatisplus.core.metadata.IPage;
|
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
|
import com.qmth.boot.api.constant.ApiConstant;
|
|
|
+import com.qmth.sop.business.activiti.service.ActivitiService;
|
|
|
import com.qmth.sop.business.annotation.OperationLog;
|
|
|
import com.qmth.sop.business.bean.params.DingSaveParam;
|
|
|
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.TBSopInfoService;
|
|
|
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;
|
|
@@ -27,7 +27,10 @@ import javax.annotation.Resource;
|
|
|
import javax.validation.Valid;
|
|
|
import javax.validation.constraints.Max;
|
|
|
import javax.validation.constraints.Min;
|
|
|
+import java.util.List;
|
|
|
import java.util.Map;
|
|
|
+import java.util.stream.Collectors;
|
|
|
+import java.util.stream.Stream;
|
|
|
|
|
|
/**
|
|
|
* 考勤打卡表 控制器
|
|
@@ -55,6 +58,12 @@ public class TBDingController {
|
|
|
@Resource
|
|
|
AsyncDingAttendanceExportService asyncDingAttendanceExportService;
|
|
|
|
|
|
+ @Resource
|
|
|
+ ActivitiService activitiService;
|
|
|
+
|
|
|
+ @Resource
|
|
|
+ TBSopInfoService tbSopInfoService;
|
|
|
+
|
|
|
|
|
|
@ApiOperation(value = "工时统计统计查询接口")
|
|
|
@RequestMapping(value = "/query", method = RequestMethod.POST)
|
|
@@ -214,4 +223,36 @@ public class TBDingController {
|
|
|
tBDingService.dingSave(dingSaveParam, requestUser.getId());
|
|
|
return ResultUtil.ok();
|
|
|
}
|
|
|
+
|
|
|
+ @ApiOperation(value = "考勤打卡-查询进行中的sop")
|
|
|
+ @RequestMapping(value = "/ding_find_running_sop", method = RequestMethod.POST)
|
|
|
+ @ApiResponses({@ApiResponse(code = 200, message = "查询成功", response = DingElementResult.class)})
|
|
|
+ @OperationLog
|
|
|
+ public Result findDingRunningSop(@ApiParam(value = "服务单元id", required = true) @RequestParam String serviceUnitId) {
|
|
|
+ SysUser requestUser = (SysUser) ServletUtil.getRequestUser();
|
|
|
+ IPage<WorkTaskResult> page = activitiService.getFlowTaskList(new Page<>(1, SystemConstant.PAGE_SIZE_MAX_SELECT), requestUser.getId(),
|
|
|
+ TFCustomTypeEnum.SOP_FLOW, SystemConstant.convertIdToLong(serviceUnitId), null, FlowTaskTypeEnum.ALL, null);
|
|
|
+ List<SopInfoResult> list = page.getRecords().stream().flatMap(e -> {
|
|
|
+ SopInfoResult result = new SopInfoResult();
|
|
|
+ result.setSopNo(e.getCode());
|
|
|
+ result.setCrmNo(e.getCrmNo());
|
|
|
+ result.setCrmName(e.getCrmName());
|
|
|
+ result.setCustomId(e.getCustomId());
|
|
|
+ result.setCustomName(e.getCustomName());
|
|
|
+ result.setCustomType(e.getCustomType());
|
|
|
+ result.setCustomTypeStr(e.getCustomTypeStr());
|
|
|
+ return Stream.of(result);
|
|
|
+ }).collect(Collectors.toList());
|
|
|
+ return ResultUtil.ok(list);
|
|
|
+ }
|
|
|
+
|
|
|
+ @ApiOperation(value = "考勤打卡-查询所有sop")
|
|
|
+ @RequestMapping(value = "/ding_find_all_sop", method = RequestMethod.POST)
|
|
|
+ @ApiResponses({@ApiResponse(code = 200, message = "查询成功", response = DingElementResult.class)})
|
|
|
+ @OperationLog
|
|
|
+ public Result findDingAllSop(@ApiParam(value = "服务单元id", required = true) @RequestParam String serviceUnitId) {
|
|
|
+ SysUser requestUser = (SysUser) ServletUtil.getRequestUser();
|
|
|
+ List<SopInfoResult> list = tbSopInfoService.findFlowByServiceId(SystemConstant.convertIdToLong(serviceUnitId), requestUser.getId());
|
|
|
+ return ResultUtil.ok(list);
|
|
|
+ }
|
|
|
}
|