shilei
/
E10-secondev-new
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

#E10-43# 优化人员信息接口、文档、流程分析的调整地址

Browse Source
main
shilei 1 year ago
parent d8b378b14b
commit c0cb562e23
4 changed files with 281 additions and 241 deletions
Show Stats Download Patch File Download Diff File

8
src/main/java/com/weaver/seconddev/cockpit/cmd/CockpitDocumentAnalysisCmd.java
Unescape Escape View File

@ -77,7 +77,7 @@ public class CockpitDocumentAnalysisCmd {
docMap = new HashMap<String,String>(); docMap = new HashMap<String,String>();
String doc_count5 = getDocumentDateAmount5(employeeId,tenantKey); String doc_count5 = getDocumentDateAmount5(employeeId,tenantKey);
String doc_name5 = "我的积分"; String doc_name5 = "我的积分";
String doc_pkey5 = "document.create.amount"; String doc_pkey5 = "document.mine.integral";
String doc_url5 = jucailinCockpitUtils.getUfPropData(doc_pkey5,tenantKey); String doc_url5 = jucailinCockpitUtils.getUfPropData(doc_pkey5,tenantKey);
docMap.put("count",doc_count5); docMap.put("count",doc_count5);
docMap.put("name",doc_name5); docMap.put("name",doc_name5);
@ -87,7 +87,7 @@ public class CockpitDocumentAnalysisCmd {
docMap = new HashMap<String,String>(); docMap = new HashMap<String,String>();
String doc_count6 = getDocumentDateAmount6(employeeId,tenantKey); String doc_count6 = getDocumentDateAmount6(employeeId,tenantKey);
String doc_name6 = "我的分享"; String doc_name6 = "我的分享";
String doc_pkey6 = "document.share.amount"; String doc_pkey6 = "document.mine.share";
String doc_url6 = jucailinCockpitUtils.getUfPropData(doc_pkey6,tenantKey); String doc_url6 = jucailinCockpitUtils.getUfPropData(doc_pkey6,tenantKey);
docMap.put("count",doc_count6); docMap.put("count",doc_count6);
docMap.put("name",doc_name6); docMap.put("name",doc_name6);
@ -98,7 +98,7 @@ public class CockpitDocumentAnalysisCmd {
docMap = new HashMap<String,String>(); docMap = new HashMap<String,String>();
String doc_count7 = getDocumentDateAmount7(employeeId,tenantKey); String doc_count7 = getDocumentDateAmount7(employeeId,tenantKey);
String doc_name7 = "下属知识"; String doc_name7 = "下属知识";
String doc_pkey7 = "document.create.amount"; String doc_pkey7 = "document.subordinate.create";
String doc_url7 = jucailinCockpitUtils.getUfPropData(doc_pkey7,tenantKey); String doc_url7 = jucailinCockpitUtils.getUfPropData(doc_pkey7,tenantKey);
docMap.put("count",doc_count7); docMap.put("count",doc_count7);
docMap.put("name",doc_name7); docMap.put("name",doc_name7);
@ -140,7 +140,7 @@ public class CockpitDocumentAnalysisCmd {
docMap = new HashMap<String,String>(); docMap = new HashMap<String,String>();
String doc_count8 = getDocumentDateAmount8(employeeId,tenantKey); String doc_count8 = getDocumentDateAmount8(employeeId,tenantKey);
String doc_name8 = "我关注的文档"; String doc_name8 = "我关注的文档";
String doc_pkey8 = "document.number.amount"; String doc_pkey8 = "document.mine.attention";
String doc_url8 = jucailinCockpitUtils.getUfPropData(doc_pkey8,tenantKey); String doc_url8 = jucailinCockpitUtils.getUfPropData(doc_pkey8,tenantKey);
docMap.put("count",doc_count8); docMap.put("count",doc_count8);
docMap.put("name",doc_name8); docMap.put("name",doc_name8);

14
src/main/java/com/weaver/seconddev/cockpit/cmd/CockpitProjectDataCmd.java
Unescape Escape View File

@ -37,8 +37,8 @@ public class CockpitProjectDataCmd {
try { try {
projectDate2 = getProjectDate2(employee,tenantKey,userid); projectDate2 = getProjectDate3(employee,tenantKey,userid);
projectDate3 = getProjectDate3(employee,tenantKey,userid); // projectDate3 = getProjectDate3(employee,tenantKey,userid);
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
@ -46,7 +46,7 @@ public class CockpitProjectDataCmd {
} }
recordMap.put("projectDate2",projectDate2); recordMap.put("projectDate2",projectDate2);
recordMap.put("projectDate3",projectDate3); // recordMap.put("projectDate3",projectDate3);
return recordMap; return recordMap;
} }
@ -117,7 +117,13 @@ public class CockpitProjectDataCmd {
return projectList; return projectList;
} }
/***
*
* @param employee
* @param tenantKey
* @param userid
* @return
*/
public List<Map<String,Object>> getProjectDate3(SimpleEmployee employee, String tenantKey,String userid) { public List<Map<String,Object>> getProjectDate3(SimpleEmployee employee, String tenantKey,String userid) {
List<Map<String,Object>> projectList = new ArrayList<Map<String,Object>>(); List<Map<String,Object>> projectList = new ArrayList<Map<String,Object>>();

138
src/main/java/com/weaver/seconddev/cockpit/cmd/CockpitUserDataCmd.java
Unescape Escape View File

@ -39,29 +39,50 @@ public class CockpitUserDataCmd {
Map<String, Object> userMap = new HashMap<String, Object>(); Map<String, Object> userMap = new HashMap<String, Object>();
String sourceType = "LOGIC"; String sourceType = "LOGIC";
String groupId ="weaver-ebuilder-form-service";
try{ try{
Long deptid = 0L ;
String subcompanynme = ""; String subcompanynme = "";
String employeeId = "";
String employeeId = String.valueOf(employee.getEmployeeId()); String deptname = "" ;
String positionname = "";
String username = "";
try {
employeeId = String.valueOf(employee.getEmployeeId());
username = employee.getName();
}catch (Exception e) {
e.printStackTrace();
log.error("getDataInfo1:"+e);
}
log.error("employeeId:" + employeeId); log.error("employeeId:" + employeeId);
String username = employee.getName();
log.error("username:" + username); log.error("username:" + username);
String deptname = employee.getDepartment().getName(); try {
deptname = employee.getDepartment().getName();
deptid = employee.getDepartment().getId();
}catch (Exception e) {
e.printStackTrace();
log.error("getDataInfo2:"+e);
}
log.error("deptname:" + deptname); log.error("deptname:" + deptname);
Long deptid = employee.getDepartment().getId();
log.error("deptid:" + deptid); log.error("deptid:" + deptid);
// long subCompanyid = employee.getDepartment().getSubCompanyId();
String positionname = employee.getPosition().getName(); try {
positionname = employee.getPosition().getName();
}catch (Exception e) {
e.printStackTrace();
log.error("getDataInfo3:"+e);
}
log.error("positionname:" + positionname); log.error("positionname:" + positionname);
String gradename = employee.getGrade().getName();
log.error("gradename:" + gradename);
String personnelstatusname = ""; String personnelstatusname = "正式员工";
String personnelstatus = employee.getPersonnelStatus(); String personnelstatus = "";
try {
personnelstatus = employee.getPersonnelStatus();
log.error("personnelstatus:" + personnelstatus); log.error("personnelstatus:" + personnelstatus);
if ("1".equals(personnelstatus)) { if ("1".equals(personnelstatus)) {
personnelstatusname = "试用员工"; personnelstatusname = "试用员工";
} else if ("2".equals(personnelstatus)) { } else if ("2".equals(personnelstatus)) {
@ -81,22 +102,13 @@ public class CockpitUserDataCmd {
} else if ("10".equals(personnelstatus)) { } else if ("10".equals(personnelstatus)) {
personnelstatusname = "无效员工"; personnelstatusname = "无效员工";
} }
}catch (Exception e) {
e.printStackTrace();
log.error("getDataInfo4:"+e);
}
log.error("personnelstatusname:" + personnelstatusname); log.error("personnelstatusname:" + personnelstatusname);
String userimageurl = "/profile/" + employeeId + "/personal"; try {
long formdata = employee.getFormdata();
log.error("formdata:" + formdata);
String pkey = "field69.groupId";
String groupId = jucailinCockpitUtils.getUfPropData(pkey, tenantKey);
log.error("groupId:" + groupId);
String jobcallname = "";
long jobcallid = employee.getJobCall();
log.error("jobcallid:" + jobcallid);
if (StringUtils.isNotBlank(deptid + "")) { if (StringUtils.isNotBlank(deptid + "")) {
String sql =" select name from eteams.department where id in( " + String sql =" select name from eteams.department where id in( " +
" select subcompanyid from eteams.department where id = ? and delete_type=0 and tenant_key = ?" + " select subcompanyid from eteams.department where id = ? and delete_type=0 and tenant_key = ?" +
@ -125,9 +137,15 @@ public class CockpitUserDataCmd {
subcompanynme = String.valueOf(recordList.get(0).get("name")); subcompanynme = String.valueOf(recordList.get(0).get("name"));
} }
} }
}catch (Exception e){
e.printStackTrace();
log.error("getDataInfo5:"+e);
}
log.error("subcompanynme:" + subcompanynme); String jobcallname = "";
try{
long jobcallid = employee.getJobCall();
log.error("jobcallid:" + jobcallid);
if (StringUtils.isNotBlank(jobcallid + "")) { if (StringUtils.isNotBlank(jobcallid + "")) {
String sql =" select data_name from eteams.hrm_jobcall " + String sql =" select data_name from eteams.hrm_jobcall " +
" where id = ? " + " where id = ? " +
@ -151,8 +169,15 @@ public class CockpitUserDataCmd {
jobcallname = String.valueOf(recordList.get(0).get("data_name")); jobcallname = String.valueOf(recordList.get(0).get("data_name"));
} }
} }
}catch (Exception e){
e.printStackTrace();
log.error("getDataInfo6:"+e);
}
String field69 = ""; String field69 = "";
try{
long formdata = employee.getFormdata();
log.error("formdata:" + formdata);
if (StringUtils.isNotBlank(formdata + "")) { if (StringUtils.isNotBlank(formdata + "")) {
String sql = " select field69 from eteams.Hrmemployeedefined where form_data_id = ?"; String sql = " select field69 from eteams.Hrmemployeedefined where form_data_id = ?";
log.error("getSelfServiceData--sql:" + sql); log.error("getSelfServiceData--sql:" + sql);
@ -167,7 +192,6 @@ public class CockpitUserDataCmd {
if (recordList.size() > 0) { if (recordList.size() > 0) {
field69 = String.valueOf(recordList.get(0).get("field69")); field69 = String.valueOf(recordList.get(0).get("field69"));
} }
if ("1".equals(field69)) { if ("1".equals(field69)) {
field69 = "销售"; field69 = "销售";
} else if ("2".equals(field69)) { } else if ("2".equals(field69)) {
@ -180,24 +204,17 @@ public class CockpitUserDataCmd {
field69 = "运营"; field69 = "运营";
} }
} }
}catch (Exception e){
e.printStackTrace();
log.error("getDataInfo6:"+e);
}
log.error("field69:" + field69); log.error("field69:" + field69);
userMap.put("employeeId", employeeId);
userMap.put("username", username);
userMap.put("deptmentnnme", subcompanynme + "-" + deptname);
userMap.put("positionname", positionname);
userMap.put("userimageurl", userimageurl);
userMap.put("jobcallname", jobcallname);
userMap.put("personnelstatusname", personnelstatusname);
userMap.put("personnelstatus", personnelstatus);
userMap.put("gradename", gradename);
userMap.put("field69", field69);
String avatarUrl = "";
String avatarUrl = "";
String hiredate = ""; String hiredate = "";
String resourceimageid = ""; try {
String sex = ""; String sex = "";
String resourceimageid = "";
if(StringUtils.isNotBlank(employeeId)){ if(StringUtils.isNotBlank(employeeId)){
String dataSql =" select date_format(a.hiredate,'%Y-%m-%d') hiredate,resourceimageid,sex " + String dataSql =" select date_format(a.hiredate,'%Y-%m-%d') hiredate,resourceimageid,sex " +
" from eteams.employee a " + " from eteams.employee a " +
@ -242,20 +259,22 @@ public class CockpitUserDataCmd {
avatarUrl = "/build/hrm/static/media/male.png"; //female avatarUrl = "/build/hrm/static/media/male.png"; //female
} }
} }
userMap.put("avatarUrl", avatarUrl); }catch (Exception e) {
e.printStackTrace();
log.error("getDataInfo7:"+e);
}
List<Map<String, Object>> customList = getCustomType(employee, tenantKey); List<Map<String, Object>> customList = new ArrayList<Map<String, Object>>();
try {
customList = getCustomType(employee, tenantKey);
userMap.put("customType", customList); userMap.put("customType", customList);
}catch (Exception e){
if(paramMap.containsKey("userid")){ e.printStackTrace();
String userid = String.valueOf(paramMap.get("userid")); log.error("getDataInfo8:"+e);
log.error("userid2:"+userid);
if (StringUtils.isNotBlank(userid)) {
employeeId = userid;
}
} }
List<Map<String, Object>> changeList = new ArrayList<Map<String, Object>>(); List<Map<String, Object>> changeList = new ArrayList<Map<String, Object>>();
try {
if (StringUtils.isNotBlank(hiredate)) { if (StringUtils.isNotBlank(hiredate)) {
Map<String, Object> hireMap = new HashMap<String, Object>(); Map<String, Object> hireMap = new HashMap<String, Object>();
hireMap.put("change_date", hiredate); hireMap.put("change_date", hiredate);
@ -304,14 +323,29 @@ public class CockpitUserDataCmd {
} }
currentMap.put("diffdate",diffdate); currentMap.put("diffdate",diffdate);
} }
}catch (Exception e){
e.printStackTrace();
log.error("getDataInfo9:"+e);
}
String userimageurl = "/profile/" + employeeId + "/personal";
userMap.put("employeeId", employeeId);
userMap.put("username", username);
userMap.put("deptmentnnme", subcompanynme + "-" + deptname);
userMap.put("positionname", positionname);
userMap.put("userimageurl", userimageurl);
userMap.put("jobcallname", jobcallname);
userMap.put("personnelstatusname", personnelstatusname);
userMap.put("personnelstatus", personnelstatus);
userMap.put("field69", field69);
userMap.put("avatarUrl", avatarUrl);
userMap.put("changeList", changeList); userMap.put("changeList", changeList);
}catch (Exception e){ }catch (Exception e){
e.printStackTrace(); e.printStackTrace();
log.error("PortalPerformanceInfoCmd :" + e); log.error("PortalPerformanceInfoCmd :" + e);
} }
return userMap; return userMap;
} }

6
src/main/java/com/weaver/seconddev/cockpit/cmd/CockpitWorkflowAnalysisCmd.java
Unescape Escape View File

@ -220,7 +220,7 @@ public class CockpitWorkflowAnalysisCmd {
Map<String,String> wfMap = new HashMap<String,String>(); Map<String,String> wfMap = new HashMap<String,String>();
String wf_name1 = "平均流程处理时间"; String wf_name1 = "平均流程处理时间";
String wf_pkey1 = "workflow.time.amount"; String wf_pkey1 = "workflow.processtime.amount";
String wf_url1 = jucailinCockpitUtils.getUfPropData(wf_pkey1,tenantKey); String wf_url1 = jucailinCockpitUtils.getUfPropData(wf_pkey1,tenantKey);
wfMap.put("count",count); wfMap.put("count",count);
wfMap.put("name",wf_name1); wfMap.put("name",wf_name1);
@ -287,7 +287,7 @@ public class CockpitWorkflowAnalysisCmd {
List<Map<String,String>> dayList = new ArrayList<Map<String,String>>(); List<Map<String,String>> dayList = new ArrayList<Map<String,String>>();
Map<String,String> wfMap = new HashMap<String,String>(); Map<String,String> wfMap = new HashMap<String,String>();
String wf_name2 = "平均每日发起流程"; String wf_name2 = "平均每日发起流程";
String wf_pkey2 = "workflow.average.amount"; String wf_pkey2 = "workflow.daily.create.amount";
String wf_url2 = jucailinCockpitUtils.getUfPropData(wf_pkey2,tenantKey); String wf_url2 = jucailinCockpitUtils.getUfPropData(wf_pkey2,tenantKey);
wfMap.put("count",count2); wfMap.put("count",count2);
wfMap.put("name",wf_name2); wfMap.put("name",wf_name2);
@ -297,7 +297,7 @@ public class CockpitWorkflowAnalysisCmd {
wfMap = new HashMap<String,String>(); wfMap = new HashMap<String,String>();
String wf_name3 = "平均每日处理流程"; String wf_name3 = "平均每日处理流程";
String wf_pkey3 = "workflow.average.amount"; String wf_pkey3 = "workflow.daily.process.amount";
String wf_url3 = jucailinCockpitUtils.getUfPropData(wf_pkey3,tenantKey); String wf_url3 = jucailinCockpitUtils.getUfPropData(wf_pkey3,tenantKey);
wfMap.put("count",count3); wfMap.put("count",count3);
wfMap.put("name",wf_name3); wfMap.put("name",wf_name3);

Write Preview
Loading…
Cancel
Save