123

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/UserAccountController.cs

@@ -98,7 +98,7 @@ namespace CallCenterApi.Interface.Controllers
                         F_PId = x.F_PId,
                         F_TmId = x.F_TmId,
                         F_RoleName = x.F_RoleName,
-                        F_DeptName = x.F_DeptName,
+                        F_DeptName = GetDeptName(x.F_DeptId),
                         F_WorkNumber = x.F_WorkNumber,
                         //F_WXNo=x.F_WXNo,
                         F_AreaName = GetModelDeptName(x.F_DeptId),
@@ -138,6 +138,23 @@ namespace CallCenterApi.Interface.Controllers
             }
             return str;
         }
+        public string GetDeptName(int deptid)
+        {
+            string deptname = "";
+            string sql = " select(select  stuff((select '|' + F_DeptName from T_Sys_Department  where F_DeptId   in " +
+                "  (select col from dbo.SplitToNvarchar(a.F_DeptCode, '|')  ) for xml path('')),1,1,''))  deptname" +
+                $" from T_Sys_Department a where F_DeptId={deptid}";
+            object ob = DbHelperSQL.GetSingle(sql.ToString());
+            if (ob != null)
+            {
+                deptname = ob.ToString();
+                if (deptname.Contains("河南心连心化学工业集团股份有限公司|"))
+                {
+                    deptname = deptname.Replace("河南心连心化学工业集团股份有限公司|", "");
+                }
+            }
+            return deptname;
+        }
         /// <summary>
         /// 获取下一个工号
         /// </summary>

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/weixin/WxLoginController.cs

@@ -6969,7 +6969,7 @@ namespace CallCenterApi.Interface.Controllers.weixin
         /// <returns></returns>
 
         [WechatActionFilter]
-        public ActionResult BackWorkOrder(string OpenId, long orderid, string cont, int type = 0, int inoutflag = 1)
+        public ActionResult BackWorkOrder(string OpenId, long orderid, string cont, int type = 0, int inoutflag = 0)
         {//办理人员和监管可以退回工单
             if (!string.IsNullOrEmpty(OpenId))
             {

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/workorder/WorkOrderNewController.cs

@@ -1312,7 +1312,10 @@ namespace CallCenterApi.Interface.Controllers.workorder
                             #endregion
                         }
                         NPOIHelper npoi = new NPOIHelper();
-                        if (npoi.ExportToExcel("工单列表", dt) == "")
+                        string columnName = "实收返厂数量";
+                        int index = dt.Columns.IndexOf(columnName);
+                        int[] array = { index };
+                        if (npoi.ExportToExcel("工单列表", dt,null, array) == "")
                         {
                             return Success("导出成功");
                         }
@@ -4820,7 +4823,10 @@ namespace CallCenterApi.Interface.Controllers.workorder
                             #endregion
                         }
                         NPOIHelper npoi = new NPOIHelper();
-                        if (npoi.ExportToExcel("工单列表", dt) == "")
+                        string columnName = "实收返厂数量";
+                        int index = dt.Columns.IndexOf(columnName);
+                        int[] array = { index };
+                        if (npoi.ExportToExcel("工单列表", dt,null, array) == "")
                         {
                             return Success("导出成功");
                         }
@@ -10468,7 +10474,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
         /// <param name="input"></param>
         /// <returns></returns>
         [Authority]
-        public ActionResult BackWorkOrder(long orderid, string cont, int type = 0, int inoutflag = 1)
+        public ActionResult BackWorkOrder(long orderid, string cont, int type = 0, int inoutflag = 0)
         {//办理人员和监管可以退回工单
             int userId = CurrentUser.UserData.F_UserId;
             if (userId != 0)
@@ -11270,7 +11276,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 model.F_Sid = sid;
                 if (!string.IsNullOrEmpty(F_VisitRemarks))
                 {
-                    var VisitRemarks = nowUser.F_UserName + DateTime.Now.ToString("yyyy-MM-dd") + "  "+ F_VisitRemarks;
+                    var VisitRemarks = nowUser.F_UserName+"("+ nowUser .F_WorkNumber+ ")" + DateTime.Now.ToString("yyyy-MM-dd") + "  "+ F_VisitRemarks;
                     model.F_VisitRemarks = VisitRemarks;
                 }
                 workOrder.Update(model);

codegit/CallCenterCommon/CallCenter.Utility/NPOI/NPOIHelper.cs

@@ -9,6 +9,7 @@ using NPOI.SS.UserModel;
 using NPOI.SS.Util;
 using NPOI.XSSF.UserModel;
 using System.Collections.Generic;
+using System.Linq;
 
 namespace CallCenter.Utility
 {
@@ -115,7 +116,8 @@ namespace CallCenter.Utility
         /// <param name="Name"></param>
         /// <param name="dt"></param>
         /// <returns></returns>
-        public string ExportToExcel(string Name, DataTable dt, string[] cols = null)
+        public string ExportToExcel(string Name, DataTable dt, string[] cols = null
+            ,int  [] Format=null)
         {
             try
             {
@@ -151,6 +153,7 @@ namespace CallCenter.Utility
                         ICell cell = headerRow.CreateCell(icolIndex);
                         cell.SetCellValue(dc.ColumnName);
                         cell.CellStyle = HeadercellStyle;
+                       
                         icolIndex++;
                     }
                 }
@@ -161,6 +164,7 @@ namespace CallCenter.Utility
                         ICell cell = headerRow.CreateCell(icolIndex);
                         cell.SetCellValue(dc);
                         cell.CellStyle = HeadercellStyle;
+
                         icolIndex++;
                     }
                 }
@@ -178,6 +182,17 @@ namespace CallCenter.Utility
                 cellfont.Boldweight = (short)FontBoldWeight.Normal;
                 cellStyle.SetFont(cellfont);
 
+
+                ICellStyle cellStyle1 = workbook.CreateCellStyle();
+
+                //为避免日期格式被Excel自动替换，所以设定 format 为 『@』 表示一率当成text來看
+                cellStyle1.DataFormat = HSSFDataFormat.GetBuiltinFormat("#,##0.00");
+                cellStyle1.BorderBottom = NPOI.SS.UserModel.BorderStyle.Thin;
+                cellStyle1.BorderLeft = NPOI.SS.UserModel.BorderStyle.Thin;
+                cellStyle1.BorderRight = NPOI.SS.UserModel.BorderStyle.Thin;
+                cellStyle1.BorderTop = NPOI.SS.UserModel.BorderStyle.Thin;
+                cellStyle1.SetFont(cellfont);
+
                 //建立内容行
                 int iRowIndex = 0;
                 foreach (DataRow dr in dt.Rows)
@@ -193,7 +208,15 @@ namespace CallCenter.Utility
                         }
                         ICell cell = irow.CreateCell(iCellIndex);
                         cell.SetCellValue(strsj);
-                        cell.CellStyle = cellStyle;
+                        if (Format!=null&&Array.Exists(Format, element => element == i) )
+                        {
+                            cell.CellStyle = cellStyle1;
+                        }
+                        else
+                        {
+                            cell.CellStyle = cellStyle;
+                        }
+                        
                         iCellIndex++;
                     }
                     iRowIndex++;