禅道

CallCenterApi/CallCenterApi.DAL/T_Bus_ToExamine.cs

@@ -50,9 +50,9 @@ namespace CallCenterApi.DAL
         {
             StringBuilder strSql = new StringBuilder();
             strSql.Append("insert into T_Bus_ToExamine(");
-            strSql.Append("F_WorkOrderId,F_AssignedId,F_CreatUser,F_Type,F_Result,F_IsDelete,AuditUser,F_State,F_MainDeptId,F_LimitTime,F_Content)");
+            strSql.Append("F_WorkOrderId,F_AssignedId,F_CreatUser,F_Type,F_Result,F_IsDelete,AuditUser,F_State,F_MainDeptId,F_LimitTime,F_Content,F_CreateTime)");
             strSql.Append(" values (");
-            strSql.Append("@F_WorkOrderId,@F_AssignedId,@F_CreatUser,@F_Type,@F_Result,@F_IsDelete,@AuditUser,@F_State,@F_MainDeptId,@F_LimitTime,@F_Content)");
+            strSql.Append("@F_WorkOrderId,@F_AssignedId,@F_CreatUser,@F_Type,@F_Result,@F_IsDelete,@AuditUser,@F_State,@F_MainDeptId,@F_LimitTime,@F_Content,@F_CreateTime)");
             strSql.Append(";select @@IDENTITY");
             SqlParameter[] parameters = {
                     new SqlParameter("@F_WorkOrderId", SqlDbType.NVarChar,50),
@@ -65,7 +65,9 @@ namespace CallCenterApi.DAL
                     new SqlParameter("@F_MainDeptId", SqlDbType.NVarChar,500),
                     new SqlParameter("@F_State", SqlDbType.Int,4) ,
              new SqlParameter("@F_LimitTime", SqlDbType.Int,4),
-             new SqlParameter("@F_Content", SqlDbType.NVarChar,-1)};
+             new SqlParameter("@F_Content", SqlDbType.NVarChar,-1),
+             new SqlParameter("@F_CreateTime", SqlDbType.DateTime),
+            };
             parameters[0].Value = model.F_WorkOrderId;
             parameters[1].Value = model.F_AssignedId;
             parameters[2].Value = model.F_CreatUser;
@@ -77,6 +79,7 @@ namespace CallCenterApi.DAL
             parameters[8].Value = model.F_State;
             parameters[9].Value = model.F_LimitTime;
             parameters[10].Value = model.F_Content;
+            parameters[11].Value = model.F_CreateTime;
             object obj = DbHelperSQL.GetSingle(strSql.ToString(), parameters);
             if (obj == null)
             {
@@ -104,7 +107,8 @@ namespace CallCenterApi.DAL
             strSql.Append("F_MainDeptId=@F_MainDeptId,");
             strSql.Append("F_LimitTime=@F_LimitTime,");
             strSql.Append("F_Content=@F_Content,");
-            strSql.Append("F_IsDelete=@F_IsDelete");
+            strSql.Append("F_IsDelete=@F_IsDelete,");
+            strSql.Append("F_CreateTime=@F_CreateTime");
             strSql.Append(" where F_ID=@F_ID");
             SqlParameter[] parameters = {
                     new SqlParameter("@F_WorkOrderId", SqlDbType.NVarChar,50),
@@ -118,6 +122,7 @@ namespace CallCenterApi.DAL
                            new SqlParameter("@F_LimitTime", SqlDbType.Int,4),
                             new SqlParameter("@F_Content", SqlDbType.NVarChar,-1),
                     new SqlParameter("@F_IsDelete", SqlDbType.Int,4),
+                    new SqlParameter("@F_CreateTime", SqlDbType.DateTime ),
                     new SqlParameter("@F_ID", SqlDbType.Int,4)};
             parameters[0].Value = model.F_WorkOrderId;
             parameters[1].Value = model.F_AssignedId;
@@ -130,7 +135,9 @@ namespace CallCenterApi.DAL
             parameters[8].Value = model.F_LimitTime;
             parameters[9].Value = model.F_Content;
             parameters[10].Value = model.F_IsDelete;
-            parameters[11].Value = model.F_ID;
+            parameters[11].Value = model.F_CreateTime;
+            
+            parameters[12].Value = model.F_ID;
 
             int rows = DbHelperSQL.ExecuteSql(strSql.ToString(), parameters);
             if (rows > 0)
@@ -194,7 +201,7 @@ namespace CallCenterApi.DAL
         {
 
             StringBuilder strSql = new StringBuilder();
-            strSql.Append("select  top 1 F_ID,F_WorkOrderId,F_AssignedId,F_CreatUser,F_Type,F_Result,F_IsDelete,AuditUser,F_State,F_LimitTime,F_MainDeptId,F_Content from T_Bus_ToExamine ");
+            strSql.Append("select  top 1 F_ID,F_WorkOrderId,F_CreateTime,F_AssignedId,F_CreatUser,F_Type,F_Result,F_IsDelete,AuditUser,F_State,F_LimitTime,F_MainDeptId,F_Content from T_Bus_ToExamine ");
             strSql.Append(" where F_ID=@F_ID");
             SqlParameter[] parameters = {
                     new SqlParameter("@F_ID", SqlDbType.Int,4)
@@ -295,7 +302,10 @@ namespace CallCenterApi.DAL
                 {
                     model.F_Content = row["F_Content"].ToString();
                 }
-                
+                if (row["F_CreateTime"] != null && row["F_CreateTime"].ToString() != "")
+                {
+                    model.F_CreateTime = DateTime.Parse(row["F_CreateTime"].ToString());
+                }
             }
             return model;
         }
@@ -306,7 +316,7 @@ namespace CallCenterApi.DAL
         public DataSet GetList(string strWhere)
         {
             StringBuilder strSql = new StringBuilder();
-            strSql.Append("select F_ID,F_WorkOrderId,F_AssignedId,F_LimitTime,F_CreatUser,F_Type,F_Result,F_IsDelete,AuditUser,F_State,F_MainDeptId,F_Content ");
+            strSql.Append("select F_ID,F_WorkOrderId,F_AssignedId,F_CreateTime,F_LimitTime,F_CreatUser,F_Type,F_Result,F_IsDelete,AuditUser,F_State,F_MainDeptId,F_Content ");
             strSql.Append(" FROM T_Bus_ToExamine ");
             if (strWhere.Trim() != "")
             {
@@ -326,7 +336,7 @@ namespace CallCenterApi.DAL
             {
                 strSql.Append(" top " + Top.ToString());
             }
-            strSql.Append(" F_ID,F_WorkOrderId,F_AssignedId,F_LimitTime,F_CreatUser,F_Type,F_Result,F_IsDelete,AuditUser,F_State,F_MainDeptId,F_Content ");
+            strSql.Append(" F_ID,F_WorkOrderId,F_AssignedId,F_CreateTime,F_LimitTime,F_CreatUser,F_Type,F_Result,F_IsDelete,AuditUser,F_State,F_MainDeptId,F_Content ");
             strSql.Append(" FROM T_Bus_ToExamine ");
             if (strWhere.Trim() != "")
             {

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

@@ -2267,7 +2267,7 @@ namespace CallCenterApi.Interface.Controllers.report
             if (isExport)
             {
                 var cols = new string[] { "名称", "受理数量", "处理量", "延期量", "重办量", "结案量", "办理率", "办结率" };
-                new NPOIHelper().ExportToExcel($"工单报表{sdate}-{edate}", obj.Tables[0], cols);
+                new NPOIHelper().ExportToExcel($"处理数量统计报表{sdate.Substring(0, 10)}-{edate.Substring(0, 10)}", obj.Tables[0], cols);
                 return Success("导出excel");
             }
             return Success("成功", obj);

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

@@ -188,19 +188,24 @@ namespace CallCenterApi.Interface.Controllers.workorder
             {
                 if (ddstrendtime.Trim() != "" && ddstrendtime != "undefined")
                 {
-                    sql += " and F_AssignTime  between   '" + ddstarttime +
-                             "' AND  '" + ddstrendtime + "'";
+                    sql += "and F_WorkOrderId in (select  F_WorkOrderId   from T_Bus_ToExamine  where F_IsDelete = 0 and  " +
+                        "F_CreateTime between   '" + ddstarttime +
+                             "' AND  '" + ddstrendtime + "')";
+                  
                 }
                 else
                 {
-                    sql += " and F_AssignTime>='" + ddstarttime + "' ";
+                    sql += "and F_WorkOrderId in (select  F_WorkOrderId   from T_Bus_ToExamine  where F_IsDelete = 0 and  " +
+                      "F_CreateTime >='" + ddstarttime + "')";
+
                 }
             }
             else
             {
                 if (ddstrendtime.Trim() != "" && ddstrendtime != "undefined")
                 {
-                    sql += " and F_AssignTime<='" + ddstrendtime + "' ";
+                    sql += "and F_WorkOrderId in (select  F_WorkOrderId   from T_Bus_ToExamine  where F_IsDelete = 0 and  " +
+                      "F_CreateTime <='" + ddstrendtime + "')";
                 }
             }
             if (islike > 0)
@@ -1658,7 +1663,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                     sql += "and F_SpotCheck=1";
                     if (visit > -1)
                     {
-                        sql += "and F_WorkOrderId in(select F_WorkOrderId from T_Bus_VisitResult WITH(NOLOCK) where F_Id in (select max(F_Id) from T_Bus_VisitResult WITH(NOLOCK) group by F_WorkOrderId ) and F_IsSatisfie = '"+visit +"') ";
+                        sql += "and F_WorkOrderId in(select F_WorkOrderId from T_Bus_VisitResult WITH(NOLOCK) where F_Id in (select max(F_Id) from T_Bus_VisitResult WITH(NOLOCK) group by F_WorkOrderId ) and F_IsSatisfie = '"+visit +"' ";
 
                     }
                     else 
@@ -11926,6 +11931,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                             modelT_Bus_ToExamine.F_Type = nexttype;
                             modelT_Bus_ToExamine.F_CreatUser = User.F_UserCode;
                             modelT_Bus_ToExamine.F_Result = cbreason;
+                            modelT_Bus_ToExamine.F_CreateTime = DateTime.Now;
                             if (modelT_Bus_AssignedInfo != null)
                             {
                                 modelT_Bus_ToExamine.F_AssignedId = modelT_Bus_AssignedInfo.F_Id;
@@ -14643,6 +14649,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
             if (User.F_RoleCode == "WLDW" || User.F_RoleCode == "ZXLD" || User.F_RoleCode == "GLY" || User.F_RoleCode == "DDZG" || User.F_RoleCode == "ZXHWY" || User.F_RoleCode == "SPZ" || User.F_RoleCode == "SPZJZ")
             {
                 Model.T_Bus_WorkOrder modelT_Bus_WorkOrder = workorderBLL.GetModel(workorderid);
+                Model.T_Bus_AssignedInfo modelT_Bus_AssignedInfo = new BLL .T_Bus_AssignedInfo().GetNewModelByWorkOrderID (workorderid);
                 Model.T_Bus_AssignedInfo_Next modelT_Bus_AssignedInfo_Next = new BLL.T_Bus_AssignedInfo_Next().GetNewModelByWorkOrderID(workorderid);
                 if (modelT_Bus_WorkOrder != null)
                 {
@@ -14653,6 +14660,25 @@ namespace CallCenterApi.Interface.Controllers.workorder
                     keyValuePairs.Add("F_IsProResult", 2);
                     keyValuePairs.Add("F_Note", "");
                     //  modelT_Bus_WorkOrder.F_IsProResult = 2;
+
+                    Model.T_Bus_ToExamine modelT_Bus_ToExamine = new Model.T_Bus_ToExamine();
+                    modelT_Bus_ToExamine.F_WorkOrderId = modelT_Bus_WorkOrder.F_WorkOrderId;
+                    modelT_Bus_ToExamine.F_IsDelete = 0;
+                    modelT_Bus_ToExamine.F_Type = 0;
+                    modelT_Bus_ToExamine.F_CreatUser = User.F_UserCode;
+                    modelT_Bus_ToExamine.F_CreateTime = DateTime.Now;
+                    modelT_Bus_ToExamine.F_Result = "";
+                    if (modelT_Bus_AssignedInfo != null)
+                    {
+                        modelT_Bus_ToExamine.F_AssignedId = modelT_Bus_AssignedInfo.F_Id;
+                    }
+                    int id = new BLL.T_Bus_ToExamine().Add(modelT_Bus_ToExamine);
+                    if (modelT_Bus_ToExamine != null)
+                    {
+                        keyValuePairs.Add("F_WorkState", 7);
+                        modelT_Bus_WorkOrder.F_WorkState = (int)EnumWorkState.visit;//已回访
+                    }
+
                     #region 插入操作记录
                     Model.T_Bus_Operation oper = new Model.T_Bus_Operation();
                     oper.F_WorkOrderId = modelT_Bus_WorkOrder.F_WorkOrderId;
@@ -17974,8 +18000,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                         modelT_Bus_RemindRecord.F_CreateUser = User.F_UserCode;
                         modelT_Bus_RemindRecord.F_CreateTime = DateTime.Now;
                         modelT_Bus_RemindRecord.F_Mode = mode;
-                        modelT_Bus_RemindRecord.Supervisor = User.F_UserCode;
-                        modelT_Bus_RemindRecord.SupervisorTime = DateTime.Now;
+                       
                         new BLL.T_Bus_RemindRecord().Add(modelT_Bus_RemindRecord);
                     }
                     #endregion
@@ -18682,7 +18707,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                                                     #endregion
 
                                                     string userinfo = User.depname + "(" + User.F_UserCode + ")";
-                                                    oper.F_Message = userinfo + "于" + DateTime.Now.ToString("yyyy年MM月dd日HH时mm分ss秒") + "提交重办了工单，重办原因：" + reason;
+                                                    oper.F_Message = userinfo + "于" + DateTime.Now.ToString("yyyy年MM月dd日HH时mm分ss秒") + "退回重办了工单，重办原因：" + reason;
                                                     if (!string.IsNullOrEmpty(otherdeptids))
                                                     {
                                                         string sql = "select dbo.GetDeptNames('" + otherdeptids + "')";

CallCenterApi/CallCenterApi.Model/T_Bus_ToExamine.cs

@@ -89,6 +89,7 @@ namespace CallCenterApi.Model
         }
         public int? F_LimitTime { set; get; }
         public string F_Content { set; get; }
+        public DateTime? F_CreateTime { set; get; }
         #endregion Model
 
     }