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

#E10-49# 年度工作业务优化

Browse Source
main
shilei 10 months ago
parent e5a31673f6
commit edeb750a53
3 changed files with 226 additions and 139 deletions
Show Stats Download Patch File Download Diff File

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

@ -345,13 +345,15 @@ public class CockpitUserDataCmd {
addTagUrl = jucailinCockpitUtils.getUfPropData(pkey, tenantKey); addTagUrl = jucailinCockpitUtils.getUfPropData(pkey, tenantKey);
log.error("addTagUrl:" + addTagUrl); log.error("addTagUrl:" + addTagUrl);
}catch (Exception e){ }catch (Exception e){
e.printStackTrace();
log.error("addTagUrl:"+e);
} }
String userimageurl = "/profile/" + employeeId + "/personal"; String userimageurl = "/profile/" + employeeId + "/personal";
userMap.put("employeeId", employeeId); userMap.put("employeeId", employeeId);
userMap.put("username", username); userMap.put("username", username);
userMap.put("deptmentnnme", subcompanynme + "-" + deptname); userMap.put("subcompanynme", subcompanynme);
userMap.put("deptmentnnme", deptname);
userMap.put("positionname", positionname); userMap.put("positionname", positionname);
userMap.put("userimageurl", userimageurl); userMap.put("userimageurl", userimageurl);
userMap.put("jobcallname", jobcallname); userMap.put("jobcallname", jobcallname);

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

@ -14,7 +14,6 @@ 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;
@ -105,168 +104,264 @@ public class CockpitWorkAchievementsCmd {
//销售 0，项目 1,技术 2，其它 3 //销售 0，项目 1,技术 2，其它 3
if("2".equals(znlx)){ if("2".equals(znlx)){
one = getQuestInfo(startday, endday, employeeId,tenantKey);
oneword = "本年问题处理数"; oneword = "本年问题处理数";
String pkey = "workdata.technology.wtclsl";
oneurl = jucailinCockpitUtils.getUfPropData(pkey,tenantKey);
oneunit = "";
two = getDaysInfo(startday, endday, employeeId,tenantKey);
try{
String pkey = "workdata.technology.wtclsl";
oneurl = jucailinCockpitUtils.getUfPropData(pkey,tenantKey);
one = getQuestInfo(startday, endday, employeeId,tenantKey);
oneunit = "";
}catch (Exception e){
e.printStackTrace();
log.error("getQuestInfo-e:"+e);
}
twoword = "本年开发人天"; twoword = "本年开发人天";
pkey = "workdata.technology.kfrt"; try{
twourl = jucailinCockpitUtils.getUfPropData(pkey,tenantKey); String pkey = "workdata.technology.kfrt";
twounit = ""; twourl = jucailinCockpitUtils.getUfPropData(pkey,tenantKey);
two = getDaysInfo(startday, endday, employeeId,tenantKey);
twounit = "";
}catch (Exception e){
e.printStackTrace();
log.error("getDaysInfo-e:"+e);
}
three = getCoWorkInfo(startday,endday, employeeId,tenantKey);
threeword = "本年协作沟通数"; threeword = "本年协作沟通数";
pkey = "workdata.technology.gtxz"; try{
threeurl = jucailinCockpitUtils.getUfPropData(pkey,tenantKey);
threeunit = ""; String pkey = "workdata.technology.gtxz";
threeurl = jucailinCockpitUtils.getUfPropData(pkey,tenantKey);
three = getCoWorkInfo(startday,endday, employeeId,tenantKey);
threeunit = "";
}catch (Exception e){
e.printStackTrace();
log.error("getCoWorkInfo-e:"+e);
}
four = getWfInfo(simpleEmployee);
fourword = "本年处理流程数"; fourword = "本年处理流程数";
pkey = "workdata.technology.cllc";
foururl = jucailinCockpitUtils.getUfPropData(pkey,tenantKey);
fourunit = "";
try{
String pkey = "workdata.technology.cllc";
foururl = jucailinCockpitUtils.getUfPropData(pkey,tenantKey);
four = getWfInfo(simpleEmployee);
fourunit = "";
}catch (Exception e){
e.printStackTrace();
log.error("getWfInfo-e:"+e);
}
}else if("1".equals(znlx)){ }else if("1".equals(znlx)){
one = "0.00";
oneword = "本年验收指标"; oneword = "本年验收指标";
String pkey = "workdata.project.yszb"; try{
oneurl = jucailinCockpitUtils.getUfPropData(pkey,tenantKey); String pkey = "workdata.project.yszb";
oneunit = "万元"; oneurl = jucailinCockpitUtils.getUfPropData(pkey,tenantKey);
//项目验收信息 one = "0.00";
two = getYsInfo(employeeId,startday,endday); oneunit = "万元";
log.error("two:"+two); }catch (Exception e){
Map<String,String>twoMap = parseJe(two); e.printStackTrace();
if(twoMap.containsKey("amount")){ log.error("yszb-e:"+e);
two = twoMap.get("amount");
} }
log.error("two2:"+two);
twoword = "本年验收金额"; twoword = "本年验收金额";
pkey = "workdata.project.ysje"; try{
twourl = jucailinCockpitUtils.getUfPropData(pkey,tenantKey); String pkey = "workdata.project.ysje";
twounit = "万元"; twourl = jucailinCockpitUtils.getUfPropData(pkey,tenantKey);
if(twoMap.containsKey("unit")){
twounit = twoMap.get("unit"); //项目验收信息
two = getYsInfo(employeeId,startday,endday);
log.error("two:"+two);
Map<String,String>twoMap = parseJe(two);
if(twoMap.containsKey("amount")){
two = twoMap.get("amount");
}
log.error("two2:"+two);
twounit = "万元";
if(twoMap.containsKey("unit")){
twounit = twoMap.get("unit");
}
}catch (Exception e){
e.printStackTrace();
log.error("getYsInfo-e:"+e);
} }
three = "0.00";
threeword = "本年指标达成率"; threeword = "本年指标达成率";
pkey = "workdata.project.zbdcl"; try{
threeurl = jucailinCockpitUtils.getUfPropData(pkey,tenantKey);
threeunit = "%";
String pkey = "workdata.project.zbdcl";
threeurl = jucailinCockpitUtils.getUfPropData(pkey,tenantKey);
//项目收款信息 three = "0.00";
four = getSkInfo(employeeId,startday,endday,tenantKey); threeunit = "%";
log.error("four:"+four); }catch (Exception e){
Map<String,String> fourMap = parseJe(four); e.printStackTrace();
if(fourMap.containsKey("amount")){ log.error("zbdcl-e:"+e);
four = fourMap.get("amount");
} }
log.error("four2:"+four);
fourword = "本年收款金额"; fourword = "本年收款金额";
pkey = "workdata.project.skje"; try{
foururl = jucailinCockpitUtils.getUfPropData(pkey,tenantKey);
fourunit = "万元"; String pkey = "workdata.project.skje";
if(fourMap.containsKey("unit")){ foururl = jucailinCockpitUtils.getUfPropData(pkey,tenantKey);
fourunit = fourMap.get("unit");
//项目收款信息
four = getSkInfo(employeeId,startday,endday,tenantKey);
log.error("four:"+four);
Map<String,String> fourMap = parseJe(four);
if(fourMap.containsKey("amount")){
four = fourMap.get("amount");
}
log.error("four2:"+four);
fourunit = "万元";
if(fourMap.containsKey("unit")){
fourunit = fourMap.get("unit");
}
}catch (Exception e){
e.printStackTrace();
log.error("getSkInfo-e:"+e);
} }
}else if("3".equals(znlx)){ }else if("3".equals(znlx)){
one = getWfInfo(simpleEmployee);
oneword = "本年处理流程数"; oneword = "本年处理流程数";
String pkey = "workdata.other.cllc";
oneurl = jucailinCockpitUtils.getUfPropData(pkey,tenantKey);
oneunit = "";
two = getDocInfo(startday,endday,employeeId,tenantKey); try{
String pkey = "workdata.other.cllc";
oneurl = jucailinCockpitUtils.getUfPropData(pkey,tenantKey);
one = getWfInfo(simpleEmployee);
oneunit = "";
}catch (Exception e){
e.printStackTrace();
log.error("getWfInfo-e:"+e);
}
twoword = "本年文档贡献度"; twoword = "本年文档贡献度";
pkey = "workdata.other.wdgx"; try{
twourl = jucailinCockpitUtils.getUfPropData(pkey,tenantKey); String pkey = "workdata.other.wdgx";
twounit = ""; twourl = jucailinCockpitUtils.getUfPropData(pkey,tenantKey);
two = getDocInfo(startday,endday,employeeId,tenantKey);
twounit = "";
}catch (Exception e){
e.printStackTrace();
log.error("getDocInfo-e:"+e);
}
three = getDailyInfo(startday,endday,employeeId,tenantKey);
threeword = "本年微博填写数"; threeword = "本年微博填写数";
pkey = "workdata.other.wbtx";
threeurl = jucailinCockpitUtils.getUfPropData(pkey,tenantKey);
threeunit = "";
four = getCoWorkInfo(startday,endday,employeeId,tenantKey); try{
String pkey = "workdata.other.wbtx";
threeurl = jucailinCockpitUtils.getUfPropData(pkey,tenantKey);
three = getDailyInfo(startday,endday,employeeId,tenantKey);
threeunit = "";
}catch (Exception e){
e.printStackTrace();
log.error("getDailyInfo-e:"+e);
}
fourword = "本年沟通协作数"; fourword = "本年沟通协作数";
pkey = "workdata.other.gtxz";
foururl = jucailinCockpitUtils.getUfPropData(pkey,tenantKey);
fourunit = "";
}else{ try{
one = getWfInfo(simpleEmployee); String pkey = "workdata.other.gtxz";
oneword = "本年处理流程数"; foururl = jucailinCockpitUtils.getUfPropData(pkey,tenantKey);
String pkey = "workdata.other.cllc";
oneurl = jucailinCockpitUtils.getUfPropData(pkey,tenantKey);
oneunit = "";
two = getDocInfo(startday,endday,employeeId,tenantKey); four = getCoWorkInfo(startday,endday,employeeId,tenantKey);
fourunit = "";
}catch (Exception e){
e.printStackTrace();
log.error("getCoWorkInfo-e:"+e);
}
}else{
oneword = "本年处理流程数";
try{
String pkey = "workdata.other.cllc";
oneurl = jucailinCockpitUtils.getUfPropData(pkey,tenantKey);
one = getWfInfo(simpleEmployee);
oneunit = "";
}catch (Exception e){
e.printStackTrace();
log.error("getWfInfo-e:"+e);
}
twoword = "本年文档贡献度"; twoword = "本年文档贡献度";
pkey = "workdata.other.wdgx"; try{
twourl = jucailinCockpitUtils.getUfPropData(pkey,tenantKey); String pkey = "workdata.other.wdgx";
twounit = ""; twourl = jucailinCockpitUtils.getUfPropData(pkey,tenantKey);
three = getDailyInfo(startday,endday,employeeId,tenantKey); two = getDocInfo(startday,endday,employeeId,tenantKey);
twounit = "";
}catch (Exception e){
e.printStackTrace();
log.error("getDocInfo-e:"+e);
}
threeword = "本年微博填写数"; threeword = "本年微博填写数";
pkey = "workdata.other.wbtx";
threeurl = jucailinCockpitUtils.getUfPropData(pkey,tenantKey);
threeunit = "";
four = getCoWorkInfo(startday,endday,employeeId,tenantKey); try{
String pkey = "workdata.other.wbtx";
threeurl = jucailinCockpitUtils.getUfPropData(pkey,tenantKey);
three = getDailyInfo(startday,endday,employeeId,tenantKey);
threeunit = "";
}catch (Exception e){
e.printStackTrace();
log.error("getDailyInfo-e:"+e);
}
fourword = "本年沟通协作数"; fourword = "本年沟通协作数";
pkey = "workdata.other.gtxz"; try{
foururl = jucailinCockpitUtils.getUfPropData(pkey,tenantKey); String pkey = "workdata.other.gtxz";
fourunit = ""; foururl = jucailinCockpitUtils.getUfPropData(pkey,tenantKey);
}
four = getCoWorkInfo(startday,endday,employeeId,tenantKey);
Map<String,String> oneMap = new HashMap<String,String>(100); fourunit = "";
oneMap.put("name",oneword); }catch (Exception e){
oneMap.put("value",one); e.printStackTrace();
oneMap.put("url",oneurl); log.error("getCoWorkInfo-e:"+e);
oneMap.put("unit",oneunit); }
list.add(oneMap); }
Map<String,String> twoMap = new HashMap<String,String>(100);
twoMap.put("name",twoword);
twoMap.put("value",two);
twoMap.put("url",twourl);
twoMap.put("unit",twounit);
list.add(twoMap);
Map<String,String> threeMap = new HashMap<String,String>(100);
threeMap.put("name",threeword);
threeMap.put("value",three);
threeMap.put("url",threeurl);
threeMap.put("unit",threeunit);
list.add(threeMap);
Map<String,String> fourMap = new HashMap<String,String>(100);
fourMap.put("name",fourword);
fourMap.put("value",four);
fourMap.put("url",foururl);
fourMap.put("unit",fourunit);
list.add(fourMap);
log.error("4444");
recordMap.put("datas",list);
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
log.error("CockpitWorkAchievementsCmd :" + e); log.error("CockpitWorkAchievementsCmd :" + e);
} }
Map<String,String> oneMap = new HashMap<String,String>(100);
oneMap.put("name",oneword);
oneMap.put("value",one);
oneMap.put("url",oneurl);
oneMap.put("unit",oneunit);
list.add(oneMap);
Map<String,String> twoMap = new HashMap<String,String>(100);
twoMap.put("name",twoword);
twoMap.put("value",two);
twoMap.put("url",twourl);
twoMap.put("unit",twounit);
list.add(twoMap);
Map<String,String> threeMap = new HashMap<String,String>(100);
threeMap.put("name",threeword);
threeMap.put("value",three);
threeMap.put("url",threeurl);
threeMap.put("unit",threeunit);
list.add(threeMap);
Map<String,String> fourMap = new HashMap<String,String>(100);
fourMap.put("name",fourword);
fourMap.put("value",four);
fourMap.put("url",foururl);
fourMap.put("unit",fourunit);
list.add(fourMap);
recordMap.put("datas",list);
return recordMap; return recordMap;
} }
@ -619,18 +714,10 @@ public class CockpitWorkAchievementsCmd {
if(StringUtils.isNotBlank(employeeId)){ if(StringUtils.isNotBlank(employeeId)){
String sql =" SELECT \n" + String sql =" SELECT \n" +
" ifnull(sum(cast(ifnull(t1.skje,0) as decimal(18,2))),'0') as skje,\n" + //收款金额 " convert(ifnull(sum(cast(t1.skje as decimal(18,2))),0),char(100)) as skje " + //收款金额
" ifnull(sum(cast(ifnull(t1.xmskje,0) as decimal(18,2))),'0') as xmskje,\n" + // 项目收款金额 " from uf_jxhs_skmx t1\n" +
" CONVERT(ifnull(sum(cast(ifnull(t1.xsyxje,0) as decimal(18,2))),0),CHAR(100)) as xsyxje," + // 销售有效金额 " left join uf_jxhs_zxhtzb t2 ON t1.hth = t2.hth AND t2.hth != '' AND t2.hth IS NOT NULL \n" +
" CONVERT(ifnull(sum(cast(ifnull(t1.xsje,0) as decimal(18,2))),0),CHAR(100)) as xsje," + // 销售金额 " left join ebdf_physical_data epd on t1.id = epd.form_data_id and epd.delete_type = 0 \n" +
" CONVERT(ifnull(sum(cast(ifnull(t1.xmyxje,0) as decimal(18,2))),0),CHAR(100)) as xmyxje," + //项目有效金额
" CONVERT(ifnull(sum(cast(ifnull(t1.xsjxhk,0) as decimal(18,2))),0),CHAR(100)) as xsjxhk," + //有效绩效回款
" CONVERT(ifnull(sum(cast(ifnull(t1.sumsk,0) as decimal(18,2))),0),CHAR(100)) as sumsk," + //总收款金额
" CONVERT(ifnull(sum(cast(ifnull(t1.sjjsk,0) as decimal(18,2))),0),CHAR(100)) as sjjsk," + //实际结算款
" CONVERT(ifnull(sum(cast(ifnull(t1.skjs,0) as decimal(18,2))),0),CHAR(100)) as skjs " + //收款结算
" FROM uf_jxhs_skmx t1\n" +
" LEFT JOIN uf_jxhs_zxhtzb t2 ON t1.hth = t2.hth AND t2.hth != '' AND t2.hth IS NOT NULL \n" +
" LEFT JOIN ebdf_physical_data epd on t1.id = epd.form_data_id and epd.delete_type = 0 \n" +
" WHERE t1.skje != 0 \n" + " WHERE t1.skje != 0 \n" +
" and t1.skje IS NOT NULL " + " and t1.skje IS NOT NULL " +
" and t1.xshsny >= ? and t1.xshsny <=? "+ " and t1.xshsny >= ? and t1.xshsny <=? "+
@ -727,9 +814,7 @@ public class CockpitWorkAchievementsCmd {
if(StringUtils.isNotBlank(employeeId)){ if(StringUtils.isNotBlank(employeeId)){
String sql =" select ifnull(sum(cast(ifnull(t1.htzje,0) as decimal(18,2))),'0') as htzje," + String sql =" select convert(ifnull(sum(cast(t1.htzje as decimal(18,2))),0),char(100)) as htzje" +
" ifnull(sum(cast(ifnull(t1.htyxje,0) as decimal(18,2))),'0') as htyxje," +
" ifnull(sum(cast(ifnull(t1.sumsk,0) as decimal(18,2))),'0') as sumsk " +
" from uf_jxhs_xmys t1 \n" + " from uf_jxhs_xmys t1 \n" +
" where t1.ysrq>=? and t1.ysrq<=? " + " where t1.ysrq>=? and t1.ysrq<=? " +
" and ( t1.qyjl = ? "+ " and ( t1.qyjl = ? "+

2
src/main/java/com/weaver/seconddev/cockpit/controller/JucailinCockpitController.java
Unescape Escape View File

@ -32,7 +32,7 @@ public class JucailinCockpitController {
/** /**
* 绩效信息 * 绩效信息(未使用)
* @param request * @param request
* @return * @return
*/ */

Write Preview
Loading…
Cancel
Save