修改bug

API/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/report/BusinessController.cs

@@ -262,15 +262,17 @@ namespace CallCenterApi.Interface.Controllers.report
                 starttime = starttime + " 00:00:00";
                 endtime = endtime + " 23:59:59";
 
-                string sql = "select a.F_DeptId,dbo.GetDeptName(a.F_DeptId) as DeptName,w.F_WorkOrderId,w.F_ComContent,a.F_SubmitDate,"
-                    + "dbo.GetFeedBackTime(a.F_SubmitDate,10) as YFKDate, F_EndDate,"
-                    + "dbo.GetFeedBackOverDay(a.F_SubmitDate,ISNULL(a.F_EndDate, GETDATE()))-10 as OverDays "
-                    + " from T_Bus_WorkOrder w inner join T_Bus_AssignedInfo a on w.F_WorkOrderId=a.F_WorkOrderId "
-                    + "where w.F_IsDelete=0 and  w.F_RegDate>'" + starttime + "'  and  w.F_RegDate<='" + endtime
-                    + "' and  isnull(a.F_DeptId,0)<>0 and dbo.GetFeedBackOverDay(a.F_SubmitDate,ISNULL(a.F_EndDate, GETDATE()))>10 "
-                    + " order by a.F_DeptId";
-
+                //string sql = "select a.F_DeptId,dbo.GetDeptName(a.F_DeptId) as DeptName,w.F_WorkOrderId,w.F_ComContent,a.F_SubmitDate,"
+                //    + "dbo.GetFeedBackTime(a.F_SubmitDate,10) as YFKDate, F_EndDate,"
+                //    + "dbo.GetFeedBackOverDay(a.F_SubmitDate,ISNULL(a.F_EndDate, GETDATE()))-10 as OverDays "
+                //    + " from T_Bus_WorkOrder w inner join T_Bus_AssignedInfo a on w.F_WorkOrderId=a.F_WorkOrderId "
+                //    + "where w.F_IsDelete=0 and  w.F_RegDate>'" + starttime + "'  and  w.F_RegDate<='" + endtime
+                //    + "' and  isnull(a.F_DeptId,0)<>0 and dbo.GetFeedBackOverDay(a.F_SubmitDate,ISNULL(a.F_EndDate, GETDATE()))>10 "
+                //    + " order by a.F_DeptId";
+                string sql = "SELECT * FROM dbo.View_OverList where F_RegDate>='" + starttime + "'  and  F_RegDate<='" + endtime + "' order by F_DeptId";
                 var dt = DbHelperSQL.Query(sql).Tables[0];
+                dt.Columns.Remove("F_DeptId");
+                dt.Columns.Remove("F_RegDate");
 
                 string[] cols = { "单位", "编号", "内容", "转办日期", "应反馈日期", "反馈日期", "逾期天数" };
 
@@ -312,19 +314,23 @@ namespace CallCenterApi.Interface.Controllers.report
                 //    + "where w.F_IsDelete=0 and  w.F_RegDate>'" + starttime + "'  and  w.F_RegDate<='" + endtime
                 //    + "' and  isnull(a.F_DeptId,0)<>0 and dbo.GetFeedBackOverDay(a.F_SubmitDate,ISNULL(a.F_EndDate, GETDATE()))>a.F_OverDay "
                 //    + " order by a.F_DeptId";
-                string sql = "select dbo.GetDeptName(a.F_DeptId) as '单位',w.F_WorkOrderId as '编号',w.F_ComContent as '内容',a.F_SubmitDate as '转办日期',"
-                    + "dbo.GetFeedBackTime(a.F_SubmitDate,10) as '应反馈日期', F_EndDate as '反馈日期',"
-                    + "dbo.GetFeedBackOverDay(a.F_SubmitDate,ISNULL(a.F_EndDate, GETDATE()))-10 as '逾期天数' "
-                    + " from T_Bus_WorkOrder w inner join T_Bus_AssignedInfo a on w.F_WorkOrderId=a.F_WorkOrderId "
-                    + "where w.F_IsDelete=0 and  w.F_RegDate>'" + starttime + "'  and  w.F_RegDate<='" + endtime
-                    + "' and  isnull(a.F_DeptId,0)<>0 and dbo.GetFeedBackOverDay(a.F_SubmitDate,ISNULL(a.F_EndDate, GETDATE()))>10 "
-                    + " order by a.F_DeptId";
-
+                //string sql = "select dbo.GetDeptName(a.F_DeptId) as '单位',w.F_WorkOrderId as '编号',w.F_ComContent as '内容',a.F_SubmitDate as '转办日期',"
+                //    + "dbo.GetFeedBackTime(a.F_SubmitDate,10) as '应反馈日期', F_EndDate as '反馈日期',"
+                //    + "dbo.GetFeedBackOverDay(a.F_SubmitDate,ISNULL(a.F_EndDate, GETDATE()))-10 as '逾期天数' "
+                //    + " from T_Bus_WorkOrder w inner join T_Bus_AssignedInfo a on w.F_WorkOrderId=a.F_WorkOrderId "
+                //    + "where w.F_IsDelete=0 and  w.F_RegDate>'" + starttime + "'  and  w.F_RegDate<='" + endtime
+                //    + "' and  isnull(a.F_DeptId,0)<>0 and dbo.GetFeedBackOverDay(a.F_SubmitDate,ISNULL(a.F_EndDate, GETDATE()))>10 "
+                //    + " order by a.F_DeptId";
+                string sql = "SELECT * FROM dbo.View_OverList where F_RegDate>='" + starttime + "'  and  F_RegDate<='" + endtime + "' order by F_DeptId";
                 var dt = DbHelperSQL.Query(sql).Tables[0];
+                dt.Columns.Remove("F_DeptId");
+                dt.Columns.Remove("F_RegDate");
+
+                string[] cols = { "单位", "编号", "内容", "转办日期", "应反馈日期", "反馈日期", "逾期天数" };
 
                 NPOIHelper npoi = new NPOIHelper();
 
-                if (npoi.ExportToExcel("逾期统计", dt) == "")
+                if (npoi.ExportToExcel("逾期统计", dt, cols) == "")
                 {
                     return Success("导出成功");
                 }
@@ -405,6 +411,9 @@ namespace CallCenterApi.Interface.Controllers.report
             ActionResult res = NoToken("未知错误，请重新登录");
             if (Request.IsAuthenticated)
             {
+                int type = RequestString.GetInt("type", 0);
+                int bigtype = RequestString.GetInt("bigtype", 0);
+                int smalltype = RequestString.GetInt("smalltype", 0);
                 string year = RequestString.GetQueryString("year");
                 string month = RequestString.GetQueryString("month");
                 if (string.IsNullOrEmpty(year))
@@ -417,7 +426,23 @@ namespace CallCenterApi.Interface.Controllers.report
                 }
                 string sql = "SELECT * FROM dbo.View_DealList where SUBSTRING(F_RegDate,1,7)='" + (year + "-" + month) + "'";
 
+                if (type != 0)
+                {
+                    sql += " and F_InfoType = '" + type + "' ";
+                }
+                if (bigtype != 0)
+                {
+                    sql += " and F_InfoConBigType = '" + bigtype + "' ";
+                }
+                if (smalltype != 0)
+                {
+                    sql += " and F_InfoConSmallType = '" + smalltype + "' ";
+                }
+
                 var dt = DbHelperSQL.Query(sql).Tables[0];
+                dt.Columns.Remove("F_InfoType");
+                dt.Columns.Remove("F_InfoConBigType");
+                dt.Columns.Remove("F_InfoConSmallType");
 
                 string[] cols = { "受理编号", "投诉人及电话", "投诉时间", "办理部门", "办结时间", "内容摘要", "办理结果", "备注" };
 
@@ -441,7 +466,7 @@ namespace CallCenterApi.Interface.Controllers.report
                         cols = cols,
                         data = dt
                     };
-                    return Success("成功");
+                    return Success("成功",obj);
                 }
             }
             return res;

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

@@ -2280,7 +2280,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                         Model.T_Bus_WorkOrder modelT_Bus_WorkOrder = new BLL.T_Bus_WorkOrder().GetModel(workorderid);
                         if (modelT_Bus_WorkOrder != null)
                         {
-                            if (modelT_Bus_WorkOrder.F_WorkState == 18 || modelT_Bus_WorkOrder.F_WorkState == 26)
+                            if (modelT_Bus_WorkOrder.F_WorkState == 18|| modelT_Bus_WorkOrder.F_WorkState == 25 || modelT_Bus_WorkOrder.F_WorkState == 26)
                             {
                                 using (TransactionScope trans = new TransactionScope())
                                 {
@@ -2599,7 +2599,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                             }
                             else
                             {
-                                res = Error("已经交办过了");
+                                res = Error("已经处理过了");
                             }
                         }
                     }
@@ -2631,55 +2631,62 @@ namespace CallCenterApi.Interface.Controllers.workorder
                         Model.T_Bus_WorkOrder modelT_Bus_WorkOrder = new BLL.T_Bus_WorkOrder().GetModel(workorderid);
                         if (modelT_Bus_WorkOrder != null)
                         {
-                            using (TransactionScope trans = new TransactionScope())
+                            if (modelT_Bus_WorkOrder.F_WorkState == 23)
                             {
-                                #region 保存工单信息
-                                modelT_Bus_WorkOrder.F_WorkState = 25;//办理中
-                                new BLL.T_Bus_WorkOrder().Update(modelT_Bus_WorkOrder);
-                                #endregion
-
-                                #region 修改呈批记录
-                                //呈批记录
-                                Model.T_Bus_SubmitSuper model_T_Bus_SubmitSuper = new BLL.T_Bus_SubmitSuper().GetNewModelByWorkOrderID(modelT_Bus_WorkOrder.F_WorkOrderId);
-                                if (model_T_Bus_SubmitSuper != null)
+                                using (TransactionScope trans = new TransactionScope())
                                 {
-                                    string clr = new BLL.T_Sys_SystemConfig().GetParamValueByParamCode("FLCLR");
-                                    model_T_Bus_SubmitSuper.F_SuperOpinion = superopinion;//领导批示
-                                    model_T_Bus_SubmitSuper.F_ApprovalUserCode = userModel.F_UserCode;//审批人工号
-                                    model_T_Bus_SubmitSuper.F_ApprovalName = clr;//分流处理人
-                                    model_T_Bus_SubmitSuper.F_ApprovalDate = DateTime.Now;//审批时间
-                                    model_T_Bus_SubmitSuper.F_State = 2;////审批状态（0:未处理，1:通过，2：退回）
-                                    model_T_Bus_SubmitSuper.F_IsRead = true;//是否已读 
-                                    model_T_Bus_SubmitSuper.F_BackReason = backreason;
-                                    model_T_Bus_SubmitSuper.F_BackType = backtype;
-                                    new BLL.T_Bus_SubmitSuper().Update(model_T_Bus_SubmitSuper);
-                                }
-                                #endregion
+                                    #region 保存工单信息
+                                    modelT_Bus_WorkOrder.F_WorkState = 25;//办理中
+                                    new BLL.T_Bus_WorkOrder().Update(modelT_Bus_WorkOrder);
+                                    #endregion
 
-                                #region 修改流转记录
-                                Model.T_Bus_WorkFlow model_T_Bus_WorkFlow = new BLL.T_Bus_WorkFlow().GetNewModelByWorkOrderID(modelT_Bus_WorkOrder.F_WorkOrderId);
-                                if (model_T_Bus_WorkFlow != null)
-                                {
-                                    model_T_Bus_WorkFlow.F_WorkOrderId = modelT_Bus_WorkOrder.F_WorkOrderId;//工单流水号
-                                    model_T_Bus_WorkFlow.F_EndDate = DateTime.Now;//流转结束时间
-                                    model_T_Bus_WorkFlow.FEUserCode = userModel.F_UserCode;//办理人            
-                                    new BLL.T_Bus_WorkFlow().Update(model_T_Bus_WorkFlow);
-                                }
-                                #endregion
+                                    #region 修改呈批记录
+                                    //呈批记录
+                                    Model.T_Bus_SubmitSuper model_T_Bus_SubmitSuper = new BLL.T_Bus_SubmitSuper().GetNewModelByWorkOrderID(modelT_Bus_WorkOrder.F_WorkOrderId);
+                                    if (model_T_Bus_SubmitSuper != null)
+                                    {
+                                        string clr = new BLL.T_Sys_SystemConfig().GetParamValueByParamCode("FLCLR");
+                                        model_T_Bus_SubmitSuper.F_SuperOpinion = superopinion;//领导批示
+                                        model_T_Bus_SubmitSuper.F_ApprovalUserCode = userModel.F_UserCode;//审批人工号
+                                        model_T_Bus_SubmitSuper.F_ApprovalName = clr;//分流处理人
+                                        model_T_Bus_SubmitSuper.F_ApprovalDate = DateTime.Now;//审批时间
+                                        model_T_Bus_SubmitSuper.F_State = 2;////审批状态（0:未处理，1:通过，2：退回）
+                                        model_T_Bus_SubmitSuper.F_IsRead = true;//是否已读 
+                                        model_T_Bus_SubmitSuper.F_BackReason = backreason;
+                                        model_T_Bus_SubmitSuper.F_BackType = backtype;
+                                        new BLL.T_Bus_SubmitSuper().Update(model_T_Bus_SubmitSuper);
+                                    }
+                                    #endregion
 
-                                #region 插入流转记录
-                                int p_WorkFlowID = 0;//声明流转编号    
-                                Model.T_Bus_WorkFlow _T_Bus_WorkFlow = new Model.T_Bus_WorkFlow();
-                                _T_Bus_WorkFlow.F_WorkOrderId = modelT_Bus_WorkOrder.F_WorkOrderId;//工单流水号
-                                _T_Bus_WorkFlow.F_WorkSatae = modelT_Bus_WorkOrder.F_WorkState;//工单状态
-                                _T_Bus_WorkFlow.F_StartDate = DateTime.Now;//流转开始时间
-                                _T_Bus_WorkFlow.F_SUserCode = userModel.F_UserCode;//登记人
-                                p_WorkFlowID = new BLL.T_Bus_WorkFlow().Add(_T_Bus_WorkFlow);
-                                #endregion
+                                    #region 修改流转记录
+                                    Model.T_Bus_WorkFlow model_T_Bus_WorkFlow = new BLL.T_Bus_WorkFlow().GetNewModelByWorkOrderID(modelT_Bus_WorkOrder.F_WorkOrderId);
+                                    if (model_T_Bus_WorkFlow != null)
+                                    {
+                                        model_T_Bus_WorkFlow.F_WorkOrderId = modelT_Bus_WorkOrder.F_WorkOrderId;//工单流水号
+                                        model_T_Bus_WorkFlow.F_EndDate = DateTime.Now;//流转结束时间
+                                        model_T_Bus_WorkFlow.FEUserCode = userModel.F_UserCode;//办理人            
+                                        new BLL.T_Bus_WorkFlow().Update(model_T_Bus_WorkFlow);
+                                    }
+                                    #endregion
 
-                                trans.Complete();
+                                    #region 插入流转记录
+                                    int p_WorkFlowID = 0;//声明流转编号    
+                                    Model.T_Bus_WorkFlow _T_Bus_WorkFlow = new Model.T_Bus_WorkFlow();
+                                    _T_Bus_WorkFlow.F_WorkOrderId = modelT_Bus_WorkOrder.F_WorkOrderId;//工单流水号
+                                    _T_Bus_WorkFlow.F_WorkSatae = modelT_Bus_WorkOrder.F_WorkState;//工单状态
+                                    _T_Bus_WorkFlow.F_StartDate = DateTime.Now;//流转开始时间
+                                    _T_Bus_WorkFlow.F_SUserCode = userModel.F_UserCode;//登记人
+                                    p_WorkFlowID = new BLL.T_Bus_WorkFlow().Add(_T_Bus_WorkFlow);
+                                    #endregion
+
+                                    trans.Complete();
+                                }
+                                res = Success("成功");
+                            }
+                            else
+                            {
+                                res = Error("已经处理过了");
                             }
-                            res = Success("成功");
                         }
                     }
                 }
@@ -2929,27 +2936,34 @@ namespace CallCenterApi.Interface.Controllers.workorder
                         Model.T_Bus_WorkOrder modelT_Bus_WorkOrder = new BLL.T_Bus_WorkOrder().GetModel(workorderid);
                         if (modelT_Bus_WorkOrder != null)
                         {
-                            using (TransactionScope trans = new TransactionScope())
+                            if (modelT_Bus_WorkOrder.F_WorkState == 26)
                             {
-                                #region 保存工单信息
-                                modelT_Bus_WorkOrder.F_WorkState = 22;//已办结
-                                modelT_Bus_WorkOrder.F_IsClosed = true;//是否关闭工单
-                                new BLL.T_Bus_WorkOrder().Update(modelT_Bus_WorkOrder);
-                                #endregion
-
-                                #region 修改流转记录
-                                Model.T_Bus_WorkFlow model_T_Bus_WorkFlow = new BLL.T_Bus_WorkFlow().GetNewModelByWorkOrderID(modelT_Bus_WorkOrder.F_WorkOrderId);
-                                if (model_T_Bus_WorkFlow != null)
+                                using (TransactionScope trans = new TransactionScope())
                                 {
-                                    model_T_Bus_WorkFlow.F_WorkOrderId = modelT_Bus_WorkOrder.F_WorkOrderId;//工单流水号
-                                    model_T_Bus_WorkFlow.F_EndDate = DateTime.Now;//流转结束时间
-                                    model_T_Bus_WorkFlow.FEUserCode = userModel.F_UserCode;//办理人            
-                                    new BLL.T_Bus_WorkFlow().Update(model_T_Bus_WorkFlow);
+                                    #region 保存工单信息
+                                    modelT_Bus_WorkOrder.F_WorkState = 22;//已办结
+                                    modelT_Bus_WorkOrder.F_IsClosed = true;//是否关闭工单
+                                    new BLL.T_Bus_WorkOrder().Update(modelT_Bus_WorkOrder);
+                                    #endregion
+
+                                    #region 修改流转记录
+                                    Model.T_Bus_WorkFlow model_T_Bus_WorkFlow = new BLL.T_Bus_WorkFlow().GetNewModelByWorkOrderID(modelT_Bus_WorkOrder.F_WorkOrderId);
+                                    if (model_T_Bus_WorkFlow != null)
+                                    {
+                                        model_T_Bus_WorkFlow.F_WorkOrderId = modelT_Bus_WorkOrder.F_WorkOrderId;//工单流水号
+                                        model_T_Bus_WorkFlow.F_EndDate = DateTime.Now;//流转结束时间
+                                        model_T_Bus_WorkFlow.FEUserCode = userModel.F_UserCode;//办理人            
+                                        new BLL.T_Bus_WorkFlow().Update(model_T_Bus_WorkFlow);
+                                    }
+                                    #endregion
+                                    trans.Complete();
                                 }
-                                #endregion
-                                trans.Complete();
+                                res = Success("成功");
+                            }
+                            else
+                            {
+                                res = Error("已经处理过了");
                             }
-                            res = Success("成功");
                         }
                         else
                         {