催单，推送，报表修改

codegit/CallCenterApi/CallCenterApi.DAL/T_Wo_WorkOrderItem_New.cs

@@ -39,9 +39,9 @@ namespace CallCenterApi.DAL
         {
             StringBuilder strSql = new StringBuilder();
             strSql.Append("insert into T_Wo_WorkOrderItem_New(");
-            strSql.Append("F_WoID,F_WoState,F_ItemType,F_OptType,F_OptContent,F_NextUser,F_NextDept,F_IsUsed,F_LimitTime,F_IsSMS,F_SMSToUser,F_SMSToPhone,F_SMSContent,F_CreateUser,F_CreateTime)");
+            strSql.Append("F_WoID,F_WoState,F_ItemType,F_OptType,F_OptContent,F_NextUser,F_NextDept,F_IsUsed,F_LimitTime,F_IsSMS,F_SMSToUser,F_SMSToPhone,F_SMSContent,F_CreateUser,F_Push,F_CreateTime)");
             strSql.Append(" values (");
-            strSql.Append("@F_WoID,@F_WoState,@F_ItemType,@F_OptType,@F_OptContent,@F_NextUser,@F_NextDept,@F_IsUsed,@F_LimitTime,@F_IsSMS,@F_SMSToUser,@F_SMSToPhone,@F_SMSContent,@F_CreateUser,@F_CreateTime)");
+            strSql.Append("@F_WoID,@F_WoState,@F_ItemType,@F_OptType,@F_OptContent,@F_NextUser,@F_NextDept,@F_IsUsed,@F_LimitTime,@F_IsSMS,@F_SMSToUser,@F_SMSToPhone,@F_SMSContent,@F_CreateUser,@F_Push,@F_CreateTime)");
             strSql.Append(";select @@IDENTITY");
             SqlParameter[] parameters = {
                     new SqlParameter("@F_WoID", SqlDbType.BigInt,8),
@@ -58,6 +58,7 @@ namespace CallCenterApi.DAL
                     new SqlParameter("@F_SMSToPhone", SqlDbType.VarChar,50),
                     new SqlParameter("@F_SMSContent", SqlDbType.NText),
                     new SqlParameter("@F_CreateUser", SqlDbType.VarChar,50),
+                     new SqlParameter("@F_Push", SqlDbType.Int,4),
                     new SqlParameter("@F_CreateTime", SqlDbType.DateTime)};
             parameters[0].Value = model.F_WoID;
             parameters[1].Value = model.F_WoState;
@@ -73,7 +74,8 @@ namespace CallCenterApi.DAL
             parameters[11].Value = model.F_SMSToPhone;
             parameters[12].Value = model.F_SMSContent;
             parameters[13].Value = model.F_CreateUser;
-            parameters[14].Value = model.F_CreateTime;
+            parameters[14].Value = model.F_Push;
+            parameters[15].Value = model.F_CreateTime;
 
             object obj = DbHelperSQL.GetSingle(strSql.ToString(), parameters);
             if (obj == null)
@@ -106,6 +108,8 @@ namespace CallCenterApi.DAL
             strSql.Append("F_SMSToPhone=@F_SMSToPhone,");
             strSql.Append("F_SMSContent=@F_SMSContent,");
             strSql.Append("F_CreateUser=@F_CreateUser,");
+            strSql.Append("F_Push=@F_Push,");
+            
             strSql.Append("F_CreateTime=@F_CreateTime");
             strSql.Append(" where F_ID=@F_ID");
             SqlParameter[] parameters = {
@@ -123,6 +127,8 @@ namespace CallCenterApi.DAL
                     new SqlParameter("@F_SMSToPhone", SqlDbType.VarChar,50),
                     new SqlParameter("@F_SMSContent", SqlDbType.NText),
                     new SqlParameter("@F_CreateUser", SqlDbType.VarChar,50),
+                        new SqlParameter("@F_Push", SqlDbType.Int,4),
+                    
                     new SqlParameter("@F_CreateTime", SqlDbType.DateTime),
                     new SqlParameter("@F_ID", SqlDbType.BigInt,8)};
             parameters[0].Value = model.F_WoID;
@@ -139,8 +145,9 @@ namespace CallCenterApi.DAL
             parameters[11].Value = model.F_SMSToPhone;
             parameters[12].Value = model.F_SMSContent;
             parameters[13].Value = model.F_CreateUser;
-            parameters[14].Value = model.F_CreateTime;
-            parameters[15].Value = model.F_ID;
+            parameters[14].Value = model.F_Push;
+            parameters[15].Value = model.F_CreateTime;
+            parameters[16].Value = model.F_ID;
 
             int rows = DbHelperSQL.ExecuteSql(strSql.ToString(), parameters);
             if (rows > 0)
@@ -204,7 +211,7 @@ namespace CallCenterApi.DAL
         {
 
             StringBuilder strSql = new StringBuilder();
-            strSql.Append("select  top 1 F_ID,F_WoID,F_WoState,F_ItemType,F_OptType,F_OptContent,F_NextUser,F_NextDept,F_IsUsed,F_LimitTime,F_IsSMS,F_SMSToUser,F_SMSToPhone,F_SMSContent,F_CreateUser,F_CreateTime from T_Wo_WorkOrderItem_New ");
+            strSql.Append("select  top 1 F_ID,F_WoID,F_WoState,F_ItemType,F_OptType,F_OptContent,F_NextUser,F_NextDept,F_IsUsed,F_LimitTime,F_IsSMS,F_SMSToUser,F_SMSToPhone,F_SMSContent,F_CreateUser,F_Push,F_CreateTime from T_Wo_WorkOrderItem_New ");
             strSql.Append(" where F_ID=@F_ID");
             SqlParameter[] parameters = {
                     new SqlParameter("@F_ID", SqlDbType.BigInt)
@@ -276,6 +283,10 @@ namespace CallCenterApi.DAL
                 {
                     model.F_IsSMS = int.Parse(row["F_IsSMS"].ToString());
                 }
+                if (row["F_Push"] != null && row["F_Push"].ToString() != "")
+                {
+                    model.F_Push = int.Parse(row["F_Push"].ToString());
+                }
                 if (row["F_SMSToUser"] != null)
                 {
                     model.F_SMSToUser = row["F_SMSToUser"].ToString();
@@ -306,7 +317,7 @@ namespace CallCenterApi.DAL
         public DataSet GetList(string strWhere)
         {
             StringBuilder strSql = new StringBuilder();
-            strSql.Append("select F_ID,F_WoID,F_WoState,F_ItemType,F_OptType,F_OptContent,F_NextUser,F_NextDept,F_IsUsed,F_LimitTime,F_IsSMS,F_SMSToUser,F_SMSToPhone,F_SMSContent,F_CreateUser,F_CreateTime ");
+            strSql.Append("select F_ID,F_WoID,F_WoState,F_ItemType,F_OptType,F_OptContent,F_NextUser,F_NextDept,F_IsUsed,F_LimitTime,F_IsSMS,F_SMSToUser,F_SMSToPhone,F_SMSContent,F_CreateUser,F_Push,F_CreateTime ");
             strSql.Append(" FROM T_Wo_WorkOrderItem_New ");
             if (strWhere.Trim() != "")
             {
@@ -326,7 +337,7 @@ namespace CallCenterApi.DAL
             {
                 strSql.Append(" top " + Top.ToString());
             }
-            strSql.Append(" F_ID,F_WoID,F_WoState,F_ItemType,F_OptType,F_OptContent,F_NextUser,F_NextDept,F_IsUsed,F_LimitTime,F_IsSMS,F_SMSToUser,F_SMSToPhone,F_SMSContent,F_CreateUser,F_CreateTime ");
+            strSql.Append(" F_ID,F_WoID,F_WoState,F_ItemType,F_OptType,F_OptContent,F_NextUser,F_NextDept,F_IsUsed,F_LimitTime,F_IsSMS,F_SMSToUser,F_SMSToPhone,F_SMSContent,F_CreateUser,F_Push,F_CreateTime ");
             strSql.Append(" FROM T_Wo_WorkOrderItem_New ");
             if (strWhere.Trim() != "")
             {

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/DepartmentController.cs

@@ -445,10 +445,17 @@ namespace CallCenterApi.Interface.Controllers
             {
                 int userId = CurrentUser.UserData.F_UserId;
                 Model.T_Sys_UserAccount userModel = new BLL.T_Sys_UserAccount().GetModel(userId);
+            
                 if (userModel != null)
                     pId = userModel.F_DeptId;
+                Model.T_Sys_RoleInfo ro = rolebll.GetModel(userModel.F_RoleId);
                 string where = "";
                 DataTable dt = new DataTable();
+                if (ro != null)
+                {
+                    if (ro.F_RoleCode == "CLZY")
+                        pId=1;
+                }
                 if (pId == 2)
                 {
                     where = "(isnull(F_DeptId,0)='" + pId + "'or F_Layer=1 ) and F_State=1";
@@ -461,7 +468,7 @@ namespace CallCenterApi.Interface.Controllers
                 {
                      where = " isnull(F_DeptId,0)='" + pId + "' and F_State=1 ";
                 }
-              
+             
                 //if (!string.IsNullOrEmpty(userModel.groupcode))
                 //{
                 //    where += " and F_GroupCode = '" + userModel.groupcode + "'";

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/IndexController.cs

@@ -168,7 +168,7 @@ namespace CallCenterApi.Interface.Controllers
         {
             //string dataurl = HttpUtility.UrlDecode(RequestString.GetFormString("dataurl"));
             string dataurl = RequestString.GetFormString("dataurl");
-            string filename = RequestString.GetFormString("filename");
+            string filename = DateTime.Now.ToString("yyyyMMddHHmmssfff") + ".jpg";
             ActionResult res = NoToken("未知错误，请重新登录");
             int userId = CurrentUser.UserData.F_UserId;
             Model.T_Sys_UserAccount userModel = new BLL.T_Sys_UserAccount().GetModel(userId);
@@ -723,8 +723,8 @@ namespace CallCenterApi.Interface.Controllers
                       
                         uwhere += " and F_IsDelete=0";
                         uwhere += "and F_Duplicate!=5";
-                        
-                 
+                        uwhere += $" and (F_Type=" + 2 + "or (F_Duplicate in(2,0)and F_Type=3))";
+
                         var obj = new
                         {
                             dtj = bll.GetList(uwhere+ "  and F_State=0 ").Tables[0].Rows.Count,

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/UserAccountController.cs

@@ -225,7 +225,19 @@ namespace CallCenterApi.Interface.Controllers
 
                 if (userModel != null)
                 {
-                    filter.dptid = userModel.F_DeptId;
+                    if (userModel.F_RoleId == 1 || userModel.F_RoleId == 4 || userModel.F_RoleId == 17
+                         || userModel.F_RoleId == 50 || userModel.F_RoleId == 67 || userModel.F_RoleId == 49)
+                    {
+                        if (filter.dptid == 0)
+                        {
+                            filter.dptid = 1;
+                        }
+                    }
+                    else
+                    {
+                        filter.dptid = userModel.F_DeptId;
+
+                    }
                 }
                 if (filter.dptid > 0)
                 {
@@ -331,13 +343,14 @@ namespace CallCenterApi.Interface.Controllers
                 //}
                 if (userModel != null)
                 {
-                    Model.T_Sys_Department deptModel = new BLL.T_Sys_Department().GetModel(filter.dptid);
-                    if (deptModel != null)
+                    if (userModel.F_RoleId == 1 || userModel.F_RoleId == 4 || userModel.F_RoleId == 17
+                          || userModel.F_RoleId == 50 || userModel.F_RoleId == 67 || userModel.F_RoleId == 49)
                     {
-                        if (userModel.F_RoleId != 1 || userModel.F_RoleId != 4 || userModel.F_RoleId != 17
-                        || userModel.F_RoleId != 50 || userModel.F_RoleId != 67)
-                            sql += " and F_DeptId in ( select F_DeptId from T_Sys_Department where F_DeptCode like '%" + deptModel.F_DeptCode + "%') ";
-                    }
+                            if (filter.dptid == 0)
+                            {
+                                filter.dptid = 1;
+                            }
+                        }
                     else
                     {
                         filter.dptid = userModel.F_DeptId;
@@ -681,6 +694,16 @@ namespace CallCenterApi.Interface.Controllers
                 {
                     return Error("无操作权限");
                 }
+                if (userModel .F_RoleId ==49)
+                {
+                    var uModel = new BLL.T_Sys_UserAccount().GetModel(input.Usercode);
+                    if (uModel!=null )
+                    {
+                        if (userModel.F_UserCode != uModel.F_UserCode&& uModel.F_RoleId ==49)
+                            return Error("不能修改其他人员");
+                    }
+                  
+                }
                 BLL.T_Sys_UserAccount sysUserAccountBll = new BLL.T_Sys_UserAccount();
                 Model.T_Sys_UserAccount userAccountModel = sysUserAccountBll.GetModelList("  F_UserId = " + 
                     input.UserId).FirstOrDefault();

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/customer/CustomerController.cs

@@ -867,7 +867,7 @@ namespace CallCenterApi.Interface.Controllers.customer
         public ActionResult Import()
         {
             DataTable dt = new DataTable();
-            var depts = new BLL.T_Sys_UserAccount().GetModelList("F_DeptId in (select F_DeptId   FROM T_Sys_Department WHERE F_State=1 and ( F_DeptCode like '|0|1|12|%' or F_DeptCode like '|0|1|15|%')) ");
+            var depts = new BLL.T_Sys_UserAccount().GetModelList("F_DeptId in (select F_DeptId   FROM T_Sys_Department WHERE F_State=1 and ( F_DeptCode like '|0|1|14|%' )) ");
            
             #region 
             dt.Columns.Add("工号");

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/report/BusinessController.cs

@@ -654,23 +654,38 @@ namespace CallCenterApi.Interface.Controllers.report
             {
                  days = System.Threading.Thread.CurrentThread.CurrentUICulture.Calendar.GetDaysInMonth(time.Year, time.Month - 1);//获取天数
             }
+            int day = 31;
             DateTime lastmonth= time.AddMonths(-1);
             sql += " and F_CreateTime>='" + lastmonth.ToString ("yyyy-MM") +"-28" + " 00:00:00' ";
-            sql += " and F_CreateTime<='" + time.ToString("yyyy-MM") + "-27" + " 23:59:59' ";
+            if (time.Month != 12)
+            {
+                sql += " and F_CreateTime<='" + time.ToString("yyyy-MM") + "-27" + " 23:59:59' ";
+                day = 27;
+            }
+            else
+            {
+                sql += " and F_CreateTime<='" + time.ToString("yyyy-MM") + "-31" + " 23:59:59' ";
+            }
             sql += $" and (F_Type=2 or (F_Duplicate in(2,0)and F_Type=3))";
             var modelList= new BLL.T_Bus_WorkOrder().GetModelList(sql);
             Product product = new Product();
             product.dates = new List<Date>();
             int lastday = days - 27;
             #region 上月28号至最后一天
-            for (int i=0;i< lastday;i ++)
+          
+            if (time .Month !=1)
             {
-               string  name = string.Format("{0}-{1}", lastmonth.ToString("yyyy-MM"), 28 + i) ;
-                product.dates.Add(RetuDate(name, timeslot, modelList));
+                for (int i = 0; i < lastday; i++)
+                {
+                    string name = string.Format("{0}-{1}", lastmonth.ToString("yyyy-MM"), 28 + i);
+                    product.dates.Add(RetuDate(name, timeslot, modelList));
+                }
             }
+           
+
             #endregion
-            #region 本月一号至27号
-            for (int i=0;i < 27; i++)
+                #region 本月一号至27号
+            for (int i=0;i < day; i++)
             {
                 string name = "";
                 if (i <9)
@@ -762,9 +777,12 @@ namespace CallCenterApi.Interface.Controllers.report
             product.dates.Add(date);
             product.factory = new List<Factory>();
             var EquipmentNumber = new BLL.T_Sys_EquipmentNumber().GetModelList("F_IsDelete=0");
-            
+
+            Model.T_Sys_EquipmentNumber t_Sys_EquipmentNumber = new Model.T_Sys_EquipmentNumber();
+            t_Sys_EquipmentNumber.F_Production = "不清"; ;
             if (EquipmentNumber!=null )
             {
+                EquipmentNumber.Add(t_Sys_EquipmentNumber);
                 int total = 0;
                 foreach (var it in EquipmentNumber)
                 {
@@ -840,7 +858,7 @@ namespace CallCenterApi.Interface.Controllers.report
                     factory.proportion = "0.00%";
                     for (int i = 0; i < modelList.Count; i++)
                     {
-                        if (modelList[i].F_ProblemCode == it.F_Name)
+                        if (modelList[i].F_ProductType == it.F_Name)
                         {
                             total++;
                             factory.number++;

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/tel/CallrecordsController.cs

@@ -17,7 +17,7 @@ namespace CallCenterApi.Interface.Controllers.tel
     {
         BLL.T_Call_CallRecords bll = new BLL.T_Call_CallRecords();
         //获取通话记录列表
-        public ActionResult GetList(string phone, string usercode)
+        public ActionResult GetList(string phone, string usercode,string workordercode)
         {
             int userId = CurrentUser.UserData.F_UserId;
             Model.T_Sys_UserAccount userModel = new BLL.T_Sys_UserAccount().GetModel(userId);
@@ -40,7 +40,7 @@ namespace CallCenterApi.Interface.Controllers.tel
             //{
             //    sql += " and groupcode = '" + userModel.groupcode + "' ";
             //}
-
+        
             if (usercode != null && usercode.Trim() != "")
             {
                 sql += " and UserCode='" + usercode + "'";
@@ -49,6 +49,19 @@ namespace CallCenterApi.Interface.Controllers.tel
             {
                 sql += " and F_DeptId='" + dept.Trim() + "'";
             }
+            if (!string .IsNullOrEmpty (workordercode))
+            {
+                var modellist = new BLL.T_Bus_WorkOrder().GetModelList("F_WorkOrderId='" + workordercode + "'").FirstOrDefault ();
+               if (modellist!=null )
+                {
+                    if (!string.IsNullOrEmpty(modellist.F_CallId))
+                    {
+                        sql += " and CallId = '" + modellist.F_CallId + "' ";
+                    }
+                    else
+                        return Error("此工单未查询到通话记录");
+                }
+            }
             if (dealtype != null && dealtype.Trim() != "")
             {
                 //处理方式

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

@@ -18,12 +18,12 @@ namespace CallCenterApi.Interface.Controllers.workorder
     public class WorkTypeController : BaseController
     {
 
-        public bool SendReminderSMS(string F_Mobile, string countent)
+        public bool SendReminderSMS(string msg ,string F_Mobile, string countent)
         {
            
             if (!string.IsNullOrEmpty(F_Mobile))
             {
-                string msg = "工单催单提醒:";
+              
                 msg += countent;
                 Dictionary<string, string> paras = new Dictionary<string, string>();
                 paras.Add("@JSHM", F_Mobile);

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

@@ -153,8 +153,10 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 DataTable dt = new DataTable();
                 Model.T_Sys_UserAccount ua = userBLL.GetModel(userId);
                 Model.T_Sys_RoleInfo ro = rolebll.GetModel(ua.F_RoleId);
-                int DTJ = 0, DFP = 0, DCL = 0, CLZ = 0, YWJ = 0, THDTJ = 0, THDFP = 0, YJGD = 0, EJGD = 0, SJGD = 0, CJSL=0;  
-                for (int i=0;i<11;i ++)
+                int DTJ = 0, DFP = 0, DCL = 0, CLZ = 0, YWJ = 0, THDTJ = 0, THDFP = 0, YJGD = 0, EJGD = 0, SJGD = 0, CJSL=0,ZX=0;
+             string    uwhere = "and F_Area in( select  F_DeptId  from T_Sys_Department  where  (F_DeptCode like '|0|1|18|%' or F_DeptCode like '|0|1|19|%' or F_DeptCode like '|0|1|8|%' or F_DeptCode like '|0|1|9|%'or F_DeptCode like '|0|1|61|%'or F_DeptCode like '|0|1|10|%'or F_DeptCode like '|0|1|11|%' or F_DeptCode like '|0|1|12|%' or F_DeptCode like '|0|1|15|%' or F_DeptCode like '|0|1|13|%' or F_DeptCode like '|0|1|482|%' or F_DeptCode like '|0|1|14|%'))";
+              string where = $" and (F_Type=" + 2 + "or (F_Duplicate in(2,0)and F_Type=3))";
+                for (int i=0;i<12;i ++)
                 {
                     switch (i )
                     {
@@ -162,7 +164,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                             sql = "";
 
                             sql += $"  F_IsDelete=0";
-                            sql += "AND F_Duplicate !=5";
+                            sql += "AND F_Duplicate !=5"+ where;
                             if (ro.F_RoleCode == "XTGLY" || ro.F_RoleCode == "JCRY")
                             {
                                 sql += "AND F_State in(0)";
@@ -181,7 +183,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                         case 1://待分派
                             sql = "";
                             sql += $"  F_IsDelete=0";
-                            sql += "AND F_Duplicate !=5";
+                            sql += "AND F_Duplicate !=5"+ uwhere+ where;
                             sql += "AND F_State in (1)";
                             sql += RetuSql(ro, 0, ua);
                             if (ro.F_RoleCode == "YWY" || ro.F_RoleCode == "QTJS" || ro.F_RoleCode == "JDYPTZX" || ro.F_RoleCode == "JDYBTZX")
@@ -194,7 +196,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                         case 2://待处理
                             sql = "";
                             sql += $"  F_IsDelete=0";
-                            sql += "AND F_Duplicate !=5";
+                            sql += "AND F_Duplicate !=5" + uwhere+ where;
                             sql += "AND F_State=3";
                             sql += RetuSql(ro, 0, ua);
                             if (ro.F_RoleCode == "YWY")
@@ -211,7 +213,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                         case 3://处理中
                             sql = "";
                             sql += $"  F_IsDelete=0";
-                            sql += "AND F_Duplicate !=5";
+                            sql += "AND F_Duplicate !=5" + uwhere+ where;
                             sql += "AND F_State=4";
                             sql += RetuSql(ro, 0, ua);
                             if (ro.F_RoleCode == "YWY")
@@ -228,7 +230,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                         case 4://退回待分派
                             sql = "";
                             sql += $"  F_IsDelete=0";
-                            sql += "AND F_Duplicate !=5";
+                            sql += "AND F_Duplicate !=5" + uwhere+ where;
                             sql += "AND F_State=5";
                             sql += RetuSql(ro, 0, ua);
                             if (ro.F_RoleCode == "YWY" || ro.F_RoleCode == "QTJS" || ro.F_RoleCode == "JDYPTZX" || ro.F_RoleCode == "JDYBTZX")
@@ -241,7 +243,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                         case 5://退回待提交
                             sql = "";
                             sql += $" F_IsDelete=0";
-                            sql += "AND F_Duplicate !=5";
+                            sql += "AND F_Duplicate !=5"+ where;
                             sql += "AND F_State=6";
                             sql += RetuSql(ro, 0, ua);
                             if (ro.F_RoleCode == "YWY" || ro.F_RoleCode == "QTJS")
@@ -254,11 +256,14 @@ namespace CallCenterApi.Interface.Controllers.workorder
                         case 6://已完结
                             sql = "";
                             sql += $"  F_IsDelete=0";
-                            sql += "AND F_Duplicate !=5";
+                            sql += "AND F_Duplicate !=5" + uwhere+ where;
                             sql += "AND F_State=10";
                             sql += RetuSql(ro, 0, ua);
                             if (ro.F_RoleCode == "YWY")
-                                sql += "AND F_DealUser=" + ua.F_UserCode;
+                            {
+                                sql += "AND F_Notifications ='" + ua.F_UserCode + "'";
+                            }
+                             
                             if (ro.F_RoleCode == "JDYPTZX" || ro.F_RoleCode == "JDYBTZX")
                                 sql += "AND F_CreateUser=" + ua.F_UserCode;
                             if (ro.F_RoleCode == "QTJS")
@@ -268,9 +273,9 @@ namespace CallCenterApi.Interface.Controllers.workorder
                             }
                             YWJ = new BLL.T_Bus_WorkOrder().GetModelList(sql).Count;//待处理
                             break;
-                        case 7://已完结
+                        case 7://
                             sql = "";
-                            sql += $"  F_IsDelete=0";
+                            sql += $"  F_IsDelete=0" + where+ uwhere;
                             // sql += $" and F_DealTimely = 'Ⅰ级'";
 
 
@@ -284,9 +289,9 @@ namespace CallCenterApi.Interface.Controllers.workorder
                                 sql += "AND F_CreateUser=" + ua.F_UserCode;
                             YJGD = new BLL.T_Bus_WorkOrder().GetModelList(sql).Count;//待处理
                             break;
-                        case 8://已完结
+                        case 8://
                             sql = "";
-                            sql += $" F_IsDelete=0";
+                            sql += $" F_IsDelete=0" + where+ uwhere;
                             // sql += $" and F_DealTimely = 'Ⅱ级'";
 
                             sql += "AND F_Duplicate !=5";
@@ -301,7 +306,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                             break;
                         case 9://
                             sql = "";
-                            sql += $"  F_IsDelete=0";
+                            sql += $"  F_IsDelete=0" + where+ uwhere;
                             sql += "AND F_Duplicate !=5";
                             //  sql += $" and F_DealTimely = '普通工单'";
                             sql += $" and (F_DealTimely= '3类问题' or F_DealTimely= '普通工单' )";
@@ -315,12 +320,12 @@ namespace CallCenterApi.Interface.Controllers.workorder
                             break;
                         case 10://
                             sql = "";
-                            sql += $"  F_IsDelete=0";
+                            sql += $"  F_IsDelete=0" + uwhere+ where;
                             sql += "AND F_Duplicate !=5";
                             sql += "AND F_Duplicate=6";
                             if (ro.F_RoleCode == "BSCJL" || ro.F_RoleCode == "YWY")
                             {
-                                sql += "AND F_Notifications =" + ua.F_UserCode;
+                                sql += "AND F_Notifications ='" + ua.F_UserCode + "'";
                             }
                             else if (ro.F_RoleCode == "ZR" || ro.F_RoleCode == "BBZY" || ro.F_RoleCode == "CJZY" || ro.F_RoleCode == "XTGLY" || ro.F_RoleCode == "JCRY")
                             {
@@ -332,6 +337,21 @@ namespace CallCenterApi.Interface.Controllers.workorder
                             }
                             CJSL = new BLL.T_Bus_WorkOrder().GetModelList(sql).Count;//
                             break;
+                        case 11://咨询
+                            sql = "";
+                            sql += $"  F_IsDelete=0";
+                            sql += "AND F_Duplicate !=5" + uwhere ;
+                            sql += " and (F_Type=" + 1 + "or ( F_Duplicate in(1)and F_Type!=2 ))";
+                            sql += RetuSql(ro, 0, ua);
+                            if (ro.F_RoleCode == "YWY")
+                                sql += "AND F_DealUser=" + ua.F_UserCode;
+                            if (ro.F_RoleCode == "QTJS")
+                            {
+                                ZX = 0;
+                                break;
+                            }
+                            ZX = new BLL.T_Bus_WorkOrder().GetModelList(sql).Count;//待处理
+                            break;
 
                     }
 
@@ -350,7 +370,8 @@ namespace CallCenterApi.Interface.Controllers.workorder
                     YJGD = YJGD,
                     EJGD = EJGD,
                     SJGD = SJGD,
-                    CJSL= CJSL
+                    CJSL= CJSL,
+                    ZX= ZX
                 };
                 return Content(obj.ToJson()); ;
             }
@@ -375,6 +396,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 DataTable dt = new DataTable();
                 Model.T_Sys_UserAccount ua = userBLL.GetModel(userId);
                 Model.T_Sys_RoleInfo ro = rolebll.GetModel(ua.F_RoleId);
+                string uwhere = "and F_Area in( select  F_DeptId  from T_Sys_Department  where  (F_DeptCode like '|0|1|18|%' or F_DeptCode like '|0|1|19|%' or F_DeptCode like '|0|1|8|%' or F_DeptCode like '|0|1|9|%'or F_DeptCode like '|0|1|61|%'or F_DeptCode like '|0|1|10|%'or F_DeptCode like '|0|1|11|%' or F_DeptCode like '|0|1|12|%' or F_DeptCode like '|0|1|15|%' or F_DeptCode like '|0|1|13|%' or F_DeptCode like '|0|1|482|%' or F_DeptCode like '|0|1|14|%'))";
                 #region 筛选条件
                 if (CJ == 1)
                 {
@@ -477,9 +499,10 @@ namespace CallCenterApi.Interface.Controllers.workorder
                         sql += "AND F_CreateUser=" + ua.F_UserCode;
                     sql += "AND F_State in(10)";
                 }
-                    
-                string uwhere = " ";
-                if(state>-1)
+                if (state != 11)
+                    sql += $" and (F_Type=" + 2 + "or (F_Duplicate in(2,0)and F_Type=3))";
+                // string uwhere = " ";
+                if (state>-1)
                 {
                     switch (state)
                     {
@@ -505,13 +528,13 @@ namespace CallCenterApi.Interface.Controllers.workorder
                                 return Error("无操作权限");
                             break;
                         case 1://待分派
-                            sql += "AND F_State in (1)";
+                            sql += "AND F_State in (1)"+ uwhere;
                             sql += RetuSql(ro, see, ua);
                             if (ro.F_RoleCode == "YWY" || ro.F_RoleCode == "QTJS" )
                                 return Error("无操作权限");
                             break;
                         case 3://待处理
-                            sql += "AND F_State=3";
+                            sql += "AND F_State=3"+ uwhere;
                             sql += RetuSql(ro, see, ua);
                             if (ro.F_RoleCode == "YWY")
                             {
@@ -521,17 +544,17 @@ namespace CallCenterApi.Interface.Controllers.workorder
                                 return Error("无操作权限");
                             break;
                         case 4://处理中
-                            sql += "AND F_State=4";
+                            sql += "AND F_State=4"+ uwhere;
                             sql += RetuSql(ro, see, ua);
                             if (ro.F_RoleCode == "YWY")
                             {
-                                sql += "AND F_Notifications=" + ua.F_UserCode;
+                                sql += "AND F_Notifications ='" + ua.F_UserCode + "'";
                             }
                             if (ro.F_RoleCode == "QTJS" )
                                 return Error("无操作权限");
                             break;
                         case 5://退回待分派
-                            sql += "AND F_State=5";
+                            sql += "AND F_State=5"+ uwhere;
                             sql += RetuSql(ro, see, ua);
                             if (ro.F_RoleCode == "YWY" || ro.F_RoleCode == "QTJS" )
                                 return Error("无操作权限");
@@ -544,12 +567,23 @@ namespace CallCenterApi.Interface.Controllers.workorder
                             break;
                    
                         case 10://已完结
-                            sql += "AND F_State=10";
+                            sql += "AND F_State=10"+ uwhere;
+                            sql += RetuSql(ro, see, ua);
+
+                            if ( ro.F_RoleCode == "YWY")
+                            {
+                                sql += "AND F_Notifications ='" + ua.F_UserCode + "'";
+                            }
+                            //      if (ro.F_RoleCode == "JDYPTZX" || ro.F_RoleCode == "JDYBTZX")
+                            //    sql += "AND F_CreateUser=" + ua.F_UserCode;
+                            if (ro.F_RoleCode == "QTJS")
+                                return Error("无操作权限");
+                            break;
+                        case 11:
+                            sql += $" and (F_Type=" + 1 + "or ( F_Duplicate in(1)and F_Type!=2 ))";
                             sql += RetuSql(ro, see, ua);
                             if (ro.F_RoleCode == "YWY")
                                 sql += "AND F_DealUser=" + ua.F_UserCode;
-                      //      if (ro.F_RoleCode == "JDYPTZX" || ro.F_RoleCode == "JDYBTZX")
-                            //    sql += "AND F_CreateUser=" + ua.F_UserCode;
                             if (ro.F_RoleCode == "QTJS")
                                 return Error("无操作权限");
                             break;
@@ -557,7 +591,9 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 }
                 else
                 {
-                    sql += RetuSql(ro, see, ua);
+                    sql += RetuSql(ro, see, ua)+ uwhere;
+                 
+
                     if (ro.F_RoleCode == "QTJS")
                     {
                         sql += "AND F_CreateUser='"+ua .F_UserCode +"'";
@@ -607,6 +643,14 @@ namespace CallCenterApi.Interface.Controllers.workorder
             #endregion
 
         }
+        private string GetWorkorderid(string F_UserCode)
+        {
+            string str = "";
+            str = "select F_WoID from T_Wo_WorkOrderItem_New where F_WoState =4 and  F_NextUser='" + F_UserCode + "'"
+               + ""
+               + " and isnull(F_IsUsed,'0')='0' ";
+            return str;
+        }
         public DataTable GetFileData(string ids, string prefix)
         {
             DataTable dt = new DataTable();
@@ -925,7 +969,8 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 }
 
             }
-            else if (ro.F_RoleCode == "DQJL" || ro.F_RoleCode == "DQZG")
+            else if (ro.F_RoleCode == "DQJL" || ro.F_RoleCode == "DQZG" || ro.F_RoleCode == "DQYWZG" || ro.F_RoleCode == "DQTJ"
+                || ro.F_RoleCode == "DQJHY" || ro.F_RoleCode == "DQBZ")
             {
                 sql += "AND F_Area =" + ua.F_DeptId;
             }
@@ -1051,7 +1096,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 string deptname = "";
                 if (deptmodel != null)
                    deptname = deptmodel.F_DeptName;
-                AddLog(modlelist.F_Id, 0, deptname + userModel.F_UserName + "创建工单", 0, 0, "", 0, userModel);
+                AddLog(modlelist.F_Id, 0, deptname + userModel.F_UserName+ "创建工单", 0, 0, "", 0, userModel);
                 if (IsAssign>0)
                 {
                      if (clid == 0)
@@ -1304,7 +1349,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 deptname = deptmodel.F_DeptName + "-";
             }
             #endregion
-            var content = deptname + nowUser.F_UserName + "(" + nowUser.F_WorkNumber + ")" + opt;
+            var content = deptname + nowUser.F_UserName + "(" + nowUser.F_UserCode  + ")" + opt;
             var itemid = AddLog((int)model.F_Id , wostate, content, 1, optbut, nowUser.F_UserCode, nowUser.F_DeptId, nowUser);
           
             if (itemid > 0)
@@ -1374,6 +1419,8 @@ namespace CallCenterApi.Interface.Controllers.workorder
                         if (model != null)
                         {
                             string Title = "工单催单提醒";
+                            if (string .IsNullOrEmpty (count))
+                                return Error("请填写催单内容");
                             if (model.F_State == 0)
                                 return Error("工单未提交");
                             else  if (model.F_State == 10)
@@ -1393,7 +1440,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                                     {
                                         if (!string .IsNullOrEmpty (user.F_Mobile))
                                         {
-                                            bool n = new WorkTypeController().SendReminderSMS(user.F_Mobile, count);
+                                            bool n = new WorkTypeController().SendReminderSMS("工单催单提醒:",user.F_Mobile, count);
                                           //  string msg = new PushMessageController().Push(Title, count, user.F_UserCode);
                                             if (n )
                                             {
@@ -1569,7 +1616,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 deptname = deptmodel.F_DeptName + "-";
             }
             #endregion
-            var content = deptname + nowUser.F_UserName + "(" + nowUser.F_WorkNumber + ")" + opt + "工单，退回说明：" + cont;
+            var content = deptname + nowUser.F_UserName + "(" + nowUser.F_UserCode  + ")" + opt + "工单，退回说明：" + cont;
             //获取上一级处理人员
             int deptid = 0;
             var touser = new BLL.T_Sys_UserAccount().GetModel(creatuser);
@@ -1643,7 +1690,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
             var optcont = "";
             if (!string.IsNullOrEmpty(cont))
                 optcont = "，处理内容：" + cont;
-            var content = deptname + nowUser.F_UserName + "(" + nowUser.F_WorkNumber + ")" + opt + "工单" + optcont;
+            var content = deptname + nowUser.F_UserName + "(" + nowUser.F_UserCode  + ")" + opt + "工单" + optcont;
             var itemid = AddLog(model.F_Id, wostate, content, 1, optbut, touser, deptid, nowUser);
             if (itemid > 0)
             {
@@ -1814,6 +1861,15 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 model.F_Officeid = F_Officeid;//转派办事处id
                 model.F_Distribution = F_Distribution; //转派分销组id
                 workorderBLL.Update(model);
+                string optnext = "指派";
+                if (opt == "指派")
+                    optnext = "处理";
+                var modellitlast = new BLL.T_Wo_WorkOrderItem_New().GetModel(itemid);
+                if (modellitlast != null)
+                {
+                    string msg = new PushMessageController().Push("工单处理提醒", "你有工单待" + optnext, touser);
+                  
+                }
                 #endregion
                 return true;
             }
@@ -1821,6 +1877,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 return false;
             #endregion
         }
+      
         /// <summary>
         /// 添加工单记录
         /// </summary>
@@ -1851,6 +1908,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
             itemModel.F_OptContent = content;
             itemModel.F_NextUser = nextuser;
             itemModel.F_IsSMS = 0;
+            itemModel.F_Push = 0;
             itemModel.F_NextDept = nextdept;
             itemModel.F_IsUsed = F_IsUsed;
             itemModel.F_CreateTime = DateTime.Now;

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

@@ -127,7 +127,7 @@ namespace CallCenterApi.Interface.Models.Common
                     break;
                 case "6":
                     //坐席 坐席班长 管理员
-                    if (code == "JDYPTZX" || code == "JDYBTZX" || code == "XTGLY")
+                    if (code == "JDYPTZX" || code == "JDYBTZX" || code == "XTGLY" || code == "BBZY" || code == "CJZY" || code == "CLZY" || code == "ZR")
                     {
                         buttons.Add(submit());
                          buttons.Add(delete());

codegit/CallCenterApi/CallCenterApi.Model/T_Wo_WorkOrderItem_New.cs

@@ -26,6 +26,12 @@ namespace CallCenterApi. Model
         private string _f_smscontent;
         private string _f_createuser;
         private DateTime? _f_createtime;
+        private int? _f_push;
+        public int? F_Push
+        {
+            set { _f_push = value; }
+            get { return _f_push; }
+        }
         /// <summary>
         /// 工单记录ID
         /// </summary>

codegit/CallCenterCommon/CallCenter.Utility/NPOI/NPOIHelper.cs

@@ -1101,17 +1101,44 @@ namespace CallCenter.Utility
                         {
                             
                             IRow irow6 = sheet.CreateRow(t+1 + i);
+                            if (Factory1.Count %2!=0)
+                            {
+                                if (i * 2+1 < Factory1.Count)
+                                {
+                                    for (int j = 0; j < 6; j++)
+                                    {
+                                        string msg = ReturnMsg(j, i, Factory1);
+                                        ICell cell18 = irow6.CreateCell(j + 1);
+                                        cell18.SetCellValue(msg);
+                                        cell18.CellStyle = cellStylebt;
+                                    }
+                                }
+                                else if (i * 2 + 1 == Factory1.Count)
+                                {
+                                    for (int j = 0; j < 3; j++)
+                                    {
+                                        string msg = ReturnMsg(j, i, Factory1);
+                                        ICell cell18 = irow6.CreateCell(j + 1);
+                                        cell18.SetCellValue(msg);
+                                        cell18.CellStyle = cellStylebt;
+                                    }
+                                }
 
-                            if (i*2 < Factory1.Count)
+                            }
+                            else
                             {
-                                for (int j = 0; j < 6; j++)
+                                if (i * 2 < Factory1.Count)
                                 {
-                                    string msg = ReturnMsg(j, i, Factory1);
-                                    ICell cell18 = irow6.CreateCell(j + 1);
-                                    cell18.SetCellValue(msg);
-                                    cell18.CellStyle = cellStylebt;
+                                    for (int j = 0; j < 6; j++)
+                                    {
+                                        string msg = ReturnMsg(j, i, Factory1);
+                                        ICell cell18 = irow6.CreateCell(j + 1);
+                                        cell18.SetCellValue(msg);
+                                        cell18.CellStyle = cellStylebt;
+                                    }
                                 }
                             }
+                           
                                 int b = 0;
                                 if (a >1)
                                 {
@@ -1248,12 +1275,12 @@ namespace CallCenter.Utility
                             }
                             if (!istrue )
                             {
-                                if (i * 2 >= Factory1.Count)
+                                if (i * 2>= Factory1.Count)
                                 {
                                     ICell cell119 = irow6.CreateCell(0);
                                     cell119.CellStyle = cellStylebt;
                                 }
-                                if (i *2 >= Factory1.Count&i < Factory2.Count)
+                                if (i *2 +1>= Factory1.Count&i < Factory2.Count)
                                 {
                                     ICell cell119 = irow6.CreateCell(7);
                                     cell119.CellStyle = cellStylebt;

codegit/PushMessage/Program.cs

@@ -0,0 +1,54 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Net;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Push
+{
+    class Program
+    {
+
+
+        static void Main(string[] args)
+        {
+            Console.OutputEncoding = System.Text.Encoding.UTF8;
+            Environment.SetEnvironmentVariable("needDetails", "true");
+            Console.OutputEncoding = System.Text.Encoding.UTF8;
+            Environment.SetEnvironmentVariable("needDetails", "true");
+
+            System.Console.WriteLine("Hello Push!");
+       
+            Thread t = new Thread(new ThreadStart(SetCensusURL));
+            t.Start();
+
+        }
+        private static void SetCensusURL()
+        {
+            int n = 0;
+            while (true)
+            {
+                Thread.Sleep(60 * 1000);
+                n += 1;
+                WebClient web = new WebClient();
+                web.Encoding = Encoding.UTF8;
+                try
+                {
+                    string seturl = "http://oa.shuanghui.net:8046/PushMessage/SetCensusURL";
+                    string Dataaaurl = web.DownloadString(seturl);//这一句话就能请求到数据了
+                    string url = "http://oa.shuanghui.net:8046/PushMessage/SetPush";
+                    string Dataaa = web.DownloadString(url);//这一句话就能请求到数据了
+                }
+                catch
+                {
+
+                }
+               
+                
+            }
+        }
+    }
+}
+

codegit/PushMessage/Properties/AssemblyInfo.cs

@@ -0,0 +1,36 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// 有关程序集的一般信息由以下
+// 控制。更改这些特性值可修改
+// 与程序集关联的信息。
+[assembly: AssemblyTitle("PushMessage")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("PushMessage")]
+[assembly: AssemblyCopyright("Copyright ©  2020")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// 将 ComVisible 设置为 false 会使此程序集中的类型
+//对 COM 组件不可见。如果需要从 COM 访问此程序集中的类型
+//请将此类型的 ComVisible 特性设置为 true。
+[assembly: ComVisible(false)]
+
+// 如果此项目向 COM 公开，则下列 GUID 用于类型库的 ID
+[assembly: Guid("12d0c6ee-2f13-47b6-9bb1-6625af6e75cd")]
+
+// 程序集的版本信息由下列四个值组成: 
+//
+//      主版本
+//      次版本
+//      生成号
+//      修订号
+//
+// 可以指定所有值，也可以使用以下所示的 "*" 预置版本号和修订号
+// 方法是按如下所示使用“*”: :
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]