diff --git a/src/com/engine/organization/thread/CompanyTriggerRunnable.java b/src/com/engine/organization/thread/CompanyTriggerRunnable.java index e1532df4..f9ae51bd 100644 --- a/src/com/engine/organization/thread/CompanyTriggerRunnable.java +++ b/src/com/engine/organization/thread/CompanyTriggerRunnable.java @@ -89,7 +89,8 @@ public class CompanyTriggerRunnable implements Runnable { jclMap.setFLeaderSt(cusFieldDataById.getString("field100008")); jclMap.setFLeaderLv(cusFieldDataById.getString("field100007")); } - jclMap.setFDateBegin(new Date(System.currentTimeMillis())); + String currentDate = OrganizationDateUtil.getFormatLocalDate(new java.util.Date()); + jclMap.setFDateBegin(new Date(OrganizationDateUtil.stringToDate(currentDate).getTime())); jclMap.setFDateEnd(new Date(OrganizationDateUtil.stringToDate("2099-12-31").getTime())); diff --git a/src/com/engine/organization/thread/DepartmentTriggerRunnable.java b/src/com/engine/organization/thread/DepartmentTriggerRunnable.java index 293aefbf..c6501bee 100644 --- a/src/com/engine/organization/thread/DepartmentTriggerRunnable.java +++ b/src/com/engine/organization/thread/DepartmentTriggerRunnable.java @@ -95,7 +95,8 @@ public class DepartmentTriggerRunnable implements Runnable { jclMap.setFLeaderSt(cusFieldDataById.getString("field100008")); jclMap.setFLeaderLv(cusFieldDataById.getString("field100007")); } - jclMap.setFDateBegin(new Date(System.currentTimeMillis())); + String currentDate = OrganizationDateUtil.getFormatLocalDate(new java.util.Date()); + jclMap.setFDateBegin(new Date(OrganizationDateUtil.stringToDate(currentDate).getTime())); jclMap.setFDateEnd(new Date(OrganizationDateUtil.stringToDate("2099-12-31").getTime())); diff --git a/src/com/engine/organization/thread/GroupTriggerRunnable.java b/src/com/engine/organization/thread/GroupTriggerRunnable.java index 6c264d94..bc9a7c0b 100644 --- a/src/com/engine/organization/thread/GroupTriggerRunnable.java +++ b/src/com/engine/organization/thread/GroupTriggerRunnable.java @@ -66,7 +66,8 @@ public class GroupTriggerRunnable implements Runnable { } jclOrgMap.setFParentId(1); jclOrgMap.setFObjParentId(0); - jclOrgMap.setFDateBegin(new Date(System.currentTimeMillis())); + String currentDate = OrganizationDateUtil.getFormatLocalDate(new java.util.Date()); + jclOrgMap.setFDateBegin(new Date(OrganizationDateUtil.stringToDate(currentDate).getTime())); jclOrgMap.setFDateEnd(new Date(OrganizationDateUtil.stringToDate("2099-12-31").getTime())); jclOrgMap.setFPlan(getGroupTriggerMapper().sumStaffNum(jclOrgMap.getFDateBegin())); jclOrgMap.setFOnJob(getGroupTriggerMapper().countHrmResource()); diff --git a/src/com/engine/organization/thread/HrmResourceTriggerRunnable.java b/src/com/engine/organization/thread/HrmResourceTriggerRunnable.java index 6ea82ab4..df8e1780 100644 --- a/src/com/engine/organization/thread/HrmResourceTriggerRunnable.java +++ b/src/com/engine/organization/thread/HrmResourceTriggerRunnable.java @@ -67,7 +67,8 @@ public class HrmResourceTriggerRunnable implements Runnable { jclMap.setFClass(0); jclMap.setFClassName("行政维度"); jclMap.setFLeaderJob(getCompTriggerMapper().getJobTitleMarkById(jclMap.getFLeaderJobId())); - jclMap.setFDateBegin(new Date(System.currentTimeMillis())); + String currentDate = OrganizationDateUtil.getFormatLocalDate(new java.util.Date()); + jclMap.setFDateBegin(new Date(OrganizationDateUtil.stringToDate(currentDate).getTime())); jclMap.setFDateEnd(new Date(OrganizationDateUtil.stringToDate("2099-12-31").getTime())); jclMap.setFIsVitual(0); diff --git a/src/com/engine/organization/thread/JobTriggerRunnable.java b/src/com/engine/organization/thread/JobTriggerRunnable.java index e2448159..685b4d31 100644 --- a/src/com/engine/organization/thread/JobTriggerRunnable.java +++ b/src/com/engine/organization/thread/JobTriggerRunnable.java @@ -75,7 +75,8 @@ public class JobTriggerRunnable implements Runnable { jclMap.setFClass(0); jclMap.setFClassName("行政维度"); - jclMap.setFDateBegin(new Date(System.currentTimeMillis())); + String currentDate = OrganizationDateUtil.getFormatLocalDate(new java.util.Date()); + jclMap.setFDateBegin(new Date(OrganizationDateUtil.stringToDate(currentDate).getTime())); jclMap.setFDateEnd(new Date(OrganizationDateUtil.stringToDate("2099-12-31").getTime())); diff --git a/src/com/engine/organization/util/saveimport/hrmimport/HrmImportProcessE9.java b/src/com/engine/organization/util/saveimport/hrmimport/HrmImportProcessE9.java index 8b030137..e42ab128 100644 --- a/src/com/engine/organization/util/saveimport/hrmimport/HrmImportProcessE9.java +++ b/src/com/engine/organization/util/saveimport/hrmimport/HrmImportProcessE9.java @@ -780,6 +780,8 @@ public class HrmImportProcessE9 extends BaseBean { flag = false; if (updateWorkData(vo.getWorkFields(), vo.getWorkFieldsValue(), id)) //添加工作字段信息 flag = false; + // 更新聚才林相关字段 + CusFieldDataTrigger.run((long) id); } /*添加人员缓存,人员默认按id显示顺序,HrmResource_Trigger_Insert 人员共享 入职维护项目状态*/ @@ -1392,6 +1394,9 @@ public class HrmImportProcessE9 extends BaseBean { if (updateWorkData(vo.getWorkFields().trim(), vo.getWorkFieldsValue(), keyMap.get(key))) flag = false; + // 更新聚才林相关字段 + CusFieldDataTrigger.run((long) keyMap.get(key)); + /*update HrmResource_Trigger */ if (flag) { recordSet.executeSql("select id from HrmResource_Trigger where id=" + hrmId); @@ -1592,10 +1597,7 @@ public class HrmImportProcessE9 extends BaseBean { writeLog(e); } recordSet.setNoAutoEncrypt(true); - boolean execute = recordSet.execute(sql); - // 更新聚才林相关字段 - CusFieldDataTrigger.run((long) id); - return execute; + return recordSet.execute(sql); } @@ -1676,10 +1678,7 @@ public class HrmImportProcessE9 extends BaseBean { } recordSet.setNoAutoEncrypt(true); if (flag) { - boolean execute = recordSet.execute(sql); - // 更新聚才林相关字段 - CusFieldDataTrigger.run((long) id); - return !execute; + return !recordSet.execute(sql); } else { return false; }