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

Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf

This commit is contained in:
dxfeng 2022-12-21 13:41:42 +08:00
parent eac5424171 fbac015a99
commit 8c6becc29c
3 changed files with 31 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/engine/organization/mapper/jclorgmap/JclOrgMapper.java
View File

@ -44,6 +44,8 @@ public interface JclOrgMapper {
int insertComToMap();
int deleteJobNull();
int deleteJobNull(@Param("currentDate") String currentDate);
JclOrgMap getResInfo(@Param("level") String level, @Param("grade") String grade, @Param("id") String id);
}

13
src/com/engine/organization/mapper/jclorgmap/JclOrgMapper.xml
View File

@ -320,7 +320,16 @@
0, 0, 0, NOW(), '2099-12-31' FROM hrmcompany
</insert>
<delete id="deleteJobNull">
delete from jcl_org_map where ftype=3 and fonjob=0
delete from jcl_org_map where ftype =3 and id not in (select FPARENTID from jcl_org_map where ftype=4 ) and fdateend &gt; #{currentDate}
</delete>
<select id="getResInfo" resultType="com.engine.organization.entity.map.JclOrgMap">
select a.messagerurl as fLeaderImg,a.LASTNAME as fLeaderName,c.id as fLeaderJobId,b.JOBTITLEMARK as fLeaderJob,e.level_name as fLeaderLv,f.grade_name as fLeaderSt
from hrmresource a
left join hrmjobtitles b on a.JOBTITLE=b.ID
left join jcl_org_job c on b.ID = c.ec_jobTitle
left join cus_fielddata d on a.id = d.id and d.scope='HrmCustomFieldByInfoType' and d.scopeid=3
left join jcl_org_level e on d.${level}=e.id
left join jcl_org_grade f on d.${grade}=f.id
where a.id=#{id}
</select>
</mapper>

23
src/com/engine/organization/service/impl/OrgChartServiceImpl.java
View File

@ -377,8 +377,21 @@ public class OrgChartServiceImpl extends Service implements OrgChartService {
return result;
}
//处理多个部门负责人
private Map<String, Object> getBmfzrInfo (String bmfzr){
private JclOrgMap getBmfzrInfo (String bmfzr){
// if (StringUtils.isNotBlank(bmfzr)) {
// try {
// String[] split = fLeaderSt.split(",");
// for (String s : split) {
// long parseLong = Long.parseLong(s);
// GradePO gradeByID = MapperProxyFactory.getProxy(GradeMapper.class).getGradeByID(parseLong);
// if (null != gradeByID) {
// jobGradeName.append(gradeByID.getGradeName());
// }
// }
// } catch (NumberFormatException exception) {
// jobGradeName = new StringBuilder(fLeaderSt);
// }
// }
return null;
}
@ -533,16 +546,14 @@ public class OrgChartServiceImpl extends Service implements OrgChartService {
getJclOrgMapMapper().insertSubComToMap();
//同步集团信息
getJclOrgMapMapper().insertComToMap();
//清除部门合并、转移造成的脏数据
getJclOrgMapMapper().deleteJobNull(currentDate);
//刷新在岗数、编制数(从岗位向上刷，岗位不需处理)
List<JclOrgMap> jclOrgMaps = getJclOrgMapMapper().getJclOrgMapByType("3",date);
for (JclOrgMap jclOrgMap : jclOrgMaps){
int id = jclOrgMap.getId();
countJobAndPlans("3",id,currentDate);
}
//清除部门合并、转移造成的脏数据
getJclOrgMapMapper().deleteJobNull();
return "同步成功";
}
/**