1

CallCenterApi/CallCenterApi.DAL/T_Bus_VisitResult.cs

@@ -38,9 +38,9 @@ namespace CallCenterApi.DAL
         {
             StringBuilder strSql = new StringBuilder();
             strSql.Append("insert into T_Bus_VisitResult(");
-            strSql.Append("F_WorkOrderId,F_AssignedId,F_VisitUser,F_Type,F_IsSatisfie,F_Result,F_LimitTime,F_CallRecordId,F_Remark,F_State,F_CreateUser,F_CreateTime,F_IsDelete,F_DeleteUser,F_DeleteTime,F_File,F_IsPerform,F_IsOver)");
+            strSql.Append("F_WorkOrderId,F_AssignedId,F_VisitUser,F_Type,F_IsSatisfie,F_Result,F_LimitTime,F_CallRecordId,F_Remark,F_State,F_CreateUser,F_CreateTime,F_IsDelete,F_DeleteUser,F_DeleteTime,F_File,F_IsPerform,F_IsOver,F_IsResolved)");
             strSql.Append(" values (");
-            strSql.Append("@F_WorkOrderId,@F_AssignedId,@F_VisitUser,@F_Type,@F_IsSatisfie,@F_Result,@F_LimitTime,@F_CallRecordId,@F_Remark,@F_State,@F_CreateUser,@F_CreateTime,@F_IsDelete,@F_DeleteUser,@F_DeleteTime,@F_File,@F_IsPerform,@F_IsOver)");
+            strSql.Append("@F_WorkOrderId,@F_AssignedId,@F_VisitUser,@F_Type,@F_IsSatisfie,@F_Result,@F_LimitTime,@F_CallRecordId,@F_Remark,@F_State,@F_CreateUser,@F_CreateTime,@F_IsDelete,@F_DeleteUser,@F_DeleteTime,@F_File,@F_IsPerform,@F_IsOver,@F_IsResolved)");
             strSql.Append(";select @@IDENTITY");
             SqlParameter[] parameters = {
                     new SqlParameter("@F_WorkOrderId", SqlDbType.NVarChar,50),
@@ -60,7 +60,8 @@ namespace CallCenterApi.DAL
                     new SqlParameter("@F_DeleteTime", SqlDbType.DateTime),
                     new SqlParameter("@F_File", SqlDbType.VarChar,500),
                     new SqlParameter("@F_IsPerform", SqlDbType.Int,4),
-                    new SqlParameter("@F_IsOver", SqlDbType.Int,4)
+                    new SqlParameter("@F_IsOver", SqlDbType.Int,4),
+                     new SqlParameter("@F_IsResolved", SqlDbType.Int,4)
                     
             };
             parameters[0].Value = model.F_WorkOrderId;
@@ -81,6 +82,8 @@ namespace CallCenterApi.DAL
             parameters[15].Value = model.F_File;
             parameters[16].Value = model.F_IsPerform;
             parameters[17].Value = model.F_IsOver;
+            parameters[18].Value = model.F_IsResolved;
+            
             object obj = DbHelperSQL.GetSingle(strSql.ToString(), parameters);
             if (obj == null)
             {
@@ -114,6 +117,7 @@ namespace CallCenterApi.DAL
             strSql.Append("F_DeleteUser=@F_DeleteUser,");
             strSql.Append("F_DeleteTime=@F_DeleteTime,");
             strSql.Append("F_File=@F_File,");
+            strSql.Append("F_IsResolved=@F_IsResolved,");
             strSql.Append("F_IsPerform=@F_IsPerform "); 
             strSql.Append(" where F_Id=@F_Id");
             SqlParameter[] parameters = {
@@ -133,6 +137,7 @@ namespace CallCenterApi.DAL
                     new SqlParameter("@F_DeleteUser", SqlDbType.VarChar,50),
                     new SqlParameter("@F_DeleteTime", SqlDbType.DateTime),
                     new SqlParameter("@F_File", SqlDbType.VarChar,500),
+                    new SqlParameter("@F_IsResolved", SqlDbType.Int,4),
                     new SqlParameter("@F_IsPerform", SqlDbType.Int,4),
                     new SqlParameter("@F_Id", SqlDbType.Int,4)};
             parameters[0].Value = model.F_WorkOrderId;
@@ -151,8 +156,9 @@ namespace CallCenterApi.DAL
             parameters[13].Value = model.F_DeleteUser;
             parameters[14].Value = model.F_DeleteTime;
             parameters[15].Value = model.F_File;
-            parameters[16].Value = model.F_IsPerform;
-            parameters[17].Value = model.F_Id;
+            parameters[16].Value = model.F_IsResolved;
+            parameters[17].Value = model.F_IsPerform;
+            parameters[18].Value = model.F_Id;
 
             int rows = DbHelperSQL.ExecuteSql(strSql.ToString(), parameters);
             if (rows > 0)
@@ -216,7 +222,7 @@ namespace CallCenterApi.DAL
         {
 
             StringBuilder strSql = new StringBuilder();
-            strSql.Append("select  top 1 F_Id,F_IsOver,F_WorkOrderId,F_AssignedId,F_VisitUser,F_Type,F_IsSatisfie,F_Result,F_LimitTime,F_CallRecordId,F_Remark,F_State,F_CreateUser,F_CreateTime,F_IsDelete,F_DeleteUser,F_DeleteTime,F_File,F_IsPerform from T_Bus_VisitResult ");
+            strSql.Append("select  top 1 F_Id,F_IsOver,F_IsResolved,F_WorkOrderId,F_AssignedId,F_VisitUser,F_Type,F_IsSatisfie,F_Result,F_LimitTime,F_CallRecordId,F_Remark,F_State,F_CreateUser,F_CreateTime,F_IsDelete,F_DeleteUser,F_DeleteTime,F_File,F_IsPerform from T_Bus_VisitResult ");
             strSql.Append(" where F_Id=@F_Id");
             SqlParameter[] parameters = {
                     new SqlParameter("@F_Id", SqlDbType.Int,4)
@@ -320,6 +326,10 @@ namespace CallCenterApi.DAL
                 {
                     model.F_IsOver = int.Parse(row["F_IsOver"].ToString());
                 }
+                if (row["F_IsResolved"] != null && row["F_IsResolved"].ToString() != "")
+                {
+                    model.F_IsResolved = int.Parse(row["F_IsResolved"].ToString());
+                }
                 
             }
             return model;
@@ -331,7 +341,7 @@ namespace CallCenterApi.DAL
         public DataSet GetList(string strWhere)
         {
             StringBuilder strSql = new StringBuilder();
-            strSql.Append("select F_Id,F_WorkOrderId,F_AssignedId,F_IsOver,F_VisitUser,F_Type,F_IsSatisfie,F_Result,F_LimitTime,F_CallRecordId,F_Remark,F_State,F_CreateUser,F_CreateTime,F_IsDelete,F_DeleteUser,F_DeleteTime,F_File,F_IsPerform ");
+            strSql.Append("select F_Id,F_WorkOrderId,F_IsResolved,F_AssignedId,F_IsOver,F_VisitUser,F_Type,F_IsSatisfie,F_Result,F_LimitTime,F_CallRecordId,F_Remark,F_State,F_CreateUser,F_CreateTime,F_IsDelete,F_DeleteUser,F_DeleteTime,F_File,F_IsPerform ");
             strSql.Append(" FROM T_Bus_VisitResult  WITH(NOLOCK)");
             if (strWhere.Trim() != "")
             {
@@ -351,7 +361,7 @@ namespace CallCenterApi.DAL
             {
                 strSql.Append(" top " + Top.ToString());
             }
-            strSql.Append(" F_Id,F_WorkOrderId,F_AssignedId,F_VisitUser,F_IsOver,F_Type,F_IsSatisfie,F_Result,F_LimitTime,F_CallRecordId,F_Remark,F_State,F_CreateUser,F_CreateTime,F_IsDelete,F_DeleteUser,F_DeleteTime,F_File,F_IsPerform ");
+            strSql.Append(" F_Id,F_WorkOrderId,F_IsResolved,F_AssignedId,F_VisitUser,F_IsOver,F_Type,F_IsSatisfie,F_Result,F_LimitTime,F_CallRecordId,F_Remark,F_State,F_CreateUser,F_CreateTime,F_IsDelete,F_DeleteUser,F_DeleteTime,F_File,F_IsPerform ");
             strSql.Append(" FROM T_Bus_VisitResult WITH(NOLOCK) ");
             if (strWhere.Trim() != "")
             {

CallCenterApi/CallCenterApi.DAL/submit_case_info.cs

@@ -51,9 +51,9 @@ namespace CallCenterApi.DAL
         {
             StringBuilder strSql = new StringBuilder();
             strSql.Append("insert into submit_case_info(");
-            strSql.Append("CASE_SERIAL,AREA_CODE,CASE_ID,APPLICANT_NAME,APPLICANT_SEX,APPLICANT_AGE,APPLICANT_NUMBER,APPLICANT_TIME,HWY_NAME,HWY_LOGINID,CASE_TIME,CASE_TITLE,CASE_CONTENT,CASE_SOURCE,CASE_TYPE,CASE_ACCORD,CASE_ISPUBLIC,CASE_ISVISIT,CASE_ISURGENT,CASE_LNGLAT,CASE_EMOTION,CASE_ADDRESS,Create_Time,ErrorObjs,Code)");
+            strSql.Append("CASE_SERIAL,AREA_CODE,CASE_ID,APPLICANT_NAME,APPLICANT_SEX,APPLICANT_AGE,APPLICANT_NUMBER,APPLICANT_TIME,HWY_NAME,HWY_LOGINID,CASE_TIME,CASE_TITLE,CASE_CONTENT,CASE_SOURCE,CASE_TYPE,CASE_ACCORD,CASE_ISPUBLIC,CASE_ISVISIT,CASE_ISURGENT,CASE_LNGLAT,CASE_EMOTION,CASE_ADDRESS,Create_Time,ErrorObjs,Code,USER_TYPE)");
             strSql.Append(" values (");
-            strSql.Append("@CASE_SERIAL,@AREA_CODE,@CASE_ID,@APPLICANT_NAME,@APPLICANT_SEX,@APPLICANT_AGE,@APPLICANT_NUMBER,@APPLICANT_TIME,@HWY_NAME,@HWY_LOGINID,@CASE_TIME,@CASE_TITLE,@CASE_CONTENT,@CASE_SOURCE,@CASE_TYPE,@CASE_ACCORD,@CASE_ISPUBLIC,@CASE_ISVISIT,@CASE_ISURGENT,@CASE_LNGLAT,@CASE_EMOTION,@CASE_ADDRESS,@Create_Time,@ErrorObjs,@Code)");
+            strSql.Append("@CASE_SERIAL,@AREA_CODE,@CASE_ID,@APPLICANT_NAME,@APPLICANT_SEX,@APPLICANT_AGE,@APPLICANT_NUMBER,@APPLICANT_TIME,@HWY_NAME,@HWY_LOGINID,@CASE_TIME,@CASE_TITLE,@CASE_CONTENT,@CASE_SOURCE,@CASE_TYPE,@CASE_ACCORD,@CASE_ISPUBLIC,@CASE_ISVISIT,@CASE_ISURGENT,@CASE_LNGLAT,@CASE_EMOTION,@CASE_ADDRESS,@Create_Time,@ErrorObjs,@Code,@USER_TYPE)");
             strSql.Append(";select @@IDENTITY");
             SqlParameter[] parameters = {
                     new SqlParameter("@CASE_SERIAL", SqlDbType.NVarChar,50),
@@ -80,8 +80,10 @@ namespace CallCenterApi.DAL
                     new SqlParameter("@CASE_ADDRESS", SqlDbType.NVarChar,500),
                     new SqlParameter("@Create_Time", SqlDbType.DateTime),
                     new SqlParameter("@ErrorObjs", SqlDbType.NVarChar,-1),
-                    new SqlParameter("@Code", SqlDbType.Int,4)};
-            parameters[0].Value = model.CASE_SERIAL;
+                    new SqlParameter("@Code", SqlDbType.Int,4),
+                    new SqlParameter("@USER_TYPE", SqlDbType.NVarChar,50)
+            }; 
+             parameters[0].Value = model.CASE_SERIAL;
             parameters[1].Value = model.AREA_CODE;
             parameters[2].Value = model.CASE_ID;
             parameters[3].Value = model.APPLICANT_NAME;
@@ -106,7 +108,8 @@ namespace CallCenterApi.DAL
             parameters[22].Value = model.Create_Time;
             parameters[23].Value = model.ErrorObjs;
             parameters[24].Value = model.Code;
-
+            parameters[25].Value = model.USER_TYPE;
+            
             object obj = DbHelperSQL.GetSingle(strSql.ToString(), parameters);
             if (obj == null)
             {
@@ -148,6 +151,7 @@ namespace CallCenterApi.DAL
             strSql.Append("CASE_ADDRESS=@CASE_ADDRESS,");
             strSql.Append("Create_Time=@Create_Time,");
             strSql.Append("ErrorObjs=@ErrorObjs,");
+            strSql.Append("USER_TYPE=@USER_TYPE,");
             strSql.Append("Code=@Code");
             strSql.Append(" where F_ID=@F_ID");
             SqlParameter[] parameters = {
@@ -175,6 +179,7 @@ namespace CallCenterApi.DAL
                     new SqlParameter("@CASE_ADDRESS", SqlDbType.NVarChar,500),
                     new SqlParameter("@Create_Time", SqlDbType.DateTime),
                     new SqlParameter("@ErrorObjs", SqlDbType.NVarChar,-1),
+                    new SqlParameter("@USER_TYPE", SqlDbType.NVarChar,50),
                     new SqlParameter("@Code", SqlDbType.Int,4),
                     new SqlParameter("@F_ID", SqlDbType.Int,4)};
             parameters[0].Value = model.CASE_SERIAL;
@@ -201,8 +206,9 @@ namespace CallCenterApi.DAL
             parameters[21].Value = model.CASE_ADDRESS;
             parameters[22].Value = model.Create_Time;
             parameters[23].Value = model.ErrorObjs;
-            parameters[24].Value = model.Code;
-            parameters[25].Value = model.F_ID;
+            parameters[24].Value = model.USER_TYPE;
+            parameters[25].Value = model.Code;
+            parameters[26].Value = model.F_ID;
 
             int rows = DbHelperSQL.ExecuteSql(strSql.ToString(), parameters);
             if (rows > 0)
@@ -266,7 +272,7 @@ namespace CallCenterApi.DAL
         {
 
             StringBuilder strSql = new StringBuilder();
-            strSql.Append("select  top 1 CASE_SERIAL,AREA_CODE,CASE_ID,APPLICANT_NAME,APPLICANT_SEX,APPLICANT_AGE,APPLICANT_NUMBER,APPLICANT_TIME,HWY_NAME,HWY_LOGINID,CASE_TIME,CASE_TITLE,CASE_CONTENT,CASE_SOURCE,CASE_TYPE,CASE_ACCORD,CASE_ISPUBLIC,CASE_ISVISIT,CASE_ISURGENT,CASE_LNGLAT,CASE_EMOTION,CASE_ADDRESS,Create_Time,F_ID,ErrorObjs,Code from submit_case_info ");
+            strSql.Append("select  top 1 CASE_SERIAL,USER_TYPE,AREA_CODE,CASE_ID,APPLICANT_NAME,APPLICANT_SEX,APPLICANT_AGE,APPLICANT_NUMBER,APPLICANT_TIME,HWY_NAME,HWY_LOGINID,CASE_TIME,CASE_TITLE,CASE_CONTENT,CASE_SOURCE,CASE_TYPE,CASE_ACCORD,CASE_ISPUBLIC,CASE_ISVISIT,CASE_ISURGENT,CASE_LNGLAT,CASE_EMOTION,CASE_ADDRESS,Create_Time,F_ID,ErrorObjs,Code from submit_case_info ");
             strSql.Append(" where F_ID=@F_ID");
             SqlParameter[] parameters = {
                     new SqlParameter("@F_ID", SqlDbType.Int,4)
@@ -398,6 +404,11 @@ namespace CallCenterApi.DAL
                 {
                     model.Code = int.Parse(row["Code"].ToString());
                 }
+                if (row["USER_TYPE"] != null)
+                {
+                    model.USER_TYPE = row["USER_TYPE"].ToString();
+                }
+                
             }
             return model;
         }
@@ -408,7 +419,7 @@ namespace CallCenterApi.DAL
         public DataSet GetList(string strWhere)
         {
             StringBuilder strSql = new StringBuilder();
-            strSql.Append("select CASE_SERIAL,AREA_CODE,CASE_ID,APPLICANT_NAME,APPLICANT_SEX,APPLICANT_AGE,APPLICANT_NUMBER,APPLICANT_TIME,HWY_NAME,HWY_LOGINID,CASE_TIME,CASE_TITLE,CASE_CONTENT,CASE_SOURCE,CASE_TYPE,CASE_ACCORD,CASE_ISPUBLIC,CASE_ISVISIT,CASE_ISURGENT,CASE_LNGLAT,CASE_EMOTION,CASE_ADDRESS,Create_Time,F_ID,ErrorObjs,Code ");
+            strSql.Append("select CASE_SERIAL,USER_TYPE,AREA_CODE,CASE_ID,APPLICANT_NAME,APPLICANT_SEX,APPLICANT_AGE,APPLICANT_NUMBER,APPLICANT_TIME,HWY_NAME,HWY_LOGINID,CASE_TIME,CASE_TITLE,CASE_CONTENT,CASE_SOURCE,CASE_TYPE,CASE_ACCORD,CASE_ISPUBLIC,CASE_ISVISIT,CASE_ISURGENT,CASE_LNGLAT,CASE_EMOTION,CASE_ADDRESS,Create_Time,F_ID,ErrorObjs,Code ");
             strSql.Append(" FROM submit_case_info ");
             if (strWhere.Trim() != "")
             {
@@ -428,7 +439,7 @@ namespace CallCenterApi.DAL
             {
                 strSql.Append(" top " + Top.ToString());
             }
-            strSql.Append(" CASE_SERIAL,AREA_CODE,CASE_ID,APPLICANT_NAME,APPLICANT_SEX,APPLICANT_AGE,APPLICANT_NUMBER,APPLICANT_TIME,HWY_NAME,HWY_LOGINID,CASE_TIME,CASE_TITLE,CASE_CONTENT,CASE_SOURCE,CASE_TYPE,CASE_ACCORD,CASE_ISPUBLIC,CASE_ISVISIT,CASE_ISURGENT,CASE_LNGLAT,CASE_EMOTION,CASE_ADDRESS,Create_Time,F_ID,ErrorObjs,Code ");
+            strSql.Append(" CASE_SERIAL,AREA_CODE,USER_TYPE,CASE_ID,APPLICANT_NAME,APPLICANT_SEX,APPLICANT_AGE,APPLICANT_NUMBER,APPLICANT_TIME,HWY_NAME,HWY_LOGINID,CASE_TIME,CASE_TITLE,CASE_CONTENT,CASE_SOURCE,CASE_TYPE,CASE_ACCORD,CASE_ISPUBLIC,CASE_ISVISIT,CASE_ISURGENT,CASE_LNGLAT,CASE_EMOTION,CASE_ADDRESS,Create_Time,F_ID,ErrorObjs,Code ");
             strSql.Append(" FROM submit_case_info ");
             if (strWhere.Trim() != "")
             {

CallCenterApi/CallCenterApi.DAL/submit_case_visit_info.cs

@@ -51,9 +51,9 @@ namespace CallCenterApi.DAL
         {
             StringBuilder strSql = new StringBuilder();
             strSql.Append("insert into submit_case_visit_info(");
-            strSql.Append("CASE_SERIAL,AREA_CODE,VISIT_TYPE,VISIT_TIME,VISIT_NAME,VISIT_CONTENT,VISIT_SATISFY,VISIT_NUMBER,CreateTime)");
+            strSql.Append("CASE_SERIAL,AREA_CODE,VISIT_TYPE,VISIT_TIME,VISIT_NAME,VISIT_CONTENT,VISIT_SATISFY,VISIT_NUMBER,CreateTime,ISRESOLVED)");
             strSql.Append(" values (");
-            strSql.Append("@CASE_SERIAL,@AREA_CODE,@VISIT_TYPE,@VISIT_TIME,@VISIT_NAME,@VISIT_CONTENT,@VISIT_SATISFY,@VISIT_NUMBER,@CreateTime)");
+            strSql.Append("@CASE_SERIAL,@AREA_CODE,@VISIT_TYPE,@VISIT_TIME,@VISIT_NAME,@VISIT_CONTENT,@VISIT_SATISFY,@VISIT_NUMBER,@CreateTime,@ISRESOLVED)");
             strSql.Append(";select @@IDENTITY");
             SqlParameter[] parameters = {
                     new SqlParameter("@CASE_SERIAL", SqlDbType.NVarChar,50),
@@ -64,7 +64,9 @@ namespace CallCenterApi.DAL
                     new SqlParameter("@VISIT_CONTENT", SqlDbType.NVarChar,-1),
                     new SqlParameter("@VISIT_SATISFY", SqlDbType.NVarChar,50),
                     new SqlParameter("@VISIT_NUMBER", SqlDbType.NVarChar,50),
-                    new SqlParameter("@CreateTime", SqlDbType.DateTime)};
+                    new SqlParameter("@CreateTime", SqlDbType.DateTime),
+                    new SqlParameter("@ISRESOLVED", SqlDbType.Int,4),
+            };
             parameters[0].Value = model.CASE_SERIAL;
             parameters[1].Value = model.AREA_CODE;
             parameters[2].Value = model.VISIT_TYPE;
@@ -74,7 +76,8 @@ namespace CallCenterApi.DAL
             parameters[6].Value = model.VISIT_SATISFY;
             parameters[7].Value = model.VISIT_NUMBER;
             parameters[8].Value = model.CreateTime;
-
+            parameters[9].Value = model.ISRESOLVED;
+            
             object obj = DbHelperSQL.GetSingle(strSql.ToString(), parameters);
             if (obj == null)
             {
@@ -100,6 +103,8 @@ namespace CallCenterApi.DAL
             strSql.Append("VISIT_CONTENT=@VISIT_CONTENT,");
             strSql.Append("VISIT_SATISFY=@VISIT_SATISFY,");
             strSql.Append("VISIT_NUMBER=@VISIT_NUMBER,");
+            strSql.Append("ISRESOLVED=@ISRESOLVED,");
+            
             strSql.Append("CreateTime=@CreateTime");
             strSql.Append(" where F_ID=@F_ID");
             SqlParameter[] parameters = {
@@ -111,6 +116,8 @@ namespace CallCenterApi.DAL
                     new SqlParameter("@VISIT_CONTENT", SqlDbType.NVarChar,-1),
                     new SqlParameter("@VISIT_SATISFY", SqlDbType.NVarChar,50),
                     new SqlParameter("@VISIT_NUMBER", SqlDbType.NVarChar,50),
+                    new SqlParameter("@ISRESOLVED", SqlDbType.Int ,4),
+                    
                     new SqlParameter("@CreateTime", SqlDbType.DateTime),
                     new SqlParameter("@F_ID", SqlDbType.Int,4)};
             parameters[0].Value = model.CASE_SERIAL;
@@ -121,8 +128,9 @@ namespace CallCenterApi.DAL
             parameters[5].Value = model.VISIT_CONTENT;
             parameters[6].Value = model.VISIT_SATISFY;
             parameters[7].Value = model.VISIT_NUMBER;
-            parameters[8].Value = model.CreateTime;
-            parameters[9].Value = model.F_ID;
+            parameters[8].Value = model.ISRESOLVED;
+            parameters[9].Value = model.CreateTime;
+            parameters[10].Value = model.F_ID;
 
             int rows = DbHelperSQL.ExecuteSql(strSql.ToString(), parameters);
             if (rows > 0)
@@ -186,7 +194,7 @@ namespace CallCenterApi.DAL
         {
 
             StringBuilder strSql = new StringBuilder();
-            strSql.Append("select  top 1 F_ID,CASE_SERIAL,AREA_CODE,VISIT_TYPE,VISIT_TIME,VISIT_NAME,VISIT_CONTENT,VISIT_SATISFY,VISIT_NUMBER,CreateTime from submit_case_visit_info ");
+            strSql.Append("select  top 1 F_ID,CASE_SERIAL,ISRESOLVED,AREA_CODE,VISIT_TYPE,VISIT_TIME,VISIT_NAME,VISIT_CONTENT,VISIT_SATISFY,VISIT_NUMBER,CreateTime from submit_case_visit_info ");
             strSql.Append(" where F_ID=@F_ID");
             SqlParameter[] parameters = {
                     new SqlParameter("@F_ID", SqlDbType.Int,4)
@@ -254,6 +262,11 @@ namespace CallCenterApi.DAL
                 {
                     model.CreateTime = DateTime.Parse(row["CreateTime"].ToString());
                 }
+                if (row["ISRESOLVED"] != null && row["ISRESOLVED"].ToString() != "")
+                {
+                    model.ISRESOLVED = int.Parse(row["ISRESOLVED"].ToString());
+                }
+                
             }
             return model;
         }
@@ -264,7 +277,7 @@ namespace CallCenterApi.DAL
         public DataSet GetList(string strWhere)
         {
             StringBuilder strSql = new StringBuilder();
-            strSql.Append("select F_ID,CASE_SERIAL,AREA_CODE,VISIT_TYPE,VISIT_TIME,VISIT_NAME,VISIT_CONTENT,VISIT_SATISFY,VISIT_NUMBER,CreateTime ");
+            strSql.Append("select F_ID,CASE_SERIAL,ISRESOLVED,AREA_CODE,VISIT_TYPE,VISIT_TIME,VISIT_NAME,VISIT_CONTENT,VISIT_SATISFY,VISIT_NUMBER,CreateTime ");
             strSql.Append(" FROM submit_case_visit_info ");
             if (strWhere.Trim() != "")
             {
@@ -284,7 +297,7 @@ namespace CallCenterApi.DAL
             {
                 strSql.Append(" top " + Top.ToString());
             }
-            strSql.Append(" F_ID,CASE_SERIAL,AREA_CODE,VISIT_TYPE,VISIT_TIME,VISIT_NAME,VISIT_CONTENT,VISIT_SATISFY,VISIT_NUMBER,CreateTime ");
+            strSql.Append(" F_ID,CASE_SERIAL,ISRESOLVED,AREA_CODE,VISIT_TYPE,VISIT_TIME,VISIT_NAME,VISIT_CONTENT,VISIT_SATISFY,VISIT_NUMBER,CreateTime ");
             strSql.Append(" FROM submit_case_visit_info ");
             if (strWhere.Trim() != "")
             {

CallCenterApi/CallCenterApi.DB/DbHelperSQL.cs

@@ -15,7 +15,8 @@ namespace CallCenterApi.DB
     public abstract class DbHelperSQL
     {
         //数据库连接字符串(web.config来配置)，可以动态更改connectionString支持多数据库.		
-        public static string connectionString = ConfigurationManager.ConnectionStrings["ConnectionString"].ConnectionString;
+        //public static string connectionString = ConfigurationManager.ConnectionStrings["ConnectionString"].ConnectionString;
+        public static string connectionString = EncryptHelper.DecryptAES(ConfigurationManager.ConnectionStrings["ConnectionString"].ConnectionString);
         public static Log log = LogFactory.GetLogger("DbHelperSQL");
         public DbHelperSQL() { }
 

CallCenterApi/CallCenterApi.DB/DbHelperSQLold.cs

@@ -1,4 +1,5 @@
-using System;
+using CallCenter.Utility;
+using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.Configuration;
@@ -14,7 +15,8 @@ namespace CallCenterApi.DB
     public abstract class DbHelperSQLOld
     {
         //数据库连接字符串(web.config来配置)，可以动态更改connectionString支持多数据库.		
-        public static string connectionString = ConfigurationManager.ConnectionStrings["ConnectionStringOld"].ConnectionString;
+       // public static string connectionString = ConfigurationManager.ConnectionStrings["ConnectionStringOld"].ConnectionString;
+        public static string connectionString = EncryptHelper.DecryptAES(ConfigurationManager.ConnectionStrings["ConnectionStringOld"].ConnectionString);
         public DbHelperSQLOld() { }
 
         #region 公用方法

CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/HomeController.cs

@@ -48,9 +48,8 @@ namespace CallCenterApi.Interface.Controllers
             public string noDept { set; get; }
             public string staffName { set; get; }
         }
-        
 
-       
+        
 
 
         public string json2()

CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/workorder/AffairsController.cs

@@ -4088,6 +4088,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
             /// 工单登记附件id
             /// </summary>
             public string CASE_ATTATH_ID { set; get; }
+            public string USER_TYPE { set; get; }
         }
         /// <summary>
         /// </summary>
@@ -4157,7 +4158,14 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 paras.CASE_ADDRESS = model.F_SourceAddress;
                 paras.SEND_CONTENT = content;
                 paras.CASE_ATTATH_ID = model.F_File;
-
+                if (model.F_IsBusiness != null && model.F_IsBusiness == 1)
+                {
+                    paras.USER_TYPE = "20";
+                }
+                else
+                {
+                    paras.USER_TYPE = "10";
+                }
 
                 try
                 {

CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/workorder/ConvergeController.cs

@@ -1293,6 +1293,7 @@ namespace CallCenterApi.Interface.Controllers
             /// 诉求详细地址
             /// </summary>
             public string CASE_ADDRESS { set; get; }//""
+            public string USER_TYPE { get; set; }
         }
         /// <summary>
         /// </summary>
@@ -1392,6 +1393,14 @@ namespace CallCenterApi.Interface.Controllers
                 {
                     jsonList.CASE_ISURGENT = "30";
                 }
+                if (model.F_IsBusiness != null && model.F_IsBusiness == 1)
+                {
+                    jsonList.USER_TYPE = "20";
+                }
+                else
+                {
+                    jsonList.USER_TYPE = "10";
+                }
                 if (model.F_IsResult == 1)
                     jsonList.CASE_ISVISIT = "0";
                 else
@@ -1504,6 +1513,7 @@ namespace CallCenterApi.Interface.Controllers
             model.CASE_EMOTION = jsonList.CASE_EMOTION;//诉求情感
             model.CASE_ADDRESS = jsonList.CASE_ADDRESS;//诉求详细地址
             model.Create_Time = DateTime.Now;
+            model.USER_TYPE = jsonList.USER_TYPE;//是否企业诉求
             return model;
         }
         #endregion
@@ -1959,6 +1969,8 @@ namespace CallCenterApi.Interface.Controllers
             /// 回访次数
             /// </summary>
             public int VISIT_NUMBER { set; get; }
+
+            public int ISRESOLVED { get; set; }
         }
         /// <summary>
         /// 工单最终评价
@@ -2012,6 +2024,10 @@ namespace CallCenterApi.Interface.Controllers
                     jsonList.VISIT_NUMBER = int.Parse(NUMBER.ToString());
                 else
                     jsonList.VISIT_NUMBER = 1;
+                if (model.F_IsResolved != null)
+                    jsonList.ISRESOLVED = model.F_IsResolved.Value;
+                else
+                    jsonList.ISRESOLVED = 1;
                 paras.jsonList.Add(jsonList);
                 string token = GetToken();
                 if (string.IsNullOrEmpty(token))
@@ -2100,6 +2116,7 @@ namespace CallCenterApi.Interface.Controllers
             model.VISIT_SATISFY = jsonList.VISIT_SATISFY;//回访结果满意度
             model.VISIT_NUMBER = jsonList.VISIT_NUMBER.ToString();//回访次数
             model.CreateTime = DateTime.Now;
+            model.ISRESOLVED = jsonList.ISRESOLVED;//
             return model;
         }
         #endregion
@@ -3191,6 +3208,10 @@ namespace CallCenterApi.Interface.Controllers
 
                     foreach (var model in modellist)
                     {
+                        if (model.number > 5)
+                        {
+                            continue;
+                        }
                         Thread.Sleep(3000);
                         model.F_Content = model.F_Content.Replace("\n", "").Replace(@"'", "").Replace(@"\", "").Replace("\t", "").Replace("%", "%25");
                         string jsonParam = "access_token=" + token + "&paras=" + model.F_Content;
@@ -3274,6 +3295,10 @@ namespace CallCenterApi.Interface.Controllers
                 {
                     foreach (var model in modellist)
                     {
+                        if (model.number > 5)
+                        {
+                            continue;
+                        }
                         Thread.Sleep(3000);
                         model.F_Content = model.F_Content.Replace("\n", "").Replace(@"'", "").Replace(@"\", "").Replace("\t", "").Replace("%", "%25");
                         string jsonParam = "access_token=" + token + "&paras=" + model.F_Content;

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

@@ -11406,7 +11406,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 int level = RequestString.GetInt("level", 0);
                 int issubmit = RequestString.GetInt("issubmit", 0);
                 string callid = RequestString.GetFormString("callid");
-
+                int isbusiness = RequestString.GetInt("isbusiness", 0);
                 string CallRecordsId = RequestString.GetFormString("CallRecordsId");
                 string longitude = RequestString.GetFormString("longitude");//经度
                 string latitude = RequestString.GetFormString("latitude");//纬度
@@ -11505,7 +11505,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                     modelT_Bus_WorkOrder.F_VisitType = visittype;
                     modelT_Bus_WorkOrder.F_Township = township;
                     modelT_Bus_WorkOrder.F_Village = village;
-
+                    modelT_Bus_WorkOrder.F_IsBusiness = isbusiness;
                     if (LeaveRecordId > 0)
                     {
                         var ld = new BLL.T_Call_LeaveRecord().GetModel(LeaveRecordId);
@@ -12426,6 +12426,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 string file = RequestString.GetFormString("file");
                 string workcontent = RequestString.GetFormString("workcontent");
                 string maindeptids = RequestString.GetFormString("maindeptids");
+                int isbusiness = RequestString.GetInt("isbusiness", 0);
                 int limittimes = RequestString.GetInt("limittimes", 0);
                 if (type == 0)
                     return Error("请选择来电类型");
@@ -12468,6 +12469,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                     keyValuePairs.Add("F_Email", email);
                     modelT_Bus_WorkOrder.F_Email = email;//E-mail
                     keyValuePairs.Add("F_ComTitle", title);
+                    keyValuePairs.Add("F_IsBusiness", isbusiness);
                     //  modelT_Bus_WorkOrder.F_ComTitle = title;//标题
                     keyValuePairs.Add("F_ComContent", content);
                     // modelT_Bus_WorkOrder.F_ComContent = content;//情况摘要（投诉内容）
@@ -21612,6 +21614,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 int statistics = RequestString.GetInt("statistics", 0);//是否进行退回统计0否1是
                 int groupstatistics = RequestString.GetInt("groupstatistics", 0);
                 string result = RequestString.GetFormString("result");//回访情况
+                int isResolved = RequestString.GetInt("isResolved", 1);//事件解决结果0未解决1已解决
                 int nexttype = RequestString.GetInt("nexttype", 0);//1重办 2退回重办3仅回访4已办未果
                 string cbreason = RequestString.GetFormString("cbreason");//重办原因
                 string finalopinion = RequestString.GetFormString("finalopinion");//结案意见
@@ -21641,6 +21644,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                                 modelT_Bus_VisitResult.F_VisitUser = visituser;
                                 modelT_Bus_VisitResult.F_Type = type;
                                 modelT_Bus_VisitResult.F_IsSatisfie = issatisfie;
+                                modelT_Bus_VisitResult.F_IsResolved = isResolved;
                                 modelT_Bus_VisitResult.F_Result = result;
                                 modelT_Bus_VisitResult.F_Remark = cbreason;//重办原因
                                 modelT_Bus_VisitResult.F_State = state;
@@ -21680,6 +21684,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                                     modelT_Bus_VisitResult.F_VisitUser = visituser;
                                     modelT_Bus_VisitResult.F_Type = type;
                                     modelT_Bus_VisitResult.F_IsSatisfie = issatisfie;
+                                    modelT_Bus_VisitResult.F_IsResolved = isResolved;
                                     modelT_Bus_VisitResult.F_Result = result;
                                     modelT_Bus_VisitResult.F_Remark = cbreason;//重办原因
                                     modelT_Bus_VisitResult.F_State = state;
@@ -24385,6 +24390,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 string finalopinion = RequestString.GetFormString("finalopinion");//结案意见
                 int issatisfie = RequestString.GetInt("issatisfie", 1);//0不满意 1满意
                 int isnotice = RequestString.GetInt("isnotice", 0);//0不通告 1通告
+            
                 //是否发送短信0否1是
                 int issms = RequestString.GetInt("issms", 0);
                 string deptids = RequestString.GetFormString("deptids");//通告单位

CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/workorder/hb_affairsController.cs

@@ -149,6 +149,14 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 }
                 else
                     modelT_Bus_WorkOrder.F_InfoType = 90;
+                if (result["USER_TYPE"] != null)
+                {
+                    //是否营商
+                    if (result["USER_TYPE"].ToString() == "20")
+                        modelT_Bus_WorkOrder.F_IsBusiness = 1;
+                    else
+                        modelT_Bus_WorkOrder.F_IsBusiness = 0;
+                }
                 modelT_Bus_WorkOrder.F_SourceAddress = result["CASE_ADDRESS"] == null ? "" : result["CASE_ADDRESS"].ToString();
                 modelT_Bus_WorkOrder.F_CusName = result["APPLICANT_NAME"] == null ? "" : result["APPLICANT_NAME"].ToString();
                 if (string.IsNullOrEmpty(result["APPLICANT_NAME"].ToString()))

CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Web.config

@@ -27,8 +27,8 @@
     <!--<add name="ConnectionString" connectionString="Data Source=192.168.8.3;User ID=sa;pwd=800100;Initial Catalog=12345_anyang;"/>-->
     <!--<add name="ConnectionString" connectionString="Data Source=192.168.8.3;User ID=sa;pwd=800100;Initial Catalog=anyang;"/>-->
 
-    <add name="ConnectionString" connectionString="Data Source=192.168.1.36;User ID=sa;pwd=hykj800100;Initial Catalog=HB12345;" />
-
+    <add name="ConnectionString" connectionString="+W8IUPbrCEH773KLes7fVEC+4ZFtJJrFkvPNVAHa+YHI1uWkNRMu6tLFGzlMvyOE7JbNwPH3DI9NOEgvgBpuTKa5FSOeOE2QtxKO8oCulQI=" />
+   <!-- <add name="ConnectionString" connectionString="+W8IUPbrCEH773KLes7fVCZXGyev2Glt1NnofzL1broNji+Bk6jbD725f8xE9tHjScRpjOe1GvovO8Cz1uS4nX41ppgPd78ewfvW6CzDRVY=" /> -->
     <add name="ConnectionStringOld" connectionString="Data Source=192.168.1.36;User ID=sa;pwd=hykj800100;Initial Catalog=HBSZRX;" />
     <add name="MySqlconnection" connectionString="server=192.168.1.200;Port=3306;User ID=root;Password=800100;database=ay110;charset=utf8mb4;Allow User Variables=true;" />
 

CallCenterApi/CallCenterApi.Model/T_Bus_VisitResult.cs

@@ -176,6 +176,7 @@ namespace CallCenterApi.Model
         /// 是否强制结案
         /// </summary>
         public int F_IsOver { set; get; }
+        public int? F_IsResolved { get; set; }
         #endregion Model
 
     }

CallCenterApi/CallCenterApi.Model/T_Bus_WorkOrder.cs

@@ -767,6 +767,7 @@ namespace CallCenterApi.Model
             set { _f_ordersign = value; }
             get { return _f_ordersign; }
         }
+        public int ? F_IsBusiness { get; set; }
         #endregion Model
 
     }

CallCenterApi/CallCenterApi.Model/submit_case_info.cs

@@ -250,6 +250,8 @@ namespace CallCenterApi.Model
             set { _code = value; }
             get { return _code; }
         }
+
+        public string USER_TYPE { get; set; }
         #endregion Model
 
     }

CallCenterApi/CallCenterApi.Model/submit_case_visit_info.cs

@@ -106,6 +106,8 @@ namespace CallCenterApi.Model
             set { _createtime = value; }
             get { return _createtime; }
         }
+
+        public int ? ISRESOLVED { get; set; }
         #endregion Model
 
     }