合并代码到master

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

                     }
                     else if (ro.F_RoleCode == "DQJL" || ro.F_RoleCode == "FGSJL" || ro.F_RoleCode == "BLRY" || ro.F_RoleCode == "ZG" || ro.F_RoleCode == "GC")
                     {
-                        string markdepts = "37,57,74,88,268,422,339,213";
+                        string markdepts = "37,57,74,88,268,295,339,422,213,427";
                         string qualdepts = "12,36,295,245";
                         string detpid = "" + ua.F_DeptId;
                         var deparmentlist = new List<Model.T_Sys_Department>();
                         else if (ro.F_RoleCode == "DQJL" || ro.F_RoleCode == "FGSJL" || ro.F_RoleCode == "BLRY" || ro.F_RoleCode == "ZG" || ro.F_RoleCode == "GC")
                         {
 
-                            string markdepts = "37,57,74,88,268,422,339,213";
+                            string markdepts = "37,57,74,88,268,295,339,422,213,427";
                             string qualdepts = "12,36,295,245";
                             string detpid = "" + ua.F_DeptId;
                             var deparmentlist = new List<Model.T_Sys_Department>();
                             string touser = "";
                             string strwhere = "";
                             string contens = "";
-                            strwhere = $" F_DeptId in (select top 1 F_NextDept  from T_Wo_WorkOrderItem_New where F_WoID={model.F_ID} and F_NextDept in(37,57,74,88,268,295,339,422,213) order by F_CreateTime desc)";
+                            strwhere = $" F_DeptId in (select top 1 F_NextDept  from T_Wo_WorkOrderItem_New where F_WoID={model.F_ID} and F_NextDept in(37,57,74,88,268,295,339,422,213,427) order by F_CreateTime desc)";
                             var deptmodel = departmentBLL.GetModelList(strwhere).FirstOrDefault();
                             if (deptmodel != null)
                             {
             if (!string.IsNullOrEmpty(OpenId))
             {
                 int woflag = 0;
-                string markdepts = "37,57,74,88,268,295,339,213";
+                string markdepts = "37,57,74,88,268,295,339,213,427";
                 string sqlstr = "";
                 if (id <= 0)
                 {
         {
             int? flag = 0;
 
-            string markdepts = "37,57,74,88,268,295,339,213";
+            string markdepts = "37,57,74,88,268,295,339,213,427";
             if (!string.IsNullOrEmpty(usercode))
             {
                 Model.T_Sys_UserAccount ua = userAccountBLL.GetModel(usercode);
                      sms = (int)itemlast.F_IsSMS;
                 }
                 WorkOrderNewInput input = new WorkOrderNewInput();
-                string markdepts = "37,57,74,88,268,422,339,213";
+                string markdepts = "37,57,74,88,268,295,339,422,213,427";
                 string qualdepts = "12,36,295,245";
                 if (ua != null)
                 {
          string uncont = "",
         int isvisit = 1, int isover = 0)
         {
-            string markdepts = "37,57,74,88,268,422,339,213";
+            string markdepts = "37,57,74,88,268,295,339,422,213,427";
             string qualdepts = "12,36,295,245";
             if (!string.IsNullOrEmpty(OpenId))
             {
                     if (model != null)
                     {
                         int flag = 0;
-                        string markdepts = "37,57,74,88,268,422,339,213";
+                        string markdepts = "37,57,74,88,268,295,339,422,213,427";
                         var modellist = new BLL.T_Wo_WorkOrderItem_New().GetModelList($"F_WoID={model.F_ID} and F_IsUsed=0 and (F_CreateUser={ua.F_UserCode} or F_NextUser like '%{ua.F_UserCode}%')  order by   F_ID desc ").FirstOrDefault();
 
                         if (modellist == null)
                     if (model != null)
                     {
                         int flag = 0;
-                        string markdepts = "37,57,74,88,268,422,339,213";
+                        string markdepts = "37,57,74,88,268,295,339,422,213,427";
                         Model.T_Sys_RoleInfo ro = rolebll.GetModel(ua.F_RoleId);
                         var modelnext = new BLL.T_Wo_WorkOrderItem_New().GetModelList($"F_WoID={model.F_ID} and F_OptType=1  and F_CreateUser={ua.F_UserCode} order by   F_ID desc ");
 
         {
             #region 工单处理
             int sms = 0;
-            string markdepts = "37,57,74,88,268,422,339,213";
+            string markdepts = "37,57,74,88,268,295,339,422,213,427";
             var itemlasts = itembll.GetModelList("  F_ItemType=" + (int)EnumItemType.deal + " and  F_WoID=" + model.F_ID + " ");
             if (itemlasts.Count > 0)
             {

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

                             else if (ro.F_RoleCode == "DQJL" || ro.F_RoleCode == "FGSJL" || ro.F_RoleCode == "BLRY" || ro.F_RoleCode == "ZG" || ro.F_RoleCode == "GC")
                             {
 
-                                string markdepts = "37,57,74,88,268,422,339,213";
+                                string markdepts = "37,57,74,88,268,295,339,422,213,427";
                                 string qualdepts = "12,36,295,245";
                                 string detpid = "" + ua.F_DeptId;
                                 var deparmentlist = new List<Model.T_Sys_Department>();
         {
             int userId = CurrentUser.UserData.F_UserId;
             int woflag = 0;
-            string markdepts = "37,57,74,88,268,295,339,213";
+            string markdepts = "37,57,74,88,268,295,339,213,427";
             if (userId != 0)
             {
                 DataTable FileUrl = new DataTable();
         {
             int? flag = 0;
             int userId = CurrentUser.UserData.F_UserId;
-            string markdepts = "37,57,74,88,268,295,339,213";
+            string markdepts = "37,57,74,88,268,295,339,213,427";
             if (userId != 0)
             {
                 Model.T_Sys_UserAccount ua = sysUserAccountBll.GetModel(userId);
         public int? IsMarketAssign(long fid)
         {
             int? woflag = 0;
-            string markdepts = "37,57,74,88,268,295,339,213";
+            string markdepts = "37,57,74,88,268,295,339,213,427";
             int userId = CurrentUser.UserData.F_UserId;
             if (userId != 0)
             {
                     sql += $" and F_CreateBy like '%" + ua.F_UserCode.Trim() + "%'";
                 else if (ro.F_RoleCode == "DQJL" || ro.F_RoleCode == "FGSJL" || ro.F_RoleCode == "BLRY" || ro.F_RoleCode == "ZG" || ro.F_RoleCode == "GC")
                 {
-                    string markdepts = "37,57,74,88,268,422,339,213";
+                    string markdepts = "37,57,74,88,268,295,339,422,213,427";
                     string qualdepts = "12,36,295,245";
                     string detpid = "" + ua.F_DeptId;
                     var deparmentlist = new List<Model.T_Sys_Department>();
                         dt.Columns.Add("工单编号");
                         dt.Columns.Add("工单来源");
                         dt.Columns.Add("工单类型");
+                        if (type == 2 || type == 5)
+                        {
+                            dt.Columns.Add("责任单位");
+                            dt.Columns.Add("产品名称");
+                            dt.Columns.Add("销售基地");
+                        }
                         dt.Columns.Add("外线工单状态");
                         dt.Columns.Add("内线工单状态");
                         dt.Columns.Add("生产单位");
                         else if (type == 2 || type==5)
                         {
 
-                            dt.Columns.Add("产品名称");
-                            dt.Columns.Add("问题数量");
-                            dt.Columns.Add("销售基地");
+                          
+                            //dt.Columns.Add("问题数量");                 
                             dt.Columns.Add("生产批次号");
                             dt.Columns.Add("问题类别1");
                             dt.Columns.Add("问题类别2");
                             dt.Columns.Add("问题类别3");
-                            dt.Columns.Add("重要级别");
-                            dt.Columns.Add("品牌");
-                            dt.Columns.Add("客户编号");
-                            dt.Columns.Add("业务员");
-                            dt.Columns.Add("电话");
-                            dt.Columns.Add("经营品牌");
                             dt.Columns.Add("大区名称");
                             dt.Columns.Add("分公司名称");
-                            dt.Columns.Add("公司名称");
                             dt.Columns.Add("渠道类型");
                             dt.Columns.Add("物料编码");
                             dt.Columns.Add("物料名称");
                             dt.Columns.Add("复合肥肥效");
                             dt.Columns.Add("产品线");
                             dt.Columns.Add("工艺");
-                            dt.Columns.Add("原料及厂家");
-                            dt.Columns.Add("该批次生产数量");
-                            dt.Columns.Add("车牌号");
-                            dt.Columns.Add("返账金额");
-                            dt.Columns.Add("责任单位");
-                            dt.Columns.Add("下步整改");
-                            dt.Columns.Add("问题原因(外)");
-                            dt.Columns.Add("问题原因(内)");
-                            dt.Columns.Add("处理结果(外)");
-                            dt.Columns.Add("处理结果(内)");
+
+
+                            //dt.Columns.Add("重要级别");
+                            //dt.Columns.Add("品牌");
+                            //dt.Columns.Add("客户编号");
+                            //dt.Columns.Add("业务员");
+                            //dt.Columns.Add("电话");
+                            //dt.Columns.Add("经营品牌");
+                            //dt.Columns.Add("公司名称");
+                          
+                          
                         }
                         else
                         {
                             dt.Columns.Add("工艺");
                             dt.Columns.Add("原料及厂家");
                             dt.Columns.Add("该批次生产数量");
-                            dt.Columns.Add("问题原因(外)");
-                            dt.Columns.Add("问题原因(内)");
+                            dt.Columns.Add("问题判定原因");
                             dt.Columns.Add("处理结果(外)");
                             dt.Columns.Add("处理结果(内)");
                         }
                         dt.Columns.Add("客户姓名");
                         dt.Columns.Add("客户电话");
                         dt.Columns.Add("问题描述");
-                        dt.Columns.Add("事发地-省");
-                        dt.Columns.Add("事发地-市");
-                        dt.Columns.Add("事发地-县");
-                        dt.Columns.Add("事发地-乡");
-                        dt.Columns.Add("事发地-详细");
-                        dt.Columns.Add("上级处理意见");
-                        dt.Columns.Add("处理详情-外线");
-                        dt.Columns.Add("处理详情-内线");
+                        dt.Columns.Add("创建时间");
+                        dt.Columns.Add("完结时间");
+                        dt.Columns.Add("用时(天)");
+                        //dt.Columns.Add("工单状态");
+                        //dt.Columns.Add("事发地-省");
+                        //dt.Columns.Add("事发地-市");
+                        //dt.Columns.Add("事发地-县");
+                        //dt.Columns.Add("事发地-乡");
+                        //dt.Columns.Add("事发地-详细");
+                        //dt.Columns.Add("上级处理意见");
+                        //dt.Columns.Add("处理详情-外线");
+                        //dt.Columns.Add("处理详情-内线");
                         dt.Columns.Add("备注");
-                        dt.Columns.Add("注解");
+                        //dt.Columns.Add("注解");
                         dt.Columns.Add("超时时限");
-                        dt.Columns.Add("剩余时间-外线");
-                        dt.Columns.Add("剩余时间-内线");
+                        dt.Columns.Add("剩余时间");
+                        //dt.Columns.Add("剩余时间-内线");
                         dt.Columns.Add("超时原因");
-                        dt.Columns.Add("工单记录");
+                        dt.Columns.Add("作物");
+                        dt.Columns.Add("下步整改");
+                        dt.Columns.Add("问题判定原因");
+                        dt.Columns.Add("处理结果(外)");
+                        dt.Columns.Add("处理结果(内)");
+                        dt.Columns.Add("原料及厂家");
+                        dt.Columns.Add("该批次生产数量");
+                        dt.Columns.Add("车牌号");
+                        dt.Columns.Add("返账金额");
+                        //dt.Columns.Add("工单记录");
                         #endregion
                         foreach (var it in depts)
                         {
                             else if (type == 2 || type==5)
                             {
                                 drNew["产品名称"] = it.F_TS_Category;
-                                if (!string.IsNullOrEmpty(it.F_TS_Quantity))
-                                {
-                                    drNew["问题数量"] = it.F_TS_Quantity + "吨";//投诉-问题数量（吨）
-                                }
-                                else
-                                    drNew["问题数量"] = "";
+                                //if (!string.IsNullOrEmpty(it.F_TS_Quantity))
+                                //{
+                                //    drNew["问题数量"] = it.F_TS_Quantity + "吨";//投诉-问题数量（吨）
+                                //}
+                                //else
+                                //    drNew["问题数量"] = "";
                                 drNew["销售基地"] = it.F_SalesBase;
                                 drNew["生产批次号"] = it.F_BatchNumber;
                                 if (!string.IsNullOrEmpty(it.F_QuestionType))
                                         drNew["问题类别3"] = it.F_QuestionType; //问题类别（投诉抽捡和咨询类别不一样）
                                     }
                                 }
-                                drNew["重要级别"] = it.F_TS_Level;
-                                drNew["品牌"] = it.F_Brand;
+                                //drNew["重要级别"] = it.F_TS_Level;
+                                //drNew["品牌"] = it.F_Brand;
                                 drNew["车牌号"] = it.F_CarNumber;
                                 drNew["返账金额"] = it.F_SC_CJ_ReturnAccount;
                                 drNew["责任单位"] = it.F_ZL_ResponsibleUnit;
                                     cuModel = new BLL.T_Cus_CustomerBaseNew().GetModelList(" F_IsDelete = 0 " + sqlt).FirstOrDefault();
                                 }
                                 if (cuModel != null)
-                                {
-                                    drNew["客户编号"] = cuModel.F_CustomerCode;//客户编码
-
+                                {                                 
                                     if (!string.IsNullOrEmpty(cuModel.F_AreaID))
                                     {
                                         Model.T_Sys_Department pdModel = new T_Sys_Department();
                                             drNew["分公司名称"] = pdModel1.F_DeptName;
                                         }
                                     }
-                                    drNew["业务员"] = cuModel.F_Salesman;
-                                    drNew["电话"] = cuModel.F_SalesPhone;
-                                    drNew["公司名称"] = cuModel.F_CompanyName;//公司名称
-                                    drNew["经营品牌"] = cuModel.F_Brands;
                                     drNew["渠道类型"] = cuModel.F_Channel;
+                                    if (type == 3)
+                                    {
+                                        drNew["客户编号"] = cuModel.F_CustomerCode;//客户编码
+                                        drNew["业务员"] = cuModel.F_Salesman;
+                                        drNew["电话"] = cuModel.F_SalesPhone;
+                                        drNew["公司名称"] = cuModel.F_CompanyName;//公司名称
+                                        drNew["经营品牌"] = cuModel.F_Brands;
+                                    }
 
 
 
                                 //dt.Columns.Add("该批次生产数量");
                                 drNew["原料及厂家"] = it.F_Manufacturers;//原料及厂家
                                 drNew["该批次生产数量"] = it.F_ProductionNum;//该批次生产数量
-                                drNew["问题原因(外)"] = it.F_EventReason;//问题原因(外
-                                drNew["问题原因(内)"] = it.F_EventReason2;//问题原因(内)
+                                drNew["问题判定原因"] = it.F_EventReason;//问题原因(外
                                 drNew["处理结果(内)"] = it.F_SuperiorOpinion;//处理结果(外)
                                 drNew["处理结果(内)"] = it.F_SuperiorOpinion2;//处理结果(内)
 
                             drNew["客户姓名"] = it.F_CusName;//
                             drNew["客户电话"] = it.F_CusPhone;//
                             drNew["问题描述"] = it.F_Description;//
-                            drNew["事发地-省"] = it.F_IncidentProvince;//
-                            drNew["事发地-市"] = it.F_IncidentCity;//
-                            drNew["事发地-县"] = it.F_IncidentCountry;//
-                            drNew["事发地-乡"] = it.F_IncidentTownship;//
-                            drNew["事发地-详细"] = it.F_IncidentDetailed;//
-                            drNew["上级处理意见"] = AssCont(it.F_ID);//上级处理意见
-                            drNew["处理详情-外线"] = it.F_DealContent;//处理内容
-                            drNew["处理详情-内线"] = it.F_DealContent2;//处理内容
+                            drNew["创建时间"] = it.F_CreateOn;
+                            drNew["完结时间"] = it.F_VisitOn;
+                   
+                            //drNew["事发地-省"] = it.F_IncidentProvince;//
+                            //drNew["事发地-市"] = it.F_IncidentCity;//
+                            //drNew["事发地-县"] = it.F_IncidentCountry;//
+                            //drNew["事发地-乡"] = it.F_IncidentTownship;//
+                            //drNew["事发地-详细"] = it.F_IncidentDetailed;//
+                            //drNew["上级处理意见"] = AssCont(it.F_ID);//上级处理意见
+                            //drNew["处理详情-外线"] = it.F_DealContent;//处理内容
+                            //drNew["处理详情-内线"] = it.F_DealContent2;//处理内容
                             drNew["备注"] = it.F_VisitRemarks;//处理内容
-                            drNew["注解"] = it.F_Annotation;//处理内容
+                            //drNew["注解"] = it.F_Annotation;//处理内容
                             drNew["超时时限"] = it.F_limit;//处理内容
                             #region
                             float RemainingTime = float.Parse(string.Format("{0:f2}", TimeToOver(it.F_ID, it.F_limit)));
                             if (RemainingTime >= 0)
                             {
-                                drNew["剩余时间-外线"] = RemainingTime;//处理内容
+                                drNew["剩余时间"] = RemainingTime;//处理内容
                             }
                             else
                             {
-                                drNew["剩余时间-外线"] = "超时" + Math.Abs(RemainingTime);//处理内容
+                                drNew["剩余时间"] = "超时" + Math.Abs(RemainingTime);//处理内容
                             }
+                            float aa = Math.Abs(it.F_limit-RemainingTime);
+                            int days = (int)Math.Floor(Convert.ToDouble(aa / 24));
+                            drNew["用时(天)"] = days+"天";
                             #endregion
-                            #region 内线
-                            float RemainingTime2 = float.Parse(string.Format("{0:f2}", TimeToOver(it.F_ID, it.F_limit, 2)));
-                            if (RemainingTime2 >= 0)
-                            {
-                                drNew["剩余时间-内线"] = RemainingTime2;//处理内容
-                            }
-                            else
-                            {
-                                drNew["剩余时间-内线"] = "超时" + Math.Abs(RemainingTime2);//处理内容
-                            }
-                            #endregion
-                            drNew["超时原因"] = it.F_Reasontimeout;//处理内容
-
-                            var itemlasts = itembll.GetModelList(" F_WoID=" + it.F_ID + " ");
-                            if (itemlasts != null)
+                            //#region 内线
+                            //float RemainingTime2 = float.Parse(string.Format("{0:f2}", TimeToOver(it.F_ID, it.F_limit, 2)));
+                            //if (RemainingTime2 >= 0)
+                            //{
+                            //    drNew["剩余时间-内线"] = RemainingTime2;//处理内容
+                            //}
+                            //else
+                            //{
+                            //    drNew["剩余时间-内线"] = "超时" + Math.Abs(RemainingTime2);//处理内容
+                            //}
+                            //#endregion
+                            drNew["超时原因"] = it.F_Reasontimeout;//处理内容it
+                            int cropid = 0;
+                            if (int.TryParse(it.F_Crops.Trim(), out cropid))
                             {
-                                foreach (var iv in itemlasts)
-                                {
-                                    if (drNew["工单记录"] != null)
-                                    {
-                                        drNew["工单记录"] += "--" + iv.F_OptContent;
-                                    }
-                                    else
-                                    {
-                                        drNew["工单记录"] = iv.F_OptContent;
-                                    }
-
-                                }
+                                drNew["作物"] = new BLL.T_Sys_DictionaryValue().GetModel(cropid)?.F_Name ?? "";//作物
                             }
+                            else drNew["作物"] = "";
+                            //var itemlasts = itembll.GetModelList(" F_WoID=" + it.F_ID + " ");
+                            //if (itemlasts != null)
+                            //{
+                            //    foreach (var iv in itemlasts)
+                            //    {
+                            //        if (drNew["工单记录"] != null)
+                            //        {
+                            //            drNew["工单记录"] += "--" + iv.F_OptContent;
+                            //        }
+                            //        else
+                            //        {
+                            //            drNew["工单记录"] = iv.F_OptContent;
+                            //        }
+
+                                //    }
+                                //}
                             dt.Rows.Add(drNew);
                             #endregion
                         }
                             string touser = "";
                             string strwhere = "";
                             string contens = "";
-                            strwhere = $" F_DeptId in (select top 1 F_NextDept  from T_Wo_WorkOrderItem_New where F_WoID={model.F_ID} and F_NextDept in(37,57,74,88,268,295,339,422,213) order by F_CreateTime desc)";
+                            strwhere = $" F_DeptId in (select top 1 F_NextDept  from T_Wo_WorkOrderItem_New where F_WoID={model.F_ID} and F_NextDept in(37,57,74,88,268,295,339,422,213,427) order by F_CreateTime desc)";
                             var deptmodel = departmentBLL.GetModelList(strwhere).FirstOrDefault();
                             if (deptmodel != null)
                             {
         {
             int userId = CurrentUser.UserData.F_UserId;
             string usercode = CurrentUser.UserData.F_UserCode;
-            string markdepts = "37,57,74,88,268,422,339,213";
+            string markdepts = "37,57,74,88,268,295,339,422,213,427";
             string qualdepts = "12,36,295,245";
             if (userId != 0)
             {
             int userId = CurrentUser.UserData.F_UserId;
             if (userId != 0)
             {
-                string markdepts = "37,57,74,88,268,422,339,213";
+                string markdepts = "37,57,74,88,268,295,339,422,213,427";
                 string qualdepts = "12,36,295,245"; //245:九江心连心化肥有限公司-质量督察处
                 if (string.IsNullOrEmpty(cont))
                     return Error("请输入处理内容");
                     if (model != null)
                     {
                         int flag = 0;
-                        string markdepts = "37,57,74,88,268,422,339,213";
+                        string markdepts = "37,57,74,88,268,295,339,422,213,427";
                         var modellist = new BLL.T_Wo_WorkOrderItem_New().GetModelList($"F_WoID={model.F_ID} and F_IsUsed=0 and (F_CreateUser={ua.F_UserCode} or F_NextUser like '%{ua.F_UserCode}%')  order by   F_ID desc ").FirstOrDefault();
 
                         if (modellist == null)
         {
             int userId = CurrentUser.UserData.F_UserId; ;
             int flag = 0;
-            string markdepts = "37,57,74,88,268,422,339,213";
+            string markdepts = "37,57,74,88,268,295,339,422,213,427";
             if (userId != 0)
             {
                 //增加撤回功能
         {
             #region 工单处理
             int sms = 0;
-            string markdepts = "37,57,74,88,268,422,339,213";
+            string markdepts = "37,57,74,88,268,295,339,422,213,427";
             var itemlasts = itembll.GetModelList("  F_ItemType=" + (int)EnumItemType.deal + " and  F_WoID=" + model.F_ID + " ");
             if (itemlasts.Count > 0)
             {