ss

CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/workorder/WorkOrderController.cs

@@ -1251,7 +1251,8 @@ namespace CallCenterApi.Interface.Controllers.workorder
 
 
                         //  sql += " and F_WorkState in (" + (int)EnumWorkState.neworder + "," + (int)EnumWorkState.audit + "," + (int)EnumWorkState.resubmit + ") ";
-                        sql += "and F_WorkOrderID not in(select F_WorkOrderID from T_Bus_Feedback WITH(NOLOCK) where F_State=1 and F_IsDelete=0 and F_Type = 3 and F_IsAudit=1 ) ";
+                        sql += "and F_WorkOrderID not in(select F_WorkOrderId   from T_Bus_Feedback b where F_Id in (select MAX(F_Id) from T_Bus_Feedback where F_WorkOrderId in (select F_WorkOrderId from T_Bus_Feedback where F_WorkOrderId = b.F_WorkOrderId  group by F_WorkOrderId  ))  and F_State = 1 and F_IsDelete = 0 and F_Type = 3 and F_IsAudit = 1 ) ";
+                        sql += " and (F_WorkState in(1,11) or ( F_WorkState in (" + string.Join(",", sts.Select(p => p.ToString())) + ") and F_WorkOrderID in (select F_WorkOrderID from T_Bus_AssignedInfo WITH(NOLOCK) where F_State=1 and F_IsDelete=0 ";
                         sql += " and (F_WorkState in(1,11) or ( F_WorkState in (" + string.Join(",", sts.Select(p => p.ToString())) + ") and F_WorkOrderID in (select F_WorkOrderID from T_Bus_AssignedInfo WITH(NOLOCK) where F_State=1 and F_IsDelete=0 ";
                        
 
@@ -1463,6 +1464,11 @@ namespace CallCenterApi.Interface.Controllers.workorder
                        "F_IsRelease is null) ";
                     sql += " and F_WorkState=" + (int)EnumWorkState.submit;
                     sql += "and F_WorkOrderID in(select F_WorkOrderID from T_Bus_Feedback WITH(NOLOCK) where F_State=1 and F_IsDelete=0 and F_Type = 3 and F_IsAudit=1 ) ";
+
+                   
+
+
+
                     if (userModel.F_RoleCode != "GLY" && userModel.F_RoleCode != "ZXLD"&& userModel.F_RoleCode != "MTDD")
                     {
                         sql += " and F_CreateUser='" + userModel.F_UserCode + "'";
@@ -13629,8 +13635,6 @@ namespace CallCenterApi.Interface.Controllers.workorder
                                 modelT_Bus_VisitResult.F_IsDelete = 0;
                                 modelT_Bus_VisitResult.F_CreateUser = userModel.F_UserCode;
                                 modelT_Bus_VisitResult.F_CreateTime = DateTime.Now;
-
-
                                 if (modelT_Bus_AssignedInfo != null)
                                 {
                                     modelT_Bus_VisitResult.F_AssignedId = modelT_Bus_AssignedInfo.F_Id;
@@ -14787,12 +14791,11 @@ namespace CallCenterApi.Interface.Controllers.workorder
                             operBLL.Add(oper);
 
                             //推送消息表
-                            var users = userBLL.GetModelList(" F_DeptId='" + deptinfo.F_DeptId + "' ");
-
-                            foreach (var u in users)
-                            {
-                                msg.AddInternalMessagesInfo("工单消息", oper.F_Message + "，工单编号：" + oper.F_WorkOrderId, u.F_UserCode, userModel.F_UserCode, (int)EnumSmsType.workorder);
-                            }
+                            //var users = userBLL.GetModelList(" F_DeptId='" + deptinfo.F_DeptId + "' ");
+                            //foreach (var u in users)
+                            //{
+                            //    msg.AddInternalMessagesInfo("工单消息", oper.F_Message + "，工单编号：" + oper.F_WorkOrderId, u.F_UserCode, userModel.F_UserCode, (int)EnumSmsType.workorder);
+                            //}
                             #endregion
 
                             trans.Complete();

CallCenterCommon/CallCenter.Utility/word/ExportWord.cs

@@ -54,7 +54,6 @@ public class ExportWord
               WordApp.Selection.ParagraphFormat.Alignment = Microsoft.Office.Interop.Word.WdParagraphAlignment.wdAlignParagraphLeft;
               WordApp.Selection.Font.Size = 18f;
               object missing = System.Reflection.Missing.Value;
-              object count2 = 14;
               object WdLine2 = Microsoft.Office.Interop.Word.WdUnits.wdLine;//换一行;   
               WordApp.Selection.Text = "安 阳 市 12345 政 务 服 务 热 线 交 办 单";
               WordApp.Selection.ParagraphFormat.LineSpacingRule = Microsoft.Office.Interop.Word.WdLineSpacing.wdLineSpaceSingle;//单倍行距
@@ -66,20 +65,24 @@ public class ExportWord
               WordApp.Selection.ParagraphFormat.Alignment = Microsoft.Office.Interop.Word.WdParagraphAlignment.wdAlignParagraphLeft;
               WordApp.Selection.Font.Color = Microsoft.Office.Interop.Word.WdColor.wdColorBlack;
               //文档中创建表格 
-             Microsoft.Office.Interop.Word.Table newTable = WordDoc.Tables.Add(WordApp.Selection.Range, 19, 15, ref Nothing, ref Nothing);
+             Microsoft.Office.Interop.Word.Table newTable = WordDoc.Tables.Add(WordApp.Selection.Range, 19, 9, ref Nothing, ref Nothing);
              //设置表格样式 
              WordApp.Selection.ParagraphFormat.Alignment = Microsoft.Office.Interop.Word.WdParagraphAlignment.wdAlignParagraphCenter;//水平居中 
              //设置表格框
-            newTable.Borders.OutsideLineStyle = Microsoft.Office.Interop.Word.WdLineStyle.wdLineStyleSingle;
+           // newTable.Borders.OutsideLineStyle = Microsoft.Office.Interop.Word.WdLineStyle.wdLineStyleSingle;
          
             for (int i = 1; i < 10; i ++)
             {
-            newTable.Columns[i].Width = 15f;
-            }
+            newTable.Columns[i].Width = 60f;
+          }
+            for (int i=1;i<19;i++)
+          {
+            newTable.Rows[i].Height = 30f;
+          }
             //表格外线
         newTable.Borders.OutsideLineStyle = Microsoft.Office.Interop.Word.WdLineStyle.wdLineStyleSingle;
         //表格内线
-        newTable.Borders.OutsideLineStyle = Microsoft.Office.Interop.Word.WdLineStyle.wdLineStyleSingle;
+        newTable.Borders.InsideLineStyle = Microsoft.Office.Interop.Word.WdLineStyle.wdLineStyleSingle;
         ////填充表格内容 
         //for (int k = 1; k< 19; k++)
         //     {
@@ -98,22 +101,19 @@ public class ExportWord
             //填充表格内容 第一行
              newTable.Cell(1, 1).Range.Text = "事项编号";
            //合并单元格 
-             newTable.Cell(1, 1).Merge(newTable.Cell(1, 2));
-             newTable.Cell(1, 1).Merge(newTable.Cell(2, 2));
+            // newTable.Cell(1, 1).Merge(newTable.Cell(1, 1));
+             newTable.Cell(1, 1).Merge(newTable.Cell(2, 1));
              newTable.Cell(1, 2).Range.Text ="";//工单编号
-             newTable.Cell(1, 2).Merge(newTable.Cell(1, 5));
-             newTable.Cell(1, 2).Merge(newTable.Cell(2, 5));
-
-             newTable.Cell(1, 6).Range.Text = "工单来源";
-            
-             newTable.Cell(1, 7).Range.Text = "";
-          //  newTable.Cell(1, 6).Merge(newTable.Cell(1, 7));
-             newTable.Cell(1, 8).Range.Text = "办理时限";
-           // newTable.Cell(1, 7).Merge(newTable.Cell(1, 8));
-             newTable.Cell(1, 9).Range.Text = "";
-          //  newTable.Cell(1, 8).Merge(newTable.Cell(1, 9));
-             newTable.Cell(1, 10).Range.Text = "联系电话";
-           // newTable.Cell(1, 9).Merge(newTable.Cell(1, 10));
+             newTable.Cell(1, 2).Merge(newTable.Cell(2, 3));
+             newTable.Cell(1, 3).Range.Text = "工单来源";
+            // newTable.Cell(1, 3).Merge(newTable.Cell(1, 4));
+             newTable.Cell(1, 4).Range.Text = "";
+           //  newTable.Cell(1, 4).Merge(newTable.Cell(1, 5));
+             newTable.Cell(1, 5).Range.Text = "办理时限";
+           //  newTable.Cell(1, 5).Merge(newTable.Cell(1, 6));
+             newTable.Cell(1, 6).Range.Text = "";
+           //  newTable.Cell(1, 6).Merge(newTable.Cell(1, 7));
+             newTable.Cell(1, 7).Range.Text = "联系电话";
 
             // newTable.Cell(1, 9).Merge(newTable.Cell(3, 15));
             // newTable.Cell(1, 9).Select();//选中一行 
@@ -128,64 +128,59 @@ public class ExportWord
  
             // 填充表格内容 第二行
          
-             newTable.Cell(2, 6).Range.Text = "签收时间";
+             newTable.Cell(2, 3).Range.Text = "签收时间";
           
-             newTable.Cell(2, 7).Range.Text = "";
+             newTable.Cell(2, 4).Range.Text = "";
           
-             newTable.Cell(2, 8).Range.Text = "办理时间";
+             newTable.Cell(2, 5).Range.Text = "办理时间";
           
-             newTable.Cell(2, 9).Range.Text = "";
+             newTable.Cell(2, 6).Range.Text = "";
         
-            newTable.Cell(2, 10).Range.Text = "来电人";
-     
-             //填充表格内容 第三行
-            newTable.Cell(3, 1).Range.Text = "事项区域";
-            newTable.Cell(3, 1).Merge(newTable.Cell(3, 3));
-            newTable.Cell(3, 4).Range.Text = "";
-            newTable.Cell(3, 4).Merge(newTable.Cell(3, 10));
+            newTable.Cell(2, 7).Range.Text = "来电人";
+        //填充表格内容 第三行
+           newTable.Cell(3, 1).Range.Text = "事项区域";
+           // newTable.Cell(3, 1).Merge(newTable.Cell(3, 3));
+            newTable.Cell(3, 2).Range.Text = "";
+            newTable.Cell(3, 2).Merge(newTable.Cell(3, 9));
              //填充表格内容 第四行
             newTable.Cell(4, 1).Range.Text = "内容摘要";
             newTable.Cell(4, 1).Merge(newTable.Cell(7, 1));
-
             newTable.Cell(4, 2).Range.Text ="";
-            newTable.Cell(4, 2).Merge(newTable.Cell(4, 10));
+            newTable.Cell(4, 2).Merge(newTable.Cell(7, 9));
             
-            newTable.Cell(7, 2).Merge(newTable.Cell(7, 10));
-            newTable.Cell(8, 1).Range.Text = "承办单位";
-           
+           newTable.Cell(8, 1).Range.Text = "承办单位";
            newTable.Cell(8, 2).Range.Text = "";
-           newTable.Cell(8, 2).Merge(newTable.Cell(8, 5));
-           newTable.Cell(8, 6).Range.Text = "协办单位";
-          // newTable.Cell(9, 5).Merge(newTable.Cell(9, 6));
-           newTable.Cell(8, 7).Range.Text = "";
-           newTable.Cell(8, 7).Merge(newTable.Cell(8, 10));
+           newTable.Cell(8, 2).Merge(newTable.Cell(8, 4));
+           newTable.Cell(8, 3).Range.Text = "协办单位";
+           newTable.Cell(8, 4).Range.Text = "";
+          // newTable.Cell(8, 7).Merge(newTable.Cell(8, 9));
 
         newTable.Cell(9, 1).Range.Text = "调度意见";
         newTable.Cell(9, 1).Merge(newTable.Cell(11, 1));
       
         newTable.Cell(9, 2).Range.Text = "";
-        newTable.Cell(9, 2).Merge(newTable.Cell(9, 10));
+        newTable.Cell(9, 2).Merge(newTable.Cell(11, 9));
      //   newTable.Cell(10, 2).Merge(newTable.Cell(10, 10));
-        newTable.Cell(11, 2).Merge(newTable.Cell(11, 10));
+       // newTable.Cell(11, 2).Merge(newTable.Cell(11, 7));
         newTable.Cell(12, 1).Range.Text = "承办意见";
         newTable.Cell(12, 1).Merge(newTable.Cell(13, 1));
         newTable.Cell(12, 2).Range.Text = "";
-        newTable.Cell(12, 2).Merge(newTable.Cell(12, 10));
-        newTable.Cell(13, 2).Merge(newTable.Cell(13, 10));
+        newTable.Cell(12, 2).Merge(newTable.Cell(13, 9));
+       // newTable.Cell(13, 2).Merge(newTable.Cell(13, 7));
         
         newTable.Cell(14, 1).Range.Text = "领导批示";
         newTable.Cell(14, 1).Merge(newTable.Cell(15, 1));
         newTable.Cell(14, 2).Range.Text = "";
-        newTable.Cell(14, 2).Merge(newTable.Cell(14, 10));
-        newTable.Cell(15, 2).Merge(newTable.Cell(15, 10));
+        newTable.Cell(14, 2).Merge(newTable.Cell(15, 9));
+        //newTable.Cell(15, 2).Merge(newTable.Cell(15, 7));
 
         newTable.Cell(16, 1).Range.Text = "处理结果";
         newTable.Cell(16, 1).Merge(newTable.Cell(18, 1));
    
         newTable.Cell(16, 2).Range.Text = "";
-        newTable.Cell(16, 2).Merge(newTable.Cell(16, 10));
+        newTable.Cell(16, 2).Merge(newTable.Cell(18, 9));
       //  newTable.Cell(17, 2).Merge(newTable.Cell(17, 10));
-        newTable.Cell(18, 2).Merge(newTable.Cell(18, 10));
+       // newTable.Cell(18, 2).Merge(newTable.Cell(18, 7));
         object unite = MSWord.WdUnits.wdStory;
         WordApp.Selection.EndKey(ref unite, ref Nothing); //将光标移动到文档末尾
         WordDoc.Content.InsertAfter("联系电话：" + ""+"                        "