内外线

codegit/CallCenterApi/CallCenterApi.BLL/UserAccount.cs

@@ -281,6 +281,10 @@ namespace CallCenterApi.BLL
                             model.F_regionName = modelRegion.F_RegionName;
                         else model.F_regionName = "";
                     }
+                    if (dt.Rows[n]["F_Flag"] != null && dt.Rows[n]["F_Flag"].ToString() != "")
+                    {
+                        model.F_Flag = int.Parse(dt.Rows[n]["F_Flag"].ToString());
+                    }
                     modelList.Add(model);
                 }
             }

codegit/CallCenterApi/CallCenterApi.DAL/T_Sys_UserAccount.cs

@@ -50,9 +50,9 @@ namespace CallCenterApi.DAL
         {
             StringBuilder strSql = new StringBuilder();
             strSql.Append("insert into T_Sys_UserAccount(");
-            strSql.Append("F_UserCode,F_Password,F_ExtensionNumber,F_UserName,F_DeptId,F_RoleId,F_GroupId,F_SeatFlag,F_SeatRight,F_SeatLevel,F_SexFlag,F_RemindFlag,F_Remark,F_Telephone,F_Mobile,F_HomePhone,F_Birthday,F_CreateOn,F_CancelOn,F_DeleteFlag,F_APPOnFlag,F_LastActiveTime,F_See,F_HJType,F_PId,F_TmId,F_WorkNumber,F_DeptCode,F_WXNo,F_SeartGroupID,F_SeartGroup,F_WxOpenId,RegionId,F_Origdepts)");
+            strSql.Append("F_UserCode,F_Password,F_ExtensionNumber,F_UserName,F_DeptId,F_RoleId,F_GroupId,F_SeatFlag,F_SeatRight,F_SeatLevel,F_SexFlag,F_RemindFlag,F_Remark,F_Telephone,F_Mobile,F_HomePhone,F_Birthday,F_CreateOn,F_CancelOn,F_DeleteFlag,F_APPOnFlag,F_LastActiveTime,F_See,F_HJType,F_PId,F_TmId,F_WorkNumber,F_DeptCode,F_WXNo,F_SeartGroupID,F_SeartGroup,F_WxOpenId,RegionId,F_Origdepts,F_Flag)");
             strSql.Append(" values (");
-            strSql.Append("@F_UserCode,@F_Password,@F_ExtensionNumber,@F_UserName,@F_DeptId,@F_RoleId,@F_GroupId,@F_SeatFlag,@F_SeatRight,@F_SeatLevel,@F_SexFlag,@F_RemindFlag,@F_Remark,@F_Telephone,@F_Mobile,@F_HomePhone,@F_Birthday,@F_CreateOn,@F_CancelOn,@F_DeleteFlag,@F_APPOnFlag,@F_LastActiveTime,@F_See,@F_HJType,@F_PId,@F_TmId,@F_WorkNumber,@F_DeptCode,@F_WXNo,@F_SeartGroupID,@F_SeartGroup,@F_WxOpenId,@RegionId,@F_Origdepts)");
+            strSql.Append("@F_UserCode,@F_Password,@F_ExtensionNumber,@F_UserName,@F_DeptId,@F_RoleId,@F_GroupId,@F_SeatFlag,@F_SeatRight,@F_SeatLevel,@F_SexFlag,@F_RemindFlag,@F_Remark,@F_Telephone,@F_Mobile,@F_HomePhone,@F_Birthday,@F_CreateOn,@F_CancelOn,@F_DeleteFlag,@F_APPOnFlag,@F_LastActiveTime,@F_See,@F_HJType,@F_PId,@F_TmId,@F_WorkNumber,@F_DeptCode,@F_WXNo,@F_SeartGroupID,@F_SeartGroup,@F_WxOpenId,@RegionId,@F_Origdepts,F_Flag)");
             strSql.Append(";select @@IDENTITY");
             SqlParameter[] parameters = {
                     new SqlParameter("@F_UserCode", SqlDbType.VarChar,50),
@@ -88,7 +88,8 @@ namespace CallCenterApi.DAL
                     new SqlParameter("@F_SeartGroup", SqlDbType.NVarChar,50),
                     new SqlParameter("@F_WxOpenId", SqlDbType.NVarChar,300),
                     new SqlParameter("@RegionId", SqlDbType.Int,4),
-                    new SqlParameter("@F_Origdepts",  SqlDbType.VarChar,50)};
+                    new SqlParameter("@F_Origdepts",  SqlDbType.VarChar,50),
+                    new SqlParameter("@F_Flag", SqlDbType.Int,4)};
             parameters[0].Value = model.F_UserCode;
             parameters[1].Value = model.F_Password;
             parameters[2].Value = model.F_ExtensionNumber;
@@ -123,6 +124,7 @@ namespace CallCenterApi.DAL
             parameters[31].Value = model.F_WxOpenId;
             parameters[32].Value = model.RegionId;
             parameters[33].Value = model.F_Origdepts;
+            parameters[34].Value = model.F_Flag;
 
             object obj = DbHelperSQL.GetSingle(strSql.ToString(), parameters);
             if (obj == null)
@@ -174,7 +176,8 @@ namespace CallCenterApi.DAL
             strSql.Append("F_SeartGroup=@F_SeartGroup,");
             strSql.Append("F_WxOpenId=@F_WxOpenId,");
             strSql.Append("RegionId=@RegionId,"); 
-            strSql.Append("F_Origdepts=@F_Origdepts");
+            strSql.Append("F_Origdepts=@F_Origdepts,");
+            strSql.Append("F_Flag=@F_Flag"); 
             strSql.Append(" where F_UserId=@F_UserId");
             SqlParameter[] parameters = {
                     new SqlParameter("@F_UserCode", SqlDbType.VarChar,50),
@@ -211,6 +214,7 @@ namespace CallCenterApi.DAL
                     new SqlParameter("@F_WxOpenId", SqlDbType.NVarChar,300),
                     new SqlParameter("@RegionId", SqlDbType.Int,4),
                     new SqlParameter("@F_Origdepts", SqlDbType.VarChar,50),
+                    new SqlParameter("@F_Flag", SqlDbType.Int,4),
                     new SqlParameter("@F_UserId", SqlDbType.Int,4)};
             parameters[0].Value = model.F_UserCode;
             parameters[1].Value = model.F_Password;
@@ -246,7 +250,8 @@ namespace CallCenterApi.DAL
             parameters[31].Value = model.F_WxOpenId;
             parameters[32].Value = model.RegionId;
             parameters[33].Value = model.F_Origdepts;
-            parameters[34].Value = model.F_UserId;
+            parameters[34].Value = model.F_Flag;
+            parameters[35].Value = model.F_UserId;
 
             int rows = DbHelperSQL.ExecuteSql(strSql.ToString(), parameters);
             if (rows > 0)
@@ -326,7 +331,7 @@ namespace CallCenterApi.DAL
         {
 
             StringBuilder strSql = new StringBuilder();
-            strSql.Append("select  top 1 F_UserId,F_UserCode,F_Password,F_ExtensionNumber,F_UserName,F_DeptId,F_RoleId,F_GroupId,F_SeatFlag,F_SeatRight,F_SeatLevel,F_SexFlag,F_RemindFlag,F_Remark,F_Telephone,F_Mobile,F_HomePhone,F_Birthday,F_CreateOn,F_CancelOn,F_DeleteFlag,F_APPOnFlag,F_LastActiveTime,F_See,F_HJType,F_PId,F_TmId,F_WorkNumber,F_DeptCode,F_WXNo,F_SeartGroupID,F_SeartGroup,F_WxOpenId,RegionId,F_Origdepts from T_Sys_UserAccount ");
+            strSql.Append("select  top 1 F_UserId,F_UserCode,F_Password,F_ExtensionNumber,F_UserName,F_DeptId,F_RoleId,F_GroupId,F_SeatFlag,F_SeatRight,F_SeatLevel,F_SexFlag,F_RemindFlag,F_Remark,F_Telephone,F_Mobile,F_HomePhone,F_Birthday,F_CreateOn,F_CancelOn,F_DeleteFlag,F_APPOnFlag,F_LastActiveTime,F_See,F_HJType,F_PId,F_TmId,F_WorkNumber,F_DeptCode,F_WXNo,F_SeartGroupID,F_SeartGroup,F_WxOpenId,RegionId,F_Origdepts,F_Flag from T_Sys_UserAccount ");
             strSql.Append(" where F_WorkNumber=@F_WorkNumber and F_Password=@F_Password and  F_DeleteFlag=0");
             SqlParameter[] parameters = {
                     new SqlParameter("@F_WorkNumber", SqlDbType.VarChar,50),
@@ -353,7 +358,7 @@ namespace CallCenterApi.DAL
         {
 
             StringBuilder strSql = new StringBuilder();
-            strSql.Append("select  top 1 F_UserId,F_UserCode,F_Password,F_ExtensionNumber,F_UserName,F_DeptId,F_RoleId,F_GroupId,F_SeatFlag,F_SeatRight,F_SeatLevel,F_SexFlag,F_RemindFlag,F_Remark,F_Telephone,F_Mobile,F_HomePhone,F_Birthday,F_CreateOn,F_CancelOn,F_DeleteFlag,F_APPOnFlag,F_LastActiveTime,F_See,F_HJType,F_PId,F_TmId,F_WorkNumber,F_DeptCode,F_WXNo,F_SeartGroupID,F_SeartGroup,F_WxOpenId,RegionId,F_Origdepts from T_Sys_UserAccount ");
+            strSql.Append("select  top 1 F_UserId,F_UserCode,F_Password,F_ExtensionNumber,F_UserName,F_DeptId,F_RoleId,F_GroupId,F_SeatFlag,F_SeatRight,F_SeatLevel,F_SexFlag,F_RemindFlag,F_Remark,F_Telephone,F_Mobile,F_HomePhone,F_Birthday,F_CreateOn,F_CancelOn,F_DeleteFlag,F_APPOnFlag,F_LastActiveTime,F_See,F_HJType,F_PId,F_TmId,F_WorkNumber,F_DeptCode,F_WXNo,F_SeartGroupID,F_SeartGroup,F_WxOpenId,RegionId,F_Origdepts,F_Flag from T_Sys_UserAccount ");
             strSql.Append(" where F_UserCode=@F_UserCode and F_Password=@F_Password and  F_DeleteFlag=0");
             SqlParameter[] parameters = {
                     new SqlParameter("@F_UserCode", SqlDbType.VarChar,50),
@@ -380,7 +385,7 @@ namespace CallCenterApi.DAL
         {
 
             StringBuilder strSql = new StringBuilder();
-            strSql.Append("select  top 1 F_UserId,F_UserCode,F_Password,F_ExtensionNumber,F_UserName,F_DeptId,F_RoleId,F_GroupId,F_SeatFlag,F_SeatRight,F_SeatLevel,F_SexFlag,F_RemindFlag,F_Remark,F_Telephone,F_Mobile,F_HomePhone,F_Birthday,F_CreateOn,F_CancelOn,F_DeleteFlag,F_APPOnFlag,F_LastActiveTime,F_See,F_HJType,F_PId,F_TmId,F_WorkNumber,F_DeptCode,F_WXNo,F_SeartGroupID,F_SeartGroup,F_WxOpenId,RegionId,F_Origdepts from T_Sys_UserAccount ");
+            strSql.Append("select  top 1 F_UserId,F_UserCode,F_Password,F_ExtensionNumber,F_UserName,F_DeptId,F_RoleId,F_GroupId,F_SeatFlag,F_SeatRight,F_SeatLevel,F_SexFlag,F_RemindFlag,F_Remark,F_Telephone,F_Mobile,F_HomePhone,F_Birthday,F_CreateOn,F_CancelOn,F_DeleteFlag,F_APPOnFlag,F_LastActiveTime,F_See,F_HJType,F_PId,F_TmId,F_WorkNumber,F_DeptCode,F_WXNo,F_SeartGroupID,F_SeartGroup,F_WxOpenId,RegionId,F_Origdepts,F_Flag from T_Sys_UserAccount ");
             strSql.Append(" where F_UserName=@F_UserName");
             SqlParameter[] parameters = {
                     new SqlParameter("@F_UserName", SqlDbType.VarChar,50)
@@ -405,7 +410,7 @@ namespace CallCenterApi.DAL
         {
 
             StringBuilder strSql = new StringBuilder();
-            strSql.Append("select  top 1 F_UserId,F_UserCode,F_Password,F_ExtensionNumber,F_UserName,F_DeptId,F_RoleId,F_GroupId,F_SeatFlag,F_SeatRight,F_SeatLevel,F_SexFlag,F_RemindFlag,F_Remark,F_Telephone,F_Mobile,F_HomePhone,F_Birthday,F_CreateOn,F_CancelOn,F_DeleteFlag,F_APPOnFlag,F_LastActiveTime,F_See,F_HJType,F_PId,F_TmId,F_WorkNumber,F_DeptCode,F_WXNo,F_SeartGroupID,F_SeartGroup,F_WxOpenId,RegionId,F_Origdepts from T_Sys_UserAccount ");
+            strSql.Append("select  top 1 F_UserId,F_UserCode,F_Password,F_ExtensionNumber,F_UserName,F_DeptId,F_RoleId,F_GroupId,F_SeatFlag,F_SeatRight,F_SeatLevel,F_SexFlag,F_RemindFlag,F_Remark,F_Telephone,F_Mobile,F_HomePhone,F_Birthday,F_CreateOn,F_CancelOn,F_DeleteFlag,F_APPOnFlag,F_LastActiveTime,F_See,F_HJType,F_PId,F_TmId,F_WorkNumber,F_DeptCode,F_WXNo,F_SeartGroupID,F_SeartGroup,F_WxOpenId,RegionId,F_Origdepts,F_Flag from T_Sys_UserAccount ");
             strSql.Append(" where F_WorkNumber=@F_WorkNumber");
             SqlParameter[] parameters = {
                     new SqlParameter("@F_WorkNumber", SqlDbType.VarChar,50)
@@ -430,7 +435,7 @@ namespace CallCenterApi.DAL
         {
 
             StringBuilder strSql = new StringBuilder();
-            strSql.Append("select  top 1 F_UserId,F_UserCode,F_Password,F_ExtensionNumber,F_UserName,F_DeptId,F_RoleId,F_GroupId,F_SeatFlag,F_SeatRight,F_SeatLevel,F_SexFlag,F_RemindFlag,F_Remark,F_Telephone,F_Mobile,F_HomePhone,F_Birthday,F_CreateOn,F_CancelOn,F_DeleteFlag,F_APPOnFlag,F_LastActiveTime,F_See,F_HJType,F_PId,F_TmId,F_WorkNumber,F_DeptCode,F_WXNo,F_SeartGroupID,F_SeartGroup,F_WxOpenId,RegionId,F_Origdepts from T_Sys_UserAccount ");
+            strSql.Append("select  top 1 F_UserId,F_UserCode,F_Password,F_ExtensionNumber,F_UserName,F_DeptId,F_RoleId,F_GroupId,F_SeatFlag,F_SeatRight,F_SeatLevel,F_SexFlag,F_RemindFlag,F_Remark,F_Telephone,F_Mobile,F_HomePhone,F_Birthday,F_CreateOn,F_CancelOn,F_DeleteFlag,F_APPOnFlag,F_LastActiveTime,F_See,F_HJType,F_PId,F_TmId,F_WorkNumber,F_DeptCode,F_WXNo,F_SeartGroupID,F_SeartGroup,F_WxOpenId,RegionId,F_Origdepts,F_Flag from T_Sys_UserAccount ");
             strSql.Append(" where F_UserCode=@F_UserCode");
             SqlParameter[] parameters = {
                     new SqlParameter("@F_UserCode", SqlDbType.VarChar,50)
@@ -456,7 +461,7 @@ namespace CallCenterApi.DAL
         {
 
             StringBuilder strSql = new StringBuilder();
-            strSql.Append("select  top 1 F_UserId,F_UserCode,F_Password,F_ExtensionNumber,F_UserName,F_DeptId,F_RoleId,F_GroupId,F_SeatFlag,F_SeatRight,F_SeatLevel,F_SexFlag,F_RemindFlag,F_Remark,F_Telephone,F_Mobile,F_HomePhone,F_Birthday,F_CreateOn,F_CancelOn,F_DeleteFlag,F_APPOnFlag,F_LastActiveTime,F_See,F_HJType,F_PId,F_TmId,F_WorkNumber,F_DeptCode,F_WXNo,F_SeartGroupID,F_SeartGroup,F_WxOpenId,RegionId,F_Origdepts from T_Sys_UserAccount ");
+            strSql.Append("select  top 1 F_UserId,F_UserCode,F_Password,F_ExtensionNumber,F_UserName,F_DeptId,F_RoleId,F_GroupId,F_SeatFlag,F_SeatRight,F_SeatLevel,F_SexFlag,F_RemindFlag,F_Remark,F_Telephone,F_Mobile,F_HomePhone,F_Birthday,F_CreateOn,F_CancelOn,F_DeleteFlag,F_APPOnFlag,F_LastActiveTime,F_See,F_HJType,F_PId,F_TmId,F_WorkNumber,F_DeptCode,F_WXNo,F_SeartGroupID,F_SeartGroup,F_WxOpenId,RegionId,F_Origdepts,F_Flag from T_Sys_UserAccount ");
             strSql.Append(" where F_UserId=@F_UserId");
             SqlParameter[] parameters = {
                     new SqlParameter("@F_UserId", SqlDbType.Int,4)
@@ -678,7 +683,11 @@ namespace CallCenterApi.DAL
                 {
                     model.F_Origdepts = row["F_Origdepts"].ToString();
                 }
-                
+                if (row["F_Flag"] != null && row["F_Flag"].ToString() != "")
+                {
+                    model.F_Flag = int.Parse(row["F_Flag"].ToString());
+                }
+
             }
             return model;
         }
@@ -715,7 +724,7 @@ namespace CallCenterApi.DAL
         public DataSet GetList(string strWhere)
         {
             StringBuilder strSql = new StringBuilder();
-            strSql.Append("select F_UserId,F_UserCode,F_Password,F_ExtensionNumber,F_UserName,F_DeptId,F_RoleId,F_GroupId,F_SeatFlag,F_SeatRight,F_SeatLevel,F_SexFlag,F_RemindFlag,F_Remark,F_Telephone,F_Mobile,F_HomePhone,F_Birthday,F_CreateOn,F_CancelOn,F_DeleteFlag,F_APPOnFlag,F_LastActiveTime,F_See,F_HJType,F_PId,F_TmId,F_WorkNumber,F_DeptCode,F_WXNo,F_SeartGroupID,F_SeartGroup,F_WxOpenId,RegionId,F_Origdepts ");
+            strSql.Append("select F_UserId,F_UserCode,F_Password,F_ExtensionNumber,F_UserName,F_DeptId,F_RoleId,F_GroupId,F_SeatFlag,F_SeatRight,F_SeatLevel,F_SexFlag,F_RemindFlag,F_Remark,F_Telephone,F_Mobile,F_HomePhone,F_Birthday,F_CreateOn,F_CancelOn,F_DeleteFlag,F_APPOnFlag,F_LastActiveTime,F_See,F_HJType,F_PId,F_TmId,F_WorkNumber,F_DeptCode,F_WXNo,F_SeartGroupID,F_SeartGroup,F_WxOpenId,RegionId,F_Origdepts,F_Flag ");
             strSql.Append(" FROM T_Sys_UserAccount ");
             if (strWhere.Trim() != "")
             {
@@ -747,7 +756,7 @@ namespace CallCenterApi.DAL
             {
                 strSql.Append(" top " + Top.ToString());
             }
-            strSql.Append(" F_UserId,F_UserCode,F_Password,F_ExtensionNumber,F_UserName,F_DeptId,F_RoleId,F_GroupId,F_SeatFlag,F_SeatRight,F_SeatLevel,F_SexFlag,F_RemindFlag,F_Remark,F_Telephone,F_Mobile,F_HomePhone,F_Birthday,F_CreateOn,F_CancelOn,F_DeleteFlag,F_APPOnFlag,F_LastActiveTime,F_See,F_HJType,F_PId,F_TmId,F_WorkNumber,F_DeptCode,F_WXNo,F_SeartGroupID,F_SeartGroup,F_WxOpenId,RegionId,F_Origdepts ");
+            strSql.Append(" F_UserId,F_UserCode,F_Password,F_ExtensionNumber,F_UserName,F_DeptId,F_RoleId,F_GroupId,F_SeatFlag,F_SeatRight,F_SeatLevel,F_SexFlag,F_RemindFlag,F_Remark,F_Telephone,F_Mobile,F_HomePhone,F_Birthday,F_CreateOn,F_CancelOn,F_DeleteFlag,F_APPOnFlag,F_LastActiveTime,F_See,F_HJType,F_PId,F_TmId,F_WorkNumber,F_DeptCode,F_WXNo,F_SeartGroupID,F_SeartGroup,F_WxOpenId,RegionId,F_Origdepts,F_Flag ");
             strSql.Append(" FROM T_Sys_UserAccount ");
             if (strWhere.Trim() != "")
             {

codegit/CallCenterApi/CallCenterApi.DAL/T_Wo_WorkOrderItem_New.cs

@@ -41,9 +41,9 @@ namespace CallCenterApi.DAL
         {
             StringBuilder strSql = new StringBuilder();
             strSql.Append("insert into T_Wo_WorkOrderItem_New(");
-            strSql.Append("F_WoID,F_WoState,F_ItemType,F_OptType,F_OptContent,F_NextUser,F_NextDept,F_IsUsed,F_LimitTime,F_IsSMS,F_SMSToUser,F_SMSToPhone,F_SMSContent,F_CreateUser,F_CreateTime,F_LastTime)");
+            strSql.Append("F_WoID,F_WoState,F_ItemType,F_OptType,F_OptContent,F_NextUser,F_NextDept,F_IsUsed,F_LimitTime,F_IsSMS,F_SMSToUser,F_SMSToPhone,F_SMSContent,F_CreateUser,F_CreateTime,F_LastTime,F_Type)");
             strSql.Append(" values (");
-            strSql.Append("@F_WoID,@F_WoState,@F_ItemType,@F_OptType,@F_OptContent,@F_NextUser,@F_NextDept,@F_IsUsed,@F_LimitTime,@F_IsSMS,@F_SMSToUser,@F_SMSToPhone,@F_SMSContent,@F_CreateUser,@F_CreateTime,@F_LastTime)");
+            strSql.Append("@F_WoID,@F_WoState,@F_ItemType,@F_OptType,@F_OptContent,@F_NextUser,@F_NextDept,@F_IsUsed,@F_LimitTime,@F_IsSMS,@F_SMSToUser,@F_SMSToPhone,@F_SMSContent,@F_CreateUser,@F_CreateTime,@F_LastTime,@F_Type)");
             strSql.Append(";select @@IDENTITY");
             SqlParameter[] parameters = {
                     new SqlParameter("@F_WoID", SqlDbType.BigInt,8),
@@ -61,7 +61,8 @@ namespace CallCenterApi.DAL
                     new SqlParameter("@F_SMSContent", SqlDbType.NText),
                     new SqlParameter("@F_CreateUser", SqlDbType.VarChar,50),
                     new SqlParameter("@F_CreateTime", SqlDbType.DateTime),
-                     new SqlParameter("@F_LastTime", SqlDbType.DateTime)
+                    new SqlParameter("@F_LastTime", SqlDbType.DateTime),
+                    new SqlParameter("@F_Type",  SqlDbType.Int,4)
             };
             parameters[0].Value = model.F_WoID;
             parameters[1].Value = model.F_WoState;
@@ -79,7 +80,8 @@ namespace CallCenterApi.DAL
             parameters[13].Value = model.F_CreateUser;
             parameters[14].Value = model.F_CreateTime;
             parameters[15].Value = model.F_LastTime;
-            
+            parameters[16].Value = model.F_Type;
+
             object obj = DbHelperSQL.GetSingle(strSql.ToString(), parameters);
             if (obj == null)
             {
@@ -112,7 +114,8 @@ namespace CallCenterApi.DAL
             strSql.Append("F_SMSContent=@F_SMSContent,");
             strSql.Append("F_CreateUser=@F_CreateUser,");
             strSql.Append("F_CreateTime=@F_CreateTime,");
-            strSql.Append("F_LastTime=@F_LastTime");
+            strSql.Append("F_LastTime=@F_LastTime,");
+            strSql.Append("F_Type=@F_Type");
             strSql.Append(" where F_ID=@F_ID");
             SqlParameter[] parameters = {
                     new SqlParameter("@F_WoID", SqlDbType.BigInt,8),
@@ -131,6 +134,7 @@ namespace CallCenterApi.DAL
                     new SqlParameter("@F_CreateUser", SqlDbType.VarChar,50),
                     new SqlParameter("@F_CreateTime", SqlDbType.DateTime),
                     new SqlParameter("@F_LastTime", SqlDbType.DateTime),
+                    new SqlParameter("@F_Type", SqlDbType.Int,4),
                     new SqlParameter("@F_ID", SqlDbType.BigInt,8)};
             parameters[0].Value = model.F_WoID;
             parameters[1].Value = model.F_WoState;
@@ -148,7 +152,8 @@ namespace CallCenterApi.DAL
             parameters[13].Value = model.F_CreateUser;
             parameters[14].Value = model.F_CreateTime;
             parameters[15].Value = model.F_LastTime;
-            parameters[16].Value = model.F_ID;
+            parameters[16].Value = model.F_Type;
+            parameters[17].Value = model.F_ID;
 
             int rows = DbHelperSQL.ExecuteSql(strSql.ToString(), parameters);
             if (rows > 0)
@@ -308,7 +313,11 @@ namespace CallCenterApi.DAL
                 {
                     model.F_LastTime = DateTime.Parse(row["F_LastTime"].ToString());
                 }
-                
+                if (row["F_Type"] != null && row["F_Type"].ToString() != "")
+                {
+                    model.F_Type = int.Parse(row["F_Type"].ToString());
+                }
+
             }
             return model;
         }

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

@@ -102,7 +102,8 @@ namespace CallCenterApi.Interface.Controllers
                         F_WorkNumber = x.F_WorkNumber,
                         //F_WXNo=x.F_WXNo,
                         F_AreaName = GetModelDeptName(x.F_DeptId),
-                        F_SeatGroup = x.F_SeartGroup
+                        F_SeatGroup = x.F_SeartGroup,
+                        F_Flag=x.F_Flag
                     }),
                     total = recordCount
                 };
@@ -309,6 +310,8 @@ namespace CallCenterApi.Interface.Controllers
                 userAccountModel.F_DeleteFlag = 0;
                 if (input.HjType != null)
                     userAccountModel.F_HJType = input.HjType;
+                if (input.F_Flag != 0)
+                    userAccountModel.F_Flag = input.F_Flag;//标识(1-负责外线工单处理，2-负责内线工单处理)
                 //if (input.IsSeat)
                 //{
                 //    userAccountModel.F_WXNo = input.WXNo.Trim();
@@ -375,8 +378,8 @@ namespace CallCenterApi.Interface.Controllers
         public ActionResult EditUsers(UserAccountInput input)
         {
             ActionResult res = NoToken("未知错误，请重新登录");
-            if (Request.IsAuthenticated)
-            {
+            //if (Request.IsAuthenticated)
+            //{
                 BLL.T_Sys_UserAccount sysUserAccountBll = new BLL.T_Sys_UserAccount();
                 Model.T_Sys_UserAccount userAccountModel = sysUserAccountBll.GetModelList("  F_UserId = " + input.UserId).FirstOrDefault();
                 if (userAccountModel == null)
@@ -438,7 +441,7 @@ namespace CallCenterApi.Interface.Controllers
                 if (input.Telphone != null)
                     userAccountModel.F_Telephone = input.Telphone;
                 if (input.Birth != null)
-                    userAccountModel.F_Birthday = input.Birth;
+                    userAccountModel.F_Birthday = input.Birth;            
                 //userAccountModel.F_CreateOn = DateTime.Now;
 
                 //if (input.SeartGroupID != 0)
@@ -470,6 +473,10 @@ namespace CallCenterApi.Interface.Controllers
                 userAccountModel.F_DeleteFlag = 0;
                 if (input.HjType != null)
                     userAccountModel.F_HJType = input.HjType;
+                #region 20220426 增加用户标识
+                if (input.F_Flag != 0)
+                    userAccountModel.F_Flag = input.F_Flag;//标识(1-负责外线工单处理，2-负责内线工单处理)
+                #endregion
 
                 if (input.IsSeat)
                 {
@@ -494,7 +501,7 @@ namespace CallCenterApi.Interface.Controllers
                     else
                         res = Error("编辑失败！");
                 }
-            }
+            //}
             return res;
         }
         //[Authority]

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

@@ -2,6 +2,7 @@
 using CallCenterApi.DB;
 using CallCenterApi.Interface.App_Start;
 using CallCenterApi.Interface.Controllers.Base;
+using CallCenterApi.Interface.Controllers.workorder;
 using CallCenterApi.Interface.Models.Enum;
 using CallCenterApi.Interface.Models.Input;
 using CallCenterAPI.WechatSDK;
@@ -2906,8 +2907,81 @@ namespace CallCenterApi.Interface.Controllers.weixin
                     }
                     else if (model1[i].F_State == 16)
                     {
-                        model.F_StateName = "待办理";
+                        model.F_StateName = "待审批";
+                    }
+                    else if (model1[i].F_State == 17)
+                    {
+                        model.F_StateName = "已撤回待指派";
+                    }
+
+                    #region  内线工单状态
+                    model.F_State2 = model1[i].F_State2;
+                    if (model1[i].F_State2 == 0)//工单状态
+                    {
+                        model.F_StateName2 = "待指派";
+                    }
+                    else if (model1[i].F_State2 == 1)
+                    {
+                        model.F_StateName2 = "待接单";
+                    }
+                    else if (model1[i].F_State2 == 2)
+                    {
+                        model.F_StateName2 = "待处理";
+                    }
+                    else if (model1[i].F_State2 == 3)
+                    {
+                        model.F_StateName2 = "已退回";
+                    }
+                    else if (model1[i].F_State2 == 4)
+                    {
+                        model.F_StateName2 = "异常退回";
                     }
+                    else if (model1[i].F_State2 == 5)
+                    {
+                        model.F_StateName2 = "处理中";
+                    }
+                    else if (model1[i].F_State2 == 6)
+                    {
+                        model.F_StateName2 = "待回访";
+                    }
+                    else if (model1[i].F_State2 == 7)
+                    {
+                        model.F_StateName2 = "待完结";
+                    }
+                    else if (model1[i].F_State2 == 10)
+                    {
+                        model.F_StateName2 = "已处理";
+                    }
+                    else if (model1[i].F_State2 == 11)
+                    {
+                        model.F_StateName2 = "已回访";
+                    }
+                    else if (model1[i].F_State2 == 12)
+                    {
+                        model.F_StateName2 = "已退回";
+                    }
+                    else if (model1[i].F_State2 == 13)
+                    {
+                        model.F_StateName2 = "导入工单";
+                    }
+                    else if (model1[i].F_State2 == 14)
+                    {
+                        model.F_StateName2 = "待办理";
+                    }
+                    else if (model1[i].F_State2 == 15)
+                    {
+                        model.F_StateName2 = "微信未通过";
+                    }
+                    else if (model1[i].F_State2 == 16)
+                    {
+                        model.F_StateName2 = "待审批";
+                    }
+                    else if (model1[i].F_State2 == 17)
+                    {
+                        model.F_StateName2 = "已撤回待指派";
+                    }
+                    #endregion 内线工单状态
+
                     #endregion
                     model.F_CusName = model1[i].F_CusName;//客户姓名
                     model.F_CusPhone = model1[i].F_CusPhone;//客户电话
@@ -3108,6 +3182,24 @@ namespace CallCenterApi.Interface.Controllers.weixin
                     model.RemainingTime = string.Format("剩余{0:f0}天{1:f0}时{2:f0}分", days, hours, minutes);
                     else
                         model.RemainingTime = string.Format("超时{0:f0}天{1:f0}时{2:f0}分", days, hours, minutes);
+
+
+                    #region 内线超时时间计算
+                    float c2 = TimeToOver(model1[i].F_ID, model1[i].F_limit, 2);
+                    float a2 = Math.Abs(c2);
+                    int days2 = (int)Math.Floor(Convert.ToDouble(a2 / 24));
+                    int hours2 = days2 > 0
+                                   ? (int)Math.Floor(Convert.ToDouble((a2 - days2 * 24)))
+                                   : (int)Math.Floor(Convert.ToDouble(a2));
+                    float minutes2 = hours2 > 0
+                                   ? a2 * 60 - days2 * 1440 - hours2 * 60
+                                   : 0;
+                    if (c2 > 0)
+                        model.RemainingTime2 = string.Format("剩余{0:f0}天{1:f0}时{2:f0}分", days2, hours2, minutes2);
+                    else
+                        model.RemainingTime2 = string.Format("超时{0:f0}天{1:f0}时{2:f0}分", days2, hours2, minutes2);
+                    #endregion
+
                     if (ua != null)
                     {
                         var itemlast = itembll.GetModelList("   F_WoID='" + model.F_ID + "' order by F_ID desc").FirstOrDefault();
@@ -3138,10 +3230,18 @@ namespace CallCenterApi.Interface.Controllers.weixin
                     model.F_limitTime = time;
                     if (model1[i].F_Type !="3")
                     {
+                        #region 判断外线是否超时
                         if (TimeToOver(model1[i].F_ID, model1[i].F_limit) < 0)
                         {
                             model.F_IsOver = 1;
                         }
+                        #endregion
+                        #region 判断内线是否超时
+                        else if (TimeToOver(model1[i].F_ID, model1[i].F_limit, 2) < 0)
+                        {
+                            model.F_IsOver = 2; //内线超时
+                        }
+                        #endregion
                         else
                         {
                             model.F_IsOver = model1[i].F_IsOver;
@@ -3172,9 +3272,18 @@ namespace CallCenterApi.Interface.Controllers.weixin
         /// </summary>
         /// <param name="id"></param>
         /// <returns></returns>
-        private float TimeToOver(int id, int limit)
+        private float TimeToOver(int id, int limit, int flag = 1)
         {
-            var itemlasts = itembll.GetModelList("  F_ItemType=" + (int)EnumItemType.deal + " and  F_WoID=" + id );
+            string strsql = "";
+            if (flag == 1)
+            {
+                strsql = " and F_Type in(1,3)";
+            }
+            else if (flag == 2)
+            {
+                strsql = " and F_Type in(2,3)";
+            }
+            var itemlasts = itembll.GetModelList("  F_ItemType=" + (int)EnumItemType.deal + "" + strsql + " and  F_WoID=" + id);
             string time1 = "", time2 = ""; int x = 0, y = 0;
             if (itemlasts.Count > 0)
             {
@@ -3194,7 +3303,7 @@ namespace CallCenterApi.Interface.Controllers.weixin
                 {
                     if (itemlasts[i].F_WoState >= 1)
                     {
-                      
+
                         if (itemlasts[i].F_WoState == 10 || itemlasts[i].F_WoState == 11)
                         {
                             y = i;
@@ -3206,7 +3315,7 @@ namespace CallCenterApi.Interface.Controllers.weixin
                 {
                     if (time1 != "")
                     {
-                        if (y >x  )
+                        if (y > x)
                         {
                             System.TimeSpan a = DateTime.Parse(time2) - DateTime.Parse(time1);
                             float b = limit - (float)a.TotalHours;

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Global.asax.cs

@@ -37,12 +37,18 @@ namespace CallCenterApi.Interface
             var context = app.Context;
             if (context == null) throw new ArgumentNullException("context");
             var token = context.Request["token"];
+            //string token = "";
+            //var header = context.Request.Headers;
+            //if (header.AllKeys.Contains("token"))
+            //{
+            //    token = header["token"].ToString();//Bearer token
+            //}
             if (string.IsNullOrWhiteSpace(token)) return;
             try
             {
                 //获取缓存
-                var dict = CacheHelper.Get(token);
-                if (dict == null) return;
+                //var dict = CacheHelper.Get(token);
+                //if (dict == null) return;
                 Cache.Models.CurrentUserInfo userData = null;
                 //获取FormsAuthenticationTicket对象
                 FormsAuthenticationTicket ticket = FormsAuthentication.Decrypt(token);

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Models/Input/UserAccountInput.cs

@@ -28,6 +28,7 @@ namespace CallCenterApi.Interface.Models.Input
         public DateTime? Birth { get; set; }
         public int? HjType { get; set; }
         public string Remark { get; set; }
+        public int F_Flag { get; set; }
         //public int RegionId { get; set; } = 0;   //区域项目id
     }
 }

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Models/Input/WorkOrderNewInput.cs

@@ -146,13 +146,21 @@ namespace CallCenterApi.Interface.Models.Input
             get; set;
         }
         /// <summary>
-        /// 剩余时间
+        /// 剩余时间---外线工单
         /// </summary>
         public string  RemainingTime
         {
             get; set;
         }
-       
+
+        /// <summary>
+        /// 剩余时间---内线工单
+        /// </summary>
+        public string RemainingTime2
+        {
+            get; set;
+        }
+
         /// <summary>
         /// 处理方式:当即办理、电话转接、网络转办
         /// </summary>
@@ -464,20 +472,34 @@ namespace CallCenterApi.Interface.Models.Input
             get; set;
         }
         /// <summary>
-        /// 工单状态
+        /// 工单状态-外线
         /// </summary>
         public int?  F_State
         {
             get; set;
         }
         /// <summary>
-        /// 工单状态
+        /// 工单状态-内线线
+        /// </summary>
+        public int? F_State2
+        {
+            get; set;
+        }
+        /// <summary>
+        /// 工单状态-外线
         /// </summary>
         public string F_StateName
         {
             get; set;
         }
         /// <summary>
+        /// 工单状态-内线
+        /// </summary>
+        public string F_StateName2
+        {
+            get; set;
+        }
+        /// <summary>
         /// 市场管理科-生产基地（新乡、新疆、九江、东北、贴牌、无法确定）
         /// </summary>
         public string F_SC_ProductBase
@@ -654,7 +676,7 @@ namespace CallCenterApi.Interface.Models.Input
             get; set;
         }
         /// <summary>
-        /// 是否超时
+        /// 是否超时 0 未超时，1外线超时，2内线超时
         /// </summary>
         public int? F_IsOver
         {
@@ -675,13 +697,20 @@ namespace CallCenterApi.Interface.Models.Input
             get; set;
         }
         /// <summary>
-        /// 处理内容
+        /// 处理内容 -外线
         /// </summary>
         public string F_DealContent
         {
             get; set;
         }
         /// <summary>
+        /// 处理内容 -内线
+        /// </summary>
+        public string F_DealContent2
+        {
+            get; set;
+        }
+        /// <summary>
         /// 处理结果:已处理，未处理
         /// </summary>
         public string F_DealResult

codegit/CallCenterApi/CallCenterApi.Model/T_Sys_UserAccount.cs

@@ -324,6 +324,11 @@ namespace CallCenterApi.Model
         }
 
         public string F_Origdepts { get; set; }
+
+        /// <summary>
+        /// 用户标识(1-负责外线工单处理，2-负责内线工单处理)
+        /// </summary>
+        public int F_Flag { get; set; }
         #endregion Model
 
 

codegit/CallCenterApi/CallCenterApi.Model/T_Wo_WorkOrder.cs

@@ -103,6 +103,20 @@ namespace CallCenterApi.Model
         private string _f_visitremarks;
         private string _f_brand;
         private string _f_annotation;
+        private string _f_production;
+        private string _f_crops;
+        private string _f_carnumber;
+        private decimal? _f_loadingfee;
+        private decimal? _f_unloadingfee;
+        private decimal? _f_materialfee;
+        private string _f_formula;
+        private int? _f_returnquantity;
+        private string _f_eventreason;
+        private string _f_mailingnumber;
+        private string _f_expressname;
+        private string _f_dealcontent2;
+        private int? _f_state2;
+        private string _f_annotation2;
         public string F_Annotation
         {
             set { _f_annotation = value; }
@@ -674,7 +688,7 @@ namespace CallCenterApi.Model
             get { return _f_auditcont; }
         }
         /// <summary>
-        /// 是否超时
+        ///  是否超时 0 未超时，1外线超时，2内线超时，3内外线都超时
         /// </summary>
         public int? F_IsOver
         {
@@ -826,15 +840,119 @@ namespace CallCenterApi.Model
             set { _f_deleteon = value; }
             get { return _f_deleteon; }
         }
+
         /// <summary>
         /// 生产单位
         /// </summary>
-        public string F_Production { set; get; }
-
+        public string F_Production
+        {
+            set { _f_production = value; }
+            get { return _f_production; }
+        }
         /// <summary>
         /// 投诉- 肥效类增加作物字段
         /// </summary>
-        public string F_Crops { get; set; }
+        public string F_Crops
+        {
+            set { _f_crops = value; }
+            get { return _f_crops; }
+        }
+        /// <summary>
+        /// 车牌号
+        /// </summary>
+        public string F_CarNumber
+        {
+            set { _f_carnumber = value; }
+            get { return _f_carnumber; }
+        }
+        /// <summary>
+        /// 装车费
+        /// </summary>
+        public decimal? F_LoadingFee
+        {
+            set { _f_loadingfee = value; }
+            get { return _f_loadingfee; }
+        }
+        /// <summary>
+        /// 卸车费
+        /// </summary>
+        public decimal? F_UnLoadingFee
+        {
+            set { _f_unloadingfee = value; }
+            get { return _f_unloadingfee; }
+        }
+        /// <summary>
+        /// 返料费
+        /// </summary>
+        public decimal? F_MaterialFee
+        {
+            set { _f_materialfee = value; }
+            get { return _f_materialfee; }
+        }
+        /// <summary>
+        /// 配方
+        /// </summary>
+        public string F_Formula
+        {
+            set { _f_formula = value; }
+            get { return _f_formula; }
+        }
+        /// <summary>
+        /// 实收返厂数量
+        /// </summary>
+        public int? F_ReturnQuantity
+        {
+            set { _f_returnquantity = value; }
+            get { return _f_returnquantity; }
+        }
+        /// <summary>
+        /// 事件原因
+        /// </summary>
+        public string F_EventReason
+        {
+            set { _f_eventreason = value; }
+            get { return _f_eventreason; }
+        }
+        /// <summary>
+        /// 抽检类-样品邮寄单号
+        /// </summary>
+        public string F_MailingNumber
+        {
+            set { _f_mailingnumber = value; }
+            get { return _f_mailingnumber; }
+        }
+        /// <summary>
+        /// 快递名称
+        /// </summary>
+        public string F_ExpressName
+        {
+            set { _f_expressname = value; }
+            get { return _f_expressname; }
+        }
+        /// <summary>
+        /// 工单处理内容(内线)
+        /// </summary>
+        public string F_DealContent2
+        {
+            set { _f_dealcontent2 = value; }
+            get { return _f_dealcontent2; }
+        }
+        /// <summary>
+        /// 工单状态(内线)
+        /// </summary>
+        public int? F_State2
+        {
+            set { _f_state2 = value; }
+            get { return _f_state2; }
+        }
+        /// <summary>
+        /// 注解(内线)
+        /// </summary>
+        public string F_Annotation2
+        {
+            set { _f_annotation2 = value; }
+            get { return _f_annotation2; }
+        }
         #endregion Model
     }
 

codegit/CallCenterApi/CallCenterApi.Model/T_Wo_WorkOrderItem_New.cs

@@ -31,6 +31,8 @@ namespace CallCenterApi.Model
         private string _f_smscontent;
         private string _f_createuser;
         private DateTime? _f_createtime;
+        private DateTime? _f_lasttime;
+        private int? _f_type = 1;
         /// <summary>
         /// 工单记录ID
         /// </summary>
@@ -162,7 +164,21 @@ namespace CallCenterApi.Model
         /// <summary>
         /// 上个节点时间
         /// </summary>
-        public DateTime ? F_LastTime { set; get; }
+        public DateTime? F_LastTime
+        {
+            set { _f_lasttime = value; }
+            get { return _f_lasttime; }
+        }
+        /// <summary>
+        /// 内外线标识(1 外线,2 内线)
+        /// </summary>
+        public int? F_Type
+        {
+            set { _f_type = value; }
+            get { return _f_type; }
+        }
         #endregion Model
+
     }
 }
+

codegit/CallCenterApi/CallCenterApi.Model/UserAccount.cs

@@ -323,6 +323,8 @@ namespace CallCenterApi.Model
             set { _f_seartgroup = value; }
             get { return _f_seartgroup; }
         }
+        ///用户标识(1-负责外线工单处理，2-负责内线工单处理)
+        public int F_Flag { get; set; }
         #endregion Model
 
         /// <summary>