Przeglądaj źródła

根据息县提出问题调整

zhengbingbing 7 lat temu
rodzic
commit
ca316aa715

+ 25 - 7
codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/callout/CallOutPlanController.cs

756
             return Success("获取成功", obj);
756
             return Success("获取成功", obj);
757
         }
757
         }
758
         //获取我的任务列表
758
         //获取我的任务列表
759
-        public ActionResult GetMyTaskList(string key, int pagesize = 10, int pageindex = 1)
759
+        public ActionResult GetMyTaskList(string key, string sdate, string edate, int pagesize = 10, int pageindex = 1)
760
         {
760
         {
761
             StringBuilder sb = new StringBuilder();
761
             StringBuilder sb = new StringBuilder();
762
             int userid = CurrentUser.UserData.F_UserId;
762
             int userid = CurrentUser.UserData.F_UserId;
763
+            #region 条件查询
764
+            if (!string.IsNullOrWhiteSpace(sdate))
765
+                sb.Append(" and DATEDIFF(day,ExpandDatField1,'" + sdate.Trim() + "')<=0");
766
+            if (!string.IsNullOrWhiteSpace(edate))
767
+                sb.Append(" and DATEDIFF(day,ExpandDatField1,'" + edate.Trim() + "')>=0");
763
             sb.Append(" and F_UserId=" + userid);
768
             sb.Append(" and F_UserId=" + userid);
764
             sb.Append(" and F_DeleteFlag=0 ");
769
             sb.Append(" and F_DeleteFlag=0 ");
765
             //sb.Append(" and isnull(F_HJJGName,'')!='正常接通' and isnull(F_YHFKName,'')!='已同意'");
770
             //sb.Append(" and isnull(F_HJJGName,'')!='正常接通' and isnull(F_YHFKName,'')!='已同意'");
776
             //    sqlwhere = " and F_TaskName like '%" + key + "%' or F_TaskRemark like '%" + key + "%' ";
781
             //    sqlwhere = " and F_TaskName like '%" + key + "%' or F_TaskRemark like '%" + key + "%' ";
777
             //}
782
             //}
778
             //sb.Append(" and F_TaskID in (select F_TaskID from T_Call_OutTask where F_IsStart=1 and F_DeleteFlag=0 " + sqlwhere + ") ");
783
             //sb.Append(" and F_TaskID in (select F_TaskID from T_Call_OutTask where F_IsStart=1 and F_DeleteFlag=0 " + sqlwhere + ") ");
784
+            #endregion
779
             var recordCount = 0;
785
             var recordCount = 0;
780
             var dt = BLL.PagerBLL.GetListPager(
786
             var dt = BLL.PagerBLL.GetListPager(
781
                     "T_Call_OutTaskTelNum",
787
                     "T_Call_OutTaskTelNum",
782
                     "F_Id",
788
                     "F_Id",
783
                     "*",
789
                     "*",
784
                     sb.ToString(),
790
                     sb.ToString(),
785
-                    "ORDER BY F_Id desc",
791
+                    "ORDER BY ExpandDatField1 asc,F_Id desc",//ExpandDatField1 asc 调查时间正序 id倒序
786
                     pagesize,
792
                     pagesize,
787
                     pageindex,
793
                     pageindex,
788
                     true,
794
                     true,
796
             return Content(obj.ToJson());
802
             return Content(obj.ToJson());
797
         }
803
         }
798
         //获取我的任务结果
804
         //获取我的任务结果
799
-        public ActionResult GetMyResultList(string key, int hjjgid = 0, int yhfkid = 0, int pagesize = 10, int pageindex = 1)
805
+        public ActionResult GetMyResultList(string key, string sdate, string edate, int hjjgid = 0, int yhfkid = 0, int pagesize = 10, int pageindex = 1)
800
         {
806
         {
801
             StringBuilder sb = new StringBuilder();
807
             StringBuilder sb = new StringBuilder();
802
             int userid = CurrentUser.UserData.F_UserId;
808
             int userid = CurrentUser.UserData.F_UserId;
809
+            #region 条件查询
803
             sb.Append(" and F_UserId=" + userid);
810
             sb.Append(" and F_UserId=" + userid);
804
-            sb.Append(" and F_DeleteFlag=0 ");
811
+            sb.Append(" and F_DeleteFlag=0 ");            
812
+            if (!string.IsNullOrWhiteSpace(sdate))
813
+                sb.Append(" and DATEDIFF(day,ExpandDatField1,'" + sdate.Trim() + "')<=0");
814
+            if (!string.IsNullOrWhiteSpace(edate))
815
+                sb.Append(" and DATEDIFF(day,ExpandDatField1,'" + edate.Trim() + "')>=0");
805
             if (hjjgid != 0)
816
             if (hjjgid != 0)
806
             {
817
             {
807
                 sb.Append(" and F_HJJGId=" + hjjgid);
818
                 sb.Append(" and F_HJJGId=" + hjjgid);
824
             //    sqlwhere = " and F_TaskName like '%" + key + "%' or F_TaskRemark like '%" + key + "%' ";
835
             //    sqlwhere = " and F_TaskName like '%" + key + "%' or F_TaskRemark like '%" + key + "%' ";
825
             //}
836
             //}
826
             //sb.Append(" and F_TaskID in (select F_TaskID from T_Call_OutTask where F_IsStart=1 and F_DeleteFlag=0 " + sqlwhere + ") ");
837
             //sb.Append(" and F_TaskID in (select F_TaskID from T_Call_OutTask where F_IsStart=1 and F_DeleteFlag=0 " + sqlwhere + ") ");
838
+            #endregion
827
             var recordCount = 0;
839
             var recordCount = 0;
828
             var dt = BLL.PagerBLL.GetListPager(
840
             var dt = BLL.PagerBLL.GetListPager(
829
                     "T_Call_OutTaskTelNum",
841
                     "T_Call_OutTaskTelNum",
830
                     "F_Id",
842
                     "F_Id",
831
                     "*",
843
                     "*",
832
                     sb.ToString(),
844
                     sb.ToString(),
833
-                    "ORDER BY F_Id desc",
845
+                    "ORDER BY ExpandDatField1 desc,F_Id desc",//ExpandDatField1 调查时间倒序,id倒序
834
                     pagesize,
846
                     pagesize,
835
                     pageindex,
847
                     pageindex,
836
                     true,
848
                     true,
856
             return Content(obj.ToJson());
868
             return Content(obj.ToJson());
857
         }
869
         }
858
         //获取总体任务结果
870
         //获取总体任务结果
859
-        public ActionResult GetResultList(string key, int userid = 0, int hjjgid = 0, int yhfkid = 0, int pagesize = 10, int pageindex = 1)
871
+        public ActionResult GetResultList(string key, string sdate, string edate, int userid = 0, int hjjgid = 0, int yhfkid = 0, int pagesize = 10, int pageindex = 1)
860
         {
872
         {
861
             StringBuilder sb = new StringBuilder();
873
             StringBuilder sb = new StringBuilder();
874
+            #region 条件查询
862
             sb.Append(" and F_DeleteFlag=0 ");
875
             sb.Append(" and F_DeleteFlag=0 ");
876
+            if (!string.IsNullOrWhiteSpace(sdate))
877
+                sb.Append(" and DATEDIFF(day,ExpandDatField1,'" + sdate.Trim() + "')<=0");
878
+            if (!string.IsNullOrWhiteSpace(edate))
879
+                sb.Append(" and DATEDIFF(day,ExpandDatField1,'" + edate.Trim() + "')>=0");
863
             if (userid != 0)
880
             if (userid != 0)
864
             {
881
             {
865
                 sb.Append(" and F_UserId=" + userid);
882
                 sb.Append(" and F_UserId=" + userid);
886
             //    sqlwhere = " and F_TaskName like '%" + key + "%' or F_TaskRemark like '%" + key + "%' ";
903
             //    sqlwhere = " and F_TaskName like '%" + key + "%' or F_TaskRemark like '%" + key + "%' ";
887
             //}
904
             //}
888
             //sb.Append(" and F_TaskID in (select F_TaskID from T_Call_OutTask where F_IsStart=1 and F_DeleteFlag=0 " + sqlwhere + ") ");
905
             //sb.Append(" and F_TaskID in (select F_TaskID from T_Call_OutTask where F_IsStart=1 and F_DeleteFlag=0 " + sqlwhere + ") ");
906
+            #endregion
889
             var recordCount = 0;
907
             var recordCount = 0;
890
             var dt = BLL.PagerBLL.GetListPager(
908
             var dt = BLL.PagerBLL.GetListPager(
891
                     "T_Call_OutTaskTelNum",
909
                     "T_Call_OutTaskTelNum",
892
                     "F_Id",
910
                     "F_Id",
893
                     "*",
911
                     "*",
894
                     sb.ToString(),
912
                     sb.ToString(),
895
-                    "ORDER BY F_Id desc",
913
+                    "ORDER BY ExpandDatField1 desc,F_Id desc",//ExpandDatField1 调查时间倒序,id倒序
896
                     pagesize,
914
                     pagesize,
897
                     pageindex,
915
                     pageindex,
898
                     true,
916
                     true,

+ 10 - 3
codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/report/CallOutReportController.cs

79
                             {
79
                             {
80
                                 if (num > 0)
80
                                 if (num > 0)
81
                                 {
81
                                 {
82
-                                    dr["bili"] = (num / totalnum * 100).ToString() + "%";
82
+                                    dr["bili"] = Math.Round(Convert.ToDecimal(Convert.ToDecimal(num) / totalnum * 100), 1).ToString() + "%";
83
                                 }
83
                                 }
84
                                 else
84
                                 else
85
                                 {
85
                                 {
88
                             }
88
                             }
89
                             else
89
                             else
90
                             { dr["bili"] = "0"; }
90
                             { dr["bili"] = "0"; }
91
-                            
91
+
92
                             dtnew.Rows.Add(dr);
92
                             dtnew.Rows.Add(dr);
93
                         }
93
                         }
94
                     }
94
                     }
95
-
95
+                    #region 总计
96
+                    DataRow drzj = dtnew.NewRow();
97
+                    drzj["wenti"] = "总计";
98
+                    drzj["xuanxiang"] = "";
99
+                    drzj["shuliang"] = totalnum;
100
+                    drzj["bili"] = "-";
101
+                    dtnew.Rows.Add(drzj);
102
+                    #endregion
96
                 }
103
                 }
97
             }
104
             }
98
             return Success("获取外呼任务报表数据成功", dtnew);
105
             return Success("获取外呼任务报表数据成功", dtnew);