|
|
|
@ -26,6 +26,7 @@ import weaver.general.Util;
|
|
|
|
|
import weaver.hrm.User;
|
|
|
|
|
import weaver.hrm.company.DepartmentComInfo;
|
|
|
|
|
import weaver.hrm.company.SubCompanyComInfo;
|
|
|
|
|
import weaver.hrm.job.JobTitlesComInfo;
|
|
|
|
|
import weaver.hrm.resource.ResourceComInfo;
|
|
|
|
|
|
|
|
|
|
import java.time.LocalDate;
|
|
|
|
@ -367,6 +368,9 @@ public class ChartServiceImpl extends Service implements ChartService {
|
|
|
|
|
*/
|
|
|
|
|
private ChartPO getResourceChartPO(String id, String name, String parentId, String belongTo, String companyWorkYear) {
|
|
|
|
|
ChartPO chartPO = new ChartPO();
|
|
|
|
|
try {
|
|
|
|
|
ResourceComInfo comInfo = new ResourceComInfo();
|
|
|
|
|
JobTitlesComInfo jobInfo = new JobTitlesComInfo();
|
|
|
|
|
chartPO.setFtype("4");
|
|
|
|
|
chartPO.setFobjid(id);
|
|
|
|
|
chartPO.setId(chartPO.getFobjid());
|
|
|
|
@ -377,7 +381,12 @@ public class ChartServiceImpl extends Service implements ChartService {
|
|
|
|
|
chartPO.setHasChildren("0");
|
|
|
|
|
chartPO.setBelongto(Util.null2String(belongTo));
|
|
|
|
|
chartPO.setCompanyWorkYear(companyWorkYear);
|
|
|
|
|
try {
|
|
|
|
|
chartPO.setJobTitle(jobInfo.getJobTitlesname(comInfo.getJobTitle(id)));
|
|
|
|
|
String jobFj = getJobFj(comInfo.getJobTitle(id));
|
|
|
|
|
if(StringUtils.isBlank(jobFj)){
|
|
|
|
|
jobFj = "0";
|
|
|
|
|
}
|
|
|
|
|
chartPO.setJobFj(jobFj);
|
|
|
|
|
chartPO.setFleaderimg(new ResourceComInfo().getMessagerUrls(chartPO.getId()));
|
|
|
|
|
} catch (Exception e) {
|
|
|
|
|
throw new RuntimeException(e);
|
|
|
|
@ -385,6 +394,22 @@ public class ChartServiceImpl extends Service implements ChartService {
|
|
|
|
|
return chartPO;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* 获取岗位说明附件
|
|
|
|
|
* @param id
|
|
|
|
|
* @return
|
|
|
|
|
*/
|
|
|
|
|
public static String getJobFj(String id){
|
|
|
|
|
RecordSet rs = new RecordSet();
|
|
|
|
|
String gwsms = "";
|
|
|
|
|
String sql = "select gwsms from uf_zw where zw = "+id;
|
|
|
|
|
rs.executeQuery(sql);
|
|
|
|
|
if (rs.next()){
|
|
|
|
|
gwsms = Util.null2String(rs.getString("gwsms"));
|
|
|
|
|
}
|
|
|
|
|
return gwsms;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* 获取历史顶部元素sql
|
|
|
|
|
*
|
|
|
|
|