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

src/main/java/com/weaver/seconddev/cockpit/cmd/CockpitWorkAchievementsCmd.java

@@ -105,71 +105,66 @@ public class CockpitWorkAchievementsCmd {
             //销售 0，项目 1,技术 2，其它 3
             if("2".equals(znlx)){
                 oneword = "本年问题处理数";
-
+                oneunit = "";
-
                 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 = "本年开发人天";
+                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);
                 }
 
                 threeword = "本年协作沟通数";
+                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);
                 }
 
                 fourword = "本年处理流程数";
-
+                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)){
-
                 oneword = "本年验收指标";
+                oneunit = "万元";
                 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);
                 }
 
                 twoword = "本年验收金额";
+                twounit = "万元";
                 try{
                     String pkey = "workdata.project.ysje";
                     twourl =  jucailinCockpitUtils.getUfPropData(pkey,tenantKey);
@@ -182,7 +177,6 @@ public class CockpitWorkAchievementsCmd {
                         two = twoMap.get("amount");
                     }
                     log.error("two2:"+two);
-                    twounit = "万元";
                     if(twoMap.containsKey("unit")){
                         twounit = twoMap.get("unit");
                     }
@@ -192,21 +186,21 @@ public class CockpitWorkAchievementsCmd {
                 }
 
                 threeword = "本年指标达成率";
+                threeunit = "%";
                 try{
 
                     String pkey = "workdata.project.zbdcl";
                     threeurl =  jucailinCockpitUtils.getUfPropData(pkey,tenantKey);
-
                     three = "0.00";
-                    threeunit = "%";
+
                 }catch (Exception e){
                     e.printStackTrace();
                     log.error("zbdcl-e:"+e);
                 }
 
                 fourword = "本年收款金额";
+                fourunit = "万元";
                 try{
-
                     String pkey = "workdata.project.skje";
                     foururl =  jucailinCockpitUtils.getUfPropData(pkey,tenantKey);
 
@@ -218,8 +212,6 @@ public class CockpitWorkAchievementsCmd {
                         four = fourMap.get("amount");
                     }
                     log.error("four2:"+four);
-
-                    fourunit = "万元";
                     if(fourMap.containsKey("unit")){
                         fourunit = fourMap.get("unit");
                     }
@@ -230,98 +222,95 @@ public class CockpitWorkAchievementsCmd {
 
             }else if("3".equals(znlx)){
                 oneword = "本年处理流程数";
-
+                oneunit = "";
                 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 = "本年文档贡献度";
+                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);
                 }
 
                 threeword = "本年微博填写数";
-
+                threeunit = "";
                 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 = "本年沟通协作数";
-
+                fourunit = "";
                 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);
                 }
             }else{
                 oneword = "本年处理流程数";
+                oneunit = "";
                 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 = "本年文档贡献度";
+                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);
                 }
-                threeword = "本年微博填写数";
 
+                threeword = "本年微博填写数";
+                threeunit = "";
                 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 = "本年沟通协作数";
+                fourunit = "";
                 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);