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

#E10-47# 工作业绩接口优化

Browse Source
main
shilei 12 months ago
parent 76dd980cae
commit 7f11e046c0
1 changed files with 87 additions and 27 deletions
Show Stats Download Patch File Download Diff File

114
src/main/java/com/weaver/seconddev/cockpit/cmd/CockpitWorkAchievementsCmd.java
Unescape Escape View File

@ -14,6 +14,7 @@ import com.weaver.workflow.common.entity.list.api.RequestListConditionApiEntity;
import com.weaver.workflow.common.entity.list.api.publicapi.RequestCountInfoPAEntity; import com.weaver.workflow.common.entity.list.api.publicapi.RequestCountInfoPAEntity;
import com.weaver.workflow.list.api.rest.publicapi.WflRequestListRest; import com.weaver.workflow.list.api.rest.publicapi.WflRequestListRest;
import com.weaver.workrelate.performance.api.rest.RemotePerformanceService; import com.weaver.workrelate.performance.api.rest.RemotePerformanceService;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
@ -67,9 +68,11 @@ public class CockpitWorkAchievementsCmd {
endday = String.valueOf(paramMap.get("endday")); endday = String.valueOf(paramMap.get("endday"));
} }
String userid = "";
Long formdata = simpleEmployee.getFormdata();
String employeeId = simpleEmployee.getEmployeeId()+""; String employeeId = simpleEmployee.getEmployeeId()+"";
if(paramMap.containsKey("userid")){ if(paramMap.containsKey("userid")){
String userid = String.valueOf(paramMap.get("userid")); userid = String.valueOf(paramMap.get("userid"));
if(StringUtils.isNotBlank(userid)){ if(StringUtils.isNotBlank(userid)){
employeeId = userid; employeeId = userid;
} }
@ -97,7 +100,7 @@ public class CockpitWorkAchievementsCmd {
try { try {
//销售 0，项目 1,技术 2，其它 3 //销售 0，项目 1,技术 2，其它 3
String znlx = getUserType(simpleEmployee,tenantKey); String znlx = getUserType(formdata+"",userid,tenantKey);
log.error("znlx:"+znlx); log.error("znlx:"+znlx);
//销售 0，项目 1,技术 2，其它 3 //销售 0，项目 1,技术 2，其它 3
@ -235,7 +238,6 @@ public class CockpitWorkAchievementsCmd {
oneMap.put("url",oneurl); oneMap.put("url",oneurl);
oneMap.put("unit",oneunit); oneMap.put("unit",oneunit);
list.add(oneMap); list.add(oneMap);
log.error("1111");
Map<String,String> twoMap = new HashMap<String,String>(100); Map<String,String> twoMap = new HashMap<String,String>(100);
twoMap.put("name",twoword); twoMap.put("name",twoword);
@ -243,7 +245,6 @@ public class CockpitWorkAchievementsCmd {
twoMap.put("url",twourl); twoMap.put("url",twourl);
twoMap.put("unit",twounit); twoMap.put("unit",twounit);
list.add(twoMap); list.add(twoMap);
log.error("2222");
Map<String,String> threeMap = new HashMap<String,String>(100); Map<String,String> threeMap = new HashMap<String,String>(100);
threeMap.put("name",threeword); threeMap.put("name",threeword);
@ -251,7 +252,6 @@ public class CockpitWorkAchievementsCmd {
threeMap.put("url",threeurl); threeMap.put("url",threeurl);
threeMap.put("unit",threeunit); threeMap.put("unit",threeunit);
list.add(threeMap); list.add(threeMap);
log.error("3333");
Map<String,String> fourMap = new HashMap<String,String>(100); Map<String,String> fourMap = new HashMap<String,String>(100);
@ -296,6 +296,10 @@ public class CockpitWorkAchievementsCmd {
endday = sdf.format(new Date()); endday = sdf.format(new Date());
} }
if (StringUtils.isBlank(employeeId)) {
employeeId = String.valueOf(UserContext.getCurrentEmployeeId());
}
if (StringUtils.isNotBlank(employeeId)) { if (StringUtils.isNotBlank(employeeId)) {
String dataSql =" select ifnull(sum(d.integer2),0) as devcou \n" + String dataSql =" select ifnull(sum(d.integer2),0) as devcou \n" +
" from wfc_form_data l\n" + " from wfc_form_data l\n" +
@ -312,7 +316,7 @@ public class CockpitWorkAchievementsCmd {
" and p.delete_type=0\n" + " and p.delete_type=0\n" +
" order by d.id desc "; " order by d.id desc ";
log.info("DevQuestCountCmd dataSql:" + dataSql); log.info("getQuestInfo-dataSql:" + dataSql);
List<String> strlist = new ArrayList<>(100); List<String> strlist = new ArrayList<>(100);
strlist.add(employeeId); strlist.add(employeeId);
@ -330,10 +334,11 @@ public class CockpitWorkAchievementsCmd {
if(recordList.size()>0){ if(recordList.size()>0){
quecou = String.valueOf(recordList.get(0).get("devcou")); quecou = String.valueOf(recordList.get(0).get("devcou"));
} }
log.error("quecou:"+quecou);
} }
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
log.error("DevQuestCountCmd-Exception:" + e); log.error("getQuestInfo-e:" + e);
} }
return quecou; return quecou;
} }
@ -341,33 +346,64 @@ public class CockpitWorkAchievementsCmd {
/** /**
* 获取人员类型 * 获取人员类型
* @param employee * @param formdata
* @param userid
* @param tenantKey
* @return * @return
*/ */
public String getUserType(SimpleEmployee employee,String tenantkey) { public String getUserType(String formdata,String userid,String tenantKey) {
String sourceType = "LOGIC"; String sourceType = "LOGIC";
String userType = "3"; String userType = "3";
try{ try{
long formdata = employee.getFormdata(); if(StringUtils.isNotBlank(userid)){
String pkey = "field69.groupId";
String groupId = jucailinCockpitUtils.getUfPropData(pkey,tenantkey); String groupId ="weaver-ebuilder-form-service";
log.error("groupId:"+groupId);
String dataSql =" select formdata " +
" from eteams.employee a " +
" where a.id = ? " +
" and a.tenant_key = ? " ;
log.error("getUserType--dataSql:" + dataSql);
List<SqlParamEntity> sqlparam = new ArrayList<SqlParamEntity>();
SqlParamEntity sqlParamEntity = new SqlParamEntity();
sqlParamEntity.setParamType(SqlParamType.LONG);
sqlParamEntity.setValue(userid);
sqlparam.add(sqlParamEntity);
sqlParamEntity = new SqlParamEntity();
sqlParamEntity.setParamType(SqlParamType.VARCHAR);
sqlParamEntity.setValue(tenantKey);
sqlparam.add(sqlParamEntity);
Map<String, Object> result = databaseUtils.executeForQuery(sourceType, groupId, dataSql, sqlparam);
List<Map<String, Object>> recordList = databaseUtils.getDataSourceList(result);
if (recordList.size()>0) {
formdata = String.valueOf(recordList.get(0).get("formdata"));
}
}
String field69 = ""; String field69 = "";
String sql =" select field69 from eteams.Hrmemployeedefined where form_data_id = ?" ; if(StringUtils.isNotBlank(formdata)){
log.error("getSelfServiceData--sql:"+sql); String pkey = "field69.groupId";
String groupId = jucailinCockpitUtils.getUfPropData(pkey,tenantKey);
List<SqlParamEntity> sqlparam = new ArrayList<SqlParamEntity>(); log.error("groupId:"+groupId);
SqlParamEntity sqlParamEntity = new SqlParamEntity(); String sql =" select field69 from eteams.Hrmemployeedefined where form_data_id = ?" ;
sqlParamEntity.setParamType(SqlParamType.LONG); log.error("getUserType--sql:"+sql);
sqlParamEntity.setValue(formdata+""); List<SqlParamEntity> sqlparam = new ArrayList<SqlParamEntity>();
sqlparam.add(sqlParamEntity); SqlParamEntity sqlParamEntity = new SqlParamEntity();
Map<String, Object> result = databaseUtils.executeForQuery(sourceType, groupId, sql,sqlparam); sqlParamEntity.setParamType(SqlParamType.LONG);
List<Map<String,Object>> recordList = databaseUtils.getDataSourceList(result); sqlParamEntity.setValue(formdata+"");
if(recordList.size()>0){ sqlparam.add(sqlParamEntity);
// 销售 0，项目 1,技术 2，其它 3 Map<String, Object> result = databaseUtils.executeForQuery(sourceType, groupId, sql,sqlparam);
field69 = String.valueOf(recordList.get(0).get("field69")); List<Map<String,Object>> recordList = databaseUtils.getDataSourceList(result);
if(recordList.size()>0){
// 销售 0，项目 1,技术 2，其它 3
field69 = String.valueOf(recordList.get(0).get("field69"));
}
} }
log.error("field69:"+field69); log.error("field69:"+field69);
if(StringUtils.isNotBlank(field69)){ if(StringUtils.isNotBlank(field69)){
switch (field69){ switch (field69){
@ -416,6 +452,9 @@ public class CockpitWorkAchievementsCmd {
if (StringUtils.isBlank(endday)) { if (StringUtils.isBlank(endday)) {
endday = sdf.format(new Date()); endday = sdf.format(new Date());
} }
if (StringUtils.isBlank(employeeId)) {
employeeId = String.valueOf(UserContext.getCurrentEmployeeId());
}
if (StringUtils.isNotBlank(employeeId)) { if (StringUtils.isNotBlank(employeeId)) {
String dataSql =" select count(1) as devcou \n" + String dataSql =" select count(1) as devcou \n" +
@ -450,10 +489,11 @@ public class CockpitWorkAchievementsCmd {
if(recordList.size()>0){ if(recordList.size()>0){
devcou = String.valueOf(recordList.get(0).get("devcou")); devcou = String.valueOf(recordList.get(0).get("devcou"));
} }
log.error("getDaysInfo-devcou:"+devcou);
} }
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
log.error("getDaysInfo-Exception:" + e); log.error("getDaysInfo-e:" + e);
} }
return devcou; return devcou;
} }
@ -508,6 +548,7 @@ public class CockpitWorkAchievementsCmd {
if (recordList.size() > 0) { if (recordList.size() > 0) {
count = String.valueOf(recordList.get(0).get("count")); count = String.valueOf(recordList.get(0).get("count"));
} }
log.error("getCoWorkInfo-count:"+count);
}catch (Exception e){ }catch (Exception e){
e.printStackTrace(); e.printStackTrace();
log.error("getCoWorkInfo-e:"+e.getMessage()); log.error("getCoWorkInfo-e:"+e.getMessage());
@ -568,6 +609,10 @@ public class CockpitWorkAchievementsCmd {
endday = sdf.format(new Date()); endday = sdf.format(new Date());
} }
if (StringUtils.isBlank(employeeId)) {
employeeId = String.valueOf(UserContext.getCurrentEmployeeId());
}
log.error("employeeId2:"+employeeId); log.error("employeeId2:"+employeeId);
log.error("startday2:"+startday); log.error("startday2:"+startday);
log.error("endday2:"+endday); log.error("endday2:"+endday);
@ -671,6 +716,11 @@ public class CockpitWorkAchievementsCmd {
if(StringUtils.isBlank(endday)){ if(StringUtils.isBlank(endday)){
endday = sdf.format(new Date()); endday = sdf.format(new Date());
} }
if (StringUtils.isBlank(employeeId)) {
employeeId = String.valueOf(UserContext.getCurrentEmployeeId());
}
log.error("employeeId:"+employeeId); log.error("employeeId:"+employeeId);
log.error("startday:"+startday); log.error("startday:"+startday);
log.error("endday:"+endday); log.error("endday:"+endday);
@ -759,6 +809,10 @@ public class CockpitWorkAchievementsCmd {
endday = sdf.format(new Date()); endday = sdf.format(new Date());
} }
if (StringUtils.isBlank(employeeId)) {
employeeId = String.valueOf(UserContext.getCurrentEmployeeId());
}
if(StringUtils.isNotBlank(employeeId)){ if(StringUtils.isNotBlank(employeeId)){
String sql = " select count(1) as count " + String sql = " select count(1) as count " +
" from document " + " from document " +
@ -780,6 +834,7 @@ public class CockpitWorkAchievementsCmd {
if(recordList.size()>0){ if(recordList.size()>0){
count = String.valueOf(recordList.get(0).get("count")); count = String.valueOf(recordList.get(0).get("count"));
} }
log.error("getDocInfo-count:"+count);
} }
}catch (Exception e){ }catch (Exception e){
e.printStackTrace(); e.printStackTrace();
@ -813,6 +868,10 @@ public class CockpitWorkAchievementsCmd {
endday = sdf.format(new Date()); endday = sdf.format(new Date());
} }
if (StringUtils.isBlank(employeeId)) {
employeeId = String.valueOf(UserContext.getCurrentEmployeeId());
}
if(StringUtils.isNotBlank(employeeId)){ if(StringUtils.isNotBlank(employeeId)){
String sql =" select count(1) as count\n" + String sql =" select count(1) as count\n" +
" from blog " + " from blog " +
@ -839,6 +898,7 @@ public class CockpitWorkAchievementsCmd {
if(recordList.size()>0){ if(recordList.size()>0){
count = String.valueOf(recordList.get(0).get("count")); count = String.valueOf(recordList.get(0).get("count"));
} }
log.error("getDailyInfo-count:"+count);
} }
}catch (Exception e){ }catch (Exception e){
e.printStackTrace(); e.printStackTrace();

Write Preview
Loading…
Cancel
Save