人员调整,在岗数关联优化

src/com/engine/organization/mapper/scheme/SchemeMapper.xml

@@ -77,7 +77,7 @@
     <select id="getTreeData" resultMap="TreeResultMap">
         select id, scheme_name,forbidden_tag
         from jcl_org_scheme
-        where delete_type = '0' and forbidden_tag = 0
+        where delete_type = '0' and forbidden_tag = 0 order by scheme_no
     </select>
     <select id="getSchemesByIds" resultMap="BaseResultMap">
         select

src/com/engine/organization/mapper/trigger/StaffTriggerMapper.java

@@ -12,7 +12,9 @@ public interface StaffTriggerMapper {
 
     //Integer countDepartmentUsers(@Param("ecDepartmentId") String ecDepartmentId);
 
-    Integer countJobUsers(@Param("jobTitle") String jobTitle);
+    //Integer countJobUsers(@Param("jobTitle") String jobTitle);
+
+    Integer countOnJobByJObId(@Param("jobId") String jobId);
 
     //Integer countAllUsers();
 

src/com/engine/organization/mapper/trigger/StaffTriggerMapper.xml

@@ -95,4 +95,13 @@
           AND FDATEBEGIN <= #{currentDate}
           AND FDATEEND >= #{currentDate}
     </select>
+    <select id="countOnJobByJObId" resultType="java.lang.Integer">
+        select count(1)
+        from HrmResource a
+                 inner join cus_fielddata b on
+                    a.id = b.id
+                and b.scopeid = -1
+                and b.field100002 = #{jobId}
+        where a.status &lt; 3
+    </select>
 </mapper>

src/com/engine/organization/thread/HrmResourceTriggerRunnable.java

@@ -89,7 +89,9 @@ public class HrmResourceTriggerRunnable implements Runnable {
                 // 更新当前架构图负责人的卡片信息
                 getHrmResourceTriggerMapper().updateLeaders(currentDate, hrmResource.getId().toString(), jclMap.getFLeaderImg(), jclMap.getFLeaderName(), jclMap.getFLeaderJobId(), jclMap.getFLeaderJob(), jclMap.getFLeaderLv(), jclMap.getFLeaderSt());
                 // 更新组织架构图在岗数
-                if (!jclMap.getFObjParentId().equals(jclOrgMapByObjID.getFObjParentId())) {
+                if (null == jclOrgMapByObjID) {
+                    new StaffTriggerRunnable(jclMap.getFObjParentId()).run();
+                } else if (!jclMap.getFObjParentId().equals(jclOrgMapByObjID.getFObjParentId())) {
                     new StaffTriggerRunnable(jclOrgMapByObjID.getFObjParentId()).run();
                     new StaffTriggerRunnable(jclMap.getFObjParentId()).run();
                 }

src/com/engine/organization/thread/StaffTriggerRunnable.java

@@ -15,7 +15,6 @@ import com.engine.organization.mapper.staff.StaffPlanMapper;
 import com.engine.organization.mapper.trigger.StaffTriggerMapper;
 import com.engine.organization.util.OrganizationDateUtil;
 import com.engine.organization.util.db.MapperProxyFactory;
-import com.engine.organization.util.relation.EcHrmRelationUtil;
 import org.apache.commons.lang3.StringUtils;
 import weaver.common.DateUtil;
 
@@ -164,8 +163,7 @@ public class StaffTriggerRunnable implements Runnable {
                 break;
             case "3":
                 planSum = getStaffTriggerMapper().countJobStaffNum(currentDate, objId);
-                String ecJobId = EcHrmRelationUtil.getEcJobId(Long.parseLong(objId));
-                onJobSum = getStaffTriggerMapper().countJobUsers(ecJobId);
+                onJobSum = getStaffTriggerMapper().countOnJobByJObId(objId);
             default:
                 break;
         }