zhoufan 7 yıl önce
ebeveyn
işleme
bbf3afdcfa

+ 4 - 1
1.代码/XKPCallCenter/XKPCallCenter.Common/CSVFileHelper.cs

369
                 string exeContent = "";
369
                 string exeContent = "";
370
                 string msgParams = "";
370
                 string msgParams = "";
371
                 string msgContent = "";
371
                 string msgContent = "";
372
+                string msgReplace = "";
372
                 int numCol = 0;//标志第几列为号码列
373
                 int numCol = 0;//标志第几列为号码列
373
                 int sCount = 0;//有效的数量
374
                 int sCount = 0;//有效的数量
374
                 int fCount = 0;//无效的数量 
375
                 int fCount = 0;//无效的数量 
454
                     ScriptConverter converter = new ScriptConverter();
455
                     ScriptConverter converter = new ScriptConverter();
455
                     converter.Converte(aryline, param[1], ref exeContent);
456
                     converter.Converte(aryline, param[1], ref exeContent);
456
                     converter.Converte(aryline, param[1], ref msgContent);
457
                     converter.Converte(aryline, param[1], ref msgContent);
458
+                    converter.GetReplace(aryline, param[1], ref msgReplace);
457
                     #endregion
459
                     #endregion
458
                     #region 新增列内容
460
                     #region 新增列内容
459
                     mydr[intColCount] = param[4];//任务Id
461
                     mydr[intColCount] = param[4];//任务Id
462
                     mydr[intColCount + 3] = 0;//执行次数
464
                     mydr[intColCount + 3] = 0;//执行次数
463
                     mydr[intColCount + 4] = exeContent;//执行内容
465
                     mydr[intColCount + 4] = exeContent;//执行内容
464
                     mydr[intColCount + 5] = msgContent;//短信内容 
466
                     mydr[intColCount + 5] = msgContent;//短信内容 
465
-                    mydr[intColCount + 6] = msgParams.Substring(0, msgParams.Length-1);//短信参数 
467
+                    //mydr[intColCount + 6] = msgParams.Substring(0, msgParams.Length-1);//短信参数 
468
+                    mydr[intColCount + 6] = msgReplace;//短信参数 
466
                     #endregion
469
                     #endregion
467
                     mycsvdt.Rows.Add(mydr);
470
                     mycsvdt.Rows.Add(mydr);
468
                 }
471
                 }

+ 29 - 0
1.代码/XKPCallCenter/XKPCallCenter.Common/ScriptConverter.cs

49
         }
49
         }
50
 
50
 
51
         /// <summary>
51
         /// <summary>
52
+        /// 获取替换参数
53
+        /// </summary>
54
+        /// <param name="datas"></param>
55
+        /// <param name="script"></param>
56
+        /// <param name="content"></param>
57
+        /// <returns></returns>
58
+        public emResScriptConverte GetReplace(string[] datas, string script, ref string content)
59
+        {
60
+            content = string.Empty;
61
+            //定义正则表达式规则
62
+            Regex reg = new Regex(@"(\$[SMND]\d\$)|(\$\$)");
63
+            //返回一个结果集
64
+            MatchCollection result = reg.Matches(script);
65
+
66
+            //遍历每个结果
67
+            foreach (Match m in result)
68
+            {
69
+                int dataIdx = Int32.Parse(m.ToString().Substring(2, 1));
70
+                if (dataIdx <= datas.Length - 1)
71
+                {
72
+                    //输出结果
73
+                    content = content + datas[Int32.Parse(m.ToString().Substring(2, 1))] + ",";
74
+                }
75
+            }
76
+            content = content.Substring(0, content.Length - 1);
77
+            return emResScriptConverte.OK;
78
+        }
79
+
80
+        /// <summary>
52
         /// 测试脚本是否正确
81
         /// 测试脚本是否正确
53
         /// </summary>
82
         /// </summary>
54
         /// <returns>true,正确;false,错误</returns>
83
         /// <returns>true,正确;false,错误</returns>

+ 2 - 2
1.代码/XKPCallCenter/XKPCallCenter.Web/NewTaskManage/showtask.aspx

101
                                 var arr = new Array();
101
                                 var arr = new Array();
102
                                 var i = 0;
102
                                 var i = 0;
103
                                 for (var i = 0; i < rows.length; i++) {
103
                                 for (var i = 0; i < rows.length; i++) {
104
-                                    arr[i] = rows[i]._任务id;
104
+                                    arr[i] = rows[i]._id;
105
                                 }
105
                                 }
106
                                 $.post("ajax/tasklist.ashx?action=stop&arrid=" + arr.toString(), function (data) {
106
                                 $.post("ajax/tasklist.ashx?action=stop&arrid=" + arr.toString(), function (data) {
107
                                     if (data == "success") {
107
                                     if (data == "success") {
140
                                 var arr = new Array();
140
                                 var arr = new Array();
141
                                 var i = 0;
141
                                 var i = 0;
142
                                 for (var i = 0; i < rows.length; i++) {
142
                                 for (var i = 0; i < rows.length; i++) {
143
-                                    arr[i] = rows[i]._任务id;
143
+                                    arr[i] = rows[i]._id;
144
                                 }
144
                                 }
145
                                 $.post("ajax/tasklist.ashx?action=start&arrid=" + arr.toString(), function (data) {
145
                                 $.post("ajax/tasklist.ashx?action=start&arrid=" + arr.toString(), function (data) {
146
                                     if (data == "success") {
146
                                     if (data == "success") {

+ 3 - 3
1.代码/XKPCallCenter/XKPCallCenter.Web/NewTaskManage/tasklist.aspx

200
                                 var arr = new Array();
200
                                 var arr = new Array();
201
                                 var i = 0;
201
                                 var i = 0;
202
                                 for (var i = 0; i < rows.length; i++) {
202
                                 for (var i = 0; i < rows.length; i++) {
203
-                                    arr[i] = rows[i]._任务id;
203
+                                    arr[i] = rows[i]._id;
204
                                 }
204
                                 }
205
                                 $.post("ajax/tasklist.ashx?action=delete&arrid=" + arr.toString(), function (data) {
205
                                 $.post("ajax/tasklist.ashx?action=delete&arrid=" + arr.toString(), function (data) {
206
                                     if (data == "1") {
206
                                     if (data == "1") {
243
                                 var arr = new Array();
243
                                 var arr = new Array();
244
                                 var i = 0;
244
                                 var i = 0;
245
                                 for (var i = 0; i < rows.length; i++) {
245
                                 for (var i = 0; i < rows.length; i++) {
246
-                                    arr[i] = rows[i]._任务id;
246
+                                    arr[i] = rows[i]._id;
247
                                 }
247
                                 }
248
                                 $.post("ajax/tasklist.ashx?action=stop&arrid=" + arr.toString(), function (data) {
248
                                 $.post("ajax/tasklist.ashx?action=stop&arrid=" + arr.toString(), function (data) {
249
                                     if (data == "4") {
249
                                     if (data == "4") {
285
                                 var arr = new Array();
285
                                 var arr = new Array();
286
                                 var i = 0;
286
                                 var i = 0;
287
                                 for (var i = 0; i < rows.length; i++) {
287
                                 for (var i = 0; i < rows.length; i++) {
288
-                                    arr[i] = rows[i]._任务id;
288
+                                    arr[i] = rows[i]._id;
289
                                 }
289
                                 }
290
                                 $.post("ajax/tasklist.ashx?action=start&arrid=" + arr.toString(), function (data) {
290
                                 $.post("ajax/tasklist.ashx?action=start&arrid=" + arr.toString(), function (data) {
291
                                     if (data == "1") {
291
                                     if (data == "1") {

+ 1 - 1
1.代码/XKPCallCenter/XKPCallCenter.Web/NewTaskManage/templatelist.aspx

110
                                 var arr = new Array();
110
                                 var arr = new Array();
111
                                 var i = 0;
111
                                 var i = 0;
112
                                 for (var i = 0; i < rows.length; i++) {
112
                                 for (var i = 0; i < rows.length; i++) {
113
-                                    arr[i] = rows[i]._短信id;
113
+                                    arr[i] = rows[i]._id;
114
                                 }
114
                                 }
115
                                 $.post("ajax/template.ashx?action=delete&arrid=" + arr.toString(), function (data) {
115
                                 $.post("ajax/template.ashx?action=delete&arrid=" + arr.toString(), function (data) {
116
                                     if (data == "success") {
116
                                     if (data == "success") {