liang.cheng
/
weaver-hrm-organization
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

兼容Oracle,达梦

This commit is contained in:
dxfeng 2022-09-21 10:43:41 +08:00
parent 8a9370ee9e
commit a847a4efef
8 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/engine/organization/mapper/trigger/CompTriggerMapper.java
View File

@ -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);

2
src/com/engine/organization/mapper/trigger/CompTriggerMapper.xml
View File

@ -31,7 +31,7 @@
from hrmjobtitles
where id = #{id}
</select>
<select id="getCusFieldDataById" resultType="com.alibaba.fastjson.JSONObject">
<select id="getCusFieldDataById" resultType="com.engine.organization.entity.cusfielddata.po.CusFieldData">
select field100008, field100007
from cus_fielddata
where scope = 'HrmCustomFieldByInfoType'

4
src/com/engine/organization/mapper/trigger/HrmResourceTriggerMapper.java
View File

@ -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);
}

2
src/com/engine/organization/mapper/trigger/HrmResourceTriggerMapper.xml
View File

@ -7,7 +7,7 @@
from hrmresource
where id = #{id}
</select>
<select id="getCusFieldDataById" resultType="com.alibaba.fastjson.JSONObject">
<select id="getCusFieldDataById" resultType="com.engine.organization.entity.cusfielddata.po.CusFieldData">
select field100002, field100008, field100007
from cus_fielddata
where scope = 'HrmCustomFieldByInfoType'

8
src/com/engine/organization/thread/CompanyTriggerRunnable.java
View File

@ -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()));

8
src/com/engine/organization/thread/DepartmentTriggerRunnable.java
View File

@ -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()));

8
src/com/engine/organization/thread/GroupTriggerRunnable.java
View File

@ -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);

10
src/com/engine/organization/thread/HrmResourceTriggerRunnable.java
View File

@ -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("行政维度");