quanx

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/evaluate/controller/CoreEvaluateTaskController.java

@@ -200,7 +200,7 @@ public class CoreEvaluateTaskController extends BaseController {
      * 获取外包评价任务详细信息
      */
     @ApiOperation(value = "获取评价任务详细信息评价用")
-    @RequiresPermissions("core:evaluateTask:query")
+//删除权限是因为app用
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id) {
         return success(coreEvaluateTaskService.selectCoreEvaluateTaskContentById(id));

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/evaluate/service/impl/CoreEvaluateTaskServiceImpl.java

@@ -108,6 +108,25 @@ public class CoreEvaluateTaskServiceImpl extends ServiceImpl<CoreEvaluateTaskMap
         evaluateTaskDTO.setStartTime(DateUtils.parseDate(evaluateTaskDTO.getDate() + " 00:00:00"));
         evaluateTaskDTO.setEndTime(DateUtils.parseDate(evaluateTaskDTO.getDate() + " 23:59:59"));
         page = baseMapper.selectAppPageList(page, evaluateTaskDTO);
+        page.getRecords().forEach(p->{
+            List<Long> roleByEvaluateId = coreEvaluateRoleMapper.getRoleByEvaluateId(p.getPlanId());
+            Set<Long> rIds = new HashSet<>();
+            if (ObjectUtil.isNotEmpty(roleByEvaluateId)) {
+                rIds.addAll(roleByEvaluateId);
+            }
+            List<SysRole> roleByUserId = remoteRoleService.getRoleByUserId(SecurityUtils.getUserId(), SecurityConstants.INNER);
+            List<Long> collect = roleByUserId.stream().map(SysRole::getId).collect(Collectors.toList());
+            boolean admin = false;
+            if (null != roleByUserId || null != collect) {
+                for (Long l : collect) {
+                    if (rIds.contains(l)) {
+                        admin = true;
+                        break;
+                    }
+                }
+            }
+            p.setIsEvaluate(admin);
+        });
         return TableDataInfo.build(page);
     }
 

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/evaluate/vo/CoreEvaluateTaskVO.java

@@ -87,4 +87,5 @@ public class CoreEvaluateTaskVO {
     private String evaluateOrg;
     @ApiModelProperty(value = "平均分")
     private Integer averageScore;
+    private Boolean isEvaluate;
 }

soc-modules/soc-modules-core/src/main/resources/mapper/evaluate/CoreEvaluateTaskMapper.xml

@@ -163,6 +163,7 @@
     </select>
     <select id="selectAppPageList" resultType="com.xunmei.core.evaluate.vo.CoreEvaluateTaskVO">
         SELECT
+               a.plan_id as planId,
         a.id,
         a.org_name,
         GROUP_CONCAT( c.role_name ) as roleName,