duhongyu 4 jaren geleden
bovenliggende
commit
dd2d7ba75c

+ 3 - 1
CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/Assessment/DataAssessmentController.cs

258
         }
258
         }
259
 
259
 
260
 
260
 
261
-        public ActionResult GetDBDataList_1(DateTime ? starttime , DateTime? endtime, int deptid = 0,bool isdc=false )
261
+        public ActionResult GetDBDataList_1(DateTime ? starttime , DateTime? endtime, int deptid = 0,bool isdc=false,int source=0)
262
         {
262
         {
263
             int userId = Utils.StrToInt(User.UserData["F_UserID"], 0);
263
             int userId = Utils.StrToInt(User.UserData["F_UserID"], 0);
264
             if (userId <= 0)
264
             if (userId <= 0)
295
             paras.Add("@deptid", deptid.ToString());
295
             paras.Add("@deptid", deptid.ToString());
296
             paras.Add("@sdate", strdate);
296
             paras.Add("@sdate", strdate);
297
             paras.Add("@edate", edate);
297
             paras.Add("@edate", edate);
298
+            paras.Add("@source", source.ToString ());
299
+            
298
             var list = DbHelperSQL.RunProcedure("P_DeptDBData", paras, "DeptData").Tables[0];
300
             var list = DbHelperSQL.RunProcedure("P_DeptDBData", paras, "DeptData").Tables[0];
299
             //var list = DbHelperSQL.Query(sqlass).Tables[0];
301
             //var list = DbHelperSQL.Query(sqlass).Tables[0];
300
             if (isdc)
302
             if (isdc)

+ 3 - 3
CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/InfoController.cs

1605
             }
1605
             }
1606
             string strstart = start.Value.ToString("yyyy-MM-dd");
1606
             string strstart = start.Value.ToString("yyyy-MM-dd");
1607
             string strend = end.Value.ToString("yyyy-MM-dd");
1607
             string strend = end.Value.ToString("yyyy-MM-dd");
1608
-            if (RedisHelper.StringGet("GetDeptCountByDateNew" + start + strend + deptid.ToString ()) != null)
1608
+            if (RedisHelper.StringGet("GetDeptCountByDateNew" + strstart + strend + deptid.ToString ()) != null)
1609
             {
1609
             {
1610
-                return Success("加载成功", JsonConvert.DeserializeObject(RedisHelper.StringGet("GetDeptCountByDateNew" + start + strend + deptid.ToString()).ToString() ));
1610
+                return Success("加载成功", JsonConvert.DeserializeObject(RedisHelper.StringGet("GetDeptCountByDateNew" + strstart + strend + deptid.ToString()).ToString() ));
1611
             }
1611
             }
1612
             Dictionary<string, string> paras = new Dictionary<string, string>();
1612
             Dictionary<string, string> paras = new Dictionary<string, string>();
1613
             paras.Add("@sdate", start.Value.ToString("yyyy-MM-dd"));
1613
             paras.Add("@sdate", start.Value.ToString("yyyy-MM-dd"));
1614
             paras.Add("@edate", end.Value.ToString("yyyy-MM-dd"));
1614
             paras.Add("@edate", end.Value.ToString("yyyy-MM-dd"));
1615
             paras.Add("@deptid", deptid.ToString());
1615
             paras.Add("@deptid", deptid.ToString());
1616
             var obj = DbHelperSQL.RunProcedure("P_Info_DeptAcceptCount", paras, "P_Info_DeptAcceptCount");
1616
             var obj = DbHelperSQL.RunProcedure("P_Info_DeptAcceptCount", paras, "P_Info_DeptAcceptCount");
1617
-            RedisHelper.StringSet("GetDeptCountByDateNew" + start + strend + deptid.ToString(), obj.Tables[0].ToJson(), new TimeSpan(0, 10, 0));
1617
+            RedisHelper.StringSet("GetDeptCountByDateNew" + strstart + strend + deptid.ToString(), obj.Tables[0].ToJson(), new TimeSpan(0, 10, 0));
1618
             return Success("成功", obj.Tables[0]);
1618
             return Success("成功", obj.Tables[0]);
1619
         }
1619
         }
1620
 
1620
 

+ 25 - 2
CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/workorder/APPSController.cs

1698
 
1698
 
1699
             var replies = JsonConvert.DeserializeObject<List<chmList>>(atchmList);
1699
             var replies = JsonConvert.DeserializeObject<List<chmList>>(atchmList);
1700
 
1700
 
1701
+            var strRcrd_ID = txnBodyComresult["strRcrd_ID"] == null ? "" : txnBodyComresult["strRcrd_ID"].ToString();     //营商标识
1702
+
1703
+
1701
 
1704
 
1702
             var F_CusName = txnBodyComresult["strCst_Nm"] == null ? "" : txnBodyComresult["strCst_Nm"].ToString();     //市民姓名 
1705
             var F_CusName = txnBodyComresult["strCst_Nm"] == null ? "" : txnBodyComresult["strCst_Nm"].ToString();     //市民姓名 
1703
             var strSmsCode = txnBodyComresult["strSmsCode"] == null ? "" : txnBodyComresult["strSmsCode"].ToString();     //验证码
1706
             var strSmsCode = txnBodyComresult["strSmsCode"] == null ? "" : txnBodyComresult["strSmsCode"].ToString();     //验证码
1739
                 //1 市长热线 2 市长信箱 0 连线政府 3 人民网
1742
                 //1 市长热线 2 市长信箱 0 连线政府 3 人民网
1740
                 if (source == "连线政府")
1743
                 if (source == "连线政府")
1741
                 {
1744
                 {
1742
-                    source = "2458";
1745
+                    if (!string .IsNullOrEmpty (strRcrd_ID))
1746
+                    {
1747
+                        if (strRcrd_ID=="营商")
1748
+                        {
1749
+                            source = "2501";
1750
+                        }
1751
+                        else
1752
+                            source = "2458";
1753
+                    }
1754
+                    else
1755
+                        source = "2458";
1743
                 }
1756
                 }
1744
                 if (source == "人民网")
1757
                 if (source == "人民网")
1745
                 {
1758
                 {
1755
                 }
1768
                 }
1756
                 if (source == "0")
1769
                 if (source == "0")
1757
                 {
1770
                 {
1758
-                    source = "2458";
1771
+                    if (!string.IsNullOrEmpty(strRcrd_ID))
1772
+                    {
1773
+                        if (strRcrd_ID == "营商")
1774
+                        {
1775
+                            source = "2501";
1776
+                        }
1777
+                        else
1778
+                            source = "2458";
1779
+                    }
1780
+                    else
1781
+                        source = "2458";
1759
                 }
1782
                 }
1760
                 if (source == "3")
1783
                 if (source == "3")
1761
                 {
1784
                 {

+ 14 - 11
CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/workorder/WorkOrderController.cs

1882
                         btns = ButtonGroup.GetButtons("12", userModel.F_RoleCode.ToUpper(), dr["F_IsResult"].ToString(), iszbdw);
1882
                         btns = ButtonGroup.GetButtons("12", userModel.F_RoleCode.ToUpper(), dr["F_IsResult"].ToString(), iszbdw);
1883
                     else
1883
                     else
1884
                         btns.Add(ButtonGroup.query());
1884
                         btns.Add(ButtonGroup.query());
1885
-                  
1885
+                    if (Int32.Parse(strtab) !=4)
1886
+                    {
1886
                         if (state == 9)
1887
                         if (state == 9)
1887
                         {
1888
                         {
1888
-                        if (userModel.F_RoleCode.ToUpper() == "ZJZY" || userModel.F_RoleCode.ToUpper() == "GLY" || userModel.F_RoleCode.ToUpper() == "DDZG" || userModel.F_RoleCode.ToUpper() == "ZXLD" || userModel.F_RoleCode.ToUpper() == "ZXHWY"|| userModel.F_RoleCode.ToUpper () == "MTDD")
1889
-                        {
1890
-                            if (dr["F_CloseTime"] != null && dr["F_CloseTime"].ToString() != "")
1889
+                            if (userModel.F_RoleCode.ToUpper() == "ZJZY" || userModel.F_RoleCode.ToUpper() == "GLY" || userModel.F_RoleCode.ToUpper() == "DDZG" || userModel.F_RoleCode.ToUpper() == "ZXLD" || userModel.F_RoleCode.ToUpper() == "ZXHWY" || userModel.F_RoleCode.ToUpper() == "MTDD")
1891
                             {
1890
                             {
1892
-                                var closedttime = DateTime.Parse(dr["F_CloseTime"].ToString());
1893
-                                TimeSpan ts = DateTime.Now - closedttime;
1894
-                                if (ts.TotalDays < 20)
1891
+                                if (dr["F_CloseTime"] != null && dr["F_CloseTime"].ToString() != "")
1895
                                 {
1892
                                 {
1896
-                                    btns.Add(ButtonGroup.subreload());
1893
+                                    var closedttime = DateTime.Parse(dr["F_CloseTime"].ToString());
1894
+                                    TimeSpan ts = DateTime.Now - closedttime;
1895
+                                    if (ts.TotalDays < 20)
1896
+                                    {
1897
+                                        btns.Add(ButtonGroup.subreload());
1898
+                                    }
1897
                                 }
1899
                                 }
1898
-                            }
1899
-                            if (userModel.F_RoleCode.ToUpper() != "ZXHWY")
1900
-                                btns.Add(ButtonGroup.modify());
1900
+                                if (userModel.F_RoleCode.ToUpper() != "ZXHWY")
1901
+                                    btns.Add(ButtonGroup.modify());
1901
 
1902
 
1903
+                            }
1902
                         }
1904
                         }
1903
                     }
1905
                     }
1906
+                       
1904
                     
1907
                     
1905
 
1908
 
1906
                 }
1909
                 }