2.1.4代码更新

CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/workorder/WorkOrderController.cs

@@ -60,9 +60,15 @@ namespace CallCenterApi.Interface.Controllers.workorder
             string strkey = HttpUtility.UrlDecode(RequestString.GetQueryString("key"));
             string strstarttime = HttpUtility.UrlDecode(RequestString.GetQueryString("starttime"));
             string strendtime = HttpUtility.UrlDecode(RequestString.GetQueryString("endtime"));
+            string wjstrstarttime = HttpUtility.UrlDecode(RequestString.GetQueryString("wjstarttime"));
+            string wjstrendtime = HttpUtility.UrlDecode(RequestString.GetQueryString("wjendtime"));
             string strworkid = HttpUtility.UrlDecode(RequestString.GetQueryString("workid"));
             string strusercode = HttpUtility.UrlDecode(RequestString.GetQueryString("usercode"));
             string strddusercode = HttpUtility.UrlDecode(RequestString.GetQueryString("ddusercode"));//调度员
+            //回传时间筛选
+            string hcstrstarttime = HttpUtility.UrlDecode(RequestString.GetQueryString("hcstrstarttime"));
+            string hcstrendtime = HttpUtility.UrlDecode(RequestString.GetQueryString("hcstrendtime"));
+
             int source = RequestString.GetInt("source", 0);
             int keyid = RequestString.GetInt("keyid", 0);
             int type = RequestString.GetInt("type", 0);
@@ -217,15 +223,37 @@ namespace CallCenterApi.Interface.Controllers.workorder
             {
                 sql += " and isnull(F_IsRelease,0) = '" + issend + "' ";
             }
-
+            
             if (strstarttime.Trim() != "" && strstarttime != "undefined")
             {
                 sql += " and datediff(day,F_CreateTime,'" + strstarttime + "')<=0 ";
             }
-            if (strendtime.Trim() != "" && strendtime != "undefined")
+            if (strendtime.Trim() != "" && strendtime != "undefined") 
             {
                 sql += " and datediff(day,F_CreateTime,'" + strendtime + "')>=0   ";
             }
+            #region 结案时间
+            if (wjstrstarttime.Trim() != "" && wjstrstarttime != "undefined")
+            {
+                sql += " and datediff(day,F_CloseTime,'" + wjstrstarttime + "')<=0 ";
+            }
+            if (wjstrendtime.Trim() != "" && wjstrendtime != "undefined")
+            {
+                sql += " and datediff(day,F_CloseTime,'" + wjstrendtime + "')>=0   ";
+            }
+
+            #endregion
+            //根据回传时间判断
+            if (hcstrstarttime.Trim() != "" && hcstrstarttime != "undefined")
+            {
+                //sql += " and F_Hcdatetime >= '"+ hcstrstarttime + "'";
+                sql += " and datediff(day,F_Hcdatetime,'" + hcstrstarttime + "')<=0 ";
+            }
+            if (hcstrendtime.Trim() != "" && hcstrendtime != "undefined")
+            {
+                // sql += "  and F_Hcdatetime<='"+ hcstrendtime + "'   ";
+                sql += " and datediff(day,F_Hcdatetime,'" + hcstrendtime + "')>=0   ";
+            }
             #endregion
 
             if (strpageindex.Trim() != "")
@@ -240,7 +268,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
             //string cols = "*,dbo.GetUserName(F_CreateUser) as UserName,dbo.GetDictionaryName(F_InfoType) as TypeName,dbo.GetOverState(F_WorkOrderId) as OverState,"
             //    + "dbo.GetDictionaryName(F_InfoSource) as SourceName,dbo.GetWorkOrderAssign(F_WorkOrderId) as DeptName ,dbo.GetLimitTime(F_WorkOrderId) as LimitTime";
             //string cols = "*,dbo.GetUserName(F_CreateUser) as UserName,dbo.GetDictionaryName(F_InfoType) as TypeName,dbo.GetDictionaryName(F_InfoSource) as SourceName";
-            string sort = "ORDER BY F_CreateTime ASC";
+            string sort = "ORDER BY F_CreateTime DESC";
             if (timesort == 0)
                 sort = "ORDER BY LimitTime ASC";
             else if (timesort == 1)
@@ -2485,7 +2513,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
             int pagesize = 10;
             int IsExport = RequestString.GetInt("isexport", 0);
             int timesort = RequestString.GetInt("timesort", -1);
-            string sort = "ORDER BY F_CreateTime ASC";
+            string sort = "ORDER BY F_CreateTime DESC";
             if (timesort == 0)
                 sort = "ORDER BY LimitTime ASC";
             else if (timesort == 1)
@@ -3091,6 +3119,55 @@ namespace CallCenterApi.Interface.Controllers.workorder
 
             return Content(obj.ToJson());
         }
+        /// <summary>
+        /// 获取办理数量、催办数量、未上传数量
+        /// </summary>
+        /// <returns></returns>
+        [Authority]
+        public ActionResult GetDcsCount()
+        {
+            
+            int userId = Utils.StrToInt(User.UserData["F_UserID"], 0);
+           // int userId = 751;
+            Model.T_Sys_UserAccount userModel = userBLL.GetModel(userId);
+            //获取待办理工单数量
+            string sql = " select count(*) dblcount from T_Bus_WorkOrder where  F_IsDelete=0  and F_WorkState in (2,4,8) and F_MainDeptId="+userModel.F_DeptId;
+            //获取催办数量
+            string sql1 = " select count(*) dblcount from T_Bus_WorkOrder where  F_IsDelete=0  and ReminderNum>0 and F_WorkOrderID in(select F_WorkOrderID from T_Bus_AssignedInfo WITH(NOLOCK) where F_State=1 and F_IsDelete=0 and F_IsSure in (0,1) and F_MainDeptId=" + userModel.F_DeptId + ") ";
+            //扫描件未上传数量
+            string sql2 = " select count(*) dblcount from T_Bus_WorkOrder where  F_IsDelete=0  and  F_Files ='' and F_WorkOrderID in(select F_WorkOrderID from T_Bus_Feedback WITH(NOLOCK) where F_State=1 and F_IsDelete=0 and F_Type in (1,2) and F_CreateUser=" + userModel.F_UserCode + ") ";
+
+
+            #region 获取待办理数量
+            var dbldatable = DbHelperSQL.Query(sql).Tables[0];
+            var dblrow = dbldatable.Rows;
+            ///待办理数量
+            var dblcount = dblrow[0]["dblcount"].ToString();
+            #endregion
+            #region 获取催办数量
+            var cbdatable = DbHelperSQL.Query(sql1).Tables[0];
+            var cblrow = cbdatable.Rows;
+            ///催办数量
+            var cblcount = cblrow[0]["dblcount"].ToString();
+            #endregion
+            #region 扫描件未上传数量
+            var smjdatable = DbHelperSQL.Query(sql2).Tables[0];
+            var smjlrow = smjdatable.Rows;
+            ///扫描件未上传数量
+            var smjcount = smjlrow[0]["dblcount"].ToString();
+            #endregion
+
+            var obj = new
+            {
+                state = "success",
+                message = "成功",
+                dblcount= dblcount,
+                cblcount= cblcount,
+                smjcount= smjcount
+            };
+
+            return Content(obj.ToJson());
+        }
 
         /// <summary>
         /// 获取单位处理列表
@@ -6226,6 +6303,8 @@ namespace CallCenterApi.Interface.Controllers.workorder
             Model.T_Sys_UserAccount userModel = userBLL.GetModel(userId);
 
             string strworkorderid = HttpUtility.UrlDecode(RequestString.GetQueryString("workorderid"));
+            
+
             //int type = RequestString.GetInt("type", 0);//0基本信息1监察意见2领导批示3办理情况4回访信息5督办信息6办理过程
             if (!string.IsNullOrEmpty(strworkorderid))
             {
@@ -6238,6 +6317,8 @@ namespace CallCenterApi.Interface.Controllers.workorder
                      ;
                    
                 var dt = DbHelperSQL.Query(sql).Tables[0];
+                
+
                 if (dt.Rows.Count > 0)
                 {
                     #region 结果汇总
@@ -6581,6 +6662,28 @@ namespace CallCenterApi.Interface.Controllers.workorder
                     }
                     #endregion
 
+                    #region 获取所有工单部门名称
+                    var olderworkerid = dt.Rows[0]["F_OldWorkOrderId"].ToString();
+                    string alldeptname = "";
+                    if (olderworkerid != "")
+                    {
+                        //var olderallworker = dt.Select(" F_OldWorkOrderId='" + olderworkerid + "'");
+                        string sqlallwo = "select *,b.F_DeptName from T_Bus_WorkOrder a  left join  T_Sys_Department b  on a.F_MainDeptId=b.F_DeptId  where  F_IsDelete=0 and F_OldWorkOrderId='" + olderworkerid + "'";
+                        var aaa = DbHelperSQL.Query(sqlallwo).Tables[0];
+                        var bbb = aaa.Rows;
+                        foreach (DataRow oldtrs in aaa.Rows)
+                        {
+                            alldeptname += oldtrs["F_DeptName"].ToString();
+                            alldeptname += ",";
+                        }
+                    }
+                    //else
+                    //{
+                    //    alldeptname = dt.Rows[0]["DeptName"].ToString();
+                    //}
+                   
+                    #endregion
+
                     var obj = new
                     {
                         data = dt,
@@ -6601,7 +6704,8 @@ namespace CallCenterApi.Interface.Controllers.workorder
                         issend = issend,
                         isedit = isedit,
                         isnotice = isnotice,
-                        btndata = btns
+                        btndata = btns,
+                        alldeptname = alldeptname
                     };
                     return Success("获取成功", obj);
                 }
@@ -8229,8 +8333,10 @@ namespace CallCenterApi.Interface.Controllers.workorder
                                 if (!string .IsNullOrEmpty (modelT_Bus_WorkOrder.F_Files))
                                     {
                                     modelT_Bus_WorkOrder.F_WorkState = (int)EnumWorkState.closed ;
+                                    
                                    }
-                                    workorderBLL.Update(modelT_Bus_WorkOrder);
+                                modelT_Bus_WorkOrder.F_Hcdatetime = DateTime.Now;//回传时间
+                                workorderBLL.Update(modelT_Bus_WorkOrder);
                                     #endregion
 
                                     #region 插入操作记录

CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Models/Common/ButtonGroup.cs

@@ -269,7 +269,8 @@ namespace CallCenterApi.Interface.Models.Common
                     //二级网络单位 管理员     
                     if (code == "WLDW" || code == "GLY")
                     {
-                        buttons.Add(receive()); buttons.Add(reback());
+                        //buttons.Add(receive());
+                        buttons.Add(reback());
                     }
                     //调度专员 中心领导管理员 管理员
                     if (code == "ZXLD" || code == "ZXLDGLYGLY" || code == "GLY" || code == "DDZG")
@@ -390,7 +391,7 @@ namespace CallCenterApi.Interface.Models.Common
                     {
                         //buttons.Add(reload());
                         buttons.Add(subreload());
-                        buttons.Add(end());
+                        //buttons.Add(end());
                         buttons.Add(Result());
                         buttons.Add(Reloadsuber());
                         //   buttons.Add(approval());
@@ -402,7 +403,8 @@ namespace CallCenterApi.Interface.Models.Common
                     //二级网络单位 管理员
                     if (code == "WLDW" || code == "GLY" || code == "DDZG")
                     {
-                        buttons.Add(receive()); buttons.Add(reback());
+                        //buttons.Add(receive());
+                        buttons.Add(reback());
                     }
                     //调度专员 中心领导管理员 管理员
                     if (code == "ZXLD" || code == "ZXLDGLYGLY" || code == "GLY" || code == "DDZG")