删除班组同时删除班组人员、班组所属分包商回显问题修复、项目管理排序

src/main/java/com/bonus/gs/sub/evaluate/evaluate/dao/TeamGroupDao.java

@@ -56,4 +56,6 @@ public interface TeamGroupDao {
     List<TeamGroupBean> getTeamGroupPersons(TeamGroupBean teamGroupBean);
 
     String getSubContractorName(TeamGroupBean groupBean);
+
+    Integer delTeamGroupTypePerson(TeamGroupBean teamGroupBean);
 }

src/main/java/com/bonus/gs/sub/evaluate/evaluate/service/OrganizationalServiceImpl.java

@@ -355,8 +355,10 @@ public class OrganizationalServiceImpl implements OrganizationalService {
         AjaxRes ar = new AjaxRes();
         try {
             // 根据外包商id(project_assignment)和项目id获取组织架构(pm_org_info)中外包商id
-            String id = mapper.getsubcontractorId(bean);
+            if (StringUtils.isNotBlank(bean.getParentId())) {
-            bean.setParentId(id);
+                String id = mapper.getsubcontractorId(bean);
+                bean.setParentId(id);
+            }
             int userNum = mapper.getUser(bean);
             if (userNum > 0) {
                 ar.setFailMsg("该人员已存在");

src/main/java/com/bonus/gs/sub/evaluate/evaluate/service/TeamGroupServiceImpl.java

@@ -39,11 +39,10 @@ public class TeamGroupServiceImpl implements TeamGroupService {
         }
         List<TeamGroupBean> teamGroupList = teamGroupDao.getTeamGroupList(teamGroupBean);
         for (TeamGroupBean groupBean : teamGroupList) {
-            /*if ((StringUtils.isBlank(groupBean.getParentId()) && groupBean.getStatus() == 0) || StringUtils.isBlank(groupBean.getSubContractor())) {
+            if ((StringUtils.isBlank(groupBean.getParentId()) && groupBean.getStatus() == 0) || StringUtils.isBlank(groupBean.getSubContractor())) {
                 groupBean.setSubContractor(teamGroupDao.getSubContractorName(groupBean));
-            }*/
+            }
             if (groupBean.getStatus() == 0) {
-//                groupBean.setSubContractor(teamGroupDao.getSubContractorName(groupBean));
                 groupBean.setProject(null);
             }
             TeamGroupBean bean = teamGroupDao.selectTeamLeaser(groupBean);
@@ -81,8 +80,12 @@ public class TeamGroupServiceImpl implements TeamGroupService {
 
     @Override
     public Integer delTeamGroup(TeamGroupBean teamGroupBean) {
+        // 删除班组
         Integer i = teamGroupDao.delTeamGroup(teamGroupBean);
+        // 删除班组类型
         Integer i1 = teamGroupDao.delTeamGroupType(teamGroupBean);
+        // 删除班组下人员
+        Integer i2 = teamGroupDao.delTeamGroupTypePerson(teamGroupBean);
         if (i > 0 || i1 > 0) {
             return 1;
         }

src/main/resources/mappers/evaluate/ProjectMapper.xml

@@ -61,6 +61,7 @@
         <if test="personInChargeId != null">
             and poi1.user_id = #{personInChargeId}
         </if>
+        order by poi1.name
     </select>
     <select id="getSubcontractorNum" resultType="java.lang.Integer">
         SELECT

src/main/resources/mappers/evaluate/TeamGroupMapper.xml

@@ -46,6 +46,9 @@
     <delete id="delTeamPerson">
         delete from team_person where id = #{id}
     </delete>
+    <delete id="delTeamGroupTypePerson">
+        delete from team_person where team_id = #{id}
+    </delete>
 
     <select id="getTeamGroupList" resultType="com.bonus.gs.sub.evaluate.evaluate.beans.TeamGroupBean">
         SELECT