报表

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

@@ -1,6 +1,7 @@
 package com.xunmei.core.evaluate.controller;
 
 
+import com.xunmei.common.core.constant.SecurityConstants;
 import com.xunmei.common.core.web.controller.BaseController;
 import com.xunmei.common.core.web.domain.AjaxResult;
 import com.xunmei.common.core.web.page.TableDataInfo;
@@ -8,10 +9,14 @@ import com.xunmei.common.log.annotation.Log;
 import com.xunmei.common.log.enums.BusinessType;
 import com.xunmei.common.security.annotation.InnerAuth;
 import com.xunmei.common.security.annotation.RequiresPermissions;
+import com.xunmei.common.security.utils.SecurityUtils;
 import com.xunmei.core.evaluate.domain.CoreEvaluatePlan;
 import com.xunmei.core.evaluate.dto.CoreEvaluatePlanDTO;
 import com.xunmei.core.evaluate.dto.EvaluateQueryDTO;
 import com.xunmei.core.evaluate.service.ICoreEvaluatePlanService;
+import com.xunmei.core.evaluate.vo.CoreEvaluatePlanListVO;
+import com.xunmei.system.api.RemoteOrgService;
+import com.xunmei.system.api.domain.SysOrg;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -32,15 +37,21 @@ import java.util.List;
 public class CoreEvaluatePlanController extends BaseController {
     @Autowired
     private ICoreEvaluatePlanService coreEvaluatePlanService;
-
+    @Autowired
+    private RemoteOrgService remoteOrgService;
     /**
      * 查询外包评价计划列表
      */
     @ApiOperation(value = "查询CoreEvaluatePlan列表分页")
     @RequiresPermissions("core:evaluatePlan:list")
     @GetMapping("/list")
-    public TableDataInfo list(EvaluateQueryDTO coreEvaluatePlan) {
-        return coreEvaluatePlanService.selectPage(coreEvaluatePlan);
+    public AjaxResult list(EvaluateQueryDTO coreEvaluatePlan) {
+        AjaxResult ajax = AjaxResult.success();
+        SysOrg sysOrg = remoteOrgService.selectSysOrgById(SecurityUtils.getLoginUser().getOrgId(), SecurityConstants.INNER);
+        TableDataInfo<CoreEvaluatePlanListVO> coreEvaluatePlanListVOTableDataInfo = coreEvaluatePlanService.selectPage(coreEvaluatePlan);
+        ajax.put("data", coreEvaluatePlanListVOTableDataInfo);
+        ajax.put("isEdit", sysOrg.getId());
+        return ajax;
     }
 
     @ApiOperation(value = "查询CoreEvaluatePlan列表全部")

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

@@ -60,6 +60,7 @@
         a.id,
         a.org_name,
         a.evaluate_name,
+               a.org_id,
                a.build_task_now,
         d.dict_label AS orgType,
         GROUP_CONCAT( c.role_name ) AS roleName,