Bladeren bron

鹤壁2.12

duhongyu 3 jaren geleden
bovenliggende
commit
c5d075ae62

+ 5 - 2
CallCenterApi/CallCenterApi.DAL/T_Bus_WorkOrder.cs

954
                 {
954
                 {
955
                     model.F_Village = int.Parse(row["F_Village"].ToString());
955
                     model.F_Village = int.Parse(row["F_Village"].ToString());
956
                 }
956
                 }
957
-              
958
-                
957
+
958
+                if (row["F_SuperOpinion"] != null)
959
+                {
960
+                    model.F_SuperOpinion = row["F_SuperOpinion"].ToString();
961
+                }
959
             }
962
             }
960
             return model;
963
             return model;
961
         }
964
         }

+ 1 - 1
CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/Login/LoginController.cs

179
                 }
179
                 }
180
                 catch (Exception ex)
180
                 catch (Exception ex)
181
                 {
181
                 {
182
-                    return Error("错误:" + ex.Message);
182
+                    return Error("错误:" +ex .Message );
183
                 }
183
                 }
184
                 finally
184
                 finally
185
                 {
185
                 {

+ 1 - 1
CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/report/WorkOrderReportController.cs

47
             {
47
             {
48
                 end = DateTime.Now;
48
                 end = DateTime.Now;
49
             }
49
             }
50
-
50
+          
51
             Dictionary<string, string> paras = new Dictionary<string, string>();
51
             Dictionary<string, string> paras = new Dictionary<string, string>();
52
             paras.Add("@sdate", start.Value.ToString("yyyy-MM-dd"));
52
             paras.Add("@sdate", start.Value.ToString("yyyy-MM-dd"));
53
             paras.Add("@edate", end.Value.ToString("yyyy-MM-dd"));
53
             paras.Add("@edate", end.Value.ToString("yyyy-MM-dd"));

File diff suppressed because it is too large
+ 34 - 298
CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/workorder/WorkOrderController.cs


+ 7 - 3
CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Models/Common/ButtonGroup.cs

298
                         buttons.Add(submit());
298
                         buttons.Add(submit());
299
                     }
299
                     }
300
                     //中心话务员 坐席班长 管理员
300
                     //中心话务员 坐席班长 管理员
301
-                    if (code == "ZXHWY" || code == "ZXBZ" || code == "GLY" || code == "DDZG")
301
+                    if ( code == "ZXBZ" || code == "GLY" || code == "DDZG")
302
+                    {
303
+                        buttons.Add(delete());
304
+                    }
305
+                   if (code == "ZXHWY" )
302
                     {
306
                     {
303
                         buttons.Add(submit());
307
                         buttons.Add(submit());
304
-                        buttons.Add(edit()); buttons.Add(delete());
308
+                        buttons.Add(edit());
305
                     }
309
                     }
306
                     if (code == "MTDD")
310
                     if (code == "MTDD")
307
                     {
311
                     {
325
                             buttons.Add(edit());
329
                             buttons.Add(edit());
326
                             buttons.Add(back());
330
                             buttons.Add(back());
327
                             // buttons.Add(assign());
331
                             // buttons.Add(assign());
328
-                            // buttons.Add(approval());
332
+                           // buttons.Add(approval());
329
                             //20190315提出需求 操作-领导批示改为转督办 (20190327 zhengbingbing)
333
                             //20190315提出需求 操作-领导批示改为转督办 (20190327 zhengbingbing)
330
                             //  buttons.Add(turnsee());
334
                             //  buttons.Add(turnsee());
331
                            // buttons.Add(instruct());
335
                            // buttons.Add(instruct());

+ 16 - 11
CallCenterApi/CallCenterApi.Model/T_Bus_WorkOrder.cs

712
         /// </summary>
712
         /// </summary>
713
         public int F_VisitType { set; get; }
713
         public int F_VisitType { set; get; }
714
         public int F_IsMedia { set; get; }
714
         public int F_IsMedia { set; get; }
715
-     //   public int? F_IsSendBack{ set; get; }
715
+
716
         /// <summary>
716
         /// <summary>
717
-        /// 修改人工号
717
+        /// 领导批示
718
         /// </summary>
718
         /// </summary>
719
-     //   public string F_EditUser
720
-      //  { set; get; }
719
+        public string F_SuperOpinion { set; get; }
720
+     //   public int? F_IsSendBack{ set; get; }
721
+     /// <summary>
722
+     /// 修改人工号
723
+     /// </summary>
724
+        //   public string F_EditUser
725
+        //  { set; get; }
721
 
726
 
722
         /// <summary>
727
         /// <summary>
723
         /// 0未审核1已审核2回访审核
728
         /// 0未审核1已审核2回访审核
724
         /// </summary>
729
         /// </summary>
725
-      //  public int? F_IsExamine { set; get; }//删除
730
+        //  public int? F_IsExamine { set; get; }//删除
726
         /// <summary>
731
         /// <summary>
727
         /// 交办审核时间
732
         /// 交办审核时间
728
         /// </summary>
733
         /// </summary>
729
-      //  public DateTime? F_AssignExamineTime { set; get; }//删除
730
-    //    public string F_AssignExamineUser { set; get; }//删除
734
+        //  public DateTime? F_AssignExamineTime { set; get; }//删除
735
+        //    public string F_AssignExamineUser { set; get; }//删除
731
         /// <summary>
736
         /// <summary>
732
         /// 回访审核时间
737
         /// 回访审核时间
733
         /// </summary>
738
         /// </summary>
734
-     //   public DateTime? F_VisitExamineTime { set; get; }//删除
735
-      //  public string F_VisitAssignUser { set; get; }//删除
739
+        //   public DateTime? F_VisitExamineTime { set; get; }//删除
740
+        //  public string F_VisitAssignUser { set; get; }//删除
736
         /// <summary>
741
         /// <summary>
737
         /// 是否营商
742
         /// 是否营商
738
         /// </summary>
743
         /// </summary>
739
-     //   public int ? F_IsBusiness { set; get; }//删除
740
-      
744
+        //   public int ? F_IsBusiness { set; get; }//删除
745
+
741
         #endregion Model
746
         #endregion Model
742
 
747
 
743
     }
748
     }

+ 3 - 3
CallCenterCommon/CallCenter.Utility/NPOI/NPOIHelper.cs

3744
                 table.GetRow(5).GetCTRow().AddNewTrPr().AddNewTrHeight().val = (ulong)2000;
3744
                 table.GetRow(5).GetCTRow().AddNewTrPr().AddNewTrHeight().val = (ulong)2000;
3745
                 table.GetRow(5).MergeCells(1, 7);//合并列
3745
                 table.GetRow(5).MergeCells(1, 7);//合并列
3746
                 table.GetRow(5).GetCell(0).SetParagraph(GetParagraph(table, true, "调度意见"));
3746
                 table.GetRow(5).GetCell(0).SetParagraph(GetParagraph(table, true, "调度意见"));
3747
-                table.GetRow(5).GetCell(1).SetParagraph(GetParagraph(table, false, "请于1小时内与来电人取得联系(匿名除外),并于7个工作日内将办理情况反馈来电人,并将办理结果报市长便民公开电话受理中心,同时做好来电人信息保密工作。(若超期将进行通报;若无故不回复,将转交市委市政府督查局。)", false));
3747
+                table.GetRow(5).GetCell(1).SetParagraph(GetParagraph(table, false, "请按领导批示认真调查处理并答复来电人,在5个工作日内通过网络反馈市市长热线办公室。要求注明主办人、主管领导姓名和联系电话,同时提供有关处理依据。", false));
3748
                 //第七行
3748
                 //第七行
3749
                 table.GetRow(6).GetCTRow().AddNewTrPr().AddNewTrHeight().val = (ulong)1500;
3749
                 table.GetRow(6).GetCTRow().AddNewTrPr().AddNewTrHeight().val = (ulong)1500;
3750
                 table.GetRow(6).MergeCells(1, 7);//合并列
3750
                 table.GetRow(6).MergeCells(1, 7);//合并列
3751
                 table.GetRow(6).GetCell(0).SetParagraph(GetParagraph(table, true, "承办意见"));
3751
                 table.GetRow(6).GetCell(0).SetParagraph(GetParagraph(table, true, "承办意见"));
3752
-                table.GetRow(6).GetCell(1).SetParagraph(GetParagraph(table, false, "请于1小时内与来电人取得联系(匿名除外),并于7个工作日内将办理情况反馈来电人,并将办理结果报市长便民公开电话受理中心,同时做好来电人信息保密工作。(若超期将进行通报;若无故不回复,将转交市委市政府督查局。)", false));
3752
+                table.GetRow(6).GetCell(1).SetParagraph(GetParagraph(table, false, "请按领导批示认真调查处理并答复来电人,在5个工作日内通过网络反馈市市长热线办公室。要求注明主办人、主管领导姓名和联系电话,同时提供有关处理依据。", false));
3753
                 //第八行
3753
                 //第八行
3754
                 table.GetRow(7).GetCTRow().AddNewTrPr().AddNewTrHeight().val = (ulong)1500;
3754
                 table.GetRow(7).GetCTRow().AddNewTrPr().AddNewTrHeight().val = (ulong)1500;
3755
                 table.GetRow(7).MergeCells(1, 7);//合并列
3755
                 table.GetRow(7).MergeCells(1, 7);//合并列
3756
                 table.GetRow(7).GetCell(0).SetParagraph(GetParagraph(table, true, "领导批示"));
3756
                 table.GetRow(7).GetCell(0).SetParagraph(GetParagraph(table, true, "领导批示"));
3757
-                table.GetRow(7).GetCell(1).SetParagraph(GetParagraph(table, false, "请于1小时内与来电人取得联系(匿名除外),并于7个工作日内将办理情况反馈来电人,并将办理结果报市长便民公开电话受理中心,同时做好来电人信息保密工作。(若超期将进行通报;若无故不回复,将转交市委市政府督查局。)", false));
3757
+                table.GetRow(7).GetCell(1).SetParagraph(GetParagraph(table, false, "请按领导批示认真调查处理并答复来电人,在5个工作日内通过网络反馈市市长热线办公室。要求注明主办人、主管领导姓名和联系电话,同时提供有关处理依据。", false));
3758
                 //第九行
3758
                 //第九行
3759
                 table.GetRow(8).GetCTRow().AddNewTrPr().AddNewTrHeight().val = (ulong)2000;
3759
                 table.GetRow(8).GetCTRow().AddNewTrPr().AddNewTrHeight().val = (ulong)2000;
3760
                 table.GetRow(8).MergeCells(1, 7);//合并列
3760
                 table.GetRow(8).MergeCells(1, 7);//合并列