Merge branch 'feat-liucheng'

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/SMSController.cs

@@ -9,6 +9,8 @@ using qcloudsms_csharp.httpclient;
 using System.Data;
 using System.Collections.Generic;
 using CallCenter.Utility;
+using CallCenterApi.Interface.App_Start;
+using System.Linq;
 
 namespace CallCenterApi.Interface.Controllers
 {
@@ -57,6 +59,46 @@ namespace CallCenterApi.Interface.Controllers
             }
 
         }
+        /// <summary>
+        /// 微信端发送短信
+        /// </summary>
+        /// <param name="name"></param>
+        /// <param name="phone"></param>
+        /// <param name="cusphone"></param>
+        /// <returns></returns>
+        [WechatActionFilter]
+        public ActionResult SMSSendWx(string name, string phone, string cusphone, string OpenId)
+        {
+            if (!string.IsNullOrEmpty(OpenId))
+            {
+                var ua = sysUserAccountBll.GetModelList(" F_WxOpenId='" + OpenId + "'").FirstOrDefault();
+                //Model.T_Sys_UserAccount ua = sysUserAccountBll.GetModel(userId);
+                if (string.IsNullOrEmpty(name))
+                    return Error("请输入联系人姓名");
+                if (string.IsNullOrEmpty(phone))
+                    return Error("请输入联系人电话");
+                if (string.IsNullOrEmpty(cusphone))
+                    return Error("请输入发送号码");
+                string msg = "您好！感谢您的来电，有关化肥详细问题可联系市场经理，姓名：" + name + "，电话：" + phone + "。您也可以微信关注“心连心农资快讯”公众号进行咨询。祝您生活愉快！";
+                string[] mag = { name, phone };
+                SmsSingleSenderResult result = SMSSingleshot(466863, mag, cusphone);
+
+                if (result != null)
+                {
+                    AddSmS(cusphone, msg, ua.F_UserId);
+                    return Success("发送短信", result);
+                }
+                else
+                {
+                    return Error("发送失败，请检查客户电话");
+                }
+            }
+            else
+            {
+                return Error("无操作权限");
+            }
+
+        }
         public ActionResult GetSmSList(string starttime, string endtime,string phone, int pageindex = 1, int pagesize = 10)
         {
             int userId = CurrentUser.UserData.F_UserId;

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/weixin/WxLoginController.cs

@@ -158,13 +158,13 @@ namespace CallCenterApi.Interface.Controllers.weixin
                 #endregion
                 #region 部门角色
                 //部门角色（-1管理员，1接待部，2案场经理、项目负责人,3销售部总经理、物业部总经理、工程总经理、设计总经理,4区域客服，5业主（客户档案））
-                if (loginUser.F_RoleId == 17)
-                {
-                    //-1管理员
-                    return Error("无操作权限");
-                }
-                else
-                {
+                //if (loginUser.F_RoleId == 17)
+                //{
+                //    //-1管理员
+                //    return Error("无操作权限");
+                //}
+                //else
+                //{
                     if (loginUser.F_RoleId == 60)
                     {
                         UserType = 0;
@@ -190,6 +190,11 @@ namespace CallCenterApi.Interface.Controllers.weixin
                         UserType = 3;
                         rolename = "办理人员";
                     }
+                    else if (rolemodel.F_RoleCode == "JDYPTZX" || rolemodel.F_RoleCode == "XTGLY")
+                    {
+                        UserType = 5;
+                        rolename = "客服";
+                    }
                     //else if (loginUser.F_RoleId == 59)
                     //{
                     //    UserType = 3;
@@ -227,7 +232,7 @@ namespace CallCenterApi.Interface.Controllers.weixin
                     //    USERTYPE = 0;
                     //}
                     #endregion
-                }
+                //}
                 #endregion
                 var obj = new
                 {
@@ -1452,6 +1457,7 @@ namespace CallCenterApi.Interface.Controllers.weixin
         public int GetGCDept(int deptid)
         {
             string deptcode = "";
+            string namelike = "总经理";
             int gcdeptid = 0;
 
             if (CirculMarket(deptid, 11))
@@ -1481,7 +1487,16 @@ namespace CallCenterApi.Interface.Controllers.weixin
             }
             if (!string.IsNullOrEmpty(deptcode))
             {
-                var dept = departmentBLL.GetModelList($" F_DeptCode LIKE '" + deptcode + "%' and F_DeptName like '%总经理%'").FirstOrDefault();
+                var deptmodel = departmentBLL.GetModel(deptid);
+                if (deptmodel != null)
+                {
+                    if (deptmodel.F_DeptCode.Contains("|0|1|14|423|"))
+                    {
+                        deptcode = "|0|1|14|423|";
+                        namelike = "高层";
+                    }
+                }
+                var dept = departmentBLL.GetModelList($" F_DeptCode LIKE '" + deptcode + "%' and F_DeptName like '%" + namelike + "%'").FirstOrDefault();
                 if (dept != null)
                     gcdeptid = dept.F_DeptId;
             }
@@ -1616,7 +1631,7 @@ namespace CallCenterApi.Interface.Controllers.weixin
                     }
                     else if (ro.F_RoleCode == "DQJL" || ro.F_RoleCode == "FGSJL" || ro.F_RoleCode == "BLRY" || ro.F_RoleCode == "ZG" || ro.F_RoleCode == "GC")
                     {
-                        string markdepts = "37,57,74,88,268,295,339,422,213,427,433";
+                        string markdepts = "37,57,74,88,268,295,339,422,213,427,433,424";
                         string qualdepts = "12,36,295,245";
                         string detpid = "" + ua.F_DeptId;
                         var deparmentlist = new List<Model.T_Sys_Department>();
@@ -1891,7 +1906,7 @@ namespace CallCenterApi.Interface.Controllers.weixin
         public string GetOverWo(string usercode)
         {
             string str = "";
-            str = $"Select F_WoID from T_Wo_WorkOrderItem_New where F_ItemType=" + (int)EnumItemType.deal + " and F_WoState in (" + (int)EnumWorkOrderState.audit + "," + (int)EnumWorkOrderState.finish + ") and F_OptType=" + (int)EnumItemOpt.end + " and F_CreateUser='" + usercode + "'";
+            str = $"Select F_WoID from T_Wo_WorkOrderItem_New where F_ItemType=" + (int)EnumItemType.deal + " and F_WoState in (" + (int)EnumWorkOrderState.audit + "," + (int)EnumWorkOrderState.finish + ") and F_OptType in (" + (int)EnumItemOpt.end + "," + (int)EnumItemOpt.deal + ") and F_CreateUser='" + usercode + "'";
             return str;
 
         }
@@ -2222,7 +2237,7 @@ namespace CallCenterApi.Interface.Controllers.weixin
                         else if (ro.F_RoleCode == "DQJL" || ro.F_RoleCode == "FGSJL" || ro.F_RoleCode == "BLRY" || ro.F_RoleCode == "ZG" || ro.F_RoleCode == "GC")
                         {
 
-                            string markdepts = "37,57,74,88,268,295,339,422,213,427,433";
+                            string markdepts = "37,57,74,88,268,295,339,422,213,427,433,424";
                             string qualdepts = "12,36,295,245";
                             string detpid = "" + ua.F_DeptId;
                             var deparmentlist = new List<Model.T_Sys_Department>();
@@ -2391,7 +2406,7 @@ namespace CallCenterApi.Interface.Controllers.weixin
                             string touser = "";
                             string strwhere = "";
                             string contens = "";
-                            strwhere = $" F_DeptId in (select top 1 F_NextDept  from T_Wo_WorkOrderItem_New where F_WoID={model.F_ID} and F_NextDept in(37,57,74,88,268,295,339,422,213,427,433) order by F_CreateTime desc)";
+                            strwhere = $" F_DeptId in (select top 1 F_NextDept  from T_Wo_WorkOrderItem_New where F_WoID={model.F_ID} and F_NextDept in(37,57,74,88,268,295,339,422,213,427,433,424) order by F_CreateTime desc)";
                             var deptmodel = departmentBLL.GetModelList(strwhere).FirstOrDefault();
                             if (deptmodel != null)
                             {
@@ -2541,6 +2556,7 @@ namespace CallCenterApi.Interface.Controllers.weixin
             return Error("无操作权限！");
         }
 
+
         /// <summary>
         /// 审核工单
         /// </summary>
@@ -2988,7 +3004,7 @@ namespace CallCenterApi.Interface.Controllers.weixin
             if (!string.IsNullOrEmpty(OpenId))
             {
                 int woflag = 0;
-                string markdepts = "37,57,74,88,268,295,339,213,427,433";
+                string markdepts = "37,57,74,88,268,295,339,213,427,433,424";
                 string sqlstr = "";
                 if (id <= 0)
                 {
@@ -3135,7 +3151,7 @@ namespace CallCenterApi.Interface.Controllers.weixin
         {
             int? flag = 0;
 
-            string markdepts = "37,57,74,88,268,295,339,213,427,433";
+            string markdepts = "37,57,74,88,268,295,339,213,427,433,424";
             if (!string.IsNullOrEmpty(usercode))
             {
                 Model.T_Sys_UserAccount ua = userAccountBLL.GetModel(usercode);
@@ -5395,7 +5411,7 @@ namespace CallCenterApi.Interface.Controllers.weixin
                      sms = (int)itemlast.F_IsSMS;
                 }
                 WorkOrderNewInput input = new WorkOrderNewInput();
-                string markdepts = "37,57,74,88,268,295,339,422,213,427,433";
+                string markdepts = "37,57,74,88,268,295,339,422,213,427,433,424";
                 string qualdepts = "12,36,295,245";
                 if (ua != null)
                 {
@@ -5588,7 +5604,7 @@ namespace CallCenterApi.Interface.Controllers.weixin
                                         //    }
 
                                         //}
-                                        else if (deptmodel.F_DeptId == 248)
+                                        else if (deptmodel.F_DeptName == "计划调度科")
                                         {
                                             input.F_CarNumber = deptment.CarNumber;
                                             input.F_UnLoadingFee = deptment.UnLoadingFee;//卸车费
@@ -5941,21 +5957,22 @@ namespace CallCenterApi.Interface.Controllers.weixin
                     }
                 if (!string.IsNullOrEmpty(Supercont))
                 {
+                    string strcont = nowUser.F_UserName + "(" + nowUser.F_WorkNumber + ") " + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
+                    string strconts1 = strcont + " " + Supercont + ";@# ";
                     if (flag == 1 || ((model.F_Flag == null || model.F_Flag == 0) && flag == 3))
                     {
-                        if (model.F_SuperiorOpinion.Trim() != Supercont.Trim())
+                        if (!model.F_SuperiorOpinion.Trim().Contains(Supercont.Trim()))
                         {
-                            model.F_SuperiorOpinion = nowUser.F_UserName + "(" + nowUser.F_WorkNumber + ") " + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + " " + Supercont;
+                            model.F_SuperiorOpinion = string.IsNullOrEmpty(model.F_SuperiorOpinion) ? strconts1 : model.F_SuperiorOpinion + strconts1;
                         }
                     }
                     else if (flag == 2)
                     {
-                        if (model.F_SuperiorOpinion2.Trim() != Supercont.Trim())
+                        if (!model.F_SuperiorOpinion2.Trim().Contains(Supercont.Trim()))
                         {
-                            model.F_SuperiorOpinion2 = nowUser.F_UserName + "(" + nowUser.F_WorkNumber + ") " + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + " " + Supercont;
+                            model.F_SuperiorOpinion2 = string.IsNullOrEmpty(model.F_SuperiorOpinion2) ? strconts1 : model.F_SuperiorOpinion2 + strconts1;
                         }
                     }
-
                 }
                 InToworkModel(model, input, nowUser);
 
@@ -6411,6 +6428,8 @@ namespace CallCenterApi.Interface.Controllers.weixin
                                 }
                                 else
                                 {
+                                    string[] mag = { model.F_WorkOrderCode };
+                                    string smsmsg = $"你好，投诉工单 {model.F_WorkOrderCode} 高层审批未通过，已驳回至你的待处理工单，请及时办理！";
                                     touser = item.F_CreateUser;
                                     if (type == 1 || type == 3)
                                     {
@@ -6422,6 +6441,15 @@ namespace CallCenterApi.Interface.Controllers.weixin
                                     }
 
                                     AddLog(model.F_ID, (int)EnumWorkOrderState.receive, deptname + ua.F_UserName + "(" + ua.F_WorkNumber + ")" + "高层已审批" + isagreestr, (int)EnumItemType.deal, (int)EnumItemOpt.reaudit, touser, 0, ua, 0, 0, "", 0, type);
+                                    var tosermodel = userAccountBLL.GetModel(touser);
+                                    #region  审批未通过发送短信
+                                    if (tosermodel != null && !string.IsNullOrEmpty(tosermodel.F_Mobile))
+                                    {
+                                        SmsSingleSenderResult result = new SMSController().SMSSingleshot(1498743, mag, tosermodel.F_Mobile.Trim());
+                                        bool nn = new SMSController().AddSmS(tosermodel.F_Mobile.Trim(), smsmsg, model.F_ID);
+                                    }
+                                    #endregion
+
                                 }
                             }
                         }
@@ -6530,7 +6558,7 @@ namespace CallCenterApi.Interface.Controllers.weixin
          string uncont = "",
         int isvisit = 1, int isover = 0, int inoutflag = 0, int isApprovalp = 0)
         {
-            string markdepts = "37,57,74,88,268,295,339,422,213,427,433";
+            string markdepts = "37,57,74,88,268,295,339,422,213,427,433,424";
             string qualdepts = "12,36,295,245";
             if (!string.IsNullOrEmpty(OpenId))
             {
@@ -6742,7 +6770,7 @@ namespace CallCenterApi.Interface.Controllers.weixin
                     if (model != null)
                     {
                         int flag = 0;
-                        string markdepts = "37,57,74,88,268,295,339,422,213,427,433";
+                        string markdepts = "37,57,74,88,268,295,339,422,213,427,433,424";
                         var modellist = new BLL.T_Wo_WorkOrderItem_New().GetModelList($"F_WoID={model.F_ID} and F_IsUsed=0 and  F_NextUser like '%{ua.F_UserCode}%'  order by   F_ID desc ");
                         var itemnext = itembll.GetModelList(" F_ItemType=" + (int)EnumItemType.deal + " and F_WoState =1 and  F_WoID='" + model.F_ID + "'and F_NextUser like '%" + ua.F_UserCode + "%' order by F_ID desc").FirstOrDefault();
                         if (modellist.Count <= 0)
@@ -6804,7 +6832,7 @@ namespace CallCenterApi.Interface.Controllers.weixin
                     if (model != null)
                     {
                         int flag = 0;
-                        string markdepts = "37,57,74,88,268,295,339,422,213,427,433";
+                        string markdepts = "37,57,74,88,268,295,339,422,213,427,433,424";
                         Model.T_Sys_RoleInfo ro = rolebll.GetModel(ua.F_RoleId);
                         var modelnext = new BLL.T_Wo_WorkOrderItem_New().GetModelList($"F_WoID={model.F_ID} and F_OptType=1  and F_CreateUser={ua.F_UserCode} order by   F_ID desc ");
 
@@ -7099,7 +7127,7 @@ namespace CallCenterApi.Interface.Controllers.weixin
         {
             #region 工单处理
             int sms = 0;
-            string markdepts = "37,57,74,88,268,295,339,422,213,427,433";
+            string markdepts = "37,57,74,88,268,295,339,422,213,427,433,424";
             var itemlasts = itembll.GetModelList("  F_ItemType=" + (int)EnumItemType.deal + " and  F_WoID=" + model.F_ID + " ");
             if (itemlasts.Count > 0)
             {
@@ -7335,6 +7363,8 @@ namespace CallCenterApi.Interface.Controllers.weixin
 
                 if (!string.IsNullOrEmpty(cont))
                 {
+                    string strcont = nowUser.F_UserName + "(" + nowUser.F_WorkNumber + ") " + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
+                    string strconts1 = strcont + " " + cont + ";@# ";
                     if (model.F_Source == "3")
                     {
                         if (flag == 2)
@@ -7359,16 +7389,16 @@ namespace CallCenterApi.Interface.Controllers.weixin
                     }
                     if (flag == 1 || ((model.F_Flag == null || model.F_Flag == 0) && flag == 3))
                     {
-                        if (model.F_SuperiorOpinion.Trim() != cont.Trim())
+                        if (!model.F_SuperiorOpinion.Trim().Contains(cont.Trim()))
                         {
                             model.F_SuperiorOpinion = nowUser.F_UserName + "(" + nowUser.F_WorkNumber + ") " + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + " " + cont;
                         }
                     }
                     else if (flag == 2)
                     {
-                        if (model.F_SuperiorOpinion2.Trim() != cont.Trim())
+                        if (!model.F_SuperiorOpinion2.Trim().Contains(cont.Trim()))
                         {
-                            model.F_SuperiorOpinion2 = nowUser.F_UserName + "(" + nowUser.F_WorkNumber + ") " + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + " " + cont;
+                            model.F_SuperiorOpinion2 = string.IsNullOrEmpty(model.F_SuperiorOpinion2) ? strconts1 : model.F_SuperiorOpinion2 + strconts1;
                         }
                     }
                     //model.F_SuperiorOpinion = string.IsNullOrEmpty(model.F_SuperiorOpinion) ? cont : model.F_SuperiorOpinion + "； " + cont;

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/workorder/WorkOrderNewController.cs

@@ -656,7 +656,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
         public string GetOverWo(string usercode)
         {
             string str = "";
-            str = $"Select F_WoID from T_Wo_WorkOrderItem_New where F_ItemType="+(int)EnumItemType.deal+" and F_WoState in (" +(int)EnumWorkOrderState.audit+","+(int)EnumWorkOrderState.finish + ") and F_OptType=" + (int)EnumItemOpt.end + " and F_CreateUser='"+ usercode + "'";
+            str = $"Select F_WoID from T_Wo_WorkOrderItem_New where F_ItemType="+(int)EnumItemType.deal+" and F_WoState in (" +(int)EnumWorkOrderState.audit+","+(int)EnumWorkOrderState.finish + ") and F_OptType in (" + (int)EnumItemOpt.end + "," + (int)EnumItemOpt.deal + ") and F_CreateUser='" + usercode + "'";
             return str;
 
         }
@@ -1233,7 +1233,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                             else if (ro.F_RoleCode == "DQJL" || ro.F_RoleCode == "FGSJL" || ro.F_RoleCode == "BLRY" || ro.F_RoleCode == "ZG" || ro.F_RoleCode == "GC")
                             {
 
-                                string markdepts = "37,57,74,88,268,295,339,422,213,427,433";
+                                string markdepts = "37,57,74,88,268,295,339,422,213,427,433,424";
                                 string qualdepts = "12,36,295,245";
                                 string detpid = "" + ua.F_DeptId;
                                 var deparmentlist = new List<Model.T_Sys_Department>();
@@ -2427,6 +2427,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
         public int GetGCDept(int deptid)
         {
             string deptcode = "";
+            string namelike = "总经理";
             int gcdeptid = 0;
 
             if (CirculMarket(deptid, 11))
@@ -2456,7 +2457,16 @@ namespace CallCenterApi.Interface.Controllers.workorder
             }
             if (!string.IsNullOrEmpty(deptcode))
             {
-                var dept = departmentBLL.GetModelList($" F_DeptCode LIKE '" + deptcode + "%' and F_DeptName like '%总经理%'").FirstOrDefault();
+                var deptmodel = departmentBLL.GetModel(deptid);
+                if (deptmodel != null)
+                {
+                    if (deptmodel.F_DeptCode.Contains("|0|1|14|423|"))
+                    {
+                        deptcode = "|0|1|14|423|";
+                        namelike = "高层";
+                    }
+                }
+                var dept = departmentBLL.GetModelList($" F_DeptCode LIKE '" + deptcode + "%' and F_DeptName like '%"+ namelike + "%'").FirstOrDefault();
                 if (dept != null)
                     gcdeptid = dept.F_DeptId;
             }
@@ -2514,7 +2524,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
         {
             int userId = CurrentUser.UserData.F_UserId;
             int woflag = 0;
-            string markdepts = "37,57,74,88,268,295,339,213,427,433";
+            string markdepts = "37,57,74,88,268,295,339,213,427,433,424";
             if (userId != 0)
             {
                 DataTable FileUrl = new DataTable();
@@ -2595,7 +2605,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
         {
             int? flag = 0;
             int userId = CurrentUser.UserData.F_UserId;
-            string markdepts = "37,57,74,88,268,295,339,213,427,433";
+            string markdepts = "37,57,74,88,268,295,339,213,427,433,424";
             if (userId != 0)
             {
                 Model.T_Sys_UserAccount ua = sysUserAccountBll.GetModel(userId);
@@ -2737,7 +2747,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
         public int? IsMarketAssign(long fid)
         {
             int? woflag = 0;
-            string markdepts = "37,57,74,88,268,295,339,213,427,433";
+            string markdepts = "37,57,74,88,268,295,339,213,427,433,424";
             int userId = CurrentUser.UserData.F_UserId;
             if (userId != 0)
             {
@@ -3281,7 +3291,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                     sql += $" and F_CreateBy like '%" + ua.F_UserCode.Trim() + "%'";
                 else if (ro.F_RoleCode == "DQJL" || ro.F_RoleCode == "FGSJL" || ro.F_RoleCode == "BLRY" || ro.F_RoleCode == "ZG" || ro.F_RoleCode == "GC")
                 {
-                    string markdepts = "37,57,74,88,268,295,339,422,213,427,433";
+                    string markdepts = "37,57,74,88,268,295,339,422,213,427,433,424";
                     string qualdepts = "12,36,295,245";
                     string detpid = "" + ua.F_DeptId;
                     var deparmentlist = new List<Model.T_Sys_Department>();
@@ -3927,7 +3937,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                             drNew["问题描述"] = it.F_Description;//
                             drNew["创建时间"] = it.F_CreateOn;
                             #region  获取外线完结时间
-                            var itemlasts = itembll.GetModelList($" F_WoID={it.F_ID} and F_ItemType={(int)EnumItemType.deal} and F_OptType={(int)EnumItemOpt.end} and F_Type=1 order by F_CreateTime desc").FirstOrDefault();
+                            var itemlasts = itembll.GetModelList($" F_WoID={it.F_ID} and F_ItemType={(int)EnumItemType.deal} and F_OptType in ({(int)EnumItemOpt.end},{(int)EnumItemOpt.deal}) and F_Type in(1,3) order by F_CreateTime desc").FirstOrDefault();
                             if (itemlasts != null)
                                 drNew["完结时间"] = itemlasts.F_CreateTime;
                             #endregion
@@ -3969,10 +3979,20 @@ namespace CallCenterApi.Interface.Controllers.workorder
                                 drNew["剩余时间"] = string.Format("剩余{0:f0}天{1:f0}时{2:f0}分", days1, hours, minutes);
                             else
                                 drNew["剩余时间"] = string.Format("超时{0:f0}天{1:f0}时{2:f0}分", days1, hours, minutes);
-                            float RemainingTime = float.Parse(string.Format("{0:f2}", TimeToOver(it.F_ID, it.F_limit)));                        
-                            float aa = Math.Abs(it.F_limit-RemainingTime);
-                            int days = (int)Math.Floor(Convert.ToDouble(aa / 24));
-                            drNew["用时(天)"] = days+"天";
+                            //float RemainingTime = float.Parse(string.Format("{0:f2}", TimeToOver(it.F_ID, it.F_limit)));
+                            if (itemlasts!=null && itemlasts.F_CreateTime != null)
+                            {
+                                float aa = Math.Abs((float)(DateTime.Parse(itemlasts.F_CreateTime.ToString())- DateTime.Parse(it.F_CreateOn.ToString())).TotalHours);
+                                int days2 = (int)Math.Floor(Convert.ToDouble(aa / 24));
+                                int hours1 = days2 > 0
+                                          ? (int)Math.Floor(Convert.ToDouble((aa - days2 * 24)))
+                                          : (int)Math.Floor(Convert.ToDouble(aa));
+                                float minutes1 = hours1 > 0
+                                               ? aa * 60 - days2 * 1440 - hours1 * 60
+                                               : 0;
+                                drNew["用时(天)"] = string.Format("用时{0:f0}天{1:f0}时{2:f0}分", days2, hours1, minutes1);
+                            }
+                          
                             #endregion
                             //#region 内线
                             //float RemainingTime2 = float.Parse(string.Format("{0:f2}", TimeToOver(it.F_ID, it.F_limit, 2)));
@@ -7101,7 +7121,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 string touser = "";
                 string[] mag = { hours.ToString(),model.F_WorkOrderCode };
                 string smsmsg = $"您有一个工单即将超期，剩余时间{hours}小时，请尽快办理，工单编号：{model.F_WorkOrderCode }";
-                string strwhere = $" F_DeptId in (select top 1 F_NextDept  from T_Wo_WorkOrderItem_New where F_WoID={model.F_ID} and F_NextDept in(37,57,74,88,268,295,339,422,213,427,433) order by F_CreateTime desc)";
+                string strwhere = $" F_DeptId in (select top 1 F_NextDept  from T_Wo_WorkOrderItem_New where F_WoID={model.F_ID} and F_NextDept in(37,57,74,88,268,295,339,422,213,427,433,424) order by F_CreateTime desc)";
                 var deptmodel = departmentBLL.GetModelList(strwhere).FirstOrDefault();
                 if (deptmodel != null)
                 {
@@ -8001,8 +8021,13 @@ namespace CallCenterApi.Interface.Controllers.workorder
                                     inputs.F_ZL_ResponsibleUnit = deptment.ResponsibleUnit;// 质量管理科-责任单位（需列出，可选多个）
 
                                 }
-                                else if (deptmodel.F_DeptName == "成品库") //退换货成品库录入物料信息
+                                else if (deptmodel.F_DeptName == "计划调度科") //退换货成品库录入物料信息
                                 {
+                                    inputs.F_CarNumber = deptment.CarNumber;//返厂车牌号
+                                    inputs.F_LoadingFee = deptment.LoadingFee;//装车费
+                                    inputs.F_UnLoadingFee = deptment.UnLoadingFee;//卸车费
+                                    inputs.F_MaterialFee = deptment.MaterialFee;//返料费
+                                    input.F_DrivePhone = deptment.DrivePhone;//电话号码
                                     if (string.IsNullOrEmpty(jsonstr))
                                     {
                                         return Error("请输入物料信息！");
@@ -8040,14 +8065,14 @@ namespace CallCenterApi.Interface.Controllers.workorder
                                     }
 
                                 }
-                                else if (deptmodel.F_DeptId == 248)
-                                {
-                                    inputs.F_CarNumber = deptment.CarNumber;//返厂车牌号
-                                    inputs.F_LoadingFee = deptment.LoadingFee;//装车费
-                                    inputs.F_UnLoadingFee = deptment.UnLoadingFee;//卸车费
-                                    inputs.F_MaterialFee = deptment.MaterialFee;//返料费
-                                    input.F_DrivePhone = deptment.DrivePhone;//电话号码
-                                }
+                                //else if (deptmodel.F_DeptName == "计划调度科")
+                                //{
+                                //    inputs.F_CarNumber = deptment.CarNumber;//返厂车牌号
+                                //    inputs.F_LoadingFee = deptment.LoadingFee;//装车费
+                                //    inputs.F_UnLoadingFee = deptment.UnLoadingFee;//卸车费
+                                //    inputs.F_MaterialFee = deptment.MaterialFee;//返料费
+                                //    input.F_DrivePhone = deptment.DrivePhone;//电话号码
+                                //}
                                 //else if (deptmodel.F_DeptName == "销售内勤" && (model.F_SC_PreliminaryOpinion == "退货" || model.F_SC_PreliminaryOpinion == "换货"))//部门id=193
                                 //{
                                 //    modlelist.F_SC_CJ_ReturnAccount = deptment.ReturnAccount2;//销售内勤-确认返账金额                               
@@ -8104,9 +8129,9 @@ namespace CallCenterApi.Interface.Controllers.workorder
                             if (clbm2 == 427) //运营中心
                             {
                                 flag = 3;
-                                model.F_Flag = 9;
-                                model.F_State = (int)EnumWorkOrderState.assign;
-                                model.F_State2 = (int)EnumWorkOrderState.assign;
+                                modlelist.F_Flag = 9;
+                                modlelist.F_State = (int)EnumWorkOrderState.assign;
+                                modlelist.F_State2 = (int)EnumWorkOrderState.assign;
                                 AssignWO(ua, modlelist, inputs, cont, F_Files, clbm2, clid2, overtime, sms, 0, 0, 0, "", 0, 3,9);
                             }
                             else
@@ -8122,9 +8147,9 @@ namespace CallCenterApi.Interface.Controllers.workorder
                             if (clbm == 427) //运营中心
                             {
                                 flag = 3;
-                                model.F_Flag = 9;
-                                model.F_State = (int)EnumWorkOrderState.assign;
-                                model.F_State2 = (int)EnumWorkOrderState.assign;
+                                modlelist.F_Flag = 9;
+                                modlelist.F_State = (int)EnumWorkOrderState.assign;
+                                modlelist.F_State2 = (int)EnumWorkOrderState.assign;
                                 AssignWO(ua, modlelist, inputs, cont, F_Files, clbm, clid, overtime, sms, 0, 0, 0, "", 0, 3, 9);
                             }
                             else
@@ -8204,7 +8229,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                             string touser = "";
                             string strwhere = "";
                             string contens = "";
-                            strwhere = $" F_DeptId in (select top 1 F_NextDept  from T_Wo_WorkOrderItem_New where F_WoID={model.F_ID} and F_NextDept in(37,57,74,88,268,295,339,422,213,427,433) order by F_CreateTime desc)";
+                            strwhere = $" F_DeptId in (select top 1 F_NextDept  from T_Wo_WorkOrderItem_New where F_WoID={model.F_ID} and F_NextDept in(37,57,74,88,268,295,339,422,213,427,433,424) order by F_CreateTime desc)";
                             var deptmodel = departmentBLL.GetModelList(strwhere).FirstOrDefault();
                             if (deptmodel != null)
                             {
@@ -8299,11 +8324,9 @@ namespace CallCenterApi.Interface.Controllers.workorder
             {
                 creatuser1 = itemlasts1.F_CreateUser;
                 woflag = Convert.ToInt32(itemlasts1.F_Type);
-
             }
             if (itemlasts2 != null)
             {
-                woflag = Convert.ToInt32(itemlasts2.F_Type);
                 creatuser2 = itemlasts2.F_CreateUser;
             }
 
@@ -8604,7 +8627,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                         }
                     }
                 }
-                string markdepts = "37,57,74,88,268,295,339,422,213,427,433";
+                string markdepts = "37,57,74,88,268,295,339,422,213,427,433,424";
                 string qualdepts = "12,36,295,245";
                 WorkOrderNewInput input = new WorkOrderNewInput();
                 if (clid != 0)
@@ -8850,7 +8873,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                                     //    }
 
                                     //}
-                                    else if (deptmodel.F_DeptId == 248)
+                                    else if (deptmodel.F_DeptName == "计划调度科")
                                     {
                                         input.F_CarNumber = deptment.CarNumber;//返厂车牌号
                                         input.F_LoadingFee = deptment.LoadingFee;//装车费
@@ -9104,7 +9127,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
             int userId = CurrentUser.UserData.F_UserId;
             if (userId != 0)
             {
-                string markdepts = "37,57,74,88,268,295,339,422,213,427,433";
+                string markdepts = "37,57,74,88,268,295,339,422,213,427,433,424";
                 string qualdepts = "12,36,295,245"; //245:九江心连心化肥有限公司-质量督察处
                 if (string.IsNullOrEmpty(cont))
                     return Error("请输入处理内容");
@@ -9303,6 +9326,8 @@ namespace CallCenterApi.Interface.Controllers.workorder
                                 }
                                 else
                                 {
+                                    string[] mag = {model.F_WorkOrderCode};
+                                    string smsmsg= $"你好，投诉工单 {model.F_WorkOrderCode} 高层审批未通过，已驳回至你的待处理工单，请及时办理！";
                                     touser = item.F_CreateUser;
                                     if (type == 1 || type == 3)
                                     {
@@ -9314,6 +9339,15 @@ namespace CallCenterApi.Interface.Controllers.workorder
                                     }
 
                                     AddLog(model.F_ID, (int)EnumWorkOrderState.receive, deptname + ua.F_UserName + "(" + ua.F_WorkNumber + ")" + "高层已审批" + isagreestr, (int)EnumItemType.deal, (int)EnumItemOpt.reaudit, touser, 0, ua, 0, 0, "", 0, type);
+                                    var tosermodel = sysUserAccountBll.GetModel(touser);
+                                    #region  审批未通过发送短信
+                                    if (tosermodel!=null && !string.IsNullOrEmpty(tosermodel.F_Mobile))
+                                    {
+                                        SmsSingleSenderResult result = new SMSController().SMSSingleshot(1498743, mag, tosermodel.F_Mobile.Trim());
+                                        bool nn = new SMSController().AddSmS(tosermodel.F_Mobile.Trim(), smsmsg, model.F_ID);                                     
+                                    }
+                                    #endregion
+
                                 }
                             }
                         }
@@ -9382,7 +9416,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                     if (model != null)
                     {
                         int flag = 0;
-                        string markdepts = "37,57,74,88,268,295,339,422,213,427,433";
+                        string markdepts = "37,57,74,88,268,295,339,422,213,427,433,424";
                         var modellist = new BLL.T_Wo_WorkOrderItem_New().GetModelList($"F_WoID={model.F_ID} and F_IsUsed=0 and  F_NextUser like '%{ua.F_UserCode}%'  order by   F_ID desc ");
                         var itemnext = itembll.GetModelList(" F_ItemType=" + (int)EnumItemType.deal + " and F_WoState =1 and  F_WoID='" + model.F_ID + "'and F_NextUser like '%" + ua.F_UserCode + "%' order by F_ID desc").FirstOrDefault();
                         if (modellist.Count <= 0)
@@ -9432,7 +9466,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
         {
             int userId = CurrentUser.UserData.F_UserId; ;
             int flag = 0;
-            string markdepts = "37,57,74,88,268,295,339,422,213,427,433";
+            string markdepts = "37,57,74,88,268,295,339,422,213,427,433,424";
             if (userId != 0)
             {
                 //增加撤回功能
@@ -9914,7 +9948,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
         {
             #region 工单处理
             int sms = 0;
-            string markdepts = "37,57,74,88,268,295,339,422,213,427,433";
+            string markdepts = "37,57,74,88,268,295,339,422,213,427,433,424";
             var itemlasts = itembll.GetModelList("  F_ItemType=" + (int)EnumItemType.deal + " and  F_WoID=" + model.F_ID + " ");
             if (itemlasts.Count > 0)
             {
@@ -10388,18 +10422,18 @@ namespace CallCenterApi.Interface.Controllers.workorder
                     }
                     if (flag == 1 || ((model.F_Flag == null || model.F_Flag == 0) && flag == 3))
                     {
-                        if (model.F_SuperiorOpinion.Trim() != cont.Trim())
+                        if (!model.F_SuperiorOpinion.Trim().Contains(cont.Trim()))
                         {
-                            model.F_SuperiorOpinion = nowUser.F_UserName + "(" + nowUser.F_WorkNumber + ") " + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + " " + cont;
-                            //model.F_SuperiorOpinion = string.IsNullOrEmpty(model.F_SuperiorOpinion)? strconts1:model.F_SuperiorOpinion + strconts1;
+                            //model.F_SuperiorOpinion = nowUser.F_UserName + "(" + nowUser.F_WorkNumber + ") " + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + " " + cont;
+                            model.F_SuperiorOpinion = string.IsNullOrEmpty(model.F_SuperiorOpinion) ? strconts1 : model.F_SuperiorOpinion + strconts1;
                         }
                     }
                     else if (flag == 2)
                     {
-                        if (model.F_SuperiorOpinion2.Trim() != cont.Trim())
+                        if (!model.F_SuperiorOpinion2.Trim().Contains(cont.Trim()))
                         {
-                            model.F_SuperiorOpinion2 = nowUser.F_UserName + "(" + nowUser.F_WorkNumber + ") " + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + " " + cont;
-                            //model.F_SuperiorOpinion2 = string.IsNullOrEmpty(model.F_SuperiorOpinion2) ? strconts1 : model.F_SuperiorOpinion2 + strconts1;
+                            //model.F_SuperiorOpinion2 = nowUser.F_UserName + "(" + nowUser.F_WorkNumber + ") " + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + " " + cont;
+                            model.F_SuperiorOpinion2 = string.IsNullOrEmpty(model.F_SuperiorOpinion2) ? strconts1 : model.F_SuperiorOpinion2 + strconts1;
                         }
                     }                 
                 }
@@ -10876,18 +10910,20 @@ namespace CallCenterApi.Interface.Controllers.workorder
                     }
                 if (!string.IsNullOrEmpty(Supercont))
                 {
+                    string strcont = nowUser.F_UserName + "(" + nowUser.F_WorkNumber + ") " + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
+                    string strconts1 = strcont + " " + Supercont + ";@# ";
                     if (flag == 1 || ((model.F_Flag == null || model.F_Flag == 0) && flag == 3))
                     {
-                        if (model.F_SuperiorOpinion.Trim() != Supercont.Trim())
+                        if (!model.F_SuperiorOpinion.Trim().Contains(Supercont.Trim()))
                         {
-                            model.F_SuperiorOpinion = nowUser.F_UserName + "(" + nowUser.F_WorkNumber + ") " + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + " " + Supercont;
+                            model.F_SuperiorOpinion = string.IsNullOrEmpty(model.F_SuperiorOpinion) ? strconts1 : model.F_SuperiorOpinion + strconts1;
                         }
                     }
                     else if (flag == 2)
                     {
-                        if (model.F_SuperiorOpinion2.Trim() != Supercont.Trim())
+                        if (!model.F_SuperiorOpinion2.Trim().Contains(Supercont.Trim()))
                         {
-                            model.F_SuperiorOpinion2 = nowUser.F_UserName + "(" + nowUser.F_WorkNumber + ") " + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + " " + Supercont;
+                            model.F_SuperiorOpinion2 = string.IsNullOrEmpty(model.F_SuperiorOpinion2) ? strconts1 : model.F_SuperiorOpinion2 + strconts1;
                         }
                     }
 
@@ -10966,12 +11002,12 @@ namespace CallCenterApi.Interface.Controllers.workorder
         {
             #region 消息提醒
             string strmsg = string.Empty;
-            strmsg = nowUser.F_UserName + "(" + nowUser.F_UserCode + ")" + "操作" + opt + "工单";
+            strmsg = nowUser.F_UserName + "(" + nowUser.F_UserCode + ")" + "操作" + opt + "工单,工单编号<a href='./WorkOrder/commonHtml/orderDetails.html?oid="+womodel.F_ID+"'>" + womodel.F_WorkOrderCode + "</a>";
             Model.T_Msg_List msg = new Model.T_Msg_List();
             msg.Type = (int)Model.MSGType.Handle;//处理
             msg.ToUser = touser;
             msg.ToID = toid;
-            msg.Detail = strmsg;
+            msg.Detail = $"<span class='top_notices_con'> " + strmsg + "</span>"; ;
             msg.State = 0;
             msg.IsDel = 0;
             msg.CreateUser = nowUser.F_UserCode;

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Web.config

@@ -17,7 +17,7 @@
     <add key="smssign" value=""/>
   </appSettings>
   <connectionStrings>
-    <add name="ConnectionString" connectionString="Data Source=192.168.8.3;User ID=sa;pwd=800100;Initial Catalog=xinlianxin;"/>
+    <add name="ConnectionString" connectionString="Data Source=192.168.8.3;User ID=sa;pwd=800100;Initial Catalog=CallCenter_XinXiangXLX0804;"/>
   <!--<add name="ConnectionString" connectionString="Data Source=.;User ID=sa;pwd=sa123456;Initial Catalog=CallCenter_XinXiangXLX0722;" />-->
   </connectionStrings>
   <system.web>