duhongyu лет назад: 4
Родитель
Сommit
06ee2c4118

+ 1 - 2
CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/Assessment/DataAssessmentController.cs

@@ -271,7 +271,6 @@ namespace CallCenterApi.Interface.Controllers.Assessment
271 271
             Model.T_Sys_UserAccount userModel = userBLL.GetModel(userId);
272 272
             if (userModel == null)
273 273
                 return Error("权限不足!");
274
-              string sqlwhere = "";
275 274
             string strdate = ""; string edate = "";
276 275
             if (userModel.F_RoleCode == "WLDW")
277 276
                 deptid = userModel.F_DeptId;
@@ -293,7 +292,7 @@ namespace CallCenterApi.Interface.Controllers.Assessment
293 292
             }
294 293
             else
295 294
             {
296
-                edate = endtime.Value .ToString("yyyy-MM") + "-20 23:59:59";
295
+                edate = endtime.Value .ToString("yyyy-MM-dd")+" 23:59:59" ;
297 296
                 month = endtime.Value.Month.ToString();
298 297
             }
299 298
             #endregion

Разница между файлами не показана из-за своего большого размера
+ 88 - 54
CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/workorder/WorkOrderController.cs


+ 19 - 18
CallCenterCommon/CallCenter.Utility/word/ExportWord.cs

@@ -104,16 +104,16 @@ public class ExportWord
104 104
              newTable.Cell(1, 2).Merge(newTable.Cell(1, 5));
105 105
              newTable.Cell(1, 2).Merge(newTable.Cell(2, 5));
106 106
 
107
-             newTable.Cell(1, 5).Range.Text = "工单来源";
108
-             newTable.Cell(1, 5).Merge(newTable.Cell(1, 6));
109
-             newTable.Cell(1, 6).Range.Text = "";
110
-            newTable.Cell(1, 6).Merge(newTable.Cell(1, 7));
111
-             newTable.Cell(1, 7).Range.Text = "办理时限";
112
-            newTable.Cell(1, 7).Merge(newTable.Cell(1, 8));
113
-             newTable.Cell(1, 8).Range.Text = "";
114
-            newTable.Cell(1, 8).Merge(newTable.Cell(1, 9));
115
-             newTable.Cell(1, 9).Range.Text = "联系电话";
116
-            newTable.Cell(1, 9).Merge(newTable.Cell(1, 10));
107
+             newTable.Cell(1, 6).Range.Text = "工单来源";
108
+            
109
+             newTable.Cell(1, 7).Range.Text = "";
110
+          //  newTable.Cell(1, 6).Merge(newTable.Cell(1, 7));
111
+             newTable.Cell(1, 8).Range.Text = "办理时限";
112
+           // newTable.Cell(1, 7).Merge(newTable.Cell(1, 8));
113
+             newTable.Cell(1, 9).Range.Text = "";
114
+          //  newTable.Cell(1, 8).Merge(newTable.Cell(1, 9));
115
+             newTable.Cell(1, 10).Range.Text = "联系电话";
116
+           // newTable.Cell(1, 9).Merge(newTable.Cell(1, 10));
117 117
 
118 118
             // newTable.Cell(1, 9).Merge(newTable.Cell(3, 15));
119 119
             // newTable.Cell(1, 9).Select();//选中一行 
@@ -128,23 +128,24 @@ public class ExportWord
128 128
  
129 129
             // 填充表格内容 第二行
130 130
          
131
-             newTable.Cell(2, 5).Range.Text = "签收时间";
131
+             newTable.Cell(2, 6).Range.Text = "签收时间";
132 132
           
133
-             newTable.Cell(2, 4).Range.Text = "";
133
+             newTable.Cell(2, 7).Range.Text = "";
134 134
           
135
-             newTable.Cell(2, 5).Range.Text = "办理时间";
135
+             newTable.Cell(2, 8).Range.Text = "办理时间";
136 136
           
137
-             newTable.Cell(2, 6).Range.Text = "";
137
+             newTable.Cell(2, 9).Range.Text = "";
138 138
         
139
-            newTable.Cell(2, 7).Range.Text = "来电人";
139
+            newTable.Cell(2, 10).Range.Text = "来电人";
140 140
      
141 141
              //填充表格内容 第三行
142 142
             newTable.Cell(3, 1).Range.Text = "事项区域";
143
-            newTable.Cell(3, 2).Range.Text = "";
144
-            newTable.Cell(3, 2).Merge(newTable.Cell(3, 10));
143
+            newTable.Cell(3, 1).Merge(newTable.Cell(3, 3));
144
+            newTable.Cell(3, 4).Range.Text = "";
145
+            newTable.Cell(3, 4).Merge(newTable.Cell(3, 10));
145 146
              //填充表格内容 第四行
146 147
             newTable.Cell(4, 1).Range.Text = "内容摘要";
147
-             newTable.Cell(4, 1).Merge(newTable.Cell(7, 1));
148
+            newTable.Cell(4, 1).Merge(newTable.Cell(7, 1));
148 149
 
149 150
             newTable.Cell(4, 2).Range.Text ="";
150 151
             newTable.Cell(4, 2).Merge(newTable.Cell(4, 10));