抽检字段app通讯录

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/AddressBookController.cs

@@ -287,8 +287,99 @@ namespace CallCenterApi.Interface.Controllers
             }
             return NoToken("未知错误，请重新登录");
         }
-      
-       
+        public ActionResult GetAppModelList(string keywords, int pageindex = 1, int pagesize = 10)
+        {
+            if (Request.IsAuthenticated)
+            {
+                int userId = CurrentUser.UserData.F_UserId;
+                Model.T_Sys_UserAccount userModel = new BLL.T_Sys_UserAccount().GetModel(userId);
+                List<AddressBook> Input = new List<AddressBook>();
+                int dptid = 0;
+                if (userModel != null)
+                {
+                    dptid = userModel.F_DeptId;
+                }
+                if (userModel.F_RoleId == 49)
+                {
+                    dptid = 1;
+                }
+                if (userModel.F_See == "5")
+                    return Success("暂无记录");
+                Model.T_Sys_Department deptModel = new BLL.T_Sys_Department().GetModel(dptid);
+                DataTable dt = new DataTable();
+                string sql = "F_IsDelete=0 ";
+                if (!string.IsNullOrEmpty(keywords))
+                {
+                    sql += $"  and ( F_Name like '%" + keywords.Trim() + "%'or F_Telephone like '%" + keywords.Trim() + "%'or F_Mobile like '%" + keywords.Trim() + "%'or F_ElseMobile like '%" + keywords.Trim() + "%'or F_Department like '%" + keywords.Trim() + "%' ) ";
+                }
+                if (dptid > 0)
+                {
+
+                    sql += " and F_DepartmentId in ( select F_DeptId from T_Sys_Department where F_DeptCode like '" + deptModel.F_DeptCode + "%') ";
+                }
+                
+                var modelList = bll.GetAPPList(sql + " order by code asc").Tables[0];
+                 if (pageindex* pagesize<modelList .Rows .Count )
+                {
+                   for (int i=0;i< modelList.Rows .Count;i ++)
+                    {
+                        if (i>= pageindex * pagesize- pagesize&& i< pageindex * pagesize)
+                        {
+                            AddressBook model = new AddressBook();
+                            model = BookData(modelList.Rows[i]);
+                            Input.Add(model);
+                        }
+                    }
+                   
+                }
+                 else
+                {
+                    for (int i = 0; i < modelList.Rows.Count; i++)
+                    {
+                            AddressBook model = new AddressBook();
+                            model = BookData(modelList.Rows[i]);
+                            Input.Add(model);
+                    }
+                }
+                //  List<AddressBook> Input = AddressBooks(modelList);
+                //  var modelListOrder = Input.OrderBy(x => x.F_Name);
+                return Content(Input.ToJson());
+            }
+            return NoToken("未知错误，请重新登录");
+        }
+        public AddressBook BookData(DataRow dt)
+        {
+                  AddressBook model = new AddressBook();
+           if (dt["F_UserId"] != null && dt["F_UserId"].ToString() != "")
+            model.id = int.Parse (dt["F_UserId"] .ToString());
+            if (dt["F_Name"] != null && dt["F_Name"].ToString() != "")
+                model.F_Name = dt["F_Name"].ToString();
+            if (dt["code"] != null && dt["code"].ToString() != "")
+                model.code = dt["code"].ToString();
+            if (dt["F_Sex"] != null && dt["F_Sex"].ToString() != "")
+                model.F_Sex = dt["F_Sex"].ToString();
+            if (dt["F_Address"] != null && dt["F_Address"].ToString() != "")
+                model.F_Address = dt["F_Address"].ToString();
+            if (dt["F_Telephone"] != null && dt["F_Telephone"].ToString() != "")
+                model.F_Telephone = dt["F_Telephone"].ToString();
+            if (dt["F_Mobile"] != null && dt["F_Mobile"].ToString() != "")
+                model.F_Mobile = dt["F_Mobile"].ToString();
+            if (dt["F_ElseMobile"] != null && dt["F_ElseMobile"].ToString() != "")
+                model.F_ElseMobile = dt["F_ElseMobile"].ToString();
+            if (dt["F_Position"] != null && dt["F_Position"].ToString() != "")
+                model.F_Position = dt["F_Position"].ToString();
+            if (dt["F_Note"] != null && dt["F_Note"].ToString() != "")
+                model.F_Note = dt["F_Note"].ToString();
+            if (dt["F_Department"] != null && dt["F_Department"].ToString() != "")
+                model.F_Department = dt["F_Department"].ToString();
+            if (dt["F_Area"] != null && dt["F_Area"].ToString() != "")
+                model.F_Area = dt["F_Area"].ToString();
+            if (dt["F_Offce"] != null && dt["F_Offce"].ToString() != "")
+                model.F_Offce = dt["F_Offce"].ToString();
+
+            return model;
+        }
+
         /// <summary>
         /// 获取一条详细信息 Id
         /// </summary>

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/PushMessageController.cs

@@ -48,7 +48,7 @@ namespace CallCenterApi.Interface.Controllers
         }
         public ActionResult PushMessagePush()
         {
-            var modellist = new BLL.T_Wo_WorkOrderItem_New().GetModelList("  F_WoID in(select F_ID from  T_Bus_WorkOrder where F_IsDelete = 0 and F_State in(1, 3, 5)and F_Area in (18, 19, 8, 9, 61, 10, 11, 12, 15, 13, 482, 14, 16, 17,20,21,22)) and F_IsUsed = 0 and F_WoState in (1,3,5)");
+            var modellist = new BLL.T_Wo_WorkOrderItem_New().GetModelList("  F_WoID in(select F_ID from  T_Bus_WorkOrder where F_IsDelete = 0 and F_State in(1, 3, 5)) and F_IsUsed = 0 and F_WoState in (1,3,5)");
             string msg = "";
             if (modellist != null)
             {
@@ -95,7 +95,7 @@ namespace CallCenterApi.Interface.Controllers
         /// <returns></returns>
         public ActionResult SetPush()
         {
-            var modellist = new BLL.T_Wo_WorkOrderItem_New().GetModelList("  F_WoID in(select F_ID from  T_Bus_WorkOrder where F_IsDelete = 0 and F_State in(1, 3, 5)and F_Area in (18, 19, 8, 9, 61, 10, 11, 12, 15, 13, 482, 14, 16, 17,20,21,22)) and F_IsUsed = 0 and F_WoState in (1,3,5)");
+            var modellist = new BLL.T_Wo_WorkOrderItem_New().GetModelList("  F_WoID in(select F_ID from  T_Bus_WorkOrder where F_IsDelete = 0 and F_State in(1, 3, 5)) and F_IsUsed = 0 and F_WoState in (1,3,5)");
           
             string msg = "";
             if (modellist != null)
@@ -518,7 +518,7 @@ namespace CallCenterApi.Interface.Controllers
 
          //   var modellist = new BLL.T_Bus_WorkOrder().GetModelList("F_IsDelete=0 and F_State in(1,3,5)  and F_Area in(18,19,8,9,61,10" +
              //   ",11,12,15,13,482,14,16,17)");
-            var modellist = new BLL.T_Wo_WorkOrderItem_New().GetModelList("  F_WoID in(select F_ID from  T_Bus_WorkOrder where F_IsDelete = 0 and F_State in(1, 3, 5)and F_Area in (18, 19, 8, 9, 61, 10, 11, 12, 15, 13, 482, 14, 16, 17,20,21,22)) and F_IsUsed = 0 and F_WoState in (1,3,5)");
+            var modellist = new BLL.T_Wo_WorkOrderItem_New().GetModelList("  F_WoID in(select F_ID from  T_Bus_WorkOrder where F_IsDelete = 0 and F_State in(1, 3, 5)) and F_IsUsed = 0 and F_WoState in (1,3,5)");
             if (modellist != null)
             {
                 foreach (var it in modellist)

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

@@ -107,11 +107,15 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 if (CJ == 1)
                 {
                     sql += $" and (F_Type=" + 4 + "or (F_Duplicate in(4)and F_Type=3))";
-                    if (ro.F_RoleCode == "BSCJL" || ro.F_RoleCode == "YWY" || ro.F_RoleCode == "ZG")
+                    if ( ro.F_RoleCode == "YWY" || ro.F_RoleCode == "ZG")
                     {
                         sql += "AND F_Notifications ='" + ua.F_UserCode+"'";
                     }
-                    else if (ro.F_RoleCode == "ZR" || ro.F_RoleCode == "BBZY" || ro.F_RoleCode == "CJZY" || ro.F_RoleCode == "JCRY" || ro.F_RoleCode == "XTGLY")
+                    else if (ro.F_RoleCode == "BSCJL")
+                    {
+                        sql += "AND F_Office =" + ua.F_DeptId;
+                    }
+                    else if (ro.F_RoleCode == "ZR" || ro.F_RoleCode == "BBZY" || ro.F_RoleCode == "CJZY" || ro.F_RoleCode == "JCRY" || ro.F_RoleCode == "XTGLY" || ro.F_RoleCode == "CLZY")
                     {
                     }
                     else
@@ -396,7 +400,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                     {
                      //   dt.Columns.Add("工单编号");
                         dt.Columns.Add("序号");
-                        dt.Columns.Add("抽检日期");
+                        dt.Columns.Add("抽检时间");
                         dt.Columns.Add("抽检单位");
                         dt.Columns.Add("办事处");
                         dt.Columns.Add("抽检类型");
@@ -404,10 +408,12 @@ namespace CallCenterApi.Interface.Controllers.workorder
                         dt.Columns.Add("抽检产品");
                         dt.Columns.Add("生产日期");
                         dt.Columns.Add("涉及工厂");
-                        dt.Columns.Add("责任人");
                         dt.Columns.Add("电话");
+                        dt.Columns.Add("责任人");
+                        dt.Columns.Add("抽检日期");
                         dt.Columns.Add("抽检结果");
                         dt.Columns.Add("备注");
+                        
                         foreach (var it in depts)
                         {
                             DataRow drNew = dt.NewRow();
@@ -416,7 +422,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                             {
                                 //  drNew["工单编号"] = it.F_WorkOrderId;//
                                 drNew["序号"] = it.F_SerialNumber;//
-                                drNew["抽检日期"] = DateTime.Parse(it.F_CreateTime.ToString()).ToString("yyyy年MM月dd日HH时mm分");//
+                                drNew["抽检时间"] = DateTime.Parse(it.F_CreateTime.ToString()).ToString("yyyy年MM月dd日HH时mm分");//
                                 drNew["抽检单位"] = it.F_Company;
                                 if (!string.IsNullOrEmpty(it.F_Office))
                                 {
@@ -436,6 +442,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                                 drNew["抽检产品"] = it.F_Samplingproducts;
                                 drNew["生产日期"] = it.F_ProductDate;
                                 drNew["涉及工厂"] = it.F_Factories;
+                                drNew["抽检日期"] = it.F_Datecheck;
                                 drNew["责任人"] = it.F_Notifications;
                                 if (!string.IsNullOrEmpty(it.F_Notifications))
                                 {
@@ -561,7 +568,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
     
             string[] ccc = {
                    "工单编号","大区","办事处","投诉时间","序号","姓名","地址","联系电话","产品代码",
-                  "产品名称","规格","生产日期","生产时间","产品编码","生产厂家","问题代码","质量问题","通知人"
+                  "产品名称","规格","生产日期","产品编码","生产厂家","问题代码","质量问题","通知人"
                   ,"接听人" ,"落实情况","处理进度","工单类别"
             };
             return ccc;
@@ -573,7 +580,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
         private string[] col()
         {
             string[] ccc = {
-                   "序号","大区","办事处","姓名","地址","产品代码","产品名称","规格","生产日期","生产时间","产品编码",
+                   "序号","大区","办事处","姓名","地址","产品代码","产品名称","规格","生产日期","产品编码",
                   "生产厂家","问题代码","质量问题","通知人","接听人","落实情况","重复投诉日期"
             };
             return ccc;
@@ -955,13 +962,14 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 model.F_QualityProblem = it.F_QualityProblem;//质量问题
                 model.F_IsReduction = it.F_IsReduction;
 
-                model.F_Productiontime = it.F_Productiontime;//生产时间
+                model.F_Productiontime ="";//生产时间
                 model.F_Company = it.F_Company;//抽检单位
                 model.F_Samplingtype = it.F_Samplingtype;//抽检类型
                 model.F_Salesroom = it.F_Salesroom;//抽样客户/门店
                 model.F_Samplingproducts = it.F_Samplingproducts;//抽检产品
                 model.F_Factories = it.F_Factories;//涉及工厂
-
+                model.F_Datecheck = it.F_Datecheck;//抽检日期
+                
 
 
                 model.F_CallId  = it.F_CallId;//通话记录id
@@ -1401,6 +1409,9 @@ namespace CallCenterApi.Interface.Controllers.workorder
                         return Error("电话不能为空！");
                     if (string.IsNullOrEmpty(input.F_Remark ))
                         return Error("备注不能为空！");
+                    if (string.IsNullOrEmpty(input.F_Datecheck))
+                        return Error("抽检日期不能为空！");
+                    
                 }
                 else
                 {
@@ -1433,7 +1444,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                     }
                 }
               
-                        if (!string.IsNullOrEmpty(input.F_ProductDate))
+             if (!string.IsNullOrEmpty(input.F_ProductDate))
                 {
                     if (input.F_ProductDate!="不清")
                     {
@@ -1454,6 +1465,22 @@ namespace CallCenterApi.Interface.Controllers.workorder
                     }
                  
                 }
+                if (!string.IsNullOrEmpty(input.F_Datecheck))
+                {
+                    if (input.F_Datecheck != "不清")
+                    {
+                        try
+                        {
+                            string result = input.F_Datecheck.Replace(".", "");
+                            var pronos = DateTime.ParseExact(result, "yyyyMMdd", null).ToString("yyyy-MM-dd");
+                        }
+                        catch
+                        {
+                            return Error("抽检日期格式错误！");
+                        }
+                    }
+
+                }
                 var model = new Model.T_Bus_WorkOrder();
                 model = inputtoobj(model, input, 0);
             
@@ -1546,6 +1573,9 @@ namespace CallCenterApi.Interface.Controllers.workorder
                         return Error("电话不能为空！");
                     if (string.IsNullOrEmpty(input.F_Remark))
                         return Error("备注不能为空！");
+                    if (string.IsNullOrEmpty(input.F_Datecheck))
+                        return Error("抽检日期不能为空！");
+                    
                 }
                 else
                 {
@@ -1595,6 +1625,23 @@ namespace CallCenterApi.Interface.Controllers.workorder
                     }
                    
                 }
+                if (!string.IsNullOrEmpty(input.F_Datecheck))
+                {
+                    if (input.F_Datecheck != "不清")
+                    {
+                        try
+                        {
+                            string result = input.F_Datecheck.Replace(".", "");
+                            var pronos = DateTime.ParseExact(result, "yyyyMMdd", null).ToString("yyyy-MM-dd");
+                        }
+                        catch
+                        {
+                            return Error("抽检日期格式错误！");
+                        }
+                    }
+
+                }
+                
                 var model = workorderBLL.GetModel(input.F_Id);
                 if (model == null)
                     return Error("查询不到此工单！");
@@ -1754,6 +1801,9 @@ namespace CallCenterApi.Interface.Controllers.workorder
                         return Error("电话不能为空！");
                     if (string.IsNullOrEmpty(input.F_Remark))
                         return Error("备注不能为空！");
+                    if (string.IsNullOrEmpty(input.F_Datecheck))
+                        return Error("抽检日期不能为空！");
+                    
                 }
                 else
                 {
@@ -1802,6 +1852,24 @@ namespace CallCenterApi.Interface.Controllers.workorder
                     }
                   
                 }
+                if (!string.IsNullOrEmpty(input.F_Datecheck))
+                {
+                    if (input.F_Datecheck != "不清")
+                    {
+                        try
+                        {
+                            string result = input.F_Datecheck.Replace(".", "");
+                            var pronos = DateTime.ParseExact(result, "yyyyMMdd", null).ToString("yyyy-MM-dd");
+                           
+                        }
+                        catch
+                        {
+                            return Error("抽检日期格式错误！");
+                        }
+                    }
+
+                }
+                
                 var model = workorderBLL.GetModel(input.F_Id);
                 if (model == null)
                     return Error("查询不到此工单！");
@@ -2327,7 +2395,8 @@ namespace CallCenterApi.Interface.Controllers.workorder
             model.F_Samplingtype = input.F_Samplingtype;//抽检类型
 
             model.F_Salesroom = input.F_Salesroom;//抽样客户/门店
-
+            model.F_Datecheck = input.F_Datecheck;//抽样客户/门店
+            
             model.F_Samplingproducts = input.F_Samplingproducts;//抽检产品
 
             model.F_Factories = input.F_Factories;//涉及工厂

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

@@ -154,7 +154,6 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 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,ZX=0;
-                string uwhere = "and F_Area in (18, 19, 8, 9, 61, 10, 11, 12, 15, 13, 482, 14, 16, 17,20,21,22)";
                 string where = $" and (F_Type=" + 2 + "or (F_Duplicate in(2,0)and F_Type=3))";
                 for (int i=0;i<12;i ++)
                 {
@@ -183,7 +182,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                         case 1://待分派
                             sql = "";
                             sql += $"  F_IsDelete=0";
-                            sql += "AND F_Duplicate !=5"+ uwhere+ where;
+                            sql += "AND F_Duplicate !=5"+ 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" || ro.F_RoleCode == "ZG")
@@ -196,7 +195,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                         case 2://待处理
                             sql = "";
                             sql += $"  F_IsDelete=0";
-                            sql += "AND F_Duplicate !=5" + uwhere+ where;
+                            sql += "AND F_Duplicate !=5" + where;
                             sql += "AND F_State=3";
                             sql += RetuSql(ro, 0, ua);
                             if (ro.F_RoleCode == "YWY" || ro.F_RoleCode == "ZG")
@@ -213,7 +212,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                         case 3://处理中
                             sql = "";
                             sql += $"  F_IsDelete=0";
-                            sql += "AND F_Duplicate !=5" + uwhere+ where;
+                            sql += "AND F_Duplicate !=5" + where;
                             sql += "AND F_State=4";
                             sql += RetuSql(ro, 0, ua);
                             if (ro.F_RoleCode == "YWY" || ro.F_RoleCode == "ZG")
@@ -230,7 +229,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                         case 4://退回待分派
                             sql = "";
                             sql += $"  F_IsDelete=0";
-                            sql += "AND F_Duplicate !=5" + uwhere+ where;
+                            sql += "AND F_Duplicate !=5" + 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" || ro.F_RoleCode == "ZG")
@@ -256,7 +255,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                         case 6://已完结
                             sql = "";
                             sql += $"  F_IsDelete=0";
-                            sql += "AND F_Duplicate !=5" + uwhere+ where;
+                            sql += "AND F_Duplicate !=5" + where;
                             sql += "AND F_State=10";
                             sql += RetuSql(ro, 0, ua);
                             if (ro.F_RoleCode == "YWY" || ro.F_RoleCode == "ZG")
@@ -275,7 +274,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                             break;
                         case 7://
                             sql = "";
-                            sql += $"  F_IsDelete=0" + where+ uwhere;
+                            sql += $"  F_IsDelete=0" + where;
                             // sql += $" and F_DealTimely = 'Ⅰ级'";
 
 
@@ -291,7 +290,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                             break;
                         case 8://
                             sql = "";
-                            sql += $" F_IsDelete=0" + where+ uwhere;
+                            sql += $" F_IsDelete=0" + where;
                             // sql += $" and F_DealTimely = 'Ⅱ级'";
 
                             sql += "AND F_Duplicate !=5";
@@ -306,7 +305,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                             break;
                         case 9://
                             sql = "";
-                            sql += $"  F_IsDelete=0" + where+ uwhere;
+                            sql += $"  F_IsDelete=0" + where;
                             sql += "AND F_Duplicate !=5";
                             //  sql += $" and F_DealTimely = '普通工单'";
                             sql += $" and (F_DealTimely= '3类问题' or F_DealTimely= '普通工单' )";
@@ -320,13 +319,17 @@ namespace CallCenterApi.Interface.Controllers.workorder
                             break;
                         case 10://
                             sql = "";
-                            sql += $"  F_IsDelete=0" + uwhere;
+                            sql += $"  F_IsDelete=0" ;
                             sql += $" and (F_Type=" + 4 + "or (F_Duplicate in(4)and F_Type=3))";
-                            if (ro.F_RoleCode == "BSCJL" || ro.F_RoleCode == "YWY" || ro.F_RoleCode == "ZG")
+                            if ( ro.F_RoleCode == "YWY" || ro.F_RoleCode == "ZG")
                             {
                                 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")
+                            else if  (ro.F_RoleCode == "BSCJL" )
+                                {
+                                    sql += "AND F_Office =" + ua.F_DeptId;
+                                }
+                                else if (ro.F_RoleCode == "ZR" || ro.F_RoleCode == "BBZY" || ro.F_RoleCode == "CJZY" || ro.F_RoleCode == "XTGLY" || ro.F_RoleCode == "JCRY" || ro.F_RoleCode == "CLZY")
                             {
                             }
                             else
@@ -339,7 +342,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                         case 11://咨询
                             sql = "";
                             sql += $"  F_IsDelete=0";
-                            sql += "AND F_Duplicate !=5" + uwhere ;
+                            sql += "AND F_Duplicate !=5"  ;
                             sql += " and (F_Type=" + 1 + "or ( F_Duplicate in(1)and F_Type!=2 ))";
                             sql += RetuSql(ro, 0, ua);
                             if (ro.F_RoleCode == "YWY" || ro.F_RoleCode == "ZG")
@@ -395,17 +398,19 @@ 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 (18, 19, 8, 9, 61, 10, 11, 12, 15, 13, 482, 14, 16, 17,20,21,22)";
                 #region 筛选条件
                 if (CJ == 1)
                 {
                     sql += $" and (F_Type=" + 4 + "or (F_Duplicate in(4)and F_Type=3))";
-                    if (ro.F_RoleCode == "BSCJL" || ro.F_RoleCode == "YWY" || ro.F_RoleCode == "ZG")
+                    if ( ro.F_RoleCode == "YWY" || ro.F_RoleCode == "ZG")
                     {
                         sql += "AND F_Notifications ='" + ua.F_UserCode + "'";
                     }
-                    else if (ro.F_RoleCode == "ZR" || ro.F_RoleCode == "BBZY" || ro.F_RoleCode == "CJZY" || ro.F_RoleCode == "JCRY" || ro.F_RoleCode == "XTGLY")
+                    else if (ro.F_RoleCode == "BSCJL")
+                    {
+                        sql += "AND F_Office =" + ua.F_DeptId;
+                    }
+                    else if (ro.F_RoleCode == "ZR" || ro.F_RoleCode == "BBZY" || ro.F_RoleCode == "CJZY" || ro.F_RoleCode == "JCRY" || ro.F_RoleCode == "XTGLY" || ro.F_RoleCode == "CLZY")
                     {
                     }
                     else
@@ -576,13 +581,13 @@ namespace CallCenterApi.Interface.Controllers.workorder
                                 return Error("无操作权限");
                             break;
                         case 1://待分派
-                            sql += "AND F_State in (1)"+ uwhere;
+                            sql += "AND F_State in (1)";
                             sql += RetuSql(ro, see, ua);
                             if (ro.F_RoleCode == "YWY" || ro.F_RoleCode == "QTJS" || ro.F_RoleCode == "ZG")
                                 return Error("无操作权限");
                             break;
                         case 3://待处理
-                            sql += "AND F_State=3"+ uwhere;
+                            sql += "AND F_State=3";
                             sql += RetuSql(ro, see, ua);
                             if (ro.F_RoleCode == "YWY" || ro.F_RoleCode == "ZG")
                             {
@@ -592,7 +597,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                                 return Error("无操作权限");
                             break;
                         case 4://处理中
-                            sql += "AND F_State=4"+ uwhere;
+                            sql += "AND F_State=4";
                             sql += RetuSql(ro, see, ua);
                             if (ro.F_RoleCode == "YWY" || ro.F_RoleCode == "ZG")
                             {
@@ -602,7 +607,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                                 return Error("无操作权限");
                             break;
                         case 5://退回待分派
-                            sql += "AND F_State=5"+ uwhere;
+                            sql += "AND F_State=5";
                             sql += RetuSql(ro, see, ua);
                             if (ro.F_RoleCode == "YWY" || ro.F_RoleCode == "QTJS" || ro.F_RoleCode == "ZG")
                                 return Error("无操作权限");
@@ -615,7 +620,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                             break;
                    
                         case 10://已完结
-                            sql += "AND F_State=10"+ uwhere;
+                            sql += "AND F_State=10";
                             sql += RetuSql(ro, see, ua);
 
                             if ( ro.F_RoleCode == "YWY" || ro.F_RoleCode == "ZG")
@@ -639,7 +644,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 }
                 else
                 {
-                    sql += RetuSql(ro, see, ua)+ uwhere;
+                    sql += RetuSql(ro, see, ua);
 
                     if (ro.F_RoleCode == "YWY" || ro.F_RoleCode == "ZG")
                     {
@@ -658,7 +663,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                     {
                         var depts = new BLL.T_Bus_WorkOrder().GetModelList(sql + "order by F_Id desc");
                         dt.Columns.Add("序号");
-                        dt.Columns.Add("抽检日期");
+                        dt.Columns.Add("抽检时间");
                         dt.Columns.Add("抽检单位");
                         dt.Columns.Add("办事处");
                         dt.Columns.Add("抽检类型");
@@ -666,8 +671,10 @@ namespace CallCenterApi.Interface.Controllers.workorder
                         dt.Columns.Add("抽检产品");
                         dt.Columns.Add("生产日期");
                         dt.Columns.Add("涉及工厂");
-                        dt.Columns.Add("责任人");
                         dt.Columns.Add("电话");
+                        dt.Columns.Add("责任人");
+                        dt.Columns.Add("抽检日期");
+                      
                         dt.Columns.Add("抽检结果");
                         dt.Columns.Add("备注");
                         foreach (var it in depts)
@@ -678,7 +685,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                             {
                                 //  drNew["工单编号"] = it.F_WorkOrderId;//
                                 drNew["序号"] = it.F_SerialNumber;//
-                                drNew["抽检日期"] = DateTime.Parse(it.F_CreateTime.ToString()).ToString("yyyy年MM月dd日HH时mm分");//
+                                drNew["抽检时间"] = DateTime.Parse(it.F_CreateTime.ToString()).ToString("yyyy年MM月dd日HH时mm分");//
                                 drNew["抽检单位"] = it.F_Company;
                                 if (!string.IsNullOrEmpty(it.F_Office))
                                 {
@@ -698,6 +705,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                                 drNew["抽检产品"] = it.F_Samplingproducts;
                                 drNew["生产日期"] = it.F_ProductDate;
                                 drNew["涉及工厂"] = it.F_Factories;
+                                drNew["抽检日期"] = it.F_Datecheck;
                                 drNew["责任人"] = it.F_Notifications;
                                 if (!string.IsNullOrEmpty(it.F_Notifications))
                                 {
@@ -820,7 +828,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
 
             string[] ccc = {
                    "工单编号","大区","办事处","投诉时间","序号","姓名","地址","联系电话","产品代码",
-                  "产品名称","规格","生产日期","生产时间","产品编码","生产厂家","问题代码","质量问题","通知人"
+                  "产品名称","规格","生产日期","产品编码","生产厂家","问题代码","质量问题","通知人"
                   ,"接听人" ,"落实情况","处理进度","工单类别"
             };
             return ccc;
@@ -1124,12 +1132,13 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 model.F_DealResult = it.F_DealResult;//处理结果
                 model.F_IsReduction = it.F_IsReduction;
                 model.F_RemissionRemarks = it.F_RemissionRemarks;
-                model.F_Productiontime = it.F_Productiontime;//生产时间
+                model.F_Productiontime = "";//生产时间
                 model.F_Company = it.F_Company;//抽检单位
                 model.F_Samplingtype = it.F_Samplingtype;//抽检类型
                 model.F_Salesroom = it.F_Salesroom;//抽样客户/门店
                 model.F_Samplingproducts = it.F_Samplingproducts;//抽检产品
                 model.F_Factories = it.F_Factories;//涉及工厂
+                model.F_Datecheck = it.F_Datecheck;//抽检日期
                 model.F_Remark = it.F_Remark;
                 model.F_Notifications = it.F_Notifications;//通知人
                 if (it.F_Type == 4)
@@ -1582,41 +1591,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
             }
             return NoToken("未知错误，请重新登录");
         }
-        ///// <summary>
-        ///// 获取通讯录
-        ///// </summary>
-        ///// <param name="orderid"></param>
-        ///// <param name="cont"></param>
-        ///// <returns></returns>
-        //public ActionResult GetMaillist(string phone,string )
-        //{
-        //    if (Request.IsAuthenticated)
-        //    {
-        //        int userId = CurrentUser.UserData.F_UserId;
-        //        if (userId != 0)
-        //        {
-        //            Model.T_Sys_UserAccount ua = userBLL.GetModel(userId);
-        //            if (ua != null)
-        //            {
-        //           Model.T_Bus_WorkOrder model = workorderBLL.GetModel(id);
-        //                //验证信息 
-        //                if (model != null)
-        //                {
-        //                   // model.F_DealTimely = dealTimely;
-        //                  //  model.F_Reason = reason;
-        //                    var res = new BLL.T_Bus_WorkOrder().Update(model);
-        //                    if (res)
-        //                        return Success("标记成功");
-        //                    else
-        //                        return Error("标记失败！");
-        //                }
-        //                return Error("工单不存在");
-        //            }
-        //        }
-        //        return Error("无操作权限");
-        //    }
-        //    return NoToken("未知错误，请重新登录");
-        //}
+      
         /// <summary>
         /// 退回工单
         /// </summary>
@@ -1799,83 +1774,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 return false;
             #endregion
         }
-        /// <summary>
-        /// 根据传入的对象和input的内容返回对象（添加修改使用）
-        /// </summary>
-        private Model.T_Bus_WorkOrder inputtoobj(Model.T_Bus_WorkOrder model, WorkOrderInput input, int type)
-        {
-            string usercode = CurrentUser.UserData.F_UserCode;
-            var newmodel = model;
-            if (input.F_Id != 0)
-            {
-                model.F_Id = input.F_Id;
-            }
-            else
-            {
-                model.F_Id = model.F_Id;//工单ID
-            }
-            if (type == 0)
-            {
-                model.F_WorkOrderId = DateTime.Now.ToString("yyyyMMddHHmmssfff");  //工单编号  
-                model.F_Source = 2;//1PC2手机3微信
-            }
-            else
-            {
-                model.F_WorkOrderId = model.F_WorkOrderId;//工单编号
-                model.F_Source = model.F_Source;//工单来源
-            }
-            #region 基本字段
-            model.F_Type = input.F_Type;//工单类型1咨询2投诉
-            if (!string.IsNullOrEmpty(input.F_DealTimely))
-                model.F_DealTimely = input.F_DealTimely;// 重要级别1红色2绿色3普通工单
-            else
-                model.F_DealTimely = "普通工单";
-            model.F_Reason = input.F_Reason;// 重要级别原因
-            model.F_CusName = input.F_CusName;//来电人姓名
-            model.F_CusPhone = input.F_CusPhone;//来电人电话
-            model.F_AddRess = input.F_AddRess;//地址
-            model.F_ProductType = input.F_ProductType;//产品代码
-            model.F_ProductName = input.F_ProductName;//产品名称
-            model.F_Specifications = input.F_Specifications;//规格
-            model.F_ProductDate = input.F_ProductDate;//生产日期
-            model.F_BatchNumber = input.F_BatchNumber;//产品编码
-            model.F_Manufacturer = input.F_Manufacturer;//生产厂家
-            model.F_ProblemCode = input.F_ProblemCode;//问题代码
-            model.F_QualityProblem = input.F_QualityProblem;//质量问题
-        //    model.F_ImplementationSituation = input.F_ImplementationSituation;//落实情况
-            model.F_Duplicate = 5;//是否重复工单0否1是
-            model.F_Content = input.F_Content;//备注
-            #endregion
-            if (type == 1)
-            {
-                model.F_Area = model.F_Area;//大区
-                model.F_Office = model.F_Office;//办事处
-                model.F_State = model.F_State;//工单状态
-                model.F_CreateTime = model.F_CreateTime;//添加时间
-                model.F_CreateUser = model.F_CreateUser;//添加人
-                model.F_SerialNumber = model.F_SerialNumber;//序号
-                model.F_ReceivingPerson = model.F_ReceivingPerson;//接听人
-                model.F_Notifications = model.F_Notifications;//通知人
-                model.F_Returnnote = model.F_Returnnote;//通知人
-            }
-            else
-            {
-                model.F_Area = input.F_Area;//大区
-                model.F_Office = input.F_Office;//办事处
-                model.F_ReceivingPerson = usercode;//接听人
-                model.F_State = 0;//0
-                model.F_CreateUser = usercode;
-                model.F_CreateTime = DateTime.Now;//投诉时间
-                string strendtime = DateTime.Now.ToString("yyyy-MM") + "-01 00:00:00";
-                var modellast = workorderBLL.GetModelList ("datediff(day,F_CreateTime,'" + strendtime + "')<=0  order by F_Id desc").FirstOrDefault(); ;
-                if (modellast != null)
-                    model.F_SerialNumber = modellast.F_SerialNumber + 1;//序号
-                else
-                    model.F_SerialNumber = 1;
-            }
-            model.F_IsDelete = 0;
-            return model;
-        }
+
         /// <summary>
         /// 转派工单
         /// </summary>

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Models/Input/WorkOrderInput.cs

@@ -252,6 +252,14 @@ namespace CallCenterApi.Interface.Models.Input
             get; set;
         }
         /// <summary>
+        /// 抽检日期
+        /// </summary>
+        public string F_Datecheck
+        {
+            get; set;
+        }
+        
+        /// <summary>
         /// 处理类型
         /// </summary>
         public int? F_DealType

codegit/CallCenterApi/CallCenterApi.Model/T_Bus_WorkOrder.cs

@@ -67,6 +67,7 @@ namespace CallCenterApi.Model
         private string _f_salesroom;
         private string _f_samplingproducts;
         private string _f_factories;
+        private string _f_datecheck;
         /// <summary>
         /// 涉及工厂
         /// </summary>
@@ -92,6 +93,15 @@ namespace CallCenterApi.Model
             get { return _f_salesroom; }
         }
         /// <summary>
+        /// 抽检日期
+        /// </summary>
+        public string F_Datecheck
+        {
+            set { _f_datecheck = value; }
+            get { return _f_datecheck; }
+        }
+        
+        /// <summary>
         /// 抽检类型
         /// </summary>
         public string F_Samplingtype