diff --git a/src/main/java/com/weaver/seconddev/cockpit/cmd/CockpitUserDataCmd.java b/src/main/java/com/weaver/seconddev/cockpit/cmd/CockpitUserDataCmd.java index f6b17da..6b128f5 100644 --- a/src/main/java/com/weaver/seconddev/cockpit/cmd/CockpitUserDataCmd.java +++ b/src/main/java/com/weaver/seconddev/cockpit/cmd/CockpitUserDataCmd.java @@ -345,13 +345,15 @@ public class CockpitUserDataCmd { addTagUrl = jucailinCockpitUtils.getUfPropData(pkey, tenantKey); log.error("addTagUrl:" + addTagUrl); }catch (Exception e){ - + e.printStackTrace(); + log.error("addTagUrl:"+e); } String userimageurl = "/profile/" + employeeId + "/personal"; userMap.put("employeeId", employeeId); userMap.put("username", username); - userMap.put("deptmentnnme", subcompanynme + "-" + deptname); + userMap.put("subcompanynme", subcompanynme); + userMap.put("deptmentnnme", deptname); userMap.put("positionname", positionname); userMap.put("userimageurl", userimageurl); userMap.put("jobcallname", jobcallname); diff --git a/src/main/java/com/weaver/seconddev/cockpit/cmd/CockpitWorkAchievementsCmd.java b/src/main/java/com/weaver/seconddev/cockpit/cmd/CockpitWorkAchievementsCmd.java index 6bf7947..16117cc 100644 --- a/src/main/java/com/weaver/seconddev/cockpit/cmd/CockpitWorkAchievementsCmd.java +++ b/src/main/java/com/weaver/seconddev/cockpit/cmd/CockpitWorkAchievementsCmd.java @@ -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.list.api.rest.publicapi.WflRequestListRest; import com.weaver.workrelate.performance.api.rest.RemotePerformanceService; -import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -105,168 +104,264 @@ public class CockpitWorkAchievementsCmd { //销售 0，项目 1,技术 2，其它 3 if("2".equals(znlx)){ - - one = getQuestInfo(startday, endday, employeeId,tenantKey); 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 = "本年开发人天"; - pkey = "workdata.technology.kfrt"; - twourl = jucailinCockpitUtils.getUfPropData(pkey,tenantKey); - twounit = ""; + try{ + String pkey = "workdata.technology.kfrt"; + 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 = "本年协作沟通数"; - pkey = "workdata.technology.gtxz"; - threeurl = jucailinCockpitUtils.getUfPropData(pkey,tenantKey); - threeunit = ""; + try{ + + 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 = "本年处理流程数"; - 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)){ - one = "0.00"; oneword = "本年验收指标"; - String pkey = "workdata.project.yszb"; - oneurl = jucailinCockpitUtils.getUfPropData(pkey,tenantKey); - oneunit = "万元"; - - //项目验收信息 - two = getYsInfo(employeeId,startday,endday); - log.error("two:"+two); - MaptwoMap = parseJe(two); - if(twoMap.containsKey("amount")){ - two = twoMap.get("amount"); + try{ + String pkey = "workdata.project.yszb"; + oneurl = jucailinCockpitUtils.getUfPropData(pkey,tenantKey); + + one = "0.00"; + oneunit = "万元"; + }catch (Exception e){ + e.printStackTrace(); + log.error("yszb-e:"+e); } - log.error("two2:"+two); + twoword = "本年验收金额"; - pkey = "workdata.project.ysje"; - twourl = jucailinCockpitUtils.getUfPropData(pkey,tenantKey); - twounit = "万元"; - if(twoMap.containsKey("unit")){ - twounit = twoMap.get("unit"); + try{ + String pkey = "workdata.project.ysje"; + twourl = jucailinCockpitUtils.getUfPropData(pkey,tenantKey); + + //项目验收信息 + two = getYsInfo(employeeId,startday,endday); + log.error("two:"+two); + MaptwoMap = 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 = "本年指标达成率"; - pkey = "workdata.project.zbdcl"; - threeurl = jucailinCockpitUtils.getUfPropData(pkey,tenantKey); - threeunit = "%"; + try{ + String pkey = "workdata.project.zbdcl"; + threeurl = jucailinCockpitUtils.getUfPropData(pkey,tenantKey); - //项目收款信息 - four = getSkInfo(employeeId,startday,endday,tenantKey); - log.error("four:"+four); - Map fourMap = parseJe(four); - if(fourMap.containsKey("amount")){ - four = fourMap.get("amount"); + three = "0.00"; + threeunit = "%"; + }catch (Exception e){ + e.printStackTrace(); + log.error("zbdcl-e:"+e); } - log.error("four2:"+four); + fourword = "本年收款金额"; - pkey = "workdata.project.skje"; - foururl = jucailinCockpitUtils.getUfPropData(pkey,tenantKey); - fourunit = "万元"; - if(fourMap.containsKey("unit")){ - fourunit = fourMap.get("unit"); + try{ + + String pkey = "workdata.project.skje"; + foururl = jucailinCockpitUtils.getUfPropData(pkey,tenantKey); + + //项目收款信息 + four = getSkInfo(employeeId,startday,endday,tenantKey); + log.error("four:"+four); + Map 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)){ - - one = getWfInfo(simpleEmployee); 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 = "本年文档贡献度"; - pkey = "workdata.other.wdgx"; - twourl = jucailinCockpitUtils.getUfPropData(pkey,tenantKey); - twounit = ""; + try{ + String pkey = "workdata.other.wdgx"; + 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 = "本年微博填写数"; - 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 = "本年沟通协作数"; - pkey = "workdata.other.gtxz"; - foururl = jucailinCockpitUtils.getUfPropData(pkey,tenantKey); - fourunit = ""; - }else{ + try{ - one = getWfInfo(simpleEmployee); - oneword = "本年处理流程数"; - String pkey = "workdata.other.cllc"; - oneurl = jucailinCockpitUtils.getUfPropData(pkey,tenantKey); - oneunit = ""; + String pkey = "workdata.other.gtxz"; + foururl = jucailinCockpitUtils.getUfPropData(pkey,tenantKey); - 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 = "本年文档贡献度"; - pkey = "workdata.other.wdgx"; - twourl = jucailinCockpitUtils.getUfPropData(pkey,tenantKey); - twounit = ""; - - three = getDailyInfo(startday,endday,employeeId,tenantKey); + try{ + String pkey = "workdata.other.wdgx"; + twourl = jucailinCockpitUtils.getUfPropData(pkey,tenantKey); + + two = getDocInfo(startday,endday,employeeId,tenantKey); + twounit = ""; + }catch (Exception e){ + e.printStackTrace(); + log.error("getDocInfo-e:"+e); + } 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 = "本年沟通协作数"; - pkey = "workdata.other.gtxz"; - foururl = jucailinCockpitUtils.getUfPropData(pkey,tenantKey); - fourunit = ""; - } - - Map oneMap = new HashMap(100); - oneMap.put("name",oneword); - oneMap.put("value",one); - oneMap.put("url",oneurl); - oneMap.put("unit",oneunit); - list.add(oneMap); - - Map twoMap = new HashMap(100); - twoMap.put("name",twoword); - twoMap.put("value",two); - twoMap.put("url",twourl); - twoMap.put("unit",twounit); - list.add(twoMap); - - Map threeMap = new HashMap(100); - threeMap.put("name",threeword); - threeMap.put("value",three); - threeMap.put("url",threeurl); - threeMap.put("unit",threeunit); - list.add(threeMap); - - - Map fourMap = new HashMap(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); + try{ + String pkey = "workdata.other.gtxz"; + foururl = jucailinCockpitUtils.getUfPropData(pkey,tenantKey); + + four = getCoWorkInfo(startday,endday,employeeId,tenantKey); + fourunit = ""; + }catch (Exception e){ + e.printStackTrace(); + log.error("getCoWorkInfo-e:"+e); + } + } } catch (Exception e) { e.printStackTrace(); log.error("CockpitWorkAchievementsCmd :" + e); } + + Map oneMap = new HashMap(100); + oneMap.put("name",oneword); + oneMap.put("value",one); + oneMap.put("url",oneurl); + oneMap.put("unit",oneunit); + list.add(oneMap); + + Map twoMap = new HashMap(100); + twoMap.put("name",twoword); + twoMap.put("value",two); + twoMap.put("url",twourl); + twoMap.put("unit",twounit); + list.add(twoMap); + + Map threeMap = new HashMap(100); + threeMap.put("name",threeword); + threeMap.put("value",three); + threeMap.put("url",threeurl); + threeMap.put("unit",threeunit); + list.add(threeMap); + + Map fourMap = new HashMap(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; } @@ -619,18 +714,10 @@ public class CockpitWorkAchievementsCmd { if(StringUtils.isNotBlank(employeeId)){ String sql =" SELECT \n" + - " ifnull(sum(cast(ifnull(t1.skje,0) as decimal(18,2))),'0') as skje,\n" + //收款金额 - " ifnull(sum(cast(ifnull(t1.xmskje,0) as decimal(18,2))),'0') as xmskje,\n" + // 项目收款金额 - " CONVERT(ifnull(sum(cast(ifnull(t1.xsyxje,0) as decimal(18,2))),0),CHAR(100)) as xsyxje," + // 销售有效金额 - " CONVERT(ifnull(sum(cast(ifnull(t1.xsje,0) as decimal(18,2))),0),CHAR(100)) as xsje," + // 销售金额 - " 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" + + " convert(ifnull(sum(cast(t1.skje as decimal(18,2))),0),char(100)) as skje " + //收款金额 + " 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" + " and t1.skje IS NOT NULL " + " and t1.xshsny >= ? and t1.xshsny <=? "+ @@ -727,9 +814,7 @@ public class CockpitWorkAchievementsCmd { if(StringUtils.isNotBlank(employeeId)){ - String sql =" select ifnull(sum(cast(ifnull(t1.htzje,0) as decimal(18,2))),'0') 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 " + + String sql =" select convert(ifnull(sum(cast(t1.htzje as decimal(18,2))),0),char(100)) as htzje" + " from uf_jxhs_xmys t1 \n" + " where t1.ysrq>=? and t1.ysrq<=? " + " and ( t1.qyjl = ? "+ diff --git a/src/main/java/com/weaver/seconddev/cockpit/controller/JucailinCockpitController.java b/src/main/java/com/weaver/seconddev/cockpit/controller/JucailinCockpitController.java index 72bb0bd..e81aa8e 100644 --- a/src/main/java/com/weaver/seconddev/cockpit/controller/JucailinCockpitController.java +++ b/src/main/java/com/weaver/seconddev/cockpit/controller/JucailinCockpitController.java @@ -32,7 +32,7 @@ public class JucailinCockpitController { /** - * 绩效信息 + * 绩效信息(未使用) * @param request * @return */