修改项目进度报表v2

anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/ReportController.java

@@ -193,6 +193,20 @@ public class ReportController {
             return R.failed(e.getMessage());
         }
     }
+    /**
+     * 查找用户用户组
+     * @param paramMap
+     * @return
+     */
+    @GetMapping("/findUserGroupList")
+    public R findUserGroupList(@RequestParam(required = false) Map paramMap){
+        try{
+            Map<String, Object> result = reportService.findUserGroupList(paramMap);
+            return R.ok(result);
+        }catch (Exception e){
+            return R.failed(e.getMessage());
+        }
+    }
 
     @GetMapping("/findOperatorScheduleReport")
     public R findOperatorScheduleReport(@RequestParam(required = false) Map paramMap){

anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/ReportService.java

@@ -90,5 +90,10 @@ public interface ReportService {
      */
     Map<String, Object> ProjectScheduleReport(Map paramMap);
 
-
+    /**
+     * 查找用户用户组
+     * @param paramMap
+     * @return
+     */
+    Map<String, Object> findUserGroupList(Map paramMap);
 }

anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/ReportServiceImpl.java

@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.foreverwin.mesnac.anomaly.dto.IntegrationLogDto;
 import com.foreverwin.mesnac.anomaly.mapper.ReportMapper;
 import com.foreverwin.mesnac.anomaly.service.ReportService;
+import com.foreverwin.mesnac.common.enums.HandleEnum;
 import com.foreverwin.mesnac.meapi.mapper.DataFieldListMapper;
 import com.foreverwin.mesnac.meapi.mapper.ItemMapper;
 import com.foreverwin.mesnac.meapi.mapper.ShopOrderMapper;
@@ -11,6 +12,7 @@ import com.foreverwin.mesnac.meapi.model.*;
 import com.foreverwin.mesnac.meapi.service.NcCodeService;
 import com.foreverwin.mesnac.meapi.service.NwaUserService;
 import com.foreverwin.mesnac.meapi.service.RouterStepcontentService;
+import com.foreverwin.mesnac.meapi.service.UserGroupService;
 import com.foreverwin.mesnac.meapi.util.StringUtils;
 import com.foreverwin.modular.core.util.CommonMethods;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -54,6 +56,9 @@ public class ReportServiceImpl implements ReportService {
     @Autowired
     private RouterStepcontentService routerStepcontentService;
 
+    @Autowired
+    private UserGroupService userGroupService;
+
     /**
      * 接口日志表
      *
@@ -475,6 +480,20 @@ public class ReportServiceImpl implements ReportService {
         result.put("workOrder", paramMap.get("workOrder"));
         return result;
     }
+
+    @Override
+    public Map<String, Object> findUserGroupList(Map paramMap) {
+        String site = CommonMethods.getSite();
+        //查询用户对应用户组
+        String user = CommonMethods.getUser();
+        String userBo = HandleEnum.USER.getHandle(site, user);
+        List<UserGroup> userGroupList = userGroupService.getUserGroupListByUserBo(userBo);
+        HashMap<String, Object> result = new HashMap<>();
+        result.put("userGroupList", userGroupList);
+        return result;
+    }
+
+
 }