From a847a4efef992395ba92b3f2068e3f3a4dd8480e Mon Sep 17 00:00:00 2001 From: dxfeng Date: Wed, 21 Sep 2022 10:43:41 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=BC=E5=AE=B9Oracle,=E8=BE=BE=E6=A2=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../organization/mapper/trigger/CompTriggerMapper.java | 4 ++-- .../organization/mapper/trigger/CompTriggerMapper.xml | 2 +- .../mapper/trigger/HrmResourceTriggerMapper.java | 4 ++-- .../mapper/trigger/HrmResourceTriggerMapper.xml | 2 +- .../organization/thread/CompanyTriggerRunnable.java | 8 ++++---- .../organization/thread/DepartmentTriggerRunnable.java | 8 ++++---- .../organization/thread/GroupTriggerRunnable.java | 8 ++++---- .../thread/HrmResourceTriggerRunnable.java | 10 +++++----- 8 files changed, 23 insertions(+), 23 deletions(-) diff --git a/src/com/engine/organization/mapper/trigger/CompTriggerMapper.java b/src/com/engine/organization/mapper/trigger/CompTriggerMapper.java index 7cebc741..2d0e9832 100644 --- a/src/com/engine/organization/mapper/trigger/CompTriggerMapper.java +++ b/src/com/engine/organization/mapper/trigger/CompTriggerMapper.java @@ -1,7 +1,7 @@ package com.engine.organization.mapper.trigger; -import com.alibaba.fastjson.JSONObject; +import com.engine.organization.entity.cusfielddata.po.CusFieldData; import org.apache.ibatis.annotations.Param; import weaver.hrm.passwordprotection.domain.HrmResource; @@ -20,7 +20,7 @@ public interface CompTriggerMapper { String getJobTitleMarkById(@Param("id") Integer id); - JSONObject getCusFieldDataById(@Param("id") Integer id); + CusFieldData getCusFieldDataById(@Param("id") Integer id); Integer sumStaffNum(@Param("fdatebegin") Date fdatebegin, @Param("compId") Integer compId); diff --git a/src/com/engine/organization/mapper/trigger/CompTriggerMapper.xml b/src/com/engine/organization/mapper/trigger/CompTriggerMapper.xml index 29ef9d02..cc3cd314 100644 --- a/src/com/engine/organization/mapper/trigger/CompTriggerMapper.xml +++ b/src/com/engine/organization/mapper/trigger/CompTriggerMapper.xml @@ -31,7 +31,7 @@ from hrmjobtitles where id = #{id} - select field100008, field100007 from cus_fielddata where scope = 'HrmCustomFieldByInfoType' diff --git a/src/com/engine/organization/mapper/trigger/HrmResourceTriggerMapper.java b/src/com/engine/organization/mapper/trigger/HrmResourceTriggerMapper.java index 0125a2cd..7679459d 100644 --- a/src/com/engine/organization/mapper/trigger/HrmResourceTriggerMapper.java +++ b/src/com/engine/organization/mapper/trigger/HrmResourceTriggerMapper.java @@ -1,6 +1,6 @@ package com.engine.organization.mapper.trigger; -import com.alibaba.fastjson.JSONObject; +import com.engine.organization.entity.cusfielddata.po.CusFieldData; import org.apache.ibatis.annotations.Param; import weaver.hrm.passwordprotection.domain.HrmResource; @@ -12,6 +12,6 @@ import weaver.hrm.passwordprotection.domain.HrmResource; public interface HrmResourceTriggerMapper { HrmResource getHrmResource(@Param("id") Long id); - JSONObject getCusFieldDataById(@Param("fObjId") Integer fObjId); + CusFieldData getCusFieldDataById(@Param("fObjId") Integer fObjId); } diff --git a/src/com/engine/organization/mapper/trigger/HrmResourceTriggerMapper.xml b/src/com/engine/organization/mapper/trigger/HrmResourceTriggerMapper.xml index 37649663..6b7a5d0e 100644 --- a/src/com/engine/organization/mapper/trigger/HrmResourceTriggerMapper.xml +++ b/src/com/engine/organization/mapper/trigger/HrmResourceTriggerMapper.xml @@ -7,7 +7,7 @@ from hrmresource where id = #{id} - select field100002, field100008, field100007 from cus_fielddata where scope = 'HrmCustomFieldByInfoType' diff --git a/src/com/engine/organization/thread/CompanyTriggerRunnable.java b/src/com/engine/organization/thread/CompanyTriggerRunnable.java index f9ae51bd..c3a0941c 100644 --- a/src/com/engine/organization/thread/CompanyTriggerRunnable.java +++ b/src/com/engine/organization/thread/CompanyTriggerRunnable.java @@ -1,7 +1,7 @@ package com.engine.organization.thread; -import com.alibaba.fastjson.JSONObject; import com.engine.organization.entity.company.po.CompPO; +import com.engine.organization.entity.cusfielddata.po.CusFieldData; import com.engine.organization.entity.logview.bo.FieldBaseEquator; import com.engine.organization.entity.map.JclOrgMap; import com.engine.organization.mapper.comp.CompMapper; @@ -84,10 +84,10 @@ public class CompanyTriggerRunnable implements Runnable { jclMap.setFLeaderJob(getCompTriggerMapper().getJobTitleMarkById(jclMap.getFLeaderJobId())); - JSONObject cusFieldDataById = getCompTriggerMapper().getCusFieldDataById(jclMap.getFLeader()); + CusFieldData cusFieldDataById = getCompTriggerMapper().getCusFieldDataById(jclMap.getFLeader()); if (null != cusFieldDataById) { - jclMap.setFLeaderSt(cusFieldDataById.getString("field100008")); - jclMap.setFLeaderLv(cusFieldDataById.getString("field100007")); + jclMap.setFLeaderSt(cusFieldDataById.getField100008()); + jclMap.setFLeaderLv(cusFieldDataById.getField100007()); } String currentDate = OrganizationDateUtil.getFormatLocalDate(new java.util.Date()); jclMap.setFDateBegin(new Date(OrganizationDateUtil.stringToDate(currentDate).getTime())); diff --git a/src/com/engine/organization/thread/DepartmentTriggerRunnable.java b/src/com/engine/organization/thread/DepartmentTriggerRunnable.java index c6501bee..af1fb673 100644 --- a/src/com/engine/organization/thread/DepartmentTriggerRunnable.java +++ b/src/com/engine/organization/thread/DepartmentTriggerRunnable.java @@ -1,6 +1,6 @@ package com.engine.organization.thread; -import com.alibaba.fastjson.JSONObject; +import com.engine.organization.entity.cusfielddata.po.CusFieldData; import com.engine.organization.entity.department.po.DepartmentPO; import com.engine.organization.entity.logview.bo.FieldBaseEquator; import com.engine.organization.entity.map.JclOrgMap; @@ -90,10 +90,10 @@ public class DepartmentTriggerRunnable implements Runnable { jclMap.setFLeaderJob(getCompTriggerMapper().getJobTitleMarkById(jclMap.getFLeaderJobId())); - JSONObject cusFieldDataById = getCompTriggerMapper().getCusFieldDataById(jclMap.getFLeader()); + CusFieldData cusFieldDataById = getCompTriggerMapper().getCusFieldDataById(jclMap.getFLeader()); if (null != cusFieldDataById) { - jclMap.setFLeaderSt(cusFieldDataById.getString("field100008")); - jclMap.setFLeaderLv(cusFieldDataById.getString("field100007")); + jclMap.setFLeaderSt(cusFieldDataById.getField100008()); + jclMap.setFLeaderLv(cusFieldDataById.getField100007()); } String currentDate = OrganizationDateUtil.getFormatLocalDate(new java.util.Date()); jclMap.setFDateBegin(new Date(OrganizationDateUtil.stringToDate(currentDate).getTime())); diff --git a/src/com/engine/organization/thread/GroupTriggerRunnable.java b/src/com/engine/organization/thread/GroupTriggerRunnable.java index bc9a7c0b..c18a9b18 100644 --- a/src/com/engine/organization/thread/GroupTriggerRunnable.java +++ b/src/com/engine/organization/thread/GroupTriggerRunnable.java @@ -1,6 +1,6 @@ package com.engine.organization.thread; -import com.alibaba.fastjson.JSONObject; +import com.engine.organization.entity.cusfielddata.po.CusFieldData; import com.engine.organization.entity.map.JclOrgMap; import com.engine.organization.mapper.jclorgmap.JclOrgMapper; import com.engine.organization.mapper.trigger.CompTriggerMapper; @@ -59,10 +59,10 @@ public class GroupTriggerRunnable implements Runnable { jclOrgMap.setFLeaderJobId(hrmResourceById.getJobtitle()); } jclOrgMap.setFLeaderJob(getCompTriggerMapper().getJobTitleMarkById(jclOrgMap.getFLeaderJobId())); - JSONObject cusFieldDataById = getCompTriggerMapper().getCusFieldDataById(jclOrgMap.getFLeader()); + CusFieldData cusFieldDataById = getCompTriggerMapper().getCusFieldDataById(jclOrgMap.getFLeader()); if (null != cusFieldDataById) { - jclOrgMap.setFLeaderSt(cusFieldDataById.getString("field100008")); - jclOrgMap.setFLeaderLv(cusFieldDataById.getString("field100007")); + jclOrgMap.setFLeaderSt(cusFieldDataById.getField100008()); + jclOrgMap.setFLeaderLv(cusFieldDataById.getField100007()); } jclOrgMap.setFParentId(1); jclOrgMap.setFObjParentId(0); diff --git a/src/com/engine/organization/thread/HrmResourceTriggerRunnable.java b/src/com/engine/organization/thread/HrmResourceTriggerRunnable.java index df8e1780..26de1bef 100644 --- a/src/com/engine/organization/thread/HrmResourceTriggerRunnable.java +++ b/src/com/engine/organization/thread/HrmResourceTriggerRunnable.java @@ -1,6 +1,6 @@ package com.engine.organization.thread; -import com.alibaba.fastjson.JSONObject; +import com.engine.organization.entity.cusfielddata.po.CusFieldData; import com.engine.organization.entity.map.JclOrgMap; import com.engine.organization.mapper.jclorgmap.JclOrgMapper; import com.engine.organization.mapper.trigger.CompTriggerMapper; @@ -53,16 +53,16 @@ public class HrmResourceTriggerRunnable implements Runnable { jclMap.setFLeaderImg(hrmResource.getMessagerurl()); jclMap.setFLeaderName(hrmResource.getLastname()); jclMap.setFLeaderJobId(hrmResource.getJobtitle()); - JSONObject cusFieldDataById = getHrmResourceTriggerMapper().getCusFieldDataById(jclMap.getFObjId()); + CusFieldData cusFieldDataById = getHrmResourceTriggerMapper().getCusFieldDataById(jclMap.getFObjId()); if (null != cusFieldDataById) { - String field100002 = cusFieldDataById.getString("field100002"); + String field100002 = cusFieldDataById.getField100002(); if (StringUtils.isNotBlank(field100002)) { int index = field100002.indexOf('_'); jclMap.setFObjParentId(Integer.parseInt(field100002.substring(index + 1))); jclMap.setFParentId(jclMap.getFObjParentId() + sj); } - jclMap.setFLeaderSt(cusFieldDataById.getString("field100008")); - jclMap.setFLeaderLv(cusFieldDataById.getString("field100007")); + jclMap.setFLeaderSt(cusFieldDataById.getField100008()); + jclMap.setFLeaderLv(cusFieldDataById.getField100007()); } jclMap.setFClass(0); jclMap.setFClassName("行政维度");