Merge remote-tracking branch 'origin/dev_v1.0.0' into dev_v1.0.0

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

@@ -2,7 +2,6 @@ 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.annotation.Aac;
 import com.qmth.boot.api.constant.ApiConstant;
 import com.qmth.sop.business.activiti.service.ActivitiService;
 import com.qmth.sop.business.annotation.OperationLog;
@@ -10,6 +9,7 @@ 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.SysRoleService;
 import com.qmth.sop.business.service.TBDingService;
 import com.qmth.sop.business.service.TBSopInfoService;
 import com.qmth.sop.business.service.TBTaskService;
@@ -67,6 +67,9 @@ public class TBDingController {
     @Resource
     TBSopInfoService tbSopInfoService;
 
+    @Resource
+    SysRoleService sysRoleService;
+
     @ApiOperation(value = "工时统计统计查询接口")
     @RequestMapping(value = "/query", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "工时统计统计查询结果", response = TBDingSubmitQueryResult.class)})
@@ -81,7 +84,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() : "", submitUserId, userName, supplierId, custom, sopNo, days);
 
         return ResultUtil.ok(resultIPage);
     }
@@ -231,9 +234,16 @@ public class TBDingController {
     @OperationLog
     public Result findDingRunningSop(@ApiParam(value = "服务单元id", required = true) @RequestParam String serviceUnitId) {
         SysUser requestUser = (SysUser) ServletUtil.getRequestUser();
+        Long requestUserId = requestUser.getId();
+
+
         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 -> {
+        List<SopInfoResult> list = page.getRecords().stream().filter(e -> {
+            RoleTypeEnum type = sysRoleService.findRoleTypeByUserCrm(requestUserId, e.getCrmNo());
+            return RoleTypeEnum.EFFECT_ENGINEER.equals(type) || RoleTypeEnum.ASSISTANT_ENGINEER.equals(type);
+        }).flatMap(e -> {
+
             SopInfoResult result = new SopInfoResult();
             result.setSopNo(e.getCode());
             result.setCrmNo(e.getCrmNo());

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

@@ -242,7 +242,7 @@
     <select id="attendanceQuery" resultType="com.qmth.sop.business.bean.result.TBDingAttendanceResult">
         SELECT * from (
         SELECT
-        d.ding_sop_no sop_no,
+        d.sop_no sop_no,
         bs.NAME service,
         c.NAME custom,
         ua.province,