调整外呼计划和工单

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/callout/CallOutPlanController.cs

@@ -692,7 +692,8 @@ namespace CallCenterApi.Interface.Controllers.callout
                     if (cusmodel != null)
                     {
                         taskmodel.F_CusID = model.F_CusID.Value;//客户id                
-                        taskmodel.F_CityID = cusmodel.F_CityID.Value;//乡镇id                
+                        taskmodel.F_CityID = cusmodel.F_CityID.Value;//乡镇id 
+                        taskmodel.F_Address = cusmodel.F_Address;//住址
                         taskmodel.F_CusName = cusmodel.F_CustomerName;//客户姓名                
                         taskmodel.F_Phone = cusmodel.F_Telephone;//号码                
                         taskmodel.F_Telephone = cusmodel.F_Mobile;//手机号码        
@@ -884,6 +885,7 @@ namespace CallCenterApi.Interface.Controllers.callout
                         taskmodel.F_Phone = cusmodel.F_Telephone;//号码                
                         taskmodel.F_Telephone = cusmodel.F_Mobile;//手机号码        
                         taskmodel.F_City = cusmodel.F_City;//乡镇   
+                        taskmodel.F_Address = cusmodel.F_Address;//住址
                     }
                 }
                 taskmodel.F_Id = model.F_Id;//号码id

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/report/CallOutReportController.cs

@@ -306,8 +306,8 @@ namespace CallCenterApi.Interface.Controllers.report
             #endregion
             #region 根据问题id获取问题的查询条件
             string sqlques = "F_QuestionId IN (select ta.F_QuestionId from  T_Ask_PagerItems ta where ta.F_PagerId=(select F_PagerID from T_Call_OutTask where isnull(F_TaskID,'')='" + TaskID + "') ) and F_Type!=1";
-            if (!string.IsNullOrWhiteSpace(quesid))
-                sqlques = "F_QuestionId=" + quesid;
+            //if (!string.IsNullOrWhiteSpace(quesid))
+            //    sqlques = "F_QuestionId=" + quesid;
             #endregion
             
             var queslist = questionBLL.GetModelList(sqlques);
@@ -317,24 +317,31 @@ namespace CallCenterApi.Interface.Controllers.report
                 {
                     DataRow dr = dtCol.NewRow();
                     dr["wenti"] = itemquestion.F_Title;
-
-                    //根据问题ID查询问题项
-                    var dsi = questionItemBLL.GetModelList(" isnull(F_QuestionId,'') = '" + itemquestion.F_QuestionId + "' ");
-                    if (dsi.Count > 0)
+                    if (itemquestion.F_QuestionId.ToString().Equals(quesid))
                     {
-                        foreach (var itemqi in dsi)
+                        //根据问题ID查询问题项
+                        var dsi = questionItemBLL.GetModelList(" isnull(F_QuestionId,'') = '" + itemquestion.F_QuestionId + "' ");
+                        if (dsi.Count > 0)
                         {
-                            if (itemquestion.F_QuestionId.ToString().Equals(quesid))
+                            foreach (var itemqi in dsi)
                             {
                                 arlist.Add(itemqi.F_ItemName);
                                 columnsnum++;
                             }
-                            else
+                            dr["fenxiangshu"] = dsi.Count;
+                        }
+                    }
+                    else
+                    {
+                        //根据问题ID查询问题项
+                        var dsi = questionItemBLL.GetModelList(" isnull(F_QuestionId,'') = '" + itemquestion.F_QuestionId + "' ");
+                        if (dsi.Count > 0)
+                        {
+                            foreach (var itemqi in dsi)
                             {
                                 checklist.Add(itemqi.F_ItemName);
                             }
                         }
-                        dr["fenxiangshu"] = dsi.Count;
                     }
                     dr["wentiid"] = quesid;
                     dtCol.Rows.Add(dr);
@@ -393,7 +400,8 @@ namespace CallCenterApi.Interface.Controllers.report
                     int num = 0;
                      totalnum = ansBLL.GetRecordCount(sqlans + "  and isnull(F_QIID,'')='" + dtCol.Rows[m]["wentiid"].ToString() + "' ");
 
-                    int fenxiang = Convert.ToInt32(dtCol.Rows[m]["fenxiangshu"].ToString());
+                    string fenxiangshu = dtCol.Rows[m]["fenxiangshu"].ToString();
+                    int fenxiang = fenxiangshu == "" ? 0 : Convert.ToInt32(fenxiangshu);
                     len = len + fenxiang;
                     while (n < len)
                     {

codegit/CallCenterApi/CallCenterApi.Model/T_Wo_WorkOrder.cs

@@ -450,6 +450,70 @@ namespace CallCenterApi.Model
             set { _unit = value; }
             get { return _unit; }
         }
+
+        #region 息县调查需要字段
+        //20180502 zhengbingbing
+        //        工单编号
+        //工单来源 Source
+        //工单状态 State
+        //姓 名 Customer
+        //电 话 CustomerTel
+        //调查时间 InqTime
+        //调查员  InqUser
+        //信息分类 InfoType
+        //交办单位 Unit
+        //县镇 country
+        //住 址 Address
+        //反映问题：问题里不安全、不满意原因；多选题和选中答案直接同步过来 Detail(工单内容)
+        //问题处理情况 Clcontent
+        //回访反馈情况 Answer
+        //备注 Remark
+        //调查对象签字
+        //调查人签字
+        //回访人签字
+        private DateTime? _inqtime;
+        private string _inquser;
+        private string _remark;
+
+        /// <summary>
+        /// 调查时间
+        /// </summary>
+        public DateTime? Inqtime
+        {
+            get
+            {
+                return _inqtime;
+            }
+
+            set
+            {
+                _inqtime = value;
+            }
+        }
+        /// <summary>
+        /// 调查员
+        /// </summary>
+        public string Inquser
+        {
+            get
+            {
+                return _inquser;
+            }
+
+            set
+            {
+                _inquser = value;
+            }
+        }
+        /// <summary>
+        /// 备注
+        /// </summary>
+        public string Remark
+        {
+            get{ return _remark; }
+            set{ _remark = value; }
+        }
+        #endregion
         #endregion Model
 
     }