驳回的时候加驳回意见，公告修改更新修改时间和修改人

web/BaseCallCenter.BLL/T_Wo_WorkOrderBase.cs

@@ -616,23 +616,23 @@ namespace YTSoft.BaseCallCenter.BLL
         #endregion
 
         //待处理驳回
-        public bool OverruleWorkOrder(int workOrderId, int byid, string byname, int bmid, string bmmc)
+        public bool OverruleWorkOrder(int workOrderId, int byid, string byname, int bmid, string bmmc,string opinion)
         {
-            return dal.OverruleWorkOrder(workOrderId, byid, byname, bmid, bmmc);
+            return dal.OverruleWorkOrder(workOrderId, byid, byname, bmid, bmmc, opinion);
         }
 
         //待回访驳回
-        public bool OverruleDHFWorkOrder(int workOrderId, int byid, string byname, int bmid, string bmmc)
+        public bool OverruleDHFWorkOrder(int workOrderId, int byid, string byname, int bmid, string bmmc, string opinion)
         {
-            return dal.OverruleDHFWorkOrder(workOrderId, byid, byname, bmid, bmmc);
+            return dal.OverruleDHFWorkOrder(workOrderId, byid, byname, bmid, bmmc, opinion);
         }
 
 
 
         //待定责驳回
-        public bool OverruleDDZWorkOrder(int workOrderId, int byid, string byname, int bmid, string bmmc)
+        public bool OverruleDDZWorkOrder(int workOrderId, int byid, string byname, int bmid, string bmmc,string opinion)
         {
-            return dal.OverruleDDZWorkOrder(workOrderId, byid, byname, bmid, bmmc);
+            return dal.OverruleDDZWorkOrder(workOrderId, byid, byname, bmid, bmmc, opinion);
         }
 
         //撤回已处理且待回访工单

web/BaseCallCenter.DAL/Order/T_Wo_WorkOrderBase.cs

@@ -2473,7 +2473,7 @@ F_SERVICETYPE,F_DECLARATIONTIME,F_SERVICENATURE,F_SERVICEWAY,F_RETURNVISITMAN,F_
 
 
         #region 待处理的工单驳回到补录工单
-        public bool OverruleWorkOrder(int workOrderId, int byid, string byname, int bmid, string bmmc)
+        public bool OverruleWorkOrder(int workOrderId, int byid, string byname, int bmid, string bmmc, string opinion)
         {
             bool result = false;
 
@@ -2485,13 +2485,13 @@ F_SERVICETYPE,F_DECLARATIONTIME,F_SERVICENATURE,F_SERVICEWAY,F_RETURNVISITMAN,F_
                 strSql.Append(" update T_Wo_WorkOrderHistory set ");
                 strSql.Append(" F_StateName = '已驳回'  WHERE  F_HISTORYID =(  SELECT TOP 1  F_HISTORYID FROM dbo.T_Wo_WorkOrderHistory  WHERE F_INSTANCEID= " + workOrderId + " ORDER BY f_optdate DESC)  ");
                 result = DbHelperSQL.ExecuteSql(strSql.ToString()) > 0;
-                int hisid = EditOverruleOrderHistoryInfo(workOrderId, byid, byname, bmid, bmmc);
+                int hisid = EditOverruleOrderHistoryInfo(workOrderId, byid, byname, bmid, bmmc,opinion);
 
             }
             return result;
         }
         //待处理的工单 插入驳回工单历史信息
-        public int EditOverruleOrderHistoryInfo(int workOrderId, int byid, string byname, int bmid, string bmmc)
+        public int EditOverruleOrderHistoryInfo(int workOrderId, int byid, string byname, int bmid, string bmmc, string opinion)
         {
             //历史工单id
             int historyId = 0;
@@ -2506,7 +2506,7 @@ F_SERVICETYPE,F_DECLARATIONTIME,F_SERVICENATURE,F_SERVICEWAY,F_RETURNVISITMAN,F_
             historyModel.F_WORKORDERSTATEID = 0;// 13;
             historyModel.F_StateName = "已驳回";
             historyModel.F_TASKFLAG = 3;//待处理的工单驳回
-            historyModel.F_REMARK = byname + "驳回，转补录工单";
+            historyModel.F_REMARK = byname + "驳回，转补录工单;" +"驳回意见："+opinion;
             historyId = InsertWorkOrderHistoryModel(historyModel);
             return historyId;
 
@@ -2519,7 +2519,7 @@ F_SERVICETYPE,F_DECLARATIONTIME,F_SERVICENATURE,F_SERVICEWAY,F_RETURNVISITMAN,F_
 
 
         #region 待回访的工单驳回 至处理中
-        public bool OverruleDHFWorkOrder(int workOrderId, int byid, string byname, int bmid, string bmmc)
+        public bool OverruleDHFWorkOrder(int workOrderId, int byid, string byname, int bmid, string bmmc,string opinion)
         {
             bool result = false;
 
@@ -2531,13 +2531,13 @@ F_SERVICETYPE,F_DECLARATIONTIME,F_SERVICENATURE,F_SERVICEWAY,F_RETURNVISITMAN,F_
                 //strSql.Append(" update T_Wo_WorkOrderHistory set ");
                 //strSql.Append(" F_StateName = '待回访驳回，至处理中'  WHERE  F_HISTORYID =(  SELECT TOP 1  F_HISTORYID FROM dbo.T_Wo_WorkOrderHistory  WHERE F_WORKORDERSTATEID=1 and F_INSTANCEID= " + workOrderId + " ORDER BY f_optdate DESC)  ");
                 result = DbHelperSQL.ExecuteSql(strSql.ToString()) > 0;
-                int hisid = EditOverruleDHFOrderHistoryInfo(workOrderId, byid, byname, bmid, bmmc);
+                int hisid = EditOverruleDHFOrderHistoryInfo(workOrderId, byid, byname, bmid, bmmc, opinion);
 
             }
             return result;
         }
         //待处理的工单 插入驳回工单历史信息
-        public int EditOverruleDHFOrderHistoryInfo(int workOrderId, int byid, string byname, int bmid, string bmmc)
+        public int EditOverruleDHFOrderHistoryInfo(int workOrderId, int byid, string byname, int bmid, string bmmc,string opinion)
         {
             //历史工单id
             int historyId = 0;
@@ -2552,7 +2552,7 @@ F_SERVICETYPE,F_DECLARATIONTIME,F_SERVICENATURE,F_SERVICEWAY,F_RETURNVISITMAN,F_
             historyModel.F_WORKORDERSTATEID = 1;//0 ;
             historyModel.F_StateName = "已驳回";
             historyModel.F_TASKFLAG = 5;//从待回访的列表里驳回
-            historyModel.F_REMARK = byname + "从待回访驳回，至待处理";
+            historyModel.F_REMARK = byname + "从待回访驳回，至待处理;"+"驳回意见："+opinion;
             historyId = InsertWorkOrderHistoryModel(historyModel);
             return historyId;
 
@@ -2561,7 +2561,7 @@ F_SERVICETYPE,F_DECLARATIONTIME,F_SERVICENATURE,F_SERVICEWAY,F_RETURNVISITMAN,F_
 
         #endregion
         //驳回待定责工单到待回访
-        public bool OverruleDDZWorkOrder(int workOrderId, int byid, string byname, int bmid, string bmmc)
+        public bool OverruleDDZWorkOrder(int workOrderId, int byid, string byname, int bmid, string bmmc,string opinion)
         {
             bool result = false;
 
@@ -2576,7 +2576,7 @@ F_SERVICETYPE,F_DECLARATIONTIME,F_SERVICENATURE,F_SERVICEWAY,F_RETURNVISITMAN,F_
                     strSql.Append(" F_WORKORDERSTATEID=3,F_REPAIRREQUEST='待回访',F_HASTENCOUNTS=0 where F_WORKORDERID=" + workOrderId);
 
                     result = DbHelperSQL.ExecuteSql(strSql.ToString()) > 0;
-                    int hisid = EditBoHuiDDZWorkOrder(workOrderId, byid, byname, bmid, bmmc);
+                    int hisid = EditBoHuiDDZWorkOrder(workOrderId, byid, byname, bmid, bmmc, opinion);
                 }
 
                 else //待定责工单如果不回访，驳回到处理人 的处理列表
@@ -2724,7 +2724,7 @@ F_SERVICETYPE,F_DECLARATIONTIME,F_SERVICENATURE,F_SERVICEWAY,F_RETURNVISITMAN,F_
         }
 
 
-        public int EditBoHuiDDZWorkOrder(int workOrderId, int byid, string byname, int bmid, string bmmc)
+        public int EditBoHuiDDZWorkOrder(int workOrderId, int byid, string byname, int bmid, string bmmc,string opinion)
         {
             //历史工单id
             int historyId = 0;
@@ -2739,7 +2739,7 @@ F_SERVICETYPE,F_DECLARATIONTIME,F_SERVICENATURE,F_SERVICEWAY,F_RETURNVISITMAN,F_
             historyModel.F_WORKORDERSTATEID = 3;
             historyModel.F_StateName = "已驳回";
             historyModel.F_TASKFLAG = 7; // 
-            historyModel.F_REMARK = byname + "驳回，转待回访";
+            historyModel.F_REMARK = byname + "驳回，转待回访;"+"驳回意见："+opinion;
             historyId = InsertWorkOrderHistoryModel(historyModel);
             return historyId;
 

web/YTSoft.BaseCallCenter.MVCWeb/Controllers/Order/WorkOrderController.cs

@@ -1570,7 +1570,7 @@ namespace YTSoft.BaseCallCenter.MVCWeb.Controllers
         /// <param name="workOrderBaseModel"></param>
         /// <returns></returns>
         [AcceptVerbs(HttpVerbs.Get)]
-        public bool OverruleWorkOrder(int workOrderId)
+        public bool OverruleWorkOrder(int workOrderId,string opinion)
         {
             string F_UserCode = "";
             if (Request.Cookies["BaseCallCenter_T_User"] != null)
@@ -1605,7 +1605,7 @@ namespace YTSoft.BaseCallCenter.MVCWeb.Controllers
                     if (list.Count > 0)
                     {
                         bmmc = list[0].F_DeptName.ToString();
-                        result = orderBLL.OverruleWorkOrder(workOrderId, F_UserID, F_UserName, F_DeptId, bmmc);
+                        result = orderBLL.OverruleWorkOrder(workOrderId, F_UserID, F_UserName, F_DeptId, bmmc,opinion);
                     }
                 }
                 return result;
@@ -1623,7 +1623,7 @@ namespace YTSoft.BaseCallCenter.MVCWeb.Controllers
         /// <param name="workOrderBaseModel"></param>
         /// <returns></returns>
         [AcceptVerbs(HttpVerbs.Get)]
-        public bool OverruleDHFWorkOrder(int workOrderId)
+        public bool OverruleDHFWorkOrder(int workOrderId,string opinion)
         {
             string F_UserCode = "";
             if (Request.Cookies["BaseCallCenter_T_User"] != null)
@@ -1647,7 +1647,7 @@ namespace YTSoft.BaseCallCenter.MVCWeb.Controllers
                     if (list.Count > 0)
                     {
                         bmmc = list[0].F_DeptName.ToString();
-                        result = orderBLL.OverruleDHFWorkOrder(workOrderId, F_UserID, F_UserName, F_DeptId, bmmc);
+                        result = orderBLL.OverruleDHFWorkOrder(workOrderId, F_UserID, F_UserName, F_DeptId, bmmc, opinion);
                     }
                 }
                 return result;
@@ -1664,7 +1664,7 @@ namespace YTSoft.BaseCallCenter.MVCWeb.Controllers
         /// <param name="workOrderBaseModel"></param>
         /// <returns></returns>
         [AcceptVerbs(HttpVerbs.Get)]
-        public bool OverruleDDZWorkOrder(int workOrderId)
+        public bool OverruleDDZWorkOrder(int workOrderId,string opinion)
         {
             string F_UserCode = "";
             if (Request.Cookies["BaseCallCenter_T_User"] != null)
@@ -1688,7 +1688,7 @@ namespace YTSoft.BaseCallCenter.MVCWeb.Controllers
                 if (list.Count > 0)
                 {
                     bmmc = list[0].F_DeptName.ToString();
-                    result = orderBLL.OverruleDDZWorkOrder(workOrderId, F_UserID, F_UserName, F_DeptId, bmmc);
+                    result = orderBLL.OverruleDDZWorkOrder(workOrderId, F_UserID, F_UserName, F_DeptId, bmmc, opinion);
                 }
             }
             return result;

web/YTSoft.BaseCallCenter.MVCWeb/Controllers/SystemManageController.cs

@@ -1352,7 +1352,9 @@ namespace YTSoft.BaseCallCenter.MVCWeb.Controllers
                     oldnoticeinfoModel.F_Content = noticeinfoModel.F_Content;
                     oldnoticeinfoModel.F_ReceiveInfo = noticeinfoModel.F_ReceiveInfo;
                     oldnoticeinfoModel.F_DeviceId = noticeinfoModel.F_DeviceId;
-                    oldnoticeinfoModel.F_State = 1;                    
+                    oldnoticeinfoModel.F_State = 1;
+                    oldnoticeinfoModel.F_ModifyDate = DateTime.Now;
+                    oldnoticeinfoModel.F_ModifyBy = F_UserID;
                     result = noticeBLL.Update(oldnoticeinfoModel);
                     AddAction("t_msg_noticeinfo", oldnoticeinfoModel.F_NoticeId.ToMyString(), "修改公告");
                 }