Merge branch 'master' of http://192.168.1.222:3000/duhongyu/Anyang_api

CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/Login/LoginController.cs

@@ -162,9 +162,10 @@ namespace CallCenterApi.Interface.Controllers
                             //DataTable dt1 = new CallCenterApi.BLL.T_Sys_UserAccount().GetList("F_UserCode='" + login.Username + "'").Tables[0];
 
                             Dictionary<string, string> paras1 = new Dictionary<string, string>();
-                            int code = int.Parse(login.Username);
-                            string sql1 = " select * from T_Sys_UserAccount where F_UserCode=@F_UserCode ";
+
+                            string sql1 = " select * from T_Sys_UserAccount where F_UserCode=@F_UserCode or F_UserName=@F_UserName ";
                             paras1.Add("@F_UserCode", login.Username);
+                            paras1.Add("@F_UserName", login.Username);
 
                             var dt1 = DbHelperSQL.Query(sql1, paras1).Tables[0];
                             if (dt1.Rows.Count > 0)

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

@@ -9259,11 +9259,12 @@ namespace CallCenterApi.Interface.Controllers.workorder
                     if (modeldept == null)
                         return Error("自动派单失败,派单单位不存在");
                 }
+                Model.T_Bus_WorkOrder modelT_Bus_WorkOrder = new Model.T_Bus_WorkOrder();
 
                 using (TransactionScope trans = new TransactionScope(TransactionScopeOption.Required, new TimeSpan(0, 10, 0)))
                 {
                     #region 保存工单信息
-                    Model.T_Bus_WorkOrder modelT_Bus_WorkOrder = new Model.T_Bus_WorkOrder();
+                    
                     string creattime = DateTime.Now.ToString("yyyy-MM-dd") + " 00:00:00";
                     string endtime = DateTime.Now.ToString("yyyy-MM-dd") + " 23:59:59";
                     modelT_Bus_WorkOrder.F_WorkOrderId = workorderBLL.GetNewWorkOrderID(source, sourcearea, creattime, endtime);
@@ -9293,8 +9294,9 @@ namespace CallCenterApi.Interface.Controllers.workorder
 
                     modelT_Bus_WorkOrder.F_Latitude = latitude != "" ? decimal.Parse(latitude) : 0;//纬度
                     modelT_Bus_WorkOrder.F_Longitude = longitude != "" ? decimal.Parse(longitude) : 0;//经度
-                                                                                                      // modelT_Bus_WorkOrder.F_IsOpen = isopen;
-                                                                                                      //是否直办（即时答复）0:，否1： 是         
+                                                                                                      
+                    // modelT_Bus_WorkOrder.F_IsOpen = isopen;
+                    //是否直办（即时答复）0:，否1： 是         
                     modelT_Bus_WorkOrder.F_IsResult = isresult;
                     modelT_Bus_WorkOrder.F_Result = result;//处理结果
 
@@ -9343,106 +9345,112 @@ namespace CallCenterApi.Interface.Controllers.workorder
                         return Error("添加失败");
                     #endregion
 
-                    await Task.Run(() =>
-                    {
-                        #region 插入操作记录
-                        Model.T_Bus_Operation oper = new Model.T_Bus_Operation();
-                        oper.F_WorkOrderId = modelT_Bus_WorkOrder.F_WorkOrderId;
-                        oper.F_State = modelT_Bus_WorkOrder.F_WorkState;
-                        oper.F_CallRecordId = modelT_Bus_WorkOrder.F_CallRecordId;
-                        oper.F_File = modelT_Bus_WorkOrder.F_File;
-                        string userinfo = User.depname + "(" + User.F_UserCode + ")";
-                        //if (modelT_Bus_WorkOrder.F_WorkState == 0)
-                        if (modelT_Bus_WorkOrder.F_WorkState == (int)EnumWorkState.neworder || modelT_Bus_WorkOrder.F_WorkState == (int)EnumWorkState.audit)
-                        {
-                            oper.F_Message = userinfo + " 登记了工单，工单编号：" + modelT_Bus_WorkOrder.F_WorkOrderId;
-                        }
-                        //if (modelT_Bus_WorkOrder.F_WorkState == 1)
-                        if (modelT_Bus_WorkOrder.F_WorkState == (int)EnumWorkState.submit)
-                        {
-                            oper.F_Message = userinfo + " 登记并提交了工单，工单编号：" + modelT_Bus_WorkOrder.F_WorkOrderId;
-                        }
-                        //if (modelT_Bus_WorkOrder.F_WorkState == 9)
-                        if (modelT_Bus_WorkOrder.F_WorkState == (int)EnumWorkState.finish)
-                        {
-                            oper.F_Message = userinfo + " 登记并结案了工单，工单编号：" + modelT_Bus_WorkOrder.F_WorkOrderId;
-                        }
-                        else
-                        {
-                            string count = "您反映的事项已受理并转交相关部门处理，感谢您拨打市长热线！";
-                            string msg = "";
-                            bool n = SMSController.AddSmS(0, msg, count, modelT_Bus_WorkOrder.F_CusPhone, "197387", "", modelT_Bus_WorkOrder.F_WorkOrderId);
-                        }
-                        oper.F_CreateUser = User.F_UserCode;
-                        oper.F_CreateTime = DateTime.Now;
-                        oper.F_IsDelete = 0;
-                        operBLL.Add(oper);
-                        #region 自动派单
-                        if (ispd > 0)
-                        {
-                            string resdatetime = "";
-                            string resdate = DateTime.Now.Date.ToString("yyyy-MM-dd");
-                            DataTable dt = DbHelperSQL.Query("select top " + 7 + " F_OffDate from  T_Sys_WorkOFFDays  where F_OffState = 1   and F_OffDate>'" + resdate + "' order by F_OffDate").Tables[0];
-                            resdatetime = dt.Rows[dt.Rows.Count - 1]["F_OffDate"].ToString();
-                            resdatetime = Convert.ToDateTime(resdatetime).ToString("yyyy-MM-dd") + " 23:59:59 ";
+                    
 
-                            Model.T_Bus_AssignedInfo modelT_Bus_AssignedInfo = new Model.T_Bus_AssignedInfo();
-                            modelT_Bus_AssignedInfo.F_WorkOrderId = modelT_Bus_WorkOrder.F_WorkOrderId;
-                            modelT_Bus_AssignedInfo.F_LimitTime = Convert.ToDateTime(resdatetime);
-                            modelT_Bus_AssignedInfo.F_MainDeptId = deptid;
-                            modelT_Bus_AssignedInfo.F_OtherDeptIds = "";//协办单位id
-                            modelT_Bus_AssignedInfo.F_AssignedOpinion = "自动派单";//交办意见
-                            modelT_Bus_AssignedInfo.F_State = 1;//0草稿  1正式
-                            modelT_Bus_AssignedInfo.F_CreateUser = User.F_UserCode;
-                            modelT_Bus_AssignedInfo.F_CreateTime = DateTime.Now;
-                            modelT_Bus_AssignedInfo.F_IsDelete = 0;
-                            modelT_Bus_AssignedInfo.F_IsOverdue = 0;
-                            modelT_Bus_AssignedInfo.F_IsSure = 0;
-                            modelT_Bus_AssignedInfo.F_IsReload = 0;
-                            modelT_Bus_AssignedInfo.F_IsNext = 0;
-                            modelT_Bus_AssignedInfo.F_TimeResp = assignBLL.GetRepTimly(DateTime.Now);//及时查收时间点
-                            int aid = assignBLL.Add(modelT_Bus_AssignedInfo);
-                            modelT_Bus_WorkOrder.F_LimitTime = Convert.ToDateTime(resdatetime);
-                            modelT_Bus_WorkOrder.F_MainDeptId = deptid;
-                            modelT_Bus_WorkOrder.F_OtherDeptIds = "";
-                            modelT_Bus_WorkOrder.F_AssignUser = User.F_UserCode;
-                            modelT_Bus_WorkOrder.F_AssignTime = DateTime.Now;
-                            workorderBLL.Update(modelT_Bus_WorkOrder);
-                            var msgss = userinfo + " 交办了工单，主办单位：" + modeldept.F_DeptName;
+                    trans.Complete();
+                }
 
-                            addoptlog(modelT_Bus_WorkOrder.F_WorkOrderId, modelT_Bus_WorkOrder.F_WorkState, modelT_Bus_AssignedInfo.F_Id, msgss, User.F_UserCode);
+                string userinfo = User.depname + "(" + User.F_UserCode + ")";
+                await Task.Run(() =>
+                {
+                    #region 插入操作记录
+                    Model.T_Bus_Operation oper = new Model.T_Bus_Operation();
+                    oper.F_WorkOrderId = modelT_Bus_WorkOrder.F_WorkOrderId;
+                    oper.F_State = modelT_Bus_WorkOrder.F_WorkState;
+                    oper.F_CallRecordId = modelT_Bus_WorkOrder.F_CallRecordId;
+                    oper.F_File = modelT_Bus_WorkOrder.F_File;
 
-                            //推送消息表
-                            var users = userBLL.GetModelList(" F_DeptId='" + deptid + "' ");
+                    //if (modelT_Bus_WorkOrder.F_WorkState == 0)
+                    if (modelT_Bus_WorkOrder.F_WorkState == (int)EnumWorkState.neworder || modelT_Bus_WorkOrder.F_WorkState == (int)EnumWorkState.audit)
+                    {
+                        oper.F_Message = userinfo + " 登记了工单，工单编号：" + modelT_Bus_WorkOrder.F_WorkOrderId;
+                    }
+                    //if (modelT_Bus_WorkOrder.F_WorkState == 1)
+                    if (modelT_Bus_WorkOrder.F_WorkState == (int)EnumWorkState.submit)
+                    {
+                        oper.F_Message = userinfo + " 登记并提交了工单，工单编号：" + modelT_Bus_WorkOrder.F_WorkOrderId;
+                    }
+                    //if (modelT_Bus_WorkOrder.F_WorkState == 9)
+                    if (modelT_Bus_WorkOrder.F_WorkState == (int)EnumWorkState.finish)
+                    {
+                        oper.F_Message = userinfo + " 登记并结案了工单，工单编号：" + modelT_Bus_WorkOrder.F_WorkOrderId;
+                    }
+                    else
+                    {
+                        string count = "您反映的事项已受理并转交相关部门处理，感谢您拨打市长热线！";
+                        string msg = "";
+                        bool n = SMSController.AddSmS(0, msg, count, modelT_Bus_WorkOrder.F_CusPhone, "197387", "", modelT_Bus_WorkOrder.F_WorkOrderId);
+                    }
+                    oper.F_CreateUser = User.F_UserCode;
+                    oper.F_CreateTime = DateTime.Now;
+                    oper.F_IsDelete = 0;
+                    operBLL.Add(oper);
 
-                            foreach (var u in users)
-                            {
-                                msg.AddInternalMessagesInfo("工单消息", msgss + "，工单编号：" + modelT_Bus_WorkOrder.F_WorkOrderId, u.F_UserCode, User.F_UserCode, (int)EnumSmsType.workorder);
-                                string count = "你有新工单：" + modelT_Bus_WorkOrder.F_WorkOrderId + "，请及时查收处理。";
-                                string mag = modelT_Bus_WorkOrder.F_WorkOrderId;
-                                bool n = SMSController.AddSmS(0, mag, count, u.F_Mobile, "153305", "");
-                            }
-                            var user = new BLL.T_Sys_UserAccount().GetModelList("F_DeptId in (" + deptid + ") ");
-                        }
-                        #endregion
-                        //推送消息表
-                        if (modelT_Bus_WorkOrder.F_WorkState != (int)EnumWorkState.neworder && modelT_Bus_WorkOrder.F_WorkState != (int)EnumWorkState.audit) //0)
-                        {
+                    //推送消息表
+                    if (modelT_Bus_WorkOrder.F_WorkState != (int)EnumWorkState.neworder && modelT_Bus_WorkOrder.F_WorkState != (int)EnumWorkState.audit) //0)
+                    {
 
-                            var role = new BLL.T_Sys_RoleInfo().GetModelList(" (F_RoleCode='ZXLD' or F_RoleCode='ZXLDGLYGLY' or F_RoleCode='MTDD')  ").Select(p => p.F_RoleId);
-                            var users = userBLL.GetModelList(" F_RoleId in (" + string.Join(",", role) + ")  ");
+                        var role = new BLL.T_Sys_RoleInfo().GetModelList(" (F_RoleCode='ZXLD' or F_RoleCode='ZXLDGLYGLY' or F_RoleCode='MTDD')  ").Select(p => p.F_RoleId);
+                        var users = userBLL.GetModelList(" F_RoleId in (" + string.Join(",", role) + ")  ");
 
-                            foreach (var u in users)
-                            {
-                                msg.AddInternalMessagesInfo("工单消息", oper.F_Message, u.F_UserCode, User.F_UserCode, (int)EnumSmsType.workorder);
-                            }
+                        foreach (var u in users)
+                        {
+                            msg.AddInternalMessagesInfo("工单消息", oper.F_Message, u.F_UserCode, User.F_UserCode, (int)EnumSmsType.workorder);
                         }
-                        #endregion
-                    });
+                    }
+                    #endregion
+                });
+                await Task.Run(() =>
+                {
+                    #region 自动派单
+                    if (ispd > 0)
+                    {
+                        string resdatetime = "";
+                        string resdate = DateTime.Now.Date.ToString("yyyy-MM-dd");
+                        DataTable dt = DbHelperSQL.Query("select top " + 7 + " F_OffDate from  T_Sys_WorkOFFDays  where F_OffState = 1   and F_OffDate>'" + resdate + "' order by F_OffDate").Tables[0];
+                        resdatetime = dt.Rows[dt.Rows.Count - 1]["F_OffDate"].ToString();
+                        resdatetime = Convert.ToDateTime(resdatetime).ToString("yyyy-MM-dd") + " 23:59:59 ";
 
+                        Model.T_Bus_AssignedInfo modelT_Bus_AssignedInfo = new Model.T_Bus_AssignedInfo();
+                        modelT_Bus_AssignedInfo.F_WorkOrderId = modelT_Bus_WorkOrder.F_WorkOrderId;
+                        modelT_Bus_AssignedInfo.F_LimitTime = Convert.ToDateTime(resdatetime);
+                        modelT_Bus_AssignedInfo.F_MainDeptId = deptid;
+                        modelT_Bus_AssignedInfo.F_OtherDeptIds = "";//协办单位id
+                        modelT_Bus_AssignedInfo.F_AssignedOpinion = "自动派单";//交办意见
+                        modelT_Bus_AssignedInfo.F_State = 1;//0草稿  1正式
+                        modelT_Bus_AssignedInfo.F_CreateUser = User.F_UserCode;
+                        modelT_Bus_AssignedInfo.F_CreateTime = DateTime.Now;
+                        modelT_Bus_AssignedInfo.F_IsDelete = 0;
+                        modelT_Bus_AssignedInfo.F_IsOverdue = 0;
+                        modelT_Bus_AssignedInfo.F_IsSure = 0;
+                        modelT_Bus_AssignedInfo.F_IsReload = 0;
+                        modelT_Bus_AssignedInfo.F_IsNext = 0;
+                        modelT_Bus_AssignedInfo.F_TimeResp = assignBLL.GetRepTimly(DateTime.Now);//及时查收时间点
+                        int aid = assignBLL.Add(modelT_Bus_AssignedInfo);
+                        modelT_Bus_WorkOrder.F_LimitTime = Convert.ToDateTime(resdatetime);
+                        modelT_Bus_WorkOrder.F_MainDeptId = deptid;
+                        modelT_Bus_WorkOrder.F_OtherDeptIds = "";
+                        modelT_Bus_WorkOrder.F_AssignUser = User.F_UserCode;
+                        modelT_Bus_WorkOrder.F_AssignTime = DateTime.Now;
+                        workorderBLL.Update(modelT_Bus_WorkOrder);
+                        var msgss = userinfo + " 交办了工单，主办单位：" + modeldept.F_DeptName;
 
-                    trans.Complete();
-                }
+                        addoptlog(modelT_Bus_WorkOrder.F_WorkOrderId, modelT_Bus_WorkOrder.F_WorkState, modelT_Bus_AssignedInfo.F_Id, msgss, User.F_UserCode);
+
+                        //推送消息表
+                        var users = userBLL.GetModelList(" F_DeptId='" + deptid + "' ");
+
+                        foreach (var u in users)
+                        {
+                            msg.AddInternalMessagesInfo("工单消息", msgss + "，工单编号：" + modelT_Bus_WorkOrder.F_WorkOrderId, u.F_UserCode, User.F_UserCode, (int)EnumSmsType.workorder);
+                            string count = "你有新工单：" + modelT_Bus_WorkOrder.F_WorkOrderId + "，请及时查收处理。";
+                            string mag = modelT_Bus_WorkOrder.F_WorkOrderId;
+                            bool n = SMSController.AddSmS(0, mag, count, u.F_Mobile, "153305", "");
+                        }
+                        var user = new BLL.T_Sys_UserAccount().GetModelList("F_DeptId in (" + deptid + ") ");
+                    }
+                    #endregion
+                });
 
                 return Success("操作成功");