添加党风政风服务

CallCenterApi/CallCenterApi.DAL/T_Bus_AssignedItemInfo.cs

         {
             StringBuilder strSql = new StringBuilder();
             strSql.Append("select F_Id,F_WorkOrderId,F_AssignedId,F_DeptId,F_AssignedOpinion,F_Remark,F_CreateUser,F_CreateTime,F_IsSure,F_State,F_SureTime,F_IsDelete,F_DeleteUser,F_DeleteTime,F_SureUser,F_FeedbackTime,F_LimitTime,F_IsOverdue,F_File,F_Type ");
-            strSql.Append(" FROM T_Bus_AssignedItemInfo ");
+            strSql.Append(" FROM T_Bus_AssignedItemInfo  WITH(NOLOCK)");
             if (strWhere.Trim() != "")
             {
                 strSql.Append(" where " + strWhere);

CallCenterApi/CallCenterApi.DAL/T_Bus_Feedback.cs

         {
             StringBuilder strSql = new StringBuilder();
             strSql.Append("select * ");
-            strSql.Append(" FROM T_Bus_Feedback ");
+            strSql.Append(" FROM T_Bus_Feedback WITH(NOLOCK) ");
             if (strWhere.Trim() != "")
             {
                 strSql.Append(" where " + strWhere);

CallCenterApi/CallCenterApi.DAL/T_Bus_VisitResult.cs

         {
             StringBuilder strSql = new StringBuilder();
             strSql.Append("select F_Id,F_WorkOrderId,F_AssignedId,F_VisitUser,F_Type,F_IsSatisfie,F_Result,F_LimitTime,F_CallRecordId,F_Remark,F_State,F_CreateUser,F_CreateTime,F_IsDelete,F_DeleteUser,F_DeleteTime,F_File,F_IsPerform ");
-            strSql.Append(" FROM T_Bus_VisitResult ");
+            strSql.Append(" FROM T_Bus_VisitResult  WITH(NOLOCK)");
             if (strWhere.Trim() != "")
             {
                 strSql.Append(" where " + strWhere);

CallCenterApi/CallCenterApi.DAL/T_Sys_Department.cs

         {
             StringBuilder strSql = new StringBuilder();
             strSql.Append("insert into T_Sys_Department(");
-            strSql.Append("F_DeptName,F_DeptNameSpell,F_DeptNameSpells,F_DeptPhone,F_DeptPhone2,F_DeptTelphone,F_PartentId,F_layer,F_Sort,F_Type,F_Address,F_Remark,F_LeaderUser,F_LeaderUserName,F_TopSplitUser,F_TopSplitUserName,F_TopLeaderUser,F_TopLeaderUserName,F_State,F_CreateUser,F_CreateDate,F_IsDept,F_IsDealDept)");
+            strSql.Append("F_DeptName,F_DeptNameSpell,F_DeptNameSpells,F_DeptPhone,F_DeptPhone2,F_DeptTelphone,F_PartentId,F_layer,F_Sort,F_Type,F_Address,F_Remark,F_LeaderUser,F_LeaderUserName,F_TopSplitUser,F_TopSplitUserName,F_TopLeaderUser,F_TopLeaderUserName,F_State,F_CreateUser,F_CreateDate,F_IsDept,F_IsDealDept,F_Valueid)");
             strSql.Append(" values (");
-            strSql.Append("@F_DeptName,@F_DeptNameSpell,@F_DeptNameSpells,@F_DeptPhone,@F_DeptPhone2,@F_DeptTelphone,@F_PartentId,@F_layer,@F_Sort,@F_Type,@F_Address,@F_Remark,@F_LeaderUser,@F_LeaderUserName,@F_TopSplitUser,@F_TopSplitUserName,@F_TopLeaderUser,@F_TopLeaderUserName,@F_State,@F_CreateUser,@F_CreateDate,@F_IsDept,@F_IsDealDept)");
+            strSql.Append("@F_DeptName,@F_DeptNameSpell,@F_DeptNameSpells,@F_DeptPhone,@F_DeptPhone2,@F_DeptTelphone,@F_PartentId,@F_layer,@F_Sort,@F_Type,@F_Address,@F_Remark,@F_LeaderUser,@F_LeaderUserName,@F_TopSplitUser,@F_TopSplitUserName,@F_TopLeaderUser,@F_TopLeaderUserName,@F_State,@F_CreateUser,@F_CreateDate,@F_IsDept,@F_IsDealDept,@F_Valueid)");
             strSql.Append(";select @@IDENTITY");
             SqlParameter[] parameters = {
                     new SqlParameter("@F_DeptName", SqlDbType.NVarChar,100),
                     new SqlParameter("@F_CreateUser", SqlDbType.VarChar,50),
                     new SqlParameter("@F_CreateDate", SqlDbType.DateTime),
                     new SqlParameter("@F_IsDept", SqlDbType.Int,4),
-                    new SqlParameter("@F_IsDealDept", SqlDbType.Int,4)};
+                    new SqlParameter("@F_IsDealDept", SqlDbType.Int,4),
+                      new SqlParameter("@F_Valueid", SqlDbType.Int,4)
+            };
             parameters[0].Value = model.F_DeptName;
             parameters[1].Value = model.F_DeptNameSpell;
             parameters[2].Value = model.F_DeptNameSpells;
             parameters[20].Value = model.F_CreateDate;
             parameters[21].Value = model.F_IsDept;
             parameters[22].Value = model.F_IsDealDept;
-
+            parameters[23].Value = model.F_Valueid;
             object obj = DbHelperSQL.GetSingle(strSql.ToString(), parameters);
             if (obj == null)
             {
             strSql.Append("F_CreateUser=@F_CreateUser,");
             strSql.Append("F_CreateDate=@F_CreateDate,");
             strSql.Append("F_IsDept=@F_IsDept,");
-            strSql.Append("F_IsDealDept=@F_IsDealDept");
+            strSql.Append("F_IsDealDept=@F_IsDealDept,");
+            strSql.Append("F_Valueid=@F_Valueid");
             strSql.Append(" where F_DeptId=@F_DeptId");
             SqlParameter[] parameters = {
                     new SqlParameter("@F_DeptName", SqlDbType.NVarChar,100),
                     new SqlParameter("@F_CreateDate", SqlDbType.DateTime),
                     new SqlParameter("@F_IsDept", SqlDbType.Int,4),
                     new SqlParameter("@F_IsDealDept", SqlDbType.Int,4),
+                     new SqlParameter("@F_Valueid", SqlDbType.Int,4),
                     new SqlParameter("@F_DeptId", SqlDbType.Int,4)};
             parameters[0].Value = model.F_DeptName;
             parameters[1].Value = model.F_DeptNameSpell;
             parameters[20].Value = model.F_CreateDate;
             parameters[21].Value = model.F_IsDept;
             parameters[22].Value = model.F_IsDealDept;
-            parameters[23].Value = model.F_DeptId;
+            parameters[23].Value = model.F_Valueid;
+            parameters[24].Value = model.F_DeptId;
 
             int rows = DbHelperSQL.ExecuteSql(strSql.ToString(), parameters);
             if (rows > 0)
         {
 
             StringBuilder strSql = new StringBuilder();
-            strSql.Append("select  top 1 F_DeptId,F_DeptName,F_DeptNameSpell,F_DeptNameSpells,F_DeptPhone,F_DeptPhone2,F_DeptTelphone,F_PartentId,F_layer,F_Sort,F_Type,F_Address,F_Remark,F_LeaderUser,F_LeaderUserName,F_TopSplitUser,F_TopSplitUserName,F_TopLeaderUser,F_TopLeaderUserName,F_State,F_CreateUser,F_CreateDate,F_IsDept,F_IsDealDept from T_Sys_Department ");
+            strSql.Append("select  top 1 F_DeptId,F_DeptName,F_DeptNameSpell,F_DeptNameSpells,F_DeptPhone,F_DeptPhone2,F_DeptTelphone,F_PartentId,F_layer,F_Sort,F_Type,F_Address,F_Remark,F_LeaderUser,F_LeaderUserName,F_TopSplitUser,F_TopSplitUserName,F_TopLeaderUser,F_TopLeaderUserName,F_State,F_CreateUser,F_CreateDate,F_IsDept,F_IsDealDept,F_Valueid from T_Sys_Department ");
             strSql.Append(" where F_DeptId=@F_DeptId");
             SqlParameter[] parameters = {
                     new SqlParameter("@F_DeptId", SqlDbType.Int,4)
                 {
                     model.F_IsDealDept = int.Parse(row["F_IsDealDept"].ToString());
                 }
+                if (row["F_Valueid"] != null && row["F_Valueid"].ToString() != "")
+                {
+                    model.F_Valueid = int.Parse(row["F_Valueid"].ToString());
+                }
+                
             }
             return model;
         }
         public DataSet GetList(string strWhere)
         {
             StringBuilder strSql = new StringBuilder();
-            strSql.Append("select F_DeptId,F_DeptName,F_DeptNameSpell,F_DeptNameSpells,F_DeptPhone,F_DeptPhone2,F_DeptTelphone,F_PartentId,F_layer,F_Sort,F_Type,F_Address,F_Remark,F_LeaderUser,F_LeaderUserName,F_TopSplitUser,F_TopSplitUserName,F_TopLeaderUser,F_TopLeaderUserName,F_State,F_CreateUser,F_CreateDate,F_IsDept,F_IsDealDept ");
+            strSql.Append("select F_DeptId,F_DeptName,F_DeptNameSpell,F_DeptNameSpells,F_DeptPhone,F_DeptPhone2,F_DeptTelphone,F_PartentId,F_layer,F_Sort,F_Type,F_Address,F_Remark,F_LeaderUser,F_LeaderUserName,F_TopSplitUser,F_TopSplitUserName,F_TopLeaderUser,F_TopLeaderUserName,F_State,F_CreateUser,F_CreateDate,F_IsDept,F_IsDealDept ,F_Valueid");
             strSql.Append(" FROM T_Sys_Department ");
             if (strWhere.Trim() != "")
             {
             {
                 strSql.Append(" top " + Top.ToString());
             }
-            strSql.Append(" F_DeptId,F_DeptName,F_DeptNameSpell,F_DeptNameSpells,F_DeptPhone,F_DeptPhone2,F_DeptTelphone,F_PartentId,F_layer,F_Sort,F_Type,F_Address,F_Remark,F_LeaderUser,F_LeaderUserName,F_TopSplitUser,F_TopSplitUserName,F_TopLeaderUser,F_TopLeaderUserName,F_State,F_CreateUser,F_CreateDate,F_IsDept,F_IsDealDept ");
+            strSql.Append(" F_DeptId,F_DeptName,F_DeptNameSpell,F_DeptNameSpells,F_DeptPhone,F_DeptPhone2,F_DeptTelphone,F_PartentId,F_layer,F_Sort,F_Type,F_Address,F_Remark,F_LeaderUser,F_LeaderUserName,F_TopSplitUser,F_TopSplitUserName,F_TopLeaderUser,F_TopLeaderUserName,F_State,F_CreateUser,F_CreateDate,F_IsDept,F_IsDealDept,F_Valueid ");
             strSql.Append(" FROM T_Sys_Department ");
             if (strWhere.Trim() != "")
             {

CallCenterApi/CallCenterApi.DAL/T_Sys_DictionaryValue.cs

         {
             StringBuilder strSql = new StringBuilder();
             strSql.Append("insert into T_Sys_DictionaryValue(");
-            strSql.Append("F_ItemId,F_Value,F_PrentId,F_Layer,F_IsLeaf,F_Remark,F_State,F_CreateUser,F_CreateDate)");
+            strSql.Append("F_ItemId,F_Value,F_PrentId,F_Layer,F_IsLeaf,F_Remark,F_State,F_CreateUser,F_CreateDate,F_Deptid)");
             strSql.Append(" values (");
-            strSql.Append("@F_ItemId,@F_Value,@F_PrentId,@F_Layer,@F_IsLeaf,@F_Remark,@F_State,@F_CreateUser,@F_CreateDate)");
+            strSql.Append("@F_ItemId,@F_Value,@F_PrentId,@F_Layer,@F_IsLeaf,@F_Remark,@F_State,@F_CreateUser,@F_CreateDate,@F_Deptid)");
             strSql.Append(";select @@IDENTITY");
             SqlParameter[] parameters = {
                     new SqlParameter("@F_ItemId", SqlDbType.Int,4),
                     new SqlParameter("@F_Remark", SqlDbType.NVarChar,-1),
                     new SqlParameter("@F_State", SqlDbType.Int,4),
                     new SqlParameter("@F_CreateUser", SqlDbType.VarChar,50),
-                    new SqlParameter("@F_CreateDate", SqlDbType.DateTime)};
+                    new SqlParameter("@F_CreateDate", SqlDbType.DateTime),
+                      new SqlParameter("@F_Deptid", SqlDbType.Int,4)
+                    
+            };
             parameters[0].Value = model.F_ItemId;
             parameters[1].Value = model.F_Value;
             parameters[2].Value = model.F_PrentId;
             parameters[6].Value = model.F_State;
             parameters[7].Value = model.F_CreateUser;
             parameters[8].Value = model.F_CreateDate;
-
+            parameters[9].Value = model.F_Deptid;
+            
             object obj = DbHelperSQL.GetSingle(strSql.ToString(), parameters);
             if (obj == null)
             {
             strSql.Append("F_Remark=@F_Remark,");
             strSql.Append("F_State=@F_State,");
             strSql.Append("F_CreateUser=@F_CreateUser,");
-            strSql.Append("F_CreateDate=@F_CreateDate");
+            strSql.Append("F_CreateDate=@F_CreateDate,");
+            strSql.Append("F_Deptid=@F_Deptid");
+            
             strSql.Append(" where F_ValueId=@F_ValueId");
             SqlParameter[] parameters = {
                     new SqlParameter("@F_ItemId", SqlDbType.Int,4),
                     new SqlParameter("@F_State", SqlDbType.Int,4),
                     new SqlParameter("@F_CreateUser", SqlDbType.VarChar,50),
                     new SqlParameter("@F_CreateDate", SqlDbType.DateTime),
+                     new SqlParameter("@F_Deptid", SqlDbType.Int,4),
+                    
                     new SqlParameter("@F_ValueId", SqlDbType.Int,4)};
             parameters[0].Value = model.F_ItemId;
             parameters[1].Value = model.F_Value;
             parameters[6].Value = model.F_State;
             parameters[7].Value = model.F_CreateUser;
             parameters[8].Value = model.F_CreateDate;
-            parameters[9].Value = model.F_ValueId;
+            parameters[9].Value = model.F_Deptid;
+            
+            parameters[10].Value = model.F_ValueId;
 
             int rows = DbHelperSQL.ExecuteSql(strSql.ToString(), parameters);
             if (rows > 0)
         {
 
             StringBuilder strSql = new StringBuilder();
-            strSql.Append("select  top 1 F_ValueId,F_ItemId,F_Value,F_PrentId,F_Layer,F_IsLeaf,F_Remark,F_State,F_CreateUser,F_CreateDate from T_Sys_DictionaryValue ");
+            strSql.Append("select  top 1 F_ValueId,F_ItemId,F_Value,F_PrentId,F_Layer,F_IsLeaf,F_Remark,F_State,F_CreateUser,F_CreateDate,F_Deptid from T_Sys_DictionaryValue ");
             strSql.Append(" where F_ValueId=@F_ValueId");
             SqlParameter[] parameters = {
                     new SqlParameter("@F_ValueId", SqlDbType.Int,4)
                 {
                     model.F_CreateDate = DateTime.Parse(row["F_CreateDate"].ToString());
                 }
+                if (row["F_Deptid"] != null && row["F_Deptid"].ToString() != "")
+                {
+                    model.F_Deptid = int.Parse(row["F_Deptid"].ToString());
+                }
+                
             }
             return model;
         }
         public DataSet GetList(string strWhere)
         {
             StringBuilder strSql = new StringBuilder();
-            strSql.Append("select F_ValueId,F_ItemId,F_Value,F_PrentId,F_Layer,F_IsLeaf,F_Remark,F_State,F_CreateUser,F_CreateDate ");
+            strSql.Append("select F_ValueId,F_ItemId,F_Value,F_PrentId,F_Layer,F_IsLeaf,F_Remark,F_State,F_CreateUser,F_CreateDate ,F_Deptid");
             strSql.Append(" FROM T_Sys_DictionaryValue ");
             if (strWhere.Trim() != "")
             {
             {
                 strSql.Append(" top " + Top.ToString());
             }
-            strSql.Append(" F_ValueId,F_ItemId,F_Value,F_PrentId,F_Layer,F_IsLeaf,F_Remark,F_State,F_CreateUser,F_CreateDate ");
+            strSql.Append(" F_ValueId,F_ItemId,F_Value,F_PrentId,F_Layer,F_IsLeaf,F_Remark,F_State,F_CreateUser,F_CreateDate,F_Deptid ");
             strSql.Append(" FROM T_Sys_DictionaryValue ");
             if (strWhere.Trim() != "")
             {

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

             int id = RequestString.GetInt("id", 0);
             Model.T_Sys_Department dModel = departmentBLL.GetModel(id);
             if (dModel != null)
+            {
+
+                string value = "";
+                if (dModel.F_Valueid  != null)
+                {
+                    var dicvalue = new BLL.T_Sys_DictionaryValue ().GetModel((int)dModel.F_Valueid);
+                    if (dicvalue != null)
+                        value = dicvalue.F_Value ;
+                }
+                var obj = new
+                {
+                    F_Address = dModel.F_Address,
+                    F_CreateDate = dModel.F_CreateDate,
+                    F_CreateUser = dModel.F_CreateUser,
+                    F_DeptId = dModel.F_DeptId,
+                    F_DeptName = dModel.F_DeptName,
+                    F_DeptNameSpell = dModel.F_DeptNameSpell,
+                    F_DeptNameSpells = dModel.F_DeptNameSpells,
+                    F_DeptPhone = dModel.F_DeptPhone,
+                    F_DeptPhone2 = dModel.F_DeptPhone2,
+                    F_DeptTelphone = dModel.F_DeptTelphone,
+                    F_IsDealDept = dModel.F_IsDealDept,
+                    F_IsDept = dModel.F_IsDept,
+                    F_LeaderUser = dModel.F_LeaderUser,
+                    F_LeaderUserName = dModel.F_LeaderUserName,
+                    F_PartentId = dModel.F_PartentId,
+                    F_Remark = dModel.F_Remark,
+                    F_Sort = dModel.F_Sort,
+                    F_State = dModel.F_State,
+                    F_TopLeaderUser = dModel.F_TopLeaderUser,
+                    F_TopLeaderUserName = dModel.F_TopLeaderUserName,
+                    F_TopSplitUser = dModel.F_TopSplitUser,
+                    F_TopSplitUserName = dModel.F_TopSplitUserName,
+                    F_Type = dModel.F_Type,
+                    F_layer = dModel.F_layer,
+                    F_Valueid = dModel.F_Valueid,
+                    F_Value = value,
+                };
                 return Success("获取信息成功", dModel);
+            }
+                
             return Error("获取信息失败");
 
         }
             int sort = RequestString.GetInt("sort", 0);
             int isdept = RequestString.GetInt("isdept", 0);
             int isdealdept = RequestString.GetInt("isdealdept", 0);
+            int valueid = RequestString.GetInt("valueid", 0);
             string name = RequestString.GetFormString("name");
             string phone = RequestString.GetFormString("phone");
             string leader = RequestString.GetFormString("leader");
                     dModel.F_IsDealDept = isdealdept;
                     dModel.F_CreateDate = DateTime.Now;
                     dModel.F_CreateUser = userModel.F_UserCode;
+                    dModel.F_Valueid  = valueid;
                     
                     int n = departmentBLL.Add(dModel);
                     if (n > 0)
+                    {
+                        if (valueid > 0)
+                        {
+                            var value = new BLL.T_Sys_DictionaryValue ().GetModel(valueid);
+                            if (value != null)
+                            {
+                                value.F_Deptid  = n;
+                            }
+                            var b = new BLL.T_Sys_DictionaryValue().Update(value);
+                        }
                         return Success("添加成功", n);
+                    }
+                       
                     else
                         return Error("添加失败");
                 }
                         dModel.F_TopLeaderUser = topleader;
                         dModel.F_IsDept = isdept;
                         dModel.F_IsDealDept = isdealdept;
+                        dModel.F_Valueid = valueid;
                         if (departmentBLL.Update(dModel))
+                        {
+                            if (valueid > 0)
+                            {
+                                var value = new BLL.T_Sys_DictionaryValue().GetModel(valueid);
+                                if (value != null)
+                                {
+                                    value.F_Deptid = dModel.F_DeptId ;
+                                }
+                                var b = new BLL.T_Sys_DictionaryValue().Update(value);
+                            }
                             return Success("修改成功");
+                        }
                         else
                             return Error("修改失败");
                     }

CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/DictionaryController.cs

 using CallCenter.Utility;
+using CallCenterApi.Common;
 using CallCenterApi.DB;
 using CallCenterApi.Interface.Controllers.Base;
 using System;
     public class DictionaryController : BaseController
     {
         private BLL.T_Sys_DictionaryValue dictionaryValueBLL = new BLL.T_Sys_DictionaryValue();
-
+        private BLL.T_Sys_UserAccount userBLL = new BLL.T_Sys_UserAccount();
         public ActionResult GetZTreeList()
         {
             DataTable dt = new DataTable();
             return Content(obj.ToJson());
 
         }
-
+        [Authority]
         /// <summary>
         /// 获取字典值列表
         /// </summary>
         /// <returns></returns>
-        public ActionResult GetDicValueListById()
+        public ActionResult GetDicValueListById(int type=0)
         {
+            int userId = Utils.StrToInt(User.UserData["F_UserID"], 0);
+            Model.T_Sys_UserAccount userModel = userBLL.GetModel(userId);
             int id = RequestString.GetInt("id", 0);
             var sql = " F_State=0 ";
             if (id == 1)
             else if (id == 2)
                 sql += " and  (F_PrentId=37 or F_ItemId='" + id + "')";
             else if (id == 3)
-                sql += " and  (F_PrentId=38 or F_ItemId='" + id + "')";
+            {
+                if (type >0)
+                {
+                    sql += " and  (F_PrentId=38 or F_ItemId='" + id + "')";
+                }
+                else
+                {
+                    if (userModel.F_RoleCode == "DFZF")
+                        sql += " and  (F_PrentId=38 or F_ItemId='" + id + "')  and F_Deptid='" + userModel.F_DeptId + "'";
+                    else
+                        sql += " and  (F_PrentId=38 or F_ItemId='" + id + "')";
+                }
+               
+            }
+               
             else
                 sql += " and  (F_PrentId='" + id + "' or F_ItemId='" + id + "')";
             DataTable dt = new DataTable();
 
             Model.T_Sys_DictionaryValue valueModel = dictionaryValueBLL.GetModel(id);
             if (valueModel != null)
-                return Success("加载字典值成功", valueModel);
+            {
+                string deptname="";
+                 if (valueModel.F_Deptid!=null )
+                {
+                    var dept = new BLL.T_Sys_Department().GetModel((int )valueModel.F_Deptid);
+                    if (dept != null)
+                        deptname = dept.F_DeptName;
+                }
+                var obj = new
+                {
+                    F_CreateDate=  valueModel.F_CreateDate ,
+                    F_CreateUser = valueModel.F_CreateUser,
+                    F_IsLeaf = valueModel.F_IsLeaf,
+                    F_ItemId = valueModel.F_ItemId,
+                    F_Layer = valueModel.F_Layer,
+                    F_PrentId = valueModel.F_PrentId,
+                    F_Remark = valueModel.F_Remark,
+                    F_State = valueModel.F_State,
+                    F_Value = valueModel.F_Value,
+                    F_ValueId = valueModel.F_ValueId,
+                    F_Deptid = valueModel.F_Deptid,
+                    F_DeptName= deptname
+                };
+                return Success("加载字典值成功", obj);
+            }
+               
             else
                 return Error("加载字典值失败");
 
             //int iid = RequestString.GetInt("iid", 0);
             int pid = RequestString.GetInt("pid", 0);
             string name = RequestString.GetFormString("name");
-
+            int deptid = RequestString.GetInt("deptid", 0);
             Model.T_Sys_DictionaryValue orderModel = new Model.T_Sys_DictionaryValue();
             BLL.T_Sys_DictionaryValue orderBll = new BLL.T_Sys_DictionaryValue();
-
+            
             if (id == 0)
             {
                 //var list = orderBll.GetModelList(" F_Value='" + name + "' and F_ItemId='"+pid+"' ");
                     orderModel.F_Value = name;
                     orderModel.F_PrentId = pid;
                     orderModel.F_State = 0;
-
+                    orderModel.F_Deptid  = deptid;
+                    
                     int n = orderBll.Add(orderModel);
                     if (n > 0)
+                    {
+                        if (deptid > 0)
+                        {
+                            var dept = new BLL.T_Sys_Department().GetModel(deptid);
+                            if (dept != null )
+                            {
+                                dept.F_Valueid = n;                     }
+                            var b = new BLL.T_Sys_Department().Update(dept);
+                            }
                         return Success("字典值添加成功", n);
+                    }
+                       
                     else
                         return Error("字典值添加失败");
                 }
                         orderModel.F_ItemId = pid;
                         orderModel.F_Value = name;
                         orderModel.F_PrentId = pid;
-
+                        orderModel.F_Deptid = deptid;
                         if (orderBll.Update(orderModel))
+                        {
+                            if (deptid > 0)
+                            {
+                                var dept = new BLL.T_Sys_Department().GetModel(deptid);
+                                if (dept != null)
+                                {
+                                    dept.F_Valueid = orderModel.F_ValueId ;
+                                }
+                                var b = new BLL.T_Sys_Department().Update(dept);
+                            }
                             return Success("字典值修改成功");
+                        }
                         else
                             return Error("字典值修改失败");
                     }

CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/report/WorkOrderReportController.cs

             }
             return Success("成功", newSet);
         }
-        public class deptSatisfiedReport
-        {
-            public int count = 0;
-            public string deptname;
-            public int notsatisfiedcount = 0;
-            public int satisfiedcount = 0;
-            public string satisfiedrate="" ;
-            public float fiedrate=0;
-        }
+  
         /// <summary>
         /// 市民满意度评价
         /// </summary>
             {
                 end = DateTime.Now;
             }
-            if (isExport)
-            {
-                Dictionary<string, string> paras = new Dictionary<string, string>();
-                paras.Add("@sdate", start.Value.ToString("yyyy-MM-dd"));
-                paras.Add("@edate", end.Value.ToString("yyyy-MM-dd"));
-                var obj = DbHelperSQL.RunProcedure("P_DeptSatisfiedReport", paras, "DeptSatisfiedReport");
-                string[] cols = new string[] { "单位名称", "处理总量", "满意总量", "不满意总量", "满意度" };
-                new NPOIHelper().ExportToExcel($"满意度统计报表{Convert.ToDateTime(start).ToString("yyyyMMdd")}-{Convert.ToDateTime(end).ToString("yyyyMMdd")}", obj.Tables[0], cols);
-                return Success("导出excel");
-            }
+           
             List<deptSatisfiedReport> DeptSatisfiedReport = new List<deptSatisfiedReport>();
             var workorder = new BLL.T_Bus_AssignedInfo().GetModelList
-                (" F_Id IN ((select max(F_Id) from T_Bus_AssignedInfo where F_IsDelete = 0 " +
-                "and F_State = 1 and isnull(F_FeedbackTime, '') <> ''  and datediff(day, F_FeedbackTime, '" + start + "') <= 0 " +
-                "and datediff(day, F_FeedbackTime, '" + end + "') >= 0  and F_WorkOrderId in (select F_WorkOrderId from" +
-                " T_Bus_WorkOrder where F_WorkState = 9)  group by F_WorkOrderId)) ");
-
-            var visit= new BLL.T_Bus_WorkOrder().GetModelList
-                ("F_IsDelete=0 and  F_WorkOrderId in " +
-                "(select a.F_WorkOrderId  from T_Bus_AssignedInfo a INNER JOIN T_Bus_VisitResult v " +
-                "on a.F_Id = v.F_AssignedId WHERE v.F_IsDelete = 0 and v.F_State = 1 and a.F_Id IN( (select max(F_Id) " +
-                "from T_Bus_AssignedInfo where F_IsDelete = 0 and F_State = 1 and isnull(F_FeedbackTime, '') <> ''  " +
-                "and datediff(day, F_FeedbackTime, '"+ start + "') <= 0 and datediff(day, F_FeedbackTime, '"+ end + "') >= 0 " +
-                "and F_WorkOrderId in (select F_WorkOrderId from T_Bus_WorkOrder where F_WorkState = 9)    group by F_WorkOrderId)) ) ")  ;
+                ("   F_Id in ( select MAX (F_Id )  from T_Bus_AssignedInfo    where "+
+   " F_IsDelete = 0 and F_IsSure = 1 and F_State = 1 "+
+      "  and isnull(F_FeedbackTime, '') <> '' "+
+       " and datediff(day, F_FeedbackTime, '" + start + "') <= 0 " +
+        "and datediff(day, F_FeedbackTime, '" + end + "') >= 0 and " +
+     " F_WorkOrderId in (select F_WorkOrderId from T_Bus_WorkOrder "+
+      " where F_WorkState = 9 and F_IsDelete = 0)  group by F_WorkOrderId,F_MainDeptId  ) ");
+
+            var vis = "select * from T_Bus_AssignedInfo a INNER JOIN T_Bus_VisitResult v  on a.F_Id = v.F_AssignedId WHERE " +
+                "v.F_IsDelete = 0 and v.F_State = 1 and a.F_Id IN((select max(F_Id)" +
+                " from T_Bus_AssignedInfo where F_IsDelete = 0 and F_State = 1 and isnull(F_FeedbackTime, '') <> ''" +
+                "  and datediff(day, F_FeedbackTime, '"+ start + "') <= 0 and datediff(day, F_FeedbackTime, '"+ end + "') >= 0" +
+                "  and F_WorkOrderId in (select F_WorkOrderId from T_Bus_WorkOrder where F_WorkState = 9 and F_IsDelete = 0)   " +
+                "  group by F_WorkOrderId,F_MainDeptId))";
+            DataTable visit = DbHelperSQL.Query(vis).Tables[0];
+            List<Model.T_Bus_AssignedInfo> visitlist = new BLL.T_Bus_AssignedInfo().DataTableToList(visit);
+         
 
             var deptMent = new BLL.T_Sys_Department().GetModelList(" F_State=0 AND F_IsDept='1'  ");
             if (deptMent!=null )
                     deptSatisfied.satisfiedcount = 0;
                     deptSatisfied.satisfiedrate = "";
                     deptSatisfied.fiedrate = 0;
+                    deptSatisfied.deptid = it.F_DeptId;
                     int   visits = 0;
                     if (workorder !=null )
                     {
                         }
                         if (visit!=null )
                         {
-                            foreach (var iv in visit)
+                            foreach (var iv in visitlist)
                             {
                                 if (iv.F_MainDeptId == it.F_DeptId)
-                                  visits++;
-                                if (iv.F_MainDeptId == it.F_DeptId&& iv. F_IsSatisfie ==1)
-                                    deptSatisfied.satisfiedcount++;
+                                {
+                                    visits++;
+                                    if ( iv.F_IsSatisfie == 1)
+                                        deptSatisfied.satisfiedcount++;
+                                }
+                                
+                              
                             }
                         }
                         deptSatisfied.notsatisfiedcount = visits - deptSatisfied.satisfiedcount;
-                        if (visits>0)
+                        if (deptSatisfied.count > 0)
                         {
-                            deptSatisfied.fiedrate = (float)deptSatisfied.satisfiedcount / visits;
-                            deptSatisfied.satisfiedrate = string.Format("{0:f2}%",(float )deptSatisfied.satisfiedcount / visits*100);
+                            deptSatisfied.fiedrate = (float)deptSatisfied.satisfiedcount / deptSatisfied.count;
+                            deptSatisfied.satisfiedrate = string.Format("{0:f2}%",(float )deptSatisfied.satisfiedcount / deptSatisfied.count * 100);
                         }
                         DeptSatisfiedReport.Add(deptSatisfied);
                     }
                     }
                 }
             }
-
-            DeptSatisfiedReport. Sort((x, y) => y .fiedrate.CompareTo(x .fiedrate));
-          //  foreach (var it in DeptSatisfiedReport)
-         //   {
-           //     if (it.satisfiedrate == "0%")
-            //        it.satisfiedrate = "";
-           // }
-          //  var result = DeptSatisfiedReport.OrderBy(x => x == null     ).ThenBy(x => x.satisfiedrate );
-
-
-
-
-
-
-
-
-            //string sql = $"select * from dbo.GetDeptSatisfied('{start.Value.ToString("yyyy-MM-dd")}','{end.Value.ToString("yyyy-MM-dd")}') ORDER BY rate DESC";
-            //var dtall = DbHelperSQL.Query(sql).Tables[0];
-
-
-
+        
+           var result = DeptSatisfiedReport.OrderBy(x => x .deptid ).OrderByDescending (x => x.fiedrate);
+            if (isExport)
+            {
+                string[] col = new string[] { "单位名称", "处理总量", "满意总量", "不满意总量", "满意度" };
+                new NPOIHelper().SatisfiedToExcel($"满意度统计报表{Convert.ToDateTime(start).ToString("yyyyMMdd")}-{Convert.ToDateTime(end).ToString("yyyyMMdd")}", result, col);
+                return Success("导出excel");
+                //   Dictionary<string, string> paras = new Dictionary<string, string>();
+                //  paras.Add("@sdate", start.Value.ToString("yyyy-MM-dd"));
+                //  paras.Add("@edate", end.Value.ToString("yyyy-MM-dd"));
+                // var obj = DbHelperSQL.RunProcedure("P_DeptSatisfiedReport", paras, "DeptSatisfiedReport");
+                //  string[] cols = new string[] { "单位名称", "处理总量", "满意总量", "不满意总量", "满意度" };
+                //  new NPOIHelper().ExportToExcel($"满意度统计报表{Convert.ToDateTime(start).ToString("yyyyMMdd")}-{Convert.ToDateTime(end).ToString("yyyyMMdd")}", obj.Tables[0], cols);
+                // return Success("导出excel");
+            }
+           
+           
             var ob = new
             {
                 state = "success",
                 message = "成功",
-                DeptSatisfiedReport = DeptSatisfiedReport,
+                DeptSatisfiedReport = result,
             };
             return Success("成功", ob );
-            //int recordCount = 0;
-            //var dt = BLL.PagerBLL.GetListPager(
-            //   "("+sql+") as v",
-            //    "deptname",
-            //    "*",
-            //    "",
-            //    "ORDER BY rate DESC",
-            //    pageSize,
-            //    pageIndex,
-            //    true,
-            //    out recordCount);
-
-            //var obj = new
-            //{
-            //    state = "success",
-            //    message = "成功",
-            //    rows = dt,
-            //    total = recordCount
-            //};
-
-            //return Content(obj.ToJson());
+         
         }
 
 

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

             if (strkey.Trim() != "" && strkey != "undefined")
             {
                 sql += " and (F_ComTitle like '%" + strkey + "%' or F_ComContent like '%" + strkey + "%') ";
+               
             }
+           
+           
             if (strusercode.Trim() != "" && strusercode != "undefined")
             {//坐席
                 var usercode = strusercode.Trim().Split(',');
             {
                 sql += " and ','+F_Key+',' like '%," + keyid + ",%' ";
             }
+            else if (userModel.F_RoleCode == "DFZF")
+            {
+                sql += " and F_CreateUser ='"+ userModel .F_UserCode + "' ";
+            }
             if (type != 0)
             {
                 sql += " and F_InfoType = '" + type + "' ";
             if (userModel.F_RoleCode == "ZXHWY" || userModel.F_RoleCode == "ZXBZ" 
                 || userModel.F_RoleCode == "ZXLD" || userModel.F_RoleCode == "ZXLDGLYGLY"
                 || userModel.F_RoleCode == "ZJZY" || userModel.F_RoleCode == "DBZY"
-                || userModel.F_RoleCode == "11"   || userModel.F_RoleCode == "GLY" || userModel.F_RoleCode == "DDZG") //增加新闻媒体(编号11)的添加工单权限 
+                || userModel.F_RoleCode == "11"   || userModel.F_RoleCode == "GLY" || userModel.F_RoleCode == "DDZG"
+                || userModel.F_RoleCode == "DFZF") //增加新闻媒体(编号11)的添加工单权限 
             {
 
                 int source = RequestString.GetInt("source", 0);
                 Model.T_Bus_AssignedInfo modelT_Bus_AssignedInfo = assignBLL.GetNewModelByWorkOrderID(workorderid);
                 if (modelT_Bus_WorkOrder != null)
                 {
-                    if (modelT_Bus_AssignedInfo != null && modelT_Bus_AssignedInfo.F_CreateUser != userModel.F_UserCode)
+                    if (userModel.F_RoleCode != "GLY" && userModel.F_RoleCode != "DDZG")
                     {
-                        return Error("操作失败");
+                        if (modelT_Bus_AssignedInfo != null && modelT_Bus_AssignedInfo.F_CreateUser != userModel.F_UserCode)
+                        {
+                            return Error("操作失败");
+                        }
                     }
+                   
 
                     using (TransactionScope trans = new TransactionScope())
                     {
                                 
                             }
                         }
+                        if (modelT_Bus_AssignedInfo!=null )
+                        {
+                            modelT_Bus_AssignedInfo.F_IsStandard = isstandard;
+                            modelT_Bus_AssignedInfo.F_StandardIDS = standardids;
 
-                        modelT_Bus_AssignedInfo.F_IsStandard = isstandard;
-                        modelT_Bus_AssignedInfo.F_StandardIDS = standardids;
-
-                        assignBLL.Update(modelT_Bus_AssignedInfo);
+                            assignBLL.Update(modelT_Bus_AssignedInfo);
+                        }
+                      
                         workorderBLL.Update(modelT_Bus_WorkOrder);
                         #endregion
 

CallCenterApi/CallCenterApi.Model/T_Sys_Department.cs

         private DateTime? _f_createdate;
         private int? _f_isdept;
         private int? _f_isdealdept;
+        private int? _f_valueid;
+        
         /// <summary>
         /// 部门id，自增
         /// </summary>
             set { _f_isdealdept = value; }
             get { return _f_isdealdept; }
         }
+        public int? F_Valueid
+        {
+            set { _f_valueid = value; }
+            get { return _f_valueid; }
+        }
         #endregion Model
 
     }

CallCenterApi/CallCenterApi.Model/T_Sys_DictionaryValue.cs

         private int? _f_state;
         private string _f_createuser;
         private DateTime? _f_createdate;
+        private int? _f_deptid;
         /// <summary>
         /// 自增
         /// </summary>
             set { _f_createdate = value; }
             get { return _f_createdate; }
         }
+        /// <summary>
+        /// 部门
+        /// </summary>
+        public int? F_Deptid
+        {
+            set { _f_deptid = value; }
+            get { return _f_deptid; }
+        }
+        
         #endregion Model
 
     }

CallCenterCommon/CallCenter.Utility/CallCenter.Utility.csproj

     <Compile Include="Linq\LinqExtend.cs" />
     <Compile Include="Linq\PredicateExtensionses.cs" />
     <Compile Include="log\LogInterface.cs" />
+    <Compile Include="NPOI\InPutType.cs" />
     <Compile Include="RedisHelper.cs" />
     <Compile Include="SaltAndHashHelper.cs" />
     <Compile Include="SysInformationHelper.cs" />

CallCenterCommon/CallCenter.Utility/NPOI/InPutType.cs

+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Text;
+
+
+namespace CallCenter.Utility
+{
+    
+        public class deptSatisfiedReport
+        {
+            public int count = 0;
+            public string deptname;
+            public int notsatisfiedcount = 0;
+            public int satisfiedcount = 0;
+            public string satisfiedrate = "";
+            public float fiedrate = 0;
+            public int deptid = 0;
+        }
+
+   
+}

CallCenterCommon/CallCenter.Utility/NPOI/NPOIHelper.cs

 
 using System;
+using System.Collections.Generic;
 using System.Data;
 using System.IO;
+using System.Linq;
 using System.Text;
 using System.Web;
 using NPOI.HSSF.UserModel;
 using NPOI.SS.Util;
 using NPOI.XSSF.UserModel;
 
+
 namespace CallCenter.Utility
 {
     public class NPOIHelper
             this._filePath = filePath;
             return ToExcel(table, columns);
         }
+        /// <summary>
+        /// 投诉产品日期分布表
+        /// </summary>
+        /// <param name="ds"></param>
+        /// <returns></returns>
+        public string SatisfiedToExcel(string Name, IOrderedEnumerable<deptSatisfiedReport>   deptSatisfied, string[] cols = null)
+        {
+            try
+            {
+                //if (dt.Rows.Count > 0)
+                //{
+                HSSFWorkbook workbook = new HSSFWorkbook();
+                ISheet sheet = workbook.CreateSheet("Sheet1");
+
+                ICellStyle HeadercellStyle = workbook.CreateCellStyle();
+                HeadercellStyle.BorderBottom = NPOI.SS.UserModel.BorderStyle.Thin;
+                HeadercellStyle.BorderLeft = NPOI.SS.UserModel.BorderStyle.Thin;
+                HeadercellStyle.BorderRight = NPOI.SS.UserModel.BorderStyle.Thin;
+                HeadercellStyle.BorderTop = NPOI.SS.UserModel.BorderStyle.Thin;
+                HeadercellStyle.Alignment = HorizontalAlignment.Center;
+                HeadercellStyle.FillForegroundColor = NPOI.HSSF.Util.HSSFColor.SkyBlue.Index;
+                HeadercellStyle.FillPattern = FillPattern.SolidForeground;
+                HeadercellStyle.FillBackgroundColor = NPOI.HSSF.Util.HSSFColor.SkyBlue.Index;
+
+                //字体
+                NPOI.SS.UserModel.IFont headerfont = workbook.CreateFont();
+                headerfont.Boldweight = (short)FontBoldWeight.Bold;
+                headerfont.FontHeightInPoints = 12;
+                HeadercellStyle.SetFont(headerfont);
+
 
+                //用column name 作为列名
+                int icolIndex = 0;
+                IRow headerRow = sheet.CreateRow(0);
+                foreach (string dc in cols)
+                {
+                    ICell cell = headerRow.CreateCell(icolIndex);
+                    cell.SetCellValue(dc);
+                    cell.CellStyle = HeadercellStyle;
+                    icolIndex++;
+                }
+                ICellStyle cellStyle = workbook.CreateCellStyle();
+
+                //为避免日期格式被Excel自动替换，所以设定 format 为 『@』 表示一率当成text來看
+                cellStyle.DataFormat = HSSFDataFormat.GetBuiltinFormat("@");
+                cellStyle.BorderBottom = NPOI.SS.UserModel.BorderStyle.Thin;
+                cellStyle.BorderLeft = NPOI.SS.UserModel.BorderStyle.Thin;
+                cellStyle.BorderRight = NPOI.SS.UserModel.BorderStyle.Thin;
+                cellStyle.BorderTop = NPOI.SS.UserModel.BorderStyle.Thin;
+
+
+                NPOI.SS.UserModel.IFont cellfont = workbook.CreateFont();
+                cellfont.Boldweight = (short)FontBoldWeight.Normal;
+                cellStyle.SetFont(cellfont);
+
+                //建立内容行
+                int iRowIndex = 0;
+                string strsj = "";
+                foreach (var  dr in deptSatisfied )
+                {
+                    IRow irow = sheet.CreateRow(iRowIndex + 1);
+                    for (int i = 0; i <5   ; i++)
+                    {
+                      
+                        switch (i )
+                        {
+                            case 0:
+                                  strsj = dr.deptname;
+                                ICell cell = irow.CreateCell(i);
+                                cell.SetCellValue(strsj);
+                                cell.CellStyle = cellStyle;
+                                break;
+                            case 1:
+                                 strsj = dr.count.ToString ();
+                                ICell cell1 = irow.CreateCell(i);
+                                cell1.SetCellValue(strsj);
+                                cell1.CellStyle = cellStyle;
+                                break;
+                            case 2:
+                                strsj = dr.satisfiedcount.ToString();
+                                ICell cell2 = irow.CreateCell(i);
+                                cell2.SetCellValue(strsj);
+                                cell2.CellStyle = cellStyle;
+                                break;
+                            case 3:
+                                 strsj = dr.notsatisfiedcount.ToString();
+                                ICell cell3 = irow.CreateCell(i);
+                                cell3.SetCellValue(strsj);
+                                cell3.CellStyle = cellStyle;
+                                break;
+                            case 4:
+                                 strsj = dr.satisfiedrate;
+                                ICell cell4 = irow.CreateCell(i);
+                                cell4.SetCellValue(strsj);
+                                cell4.CellStyle = cellStyle;
+                                break;
+                        }
+                    }
+                    iRowIndex++;
+                }
+
+                //自适应列宽度
+                for (int i = 0; i < icolIndex; i++)
+                {
+                    sheet.AutoSizeColumn(i);
+                }
+
+                using (MemoryStream ms = new MemoryStream())
+                {
+                    workbook.Write(ms);
+
+                    HttpContext curContext = HttpContext.Current;
+
+
+                    // 设置编码和附件格式
+                    curContext.Response.ContentType = "application/vnd.ms-excel";
+                    curContext.Response.ContentEncoding = Encoding.UTF8;
+                    curContext.Response.Charset = "";
+                    curContext.Response.AppendHeader("Content-Disposition",
+                        "attachment;filename=" + HttpUtility.UrlEncode(Name + ".xls", Encoding.UTF8));
+
+                    curContext.Response.BinaryWrite(ms.GetBuffer());
+
+                    workbook = null;
+                    ms.Close();
+                    ms.Dispose();
+
+                    curContext.Response.End();
+                }
+                //}
+                return "";
+            }
+            catch
+            {
+                return "导出失败！";
+            }
+
+        }
         /// <summary>
         /// 弹出下载框导出excel
         /// </summary>
             }
         }
 
+      
+
         /// <summary>
         /// 生成excel到路径
         /// </summary>