二次处理

codegit/CallCenterApi/CallCenterApi.DAL/T_Bus_WorkOrder.cs

@@ -282,7 +282,8 @@ namespace CallCenterApi.DAL
             strSql.Append("F_RepeatCreateTime=@F_RepeatCreateTime,");
             strSql.Append("F_ReviewStatus=@F_ReviewStatus,");
             strSql.Append("F_ReviewNotes=@F_ReviewNotes,");
-            strSql.Append("F_AuditTime=@F_AuditTime");
+            strSql.Append("F_AuditTime=@F_AuditTime,");
+            strSql.Append("F_IsQuadratic=@F_IsQuadratic");
             strSql.Append(" where F_Id=@F_Id");
             SqlParameter[] parameters = {
                     new SqlParameter("@F_WorkOrderId", SqlDbType.VarChar,50),
@@ -358,6 +359,8 @@ namespace CallCenterApi.DAL
                      new SqlParameter("@F_ReviewStatus", SqlDbType.Int,4),
                      new SqlParameter("@F_ReviewNotes", SqlDbType.NVarChar,-1),
                       new SqlParameter("@F_AuditTime", SqlDbType.DateTime),
+                       new SqlParameter("@F_IsQuadratic", SqlDbType.Int,4),
+                      
                     new SqlParameter("@F_Id", SqlDbType.Int,4)};
             parameters[0].Value = model.F_WorkOrderId;
             parameters[1].Value = model.F_CusPhone;
@@ -432,8 +435,8 @@ namespace CallCenterApi.DAL
             parameters[67].Value = model.F_ReviewStatus;
             parameters[68].Value = model.F_ReviewNotes;
             parameters[69].Value = model.F_AuditTime;
-            
-            parameters[70].Value = model.F_Id;
+            parameters[70].Value = model.F_IsQuadratic;
+            parameters[71].Value = model.F_Id;
             
             int rows = DbHelperSQL.ExecuteSql(strSql.ToString(), parameters);
             if (rows > 0)
@@ -817,6 +820,11 @@ namespace CallCenterApi.DAL
                 {
                     model.F_ReviewNotes = row["F_ReviewNotes"].ToString();
                 }
+                if (row["F_IsQuadratic"] != null && row["F_IsQuadratic"].ToString() != "")
+                {
+                    model.F_IsQuadratic = int.Parse(row["F_IsQuadratic"].ToString());
+                }
+                
             }
             return model;
         }
@@ -915,7 +923,7 @@ namespace CallCenterApi.DAL
             StringBuilder strSql = new StringBuilder(); strSql.Append(" select F_WorkOrderId,d.F_DeptName  AreaName ,e.F_DeptName officName ," +
                 " [dbo].[GetTime](c.F_CreateTime),F_SerialNumber,F_CusName,F_AddRess,F_CusPhone ,F_ProductType,F_ProductName,F_Specifications," +
                 " F_ProductDate,F_BatchNumber, F_Manufacturer,F_ProblemCode,F_QualityProblem," +
-                "  Notifications = f.F_UserName + '(' + f.F_Mobile + ')', ReceivingPerson =g.F_UserName, F_DealResult = h.F_DealResult, " +
+                "  Notifications = f.F_UserName + '(' + f.F_Mobile + ')', ReceivingPerson =g.F_UserName, F_DealResult = c.F_DealResult, " +
                 " case c.F_State when 0 then '待提交'when 1 then '待分派' when 3 then '待处理' when 4 then '处理中' when 5 then '退回待分派'" +
                 " when 6 then '退回待提交' when 10 then '已处理'  else '-' end F_State," +
                 " case c.F_Type when 1 then '咨询' when 2 " +
@@ -946,7 +954,7 @@ namespace CallCenterApi.DAL
         {
             StringBuilder strSql = new StringBuilder();strSql.Append(" select  F_SerialNumber, d.F_DeptName  AreaName ,e.F_DeptName officName ," +
                 "F_CusName,F_AddRess,F_ProductType,F_ProductName, F_Specifications,F_ProductDate, F_BatchNumber, F_Manufacturer, F_ProblemCode," +
-                " F_QualityProblem, Notifications =f.F_UserName +'(' +f.F_Mobile + ')' , ReceivingPerson =g.F_UserName  ,F_DealResult=h.F_DealResult," +
+                " F_QualityProblem, Notifications =f.F_UserName +'(' +f.F_Mobile + ')' , ReceivingPerson =g.F_UserName  ,F_DealResult=c.F_DealResult," +
                 "  [dbo].[GetTime](c.F_RepeatCreateTime) from dbo.T_Bus_WorkOrder c WITH(NOLOCK) " +
                 " left join T_Sys_Department d on c.F_Area = d.F_DeptId" +
                 " left join T_Sys_Department e on c.F_Office = e.F_DeptId " +
@@ -971,7 +979,7 @@ namespace CallCenterApi.DAL
             StringBuilder strSql = new StringBuilder(); strSql.Append("select F_WorkOrderId,d.F_DeptName  AreaName ,e.F_DeptName officName," +
                 "[dbo].[GetTime](c.F_CreateTime),F_SerialNumber,F_CusName,F_AddRess,F_CusPhone ,F_ProductType,F_ProductName,F_Specifications," +
                 " F_ProductDate,F_BatchNumber, F_Manufacturer,F_ProblemCode,F_QualityProblem,Notifications =f.F_UserName +'(' +f.F_Mobile + ')'  ," +
-                " ReceivingPerson = g.F_UserName, F_DealResult = h.F_DealResult, case c.F_State when 0 then '待提交'when 1 then " +
+                " ReceivingPerson = g.F_UserName, F_DealResult = c.F_DealResult, case c.F_State when 0 then '待提交'when 1 then " +
                 " '待分派' when 3 then '待处理' when 4 then '处理中' when 5 then '退回待分派' when 6 then '退回待提交' when 10 then " +
                 " '已处理'  else '-' end F_State , case c.F_Type when 1 then '咨询' when 2 then '投诉' " +
                 "when 3 then '重复' when 4 then '抽检' when 5 then '生鲜品' when 6 then '禽产品' " +

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

@@ -8,6 +8,7 @@ using System.Collections.Generic;
 using System.Data;
 using System.IO;
 using System.Linq;
+using System.Threading.Tasks;
 using System.Transactions;
 using System.Web;
 using System.Web.Mvc;
@@ -83,11 +84,11 @@ namespace CallCenterApi.Interface.Controllers.workorder
             string office,string officename, string endtime,string duplicatetime,string endduplicatetime, 
             string productType,string productDate, string batchNumber,string manufacturer,string problemCode, 
             string productName,string producttypes,string complaintType,string notifications,string keywords,
-            string auditStartTime, string auditEndTime,
+            string auditStartTime, string auditEndTime,string dealStartTime, string dealEndTime,
             string dealTimely,string ywy, string reviewNotes, string startdealtime, string enddealtime, int IsReduction=-1, 
             int CJ=0,int duplicate=-1, int see = 0, int source = 0, int type = 0, int state = -1, int pageindex = 1,
             int pagesize = 10,int isdc=0,int istime=-1 , int reminder=-1, int incomplete = -1,int isdealfile=-1,
-            int isreductions=0,int comprehensive=-1,int isManager=0, int reviewStatus = 0)
+            int isreductions=0,int comprehensive=-1,int isManager=0, int reviewStatus = 0,int isQuadratic=0)
         {
            int userId = CurrentUser.UserData.F_UserId; ;
             if (userId != 0)
@@ -231,6 +232,20 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 {
                     sql += $" and  F_AuditTime <='" + auditEndTime + "'";
                 }
+
+                if (!string.IsNullOrEmpty(dealStartTime))
+                {
+                    sql += $" and  F_DealTime >='" + dealStartTime + "'";
+                }
+
+                if (!string.IsNullOrEmpty(dealEndTime))
+                {
+                    sql += $" and  F_DealTime <='" + dealEndTime + "'";
+                }
+                if (isQuadratic > 0)
+                {
+                    sql += $" and F_IsQuadratic ='1' ";
+                }
                 if (reminder==0)
                 {
                     sql += $" and c.F_DealType ='1' ";
@@ -268,6 +283,9 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 {
                     sql += $" and c.F_DealFile is not null and c.F_DealFile != '' ";
                 }
+               
+
+
                 if (!string.IsNullOrEmpty(manufacturer))//生产厂家
                 {
                     string msg = "";
@@ -2363,8 +2381,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
         {
             if (Request.IsAuthenticated)
             {
-                lock (_MyLock)
-                {
+              
                     #region 
                     int userId = CurrentUser.UserData.F_UserId;
                     Model.T_Sys_UserAccount userModel = userBLL.GetModel(userId);
@@ -2481,11 +2498,9 @@ namespace CallCenterApi.Interface.Controllers.workorder
                     {
                         Model.T_Bus_WorkOrder modlelist = new BLL.T_Bus_WorkOrder().GetModel(n);
                        
-                     var deptmodel = departmentBLL.GetModel(userModel.F_DeptId);
-                        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 (isover > 0)
                         {
 
@@ -2494,7 +2509,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
 
                                 if (model != null)
                                 {
-                                    var res = DealWO(userModel, modlelist, cont, "", isover);
+                                    var res = DealWO(userModel, modlelist, cont, "", isover,1);
                                     if (res)
                                         return Success("处理成功");
                                     else
@@ -2508,7 +2523,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                         {
                             if (clid == 0)
                                 return Error("请选择提交人！");
-                            bool t = AssignWO(userModel, modlelist, cont, 1, clid);
+                            bool t = AssignWO(userModel, modlelist, cont, 1, clid,1);
                             if (t)
                             {
 
@@ -2518,12 +2533,20 @@ namespace CallCenterApi.Interface.Controllers.workorder
                             else
                                 return Error("提交失败！");
                         }
+                        else
+                        {
+                        var deptmodel = departmentBLL.GetModel(userModel.F_DeptId);
+                        string deptname = "";
+                        if (deptmodel != null)
+                            deptname = deptmodel.F_DeptName;
+                        AddLog(modlelist.F_Id, 0, deptname + userModel.F_UserName + "创建工单", 0, 0, "", 0, userModel);
+                         }
                         return Success("添加成功！");
 
                     }
                     else
                         return Error("添加失败！");
-                }
+                
                 #endregion
             }
 
@@ -3304,7 +3327,8 @@ namespace CallCenterApi.Interface.Controllers.workorder
         /// <summary>
         /// 处理工单
         /// </summary>
-        public bool DealWO(Model.T_Sys_UserAccount nowUser, Model.T_Bus_WorkOrder model, string cont, string F_Files, int isover = 0)
+        public bool DealWO(Model.T_Sys_UserAccount nowUser, Model.T_Bus_WorkOrder model, string cont, string F_Files
+            , int isover = 0,int isCreate=0)
         {
             #region 工单处理
             var opt = "处理";
@@ -3338,7 +3362,12 @@ namespace CallCenterApi.Interface.Controllers.workorder
             var optcont = "";
             if (!string.IsNullOrEmpty(cont))
                 optcont = "，处理内容：" + cont;
+            if (isCreate==1)
+            {
+                opt = "创建并" + opt;
+            }
             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)
             {
@@ -3361,30 +3390,37 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 }
                 else
                 {
-                    if(!string .IsNullOrEmpty(model.F_Manufacturer))
+                    Task task = Task.Run(() =>
                     {
-                        var eqipment = new BLL.T_Sys_EquipmentNumber().GetModelList($"F_Production='{model.F_Manufacturer}' and F_IsDelete=0 ");
-                        if (eqipment!=null&& eqipment.Count>0)
+                        if (!string.IsNullOrEmpty(model.F_Manufacturer))
                         {
-                            if (!string.IsNullOrEmpty(eqipment.FirstOrDefault().F_Manager))
+                            var eqipment = new BLL.T_Sys_EquipmentNumber().GetModelList($"F_Production='{model.F_Manufacturer}' and F_IsDelete=0 ");
+                            if (eqipment != null && eqipment.Count > 0)
                             {
-                                foreach (var it in eqipment.FirstOrDefault().F_Manager.Split(','))
+                                if (!string.IsNullOrEmpty(eqipment.FirstOrDefault().F_Manager))
                                 {
-                                    new PushMessageController().
-                               PushFeiShui(model, "工单处理提醒", "您负责的工厂工单已处理",
-                              it, model.F_Id);
+                                    foreach (var it in eqipment.FirstOrDefault().F_Manager.Split(','))
+                                    {
+                                        new PushMessageController().
+                                   PushFeiShui(model, "工单处理提醒", "您负责的工厂工单已处理",
+                                  it, model.F_Id);
+                                    }
                                 }
                             }
+
                         }
-                     
-                    }
-                    
+                    });
+                   
                 }
                 //处理内容
                 if (!string.IsNullOrEmpty(model.F_DealResult))
                     model.F_DealResult +="；" +cont ;
                 else
                     model.F_DealResult += cont ;
+                if(model.F_ReviewStatus!=null&& model.F_ReviewStatus==2)
+                {
+                    model.F_IsQuadratic = 1;
+                }
                 model.F_DealTime = DateTime.Now;
                 workorderBLL.Update(model);
                 #endregion
@@ -3759,7 +3795,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
         /// <summary>
         /// 转派工单
         /// </summary>
-        public bool AssignWO(Model.T_Sys_UserAccount nowUser, Model.T_Bus_WorkOrder model, string cont, int wostate, int clid = 0)
+        public bool AssignWO(Model.T_Sys_UserAccount nowUser, Model.T_Bus_WorkOrder model, string cont, int wostate, int clid = 0,int isCreate=0)
         {
             string touser = ""; string tousername = "";
             int deptid = 0;
@@ -3812,6 +3848,10 @@ namespace CallCenterApi.Interface.Controllers.workorder
             var optcont = "";
             if (!string.IsNullOrEmpty(cont))
                 optcont = "，说明：" + cont;
+            if (isCreate == 1)
+            {
+                opt = "创建并" + opt;
+            }
             var content = nowUser.F_UserName + "(" + nowUser.F_UserCode + ")" + opt + "工单给 "+deptname + tousername + optcont;
             var itemid = AddLog(model.F_Id, wostate, content, 1, optbut, touser, deptid, nowUser);
             if (itemid > 0)

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

@@ -395,9 +395,9 @@ namespace CallCenterApi.Interface.Controllers.workorder
         /// <returns></returns>
         /// F_Duplicate  1咨询2投诉6抽检
         [Authority]
-        public ActionResult GetList(string starttime, string endtime, string keywords,string reviewNotes, string area, 
+        public ActionResult GetList(string starttime, string endtime, string keywords,string reviewNotes, string area, string dealStartTime, string dealEndTime,
             string offce, string dealTimely,int CJ=0, int see=0, int state = -1, int pageindex = 1,
-            int pagesize = 10,int Processing=0,int isdc=0,int reviewStatus=0, int comprehensive = -1, int isManager = 0)
+            int pagesize = 10,int Processing=0,int isdc=0,int reviewStatus=0, int comprehensive = -1, int isManager = 0, int isQuadratic = 0)
         {
             int userId = CurrentUser.UserData.F_UserId;
             if (userId != 0)
@@ -621,7 +621,20 @@ namespace CallCenterApi.Interface.Controllers.workorder
                         sql += "AND F_CreateUser=" + ua.F_UserCode;
                     sql += "AND F_State in(10)";
                 }
-             
+                if (!string.IsNullOrEmpty(dealStartTime))
+                {
+                    sql += $" and  F_DealTime >='" + dealStartTime + "'";
+                }
+
+                if (!string.IsNullOrEmpty(dealEndTime))
+                {
+                    sql += $" and  F_DealTime <='" + dealEndTime + "'";
+                }
+                if (isQuadratic > 0)
+                {
+                    sql += $" and F_IsQuadratic ='1' ";
+                }
+
                 // string uwhere = " ";
                 if (state>-1)
                 {

codegit/CallCenterApi/CallCenterApi.Model/T_Bus_WorkOrder.cs

@@ -622,6 +622,11 @@ namespace CallCenterApi.Model
 
         public DateTime? F_AuditTime { set; get; }
 
+        /// <summary>
+        /// 是否二次处理
+        /// </summary>
+        public int? F_IsQuadratic { set; get; }
+
         #endregion Model
 
     }