1

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

@@ -200,6 +200,14 @@ public class ProjectController {
         if (StringUtils.isEmpty(number)) {
             return MessageResult.error("token异常");
         }
+        Map<String, String> projectType = projectPersonService.getProjectTypeListById(projectTypeId);
+        String projectTypeNumber = projectType.get("number");
+        if ("002".equals(projectTypeNumber)) {
+            int count = projectPersonService.isManagementByProjectRoleAndProType(projectRoleID, projectTypeId);
+            if (count > 0) {
+                return MessageResult.error("部门代表已存在该角色，不能重复添加！");
+            }
+        }
         //获取当前登录人
         String currentUser = projectPersonService.getPersonIdBYNumber(number);
         mapParam.put("personID", personID);
@@ -278,6 +286,11 @@ public class ProjectController {
             return MessageResult.error("token异常");
         }
         List<Map<String, String>> projectPersonColl = projectPersonService.getProjectRoleList();
+        for (int i = 0; i < projectPersonColl.size(); i++) {
+            Map<String, String> stringStringMap = projectPersonColl.get(i);
+            stringStringMap.put("projectTypeName", "");
+            stringStringMap.put("projectTypeId", "");
+        }
         //if (data.size() > 0) {
         //    result.put("code", 200);
         //    result.put("data", data);

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

@@ -177,7 +177,9 @@ public interface ProjectMapper {
             "projectType.fname_l2 as \"projectTypeName\" \n" +
             "from CT_PRO_ProjectRole projectRole\n" +
             "left join CT_PRO_ProjectType projectType on projectType.fid = projectRole.CFTypeID\n" +
-            "order by projectRole.fnumber")
+            "where  projectRole.FSTATE ='1' and projectRole.FNUMBER  <> '001' \n" +
+            "order by projectRole.fnumber"
+    )
     List<Map<String, String>> getProjectRoleList();
 
     @Select("select  * from CT_PRO_MemberManagement  where FNUMBER  =#{number}")
@@ -187,7 +189,12 @@ public interface ProjectMapper {
     @Select("select fname_l2 as \"name\" ,fnumber as \"number\" ,fid as \"id\" from T_BD_PERSON where fid = #{personID}")
     Map<String, String> getPerson(String personID);
 
-    @Select("select fid as \"id\",FNAME_L2 as \"name\",FNUMBER as \"number\" from CT_PRO_ProjectType  order by fnumber ")
+    @Select("select fid as \"id\",FNAME_L2 as \"name\",FNUMBER as \"number\" from CT_PRO_ProjectType  where FSTATE ='1' and FNUMBER  <> '001' order by fnumber ")
     List<Map<String, String>> getProjectTypeList();
 
+    @Select("select fid as \"id\",FNAME_L2 as \"name\",FNUMBER as \"number\" from CT_PRO_ProjectType  where fid =  #{id}")
+    Map<String, String> getProjectTypeListById(String id);
+
+    @Select("select COUNT(1) from CT_PRO_MemberManagement where CFPROJECTROLEID = #{projectRole} and CFPTYPEID = #{proType}")
+    int isManagementByProjectRoleAndProType(String projectRole, String proType);
 }

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

@@ -114,5 +114,19 @@ public interface ProjectPersonService {
      */
     List<Map<String, String>> getProjectTypeList();
 
+    /**
+     * 通过id查询项目类型
+     * @param id
+     * @return
+     */
+    Map<String, String> getProjectTypeListById(String id);
+
+    /**
+     * 校验是否存在重复数据
+     * @param projectRole
+     * @param proType
+     * @return
+     */
+    int isManagementByProjectRoleAndProType(String projectRole, String proType);
 
 }

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

@@ -22,6 +22,16 @@ public class ProjectPersonServiceImpl implements ProjectPersonService {
     @Resource
     private ProjectMapper projectMapper;
 
+    @Override
+    public int isManagementByProjectRoleAndProType(String projectRole, String proType) {
+        return projectMapper.isManagementByProjectRoleAndProType(projectRole,proType);
+    }
+
+    @Override
+    public Map<String, String> getProjectTypeListById(String id) {
+        return projectMapper.getProjectTypeListById(id);
+    }
+
     @Override
     public List<Map<String, String>> getProjectTypeList() {
         return projectMapper.getProjectTypeList();