1

app/workSheetSystem/src/main/java/com/qy/worksheetsystem/controller/ProjectController.java

@@ -117,7 +117,7 @@ public class ProjectController {
         if (StringUtils.isEmpty(number)) {
             return MessageResult.error("token异常");
         }
-        List<Map<String, String>> memberManagementcoll = projectPersonService.getMemberManagementInfoByPerobjectId(id);
+        List<Map<String, Object>> memberManagementcoll = projectPersonService.getMemberManagementInfoByPerobjectId(id);
         Map data = new HashMap();
         data.put("datalist", memberManagementcoll);
         return MessageResult.success().add("list", memberManagementcoll);
@@ -194,7 +194,6 @@ public class ProjectController {
         mapParam.put("projectNumber", projectNumber);
         String billNumber = projectNumber + number;
         mapParam.put("number", billNumber);
-
         List<Map<String, String>> managementByNumber = projectPersonService.getManagementByNumber(billNumber);
         String mapvalue = mapper.writeValueAsString(mapParam);
         System.out.println("mapvalue----" + mapvalue);

app/workSheetSystem/src/main/java/com/qy/worksheetsystem/model/mapper/ProjectMapper.java

@@ -147,7 +147,7 @@ public interface ProjectMapper {
             "    left join CT_PRO_ProjectManagement projectManagement on projectManagement.fid = memberManagement.CFPROJECTMANAGEMENID\n" +
             "    left join CT_PRO_ProjectType projectType on projectType.fid = projectRole.CFTypeID " +
             "where  projectManagement.fid = #{perobjectId}")
-    List<Map<String, String>> getMemberManagementInfoByPerobjectId(@Param("perobjectId") String perobjectId);
+    List<Map<String, Object>> getMemberManagementInfoByPerobjectId(@Param("perobjectId") String perobjectId);
 
     /**
      * 获取员工时间范围内项目列表

app/workSheetSystem/src/main/java/com/qy/worksheetsystem/service/ProjectPersonService.java

@@ -65,8 +65,7 @@ public interface ProjectPersonService {
      * @param perobjectId
      * @return
      */
-    List<Map<String, String>> getMemberManagementInfoByPerobjectId(String perobjectId);
-
+    List<Map<String, Object>> getMemberManagementInfoByPerobjectId(String perobjectId);
 
     /**
      * 获取员工时间范围内项目列表
@@ -74,16 +73,20 @@ public interface ProjectPersonService {
      * @param state
      * @return
      */
-    List<Map<String, String>> getProjectManagementByState(String state,String dateTime);
+    List<Map<String, String>> getProjectManagementByState(String state, String dateTime);
+
     /**
      * 获取员工有效项目列表
+     *
      * @param state
      * @param dateTime
      * @return
      */
-    List<Map<String, String>> getProjectListByState(String state,String dateTime,String personNumber);
+    List<Map<String, String>> getProjectListByState(String state, String dateTime, String personNumber);
+
     /**
      * 选择项目角色列表
+     *
      * @return
      */
 

app/workSheetSystem/src/main/java/com/qy/worksheetsystem/service/impl/ProjectPersonServiceImpl.java

@@ -38,8 +38,17 @@ public class ProjectPersonServiceImpl implements ProjectPersonService {
     }
 
     @Override
-    public List<Map<String, String>> getMemberManagementInfoByPerobjectId(String perobjectId) {
-        return projectMapper.getMemberManagementInfoByPerobjectId(perobjectId);
+    public List<Map<String, Object>> getMemberManagementInfoByPerobjectId(String perobjectId) {
+        List<Map<String, Object>> list = projectMapper.getMemberManagementInfoByPerobjectId(perobjectId);
+        for (int i = 0; i < list.size(); i++) {
+            Map<String, Object> map = list.get(i);
+            map.put("isDisable", 1);
+            if ("项目经理".equals(map.get("projectRoleName"))) {
+                map.put("isDisable", 0);
+            }
+        }
+        return list;
+        //return projectMapper.getMemberManagementInfoByPerobjectId(perobjectId);
     }
 
     @Override