BUG修复

src/com/engine/organization/entity/hrmresource/param/HrmResourceSearchParam.java

@@ -64,4 +64,6 @@ public class HrmResourceSearchParam extends BaseQueryParam {
      * 岗位
      */
     private Long jobTitle;
+
+    private String status;
 }

src/com/engine/organization/entity/hrmresource/vo/HrmResourceVO.java

@@ -25,6 +25,7 @@ import lombok.NoArgsConstructor;
                 "t.mobile," +
                 "t.telephone," +
                 "t.manager_id, " +
+                "t.status, " +
                 "t.show_order ",
         fromSql = "FROM jcl_org_hrmresource t ",
         orderby = " show_order ",
@@ -77,6 +78,11 @@ public class HrmResourceVO {
      */
     @OrganizationTableColumn(text = "直接上级", width = "25%", column = "manager_id", transmethod = "com.engine.organization.transmethod.HrmResourceTransMethod.getManagerName")
     private String managerName;
+    /**
+     * 状态
+     */
+    @OrganizationTableColumn(text = "状态", width = "25%", column = "status", transmethod = "com.engine.organization.transmethod.HrmResourceTransMethod.getStatusName")
+    private String status;
 
     @OrganizationTableColumn(text = "显示顺序", width = "25%", column = "show_order", orderkey = "show_order")
     private Integer showOrder;

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

@@ -12,6 +12,4 @@ import java.sql.Date;
  **/
 public interface JobTriggerMapper {
     Integer sumStaffNum(@Param("fdatebegin") Date fdatebegin, @Param("jobId") Integer jobId);
-
-    Integer countHrmResource(@Param("parentdept") Integer parentdept, @Param("fname") String fname);
 }

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

@@ -11,12 +11,4 @@
                             and time_end >= #{fdatebegin})
           and job_id = #{jobId}
     </select>
-    <select id="countHrmResource" resultType="java.lang.Integer">
-        select count(1)
-        from hrmresource
-        where status &lt;= 3
-          and departmentid =
-              (select id from hrmdepartment where uuid = (select uuid from JCL_ORG_DEPT where id = #{parentdept}))
-          and jobtitle in (select id from hrmjobtitles where JOBTITLENAME = #{fname})
-    </select>
 </mapper>

src/com/engine/organization/service/impl/HrmResourceServiceImpl.java

@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.api.browser.bean.BrowserBean;
 import com.api.browser.bean.SearchConditionGroup;
 import com.api.browser.bean.SearchConditionItem;
+import com.api.browser.bean.SearchConditionOption;
 import com.cloudstore.eccom.result.WeaResultMsg;
 import com.engine.common.util.ServiceUtil;
 import com.engine.core.impl.Service;
@@ -27,6 +28,7 @@ import com.engine.organization.entity.hrmresource.po.HrmResourcePO;
 import com.engine.organization.entity.hrmresource.vo.HrmResourceVO;
 import com.engine.organization.entity.job.bo.JobBO;
 import com.engine.organization.entity.job.po.JobPO;
+import com.engine.organization.entity.personnelcard.ResourceStatusEnum;
 import com.engine.organization.entity.searchtree.SearchTree;
 import com.engine.organization.entity.searchtree.SearchTreeParams;
 import com.engine.organization.enums.LogModuleNameEnum;
@@ -328,6 +330,13 @@ public class HrmResourceServiceImpl extends Service implements HrmResourceServic
         SearchConditionItem departmentIdItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 2, false, "部门", "4", "ecDepartment", "");
         SearchConditionItem telephoneItem = OrganizationFormItemUtil.inputItem(user, 2, 16, 2, 50, "办公电话", "telephone");
         SearchConditionItem mobileItem = OrganizationFormItemUtil.inputItem(user, 2, 16, 2, 50, "移动电话", "mobile");
+        // 状态
+        List<SearchConditionOption> selectOptions = new ArrayList<>();
+        for (ResourceStatusEnum item : ResourceStatusEnum.values()) {
+            selectOptions.add(new SearchConditionOption(item.getValue(), item.getName()));
+        }
+        SearchConditionItem statusItem = OrganizationFormItemUtil.selectItem(user, selectOptions, 2, 16, 6, false, "状态", "status");
+
 
         conditionItems.add(lastNameItem);
         conditionItems.add(jobTitleItem);
@@ -335,6 +344,7 @@ public class HrmResourceServiceImpl extends Service implements HrmResourceServic
         conditionItems.add(departmentIdItem);
         conditionItems.add(telephoneItem);
         conditionItems.add(mobileItem);
+        conditionItems.add(statusItem);
 
         addGroups.add(new SearchConditionGroup("高级搜索条件", true, conditionItems));
         apiDatas.put("conditions", addGroups);
@@ -526,6 +536,10 @@ public class HrmResourceServiceImpl extends Service implements HrmResourceServic
         if (null != jobTitle) {
             sqlWhere += " AND t.job_title = '" + jobTitle + "'";
         }
+        String status = params.getStatus();
+        if (StringUtils.isNotBlank(status)) {
+            sqlWhere += " AND t.status = '" + status + "'";
+        }
 
         // 分权查询
         DetachUtil detachUtil = new DetachUtil(user.getUID());

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

@@ -372,10 +372,6 @@ public class OrganizationSyncEc {
         map.put("departmentcode", Util.null2String(params.get("dept_no")));
         map.put("coadjutant", Util.null2String(params.get("dept_principal")));
         this.resultMap = ServiceUtil.getService(OrganizationServiceImpl.class, user).addDepartment(map, user);
-        // 更新jcl_org_dept表 uuid字段
-        //if ("1".equals(Util.null2String(resultMap.get("status"))) && null != resultMap.get("id")) {
-        //    updateJclUUID(Util.null2String(resultMap.get("id")), HRM_DEPARTMENT, JCL_DEPARTMENT);
-        //}
     }
 
     /**

src/com/engine/organization/transmethod/HrmResourceTransMethod.java

@@ -1,10 +1,12 @@
 package com.engine.organization.transmethod;
 
+import com.engine.organization.entity.personnelcard.ResourceStatusEnum;
 import com.engine.organization.mapper.comp.CompMapper;
 import com.engine.organization.mapper.department.DepartmentMapper;
 import com.engine.organization.mapper.hrmresource.SystemDataMapper;
 import com.engine.organization.mapper.job.JobMapper;
 import com.engine.organization.util.db.MapperProxyFactory;
+import org.apache.commons.lang3.StringUtils;
 import weaver.hrm.User;
 
 /**
@@ -43,4 +45,11 @@ public class HrmResourceTransMethod {
         }
         return MapperProxyFactory.getProxy(SystemDataMapper.class).getScHrmResourceNameById(managerId);
     }
+
+    public static String getStatusName(String status) {
+        if (StringUtils.isNotBlank(status)) {
+            return ResourceStatusEnum.getResourceStatus(status).getName();
+        }
+        return status;
+    }
 }