1550076451 2 years ago
parent
commit
674ff305f7

+ 23 - 10
CallCenterApi/CallCenterApi.DAL/T_RepositoryInformation.cs

38
         {
38
         {
39
             StringBuilder strSql = new StringBuilder();
39
             StringBuilder strSql = new StringBuilder();
40
             strSql.Append("insert into T_RepositoryInformation(");
40
             strSql.Append("insert into T_RepositoryInformation(");
41
-            strSql.Append("F_CategoryId,F_Title,F_Content,F_Description,F_Url,F_KeyWords,F_ClickCount,F_ISPass,F_ISSubmitAudit,F_Expand1,F_Expand2,F_IntExpand1,F_CreateOn,F_CreateBy,F_AuditID,F_Key,F_Reason,F_Score,F_DeductUser)");
41
+            strSql.Append("F_CategoryId,F_Title,F_Content,F_Description,F_Url,F_KeyWords,F_ClickCount,F_ISPass,F_ISSubmitAudit,F_Expand1,F_Expand2,F_IntExpand1,F_CreateOn,F_CreateBy,F_AuditID,F_Key,F_Reason,F_Score,F_DeductUser,F_DeptId)");
42
             strSql.Append(" values (");
42
             strSql.Append(" values (");
43
-            strSql.Append("@F_CategoryId,@F_Title,@F_Content,@F_Description,@F_Url,@F_KeyWords,@F_ClickCount,@F_ISPass,@F_ISSubmitAudit,@F_Expand1,@F_Expand2,@F_IntExpand1,@F_CreateOn,@F_CreateBy,@F_AuditID,@F_Key,@F_Reason,@F_Score,@F_DeductUser)");
43
+            strSql.Append("@F_CategoryId,@F_Title,@F_Content,@F_Description,@F_Url,@F_KeyWords,@F_ClickCount,@F_ISPass,@F_ISSubmitAudit,@F_Expand1,@F_Expand2,@F_IntExpand1,@F_CreateOn,@F_CreateBy,@F_AuditID,@F_Key,@F_Reason,@F_Score,@F_DeductUser,@F_DeptId)");
44
             strSql.Append(";select @@IDENTITY");
44
             strSql.Append(";select @@IDENTITY");
45
             SqlParameter[] parameters = {
45
             SqlParameter[] parameters = {
46
                     new SqlParameter("@F_CategoryId", SqlDbType.Int,4),
46
                     new SqlParameter("@F_CategoryId", SqlDbType.Int,4),
61
                     new SqlParameter("@F_Key", SqlDbType.Int,4),
61
                     new SqlParameter("@F_Key", SqlDbType.Int,4),
62
                 new SqlParameter("@F_Reason", SqlDbType.NVarChar, -1),
62
                 new SqlParameter("@F_Reason", SqlDbType.NVarChar, -1),
63
                 new SqlParameter("@F_Score", SqlDbType.Float , 8),
63
                 new SqlParameter("@F_Score", SqlDbType.Float , 8),
64
-                new SqlParameter("@F_DeductUser", SqlDbType.NVarChar, 50)};
64
+                new SqlParameter("@F_DeductUser", SqlDbType.NVarChar, 50),
65
+                 new SqlParameter("@F_DeptId", SqlDbType.Int,4),
66
+            };
65
             parameters[0].Value = model.F_CategoryId;
67
             parameters[0].Value = model.F_CategoryId;
66
             parameters[1].Value = model.F_Title;
68
             parameters[1].Value = model.F_Title;
67
             parameters[2].Value = model.F_Content;
69
             parameters[2].Value = model.F_Content;
81
             parameters[16].Value = model.F_Reason;
83
             parameters[16].Value = model.F_Reason;
82
             parameters[17].Value = model.F_Score;
84
             parameters[17].Value = model.F_Score;
83
             parameters[18].Value = model.F_DeductUser;
85
             parameters[18].Value = model.F_DeductUser;
86
+            parameters[19].Value = model.F_DeptId;
87
+            
84
             object obj = DbHelperSQL.GetSingle(strSql.ToString(), parameters);
88
             object obj = DbHelperSQL.GetSingle(strSql.ToString(), parameters);
85
             if (obj == null)
89
             if (obj == null)
86
             {
90
             {
116
             strSql.Append("F_Reason=@F_Reason,"); 
120
             strSql.Append("F_Reason=@F_Reason,"); 
117
             strSql.Append("F_Key=@F_Key,");
121
             strSql.Append("F_Key=@F_Key,");
118
             strSql.Append("F_Score=@F_Score,");
122
             strSql.Append("F_Score=@F_Score,");
119
-            strSql.Append("F_DeductUser=@F_DeductUser");
123
+            strSql.Append("F_DeductUser=@F_DeductUser,");
124
+            strSql.Append("F_DeptId=@F_DeptId");
125
+            
120
             strSql.Append(" where F_RepositoryId=@F_RepositoryId");
126
             strSql.Append(" where F_RepositoryId=@F_RepositoryId");
121
             SqlParameter[] parameters = {
127
             SqlParameter[] parameters = {
122
                     new SqlParameter("@F_CategoryId", SqlDbType.Int,4),
128
                     new SqlParameter("@F_CategoryId", SqlDbType.Int,4),
138
                       new SqlParameter("@F_Reason", SqlDbType.NVarChar,-1),
144
                       new SqlParameter("@F_Reason", SqlDbType.NVarChar,-1),
139
                        new SqlParameter("@F_Score", SqlDbType.Float ,8),
145
                        new SqlParameter("@F_Score", SqlDbType.Float ,8),
140
                         new SqlParameter("@F_DeductUser", SqlDbType.NVarChar,50),
146
                         new SqlParameter("@F_DeductUser", SqlDbType.NVarChar,50),
147
+                        new SqlParameter("@F_DeptId", SqlDbType.Int,4),
148
+                        
141
                     new SqlParameter("@F_RepositoryId", SqlDbType.Int,4)};
149
                     new SqlParameter("@F_RepositoryId", SqlDbType.Int,4)};
142
             parameters[0].Value = model.F_CategoryId;
150
             parameters[0].Value = model.F_CategoryId;
143
             parameters[1].Value = model.F_Title;
151
             parameters[1].Value = model.F_Title;
158
             parameters[16].Value = model.F_Reason;
166
             parameters[16].Value = model.F_Reason;
159
             parameters[17].Value = model.F_Score;
167
             parameters[17].Value = model.F_Score;
160
             parameters[18].Value = model.F_DeductUser;
168
             parameters[18].Value = model.F_DeductUser;
161
-            parameters[19].Value = model.F_RepositoryId;
169
+            parameters[19].Value = model.F_DeptId;
170
+            
171
+            parameters[20].Value = model.F_RepositoryId;
162
            
172
            
163
             int rows = DbHelperSQL.ExecuteSql(strSql.ToString(), parameters);
173
             int rows = DbHelperSQL.ExecuteSql(strSql.ToString(), parameters);
164
             if (rows > 0)
174
             if (rows > 0)
222
         {
232
         {
223
 
233
 
224
             StringBuilder strSql = new StringBuilder();
234
             StringBuilder strSql = new StringBuilder();
225
-            strSql.Append("select  top 1 F_RepositoryId,F_CategoryId,F_Title,F_Content,F_Description,F_Url,F_KeyWords,F_ClickCount,F_ISPass,F_ISSubmitAudit,F_Expand1,F_Expand2,F_IntExpand1,F_CreateOn,F_CreateBy,F_AuditID,F_Key,F_Reason,F_Score,F_DeductUser from T_RepositoryInformation ");
235
+            strSql.Append("select  top 1 F_RepositoryId,F_CategoryId,F_DeptId,F_Title,F_Content,F_Description,F_Url,F_KeyWords,F_ClickCount,F_ISPass,F_ISSubmitAudit,F_Expand1,F_Expand2,F_IntExpand1,F_CreateOn,F_CreateBy,F_AuditID,F_Key,F_Reason,F_Score,F_DeductUser from T_RepositoryInformation ");
226
             strSql.Append(" where F_RepositoryId=@F_RepositoryId");
236
             strSql.Append(" where F_RepositoryId=@F_RepositoryId");
227
             SqlParameter[] parameters = {
237
             SqlParameter[] parameters = {
228
                     new SqlParameter("@F_RepositoryId", SqlDbType.Int,4)
238
                     new SqlParameter("@F_RepositoryId", SqlDbType.Int,4)
330
                 {
340
                 {
331
                     model.F_DeductUser = row["F_DeductUser"].ToString();
341
                     model.F_DeductUser = row["F_DeductUser"].ToString();
332
                 }
342
                 }
333
-
334
-              
343
+                if (row["F_DeptId"] != null && row["F_DeptId"].ToString() != "")
344
+                {
345
+                    model.F_DeptId = int.Parse(row["F_DeptId"].ToString());
346
+                }
347
+                
335
             }
348
             }
336
             return model;
349
             return model;
337
         }
350
         }
342
         public DataSet GetList(string strWhere)
355
         public DataSet GetList(string strWhere)
343
         {
356
         {
344
             StringBuilder strSql = new StringBuilder();
357
             StringBuilder strSql = new StringBuilder();
345
-            strSql.Append("select F_RepositoryId,F_CategoryId,F_Title,F_Content,F_Description,F_Url,F_KeyWords,F_ClickCount,F_ISPass,F_ISSubmitAudit,F_Expand1,F_Expand2,F_IntExpand1,F_CreateOn,F_CreateBy,F_AuditID,F_Key,F_Reason,F_Score,F_DeductUser ");
358
+            strSql.Append("select F_RepositoryId,F_CategoryId,F_Title,F_DeptId,F_Content,F_Description,F_Url,F_KeyWords,F_ClickCount,F_ISPass,F_ISSubmitAudit,F_Expand1,F_Expand2,F_IntExpand1,F_CreateOn,F_CreateBy,F_AuditID,F_Key,F_Reason,F_Score,F_DeductUser ");
346
             strSql.Append(" FROM T_RepositoryInformation ");
359
             strSql.Append(" FROM T_RepositoryInformation ");
347
             if (strWhere.Trim() != "")
360
             if (strWhere.Trim() != "")
348
             {
361
             {
362
             {
375
             {
363
                 strSql.Append(" top " + Top.ToString());
376
                 strSql.Append(" top " + Top.ToString());
364
             }
377
             }
365
-            strSql.Append(" F_RepositoryId,F_CategoryId,F_Title,F_Content,F_Description,F_Url,F_KeyWords,F_ClickCount,F_ISPass,F_ISSubmitAudit,F_Expand1,F_Expand2,F_IntExpand1,F_CreateOn,F_CreateBy,F_AuditID,F_Key,F_Reason,F_Score,F_DeductUser ");
378
+            strSql.Append(" F_RepositoryId,F_CategoryId,F_Title,F_Content,F_DeptId,F_Description,F_Url,F_KeyWords,F_ClickCount,F_ISPass,F_ISSubmitAudit,F_Expand1,F_Expand2,F_IntExpand1,F_CreateOn,F_CreateBy,F_AuditID,F_Key,F_Reason,F_Score,F_DeductUser ");
366
             strSql.Append(" FROM T_RepositoryInformation ");
379
             strSql.Append(" FROM T_RepositoryInformation ");
367
             if (strWhere.Trim() != "")
380
             if (strWhere.Trim() != "")
368
             {
381
             {

+ 24 - 8
CallCenterApi/CallCenterApi.DAL/T_RepositoryLog.cs

41
         {
41
         {
42
             StringBuilder strSql = new StringBuilder();
42
             StringBuilder strSql = new StringBuilder();
43
             strSql.Append("insert into T_RepositoryLog(");
43
             strSql.Append("insert into T_RepositoryLog(");
44
-            strSql.Append("F_RepositoryId,F_Action,F_Title,F_Content,F_Description,F_Url,F_KeyWords,F_CreateOn,F_CreateBy,F_Expand1,F_Expand2,F_IntExpand1,F_IntExpand2)");
44
+            strSql.Append("F_RepositoryId,F_Action,F_Title,F_Content,F_Description,F_Url,F_KeyWords,F_CreateOn,F_CreateBy,F_Expand1,F_Expand2,F_IntExpand1,F_IntExpand2,F_DeptId)");
45
             strSql.Append(" values (");
45
             strSql.Append(" values (");
46
-            strSql.Append("@F_RepositoryId,@F_Action,@F_Title,@F_Content,@F_Description,@F_Url,@F_KeyWords,@F_CreateOn,@F_CreateBy,@F_Expand1,@F_Expand2,@F_IntExpand1,@F_IntExpand2)");
46
+            strSql.Append("@F_RepositoryId,@F_Action,@F_Title,@F_Content,@F_Description,@F_Url,@F_KeyWords,@F_CreateOn,@F_CreateBy,@F_Expand1,@F_Expand2,@F_IntExpand1,@F_IntExpand2,@F_DeptId)");
47
             strSql.Append(";select @@IDENTITY");
47
             strSql.Append(";select @@IDENTITY");
48
             SqlParameter[] parameters = {
48
             SqlParameter[] parameters = {
49
                     new SqlParameter("@F_RepositoryId", SqlDbType.Int,4),
49
                     new SqlParameter("@F_RepositoryId", SqlDbType.Int,4),
58
                     new SqlParameter("@F_Expand1", SqlDbType.NVarChar,100),
58
                     new SqlParameter("@F_Expand1", SqlDbType.NVarChar,100),
59
                     new SqlParameter("@F_Expand2", SqlDbType.NVarChar,200),
59
                     new SqlParameter("@F_Expand2", SqlDbType.NVarChar,200),
60
                     new SqlParameter("@F_IntExpand1", SqlDbType.SmallInt,2),
60
                     new SqlParameter("@F_IntExpand1", SqlDbType.SmallInt,2),
61
-                    new SqlParameter("@F_IntExpand2", SqlDbType.Int ,4)
61
+                    new SqlParameter("@F_IntExpand2", SqlDbType.Int ,4),
62
+                     new SqlParameter("@F_DeptId", SqlDbType.Int ,4)
63
+                    
62
             };
64
             };
63
             parameters[0].Value = model.F_RepositoryId;
65
             parameters[0].Value = model.F_RepositoryId;
64
             parameters[1].Value = model.F_Action;
66
             parameters[1].Value = model.F_Action;
73
             parameters[10].Value = model.F_Expand2;
75
             parameters[10].Value = model.F_Expand2;
74
             parameters[11].Value = model.F_IntExpand1;
76
             parameters[11].Value = model.F_IntExpand1;
75
             parameters[12].Value = model.F_IntExpand2;
77
             parameters[12].Value = model.F_IntExpand2;
78
+            parameters[13].Value = model.F_DeptId;
79
+            
76
             object obj = DbHelperSQL.GetSingle(strSql.ToString(), parameters);
80
             object obj = DbHelperSQL.GetSingle(strSql.ToString(), parameters);
77
             if (obj == null)
81
             if (obj == null)
78
             {
82
             {
101
             strSql.Append("F_CreateBy=@F_CreateBy,");
105
             strSql.Append("F_CreateBy=@F_CreateBy,");
102
             strSql.Append("F_Expand1=@F_Expand1,");
106
             strSql.Append("F_Expand1=@F_Expand1,");
103
             strSql.Append("F_Expand2=@F_Expand2,");
107
             strSql.Append("F_Expand2=@F_Expand2,");
104
-            strSql.Append("F_IntExpand1=@F_IntExpand1");
108
+            strSql.Append("F_IntExpand1=@F_IntExpand1,");
109
+            strSql.Append("F_DeptId=@F_DeptId");
110
+            
105
             strSql.Append(" where F_LogId=@F_LogId");
111
             strSql.Append(" where F_LogId=@F_LogId");
106
             SqlParameter[] parameters = {
112
             SqlParameter[] parameters = {
107
                     new SqlParameter("@F_RepositoryId", SqlDbType.Int,4),
113
                     new SqlParameter("@F_RepositoryId", SqlDbType.Int,4),
116
                     new SqlParameter("@F_Expand1", SqlDbType.NVarChar,100),
122
                     new SqlParameter("@F_Expand1", SqlDbType.NVarChar,100),
117
                     new SqlParameter("@F_Expand2", SqlDbType.NVarChar,200),
123
                     new SqlParameter("@F_Expand2", SqlDbType.NVarChar,200),
118
                     new SqlParameter("@F_IntExpand1", SqlDbType.SmallInt,2),
124
                     new SqlParameter("@F_IntExpand1", SqlDbType.SmallInt,2),
125
+                    new SqlParameter("@F_DeptId", SqlDbType.Int,4),
126
+                    
119
                     new SqlParameter("@F_LogId", SqlDbType.Int,4)};
127
                     new SqlParameter("@F_LogId", SqlDbType.Int,4)};
120
             parameters[0].Value = model.F_RepositoryId;
128
             parameters[0].Value = model.F_RepositoryId;
121
             parameters[1].Value = model.F_Action;
129
             parameters[1].Value = model.F_Action;
129
             parameters[9].Value = model.F_Expand1;
137
             parameters[9].Value = model.F_Expand1;
130
             parameters[10].Value = model.F_Expand2;
138
             parameters[10].Value = model.F_Expand2;
131
             parameters[11].Value = model.F_IntExpand1;
139
             parameters[11].Value = model.F_IntExpand1;
132
-            parameters[12].Value = model.F_LogId;
140
+            parameters[12].Value = model.F_DeptId;
141
+            
142
+            parameters[13].Value = model.F_LogId;
133
 
143
 
134
             int rows = DbHelperSQL.ExecuteSql(strSql.ToString(), parameters);
144
             int rows = DbHelperSQL.ExecuteSql(strSql.ToString(), parameters);
135
             if (rows > 0)
145
             if (rows > 0)
193
         {
203
         {
194
 
204
 
195
             StringBuilder strSql = new StringBuilder();
205
             StringBuilder strSql = new StringBuilder();
196
-            strSql.Append("select  top 1 F_IntExpand2,F_LogId,F_RepositoryId,F_Action,F_Title,F_Content,F_Description,F_Url,F_KeyWords,F_CreateOn,F_CreateBy,F_Expand1,F_Expand2,F_IntExpand1 from T_RepositoryLog ");
206
+            strSql.Append("select  top 1 F_IntExpand2,F_LogId,F_DeptId,F_RepositoryId,F_Action,F_Title,F_Content,F_Description,F_Url,F_KeyWords,F_CreateOn,F_CreateBy,F_Expand1,F_Expand2,F_IntExpand1 from T_RepositoryLog ");
197
             strSql.Append(" where F_LogId=@F_LogId");
207
             strSql.Append(" where F_LogId=@F_LogId");
198
             SqlParameter[] parameters = {
208
             SqlParameter[] parameters = {
199
                     new SqlParameter("@F_LogId", SqlDbType.Int,4)
209
                     new SqlParameter("@F_LogId", SqlDbType.Int,4)
277
                 {
287
                 {
278
                     model.F_IntExpand2 = int.Parse(row["F_IntExpand2"].ToString());
288
                     model.F_IntExpand2 = int.Parse(row["F_IntExpand2"].ToString());
279
                 }
289
                 }
290
+                if (row["F_DeptId"] != null && row["F_DeptId"].ToString() != "")
291
+                {
292
+                    model.F_DeptId = int.Parse(row["F_DeptId"].ToString());
293
+                }
280
                 
294
                 
295
+
296
+
281
             }
297
             }
282
             return model;
298
             return model;
283
         }
299
         }
288
         public DataSet GetList(string strWhere)
304
         public DataSet GetList(string strWhere)
289
         {
305
         {
290
             StringBuilder strSql = new StringBuilder();
306
             StringBuilder strSql = new StringBuilder();
291
-            strSql.Append("select F_LogId,F_RepositoryId,F_IntExpand2,F_Action,F_Title,F_Content,F_Description,F_Url,F_KeyWords,F_CreateOn,F_CreateBy,F_Expand1,F_Expand2,F_IntExpand1 ");
307
+            strSql.Append("select F_LogId,F_RepositoryId,F_DeptId,F_IntExpand2,F_Action,F_Title,F_Content,F_Description,F_Url,F_KeyWords,F_CreateOn,F_CreateBy,F_Expand1,F_Expand2,F_IntExpand1 ");
292
             strSql.Append(" FROM T_RepositoryLog ");
308
             strSql.Append(" FROM T_RepositoryLog ");
293
             if (strWhere.Trim() != "")
309
             if (strWhere.Trim() != "")
294
             {
310
             {
308
             {
324
             {
309
                 strSql.Append(" top " + Top.ToString());
325
                 strSql.Append(" top " + Top.ToString());
310
             }
326
             }
311
-            strSql.Append(" F_LogId,F_RepositoryId,F_Action,F_IntExpand2,F_Title,F_Content,F_Description,F_Url,F_KeyWords,F_CreateOn,F_CreateBy,F_Expand1,F_Expand2,F_IntExpand1 ");
327
+            strSql.Append(" F_LogId,F_RepositoryId,F_DeptId,F_Action,F_IntExpand2,F_Title,F_Content,F_Description,F_Url,F_KeyWords,F_CreateOn,F_CreateBy,F_Expand1,F_Expand2,F_IntExpand1 ");
312
             strSql.Append(" FROM T_RepositoryLog ");
328
             strSql.Append(" FROM T_RepositoryLog ");
313
             if (strWhere.Trim() != "")
329
             if (strWhere.Trim() != "")
314
             {
330
             {

+ 10 - 6
CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/knowledge/KnowledgeClassController.cs

59
             else
59
             else
60
                 sql += " and F_ParentId=0";
60
                 sql += " and F_ParentId=0";
61
 
61
 
62
-            //Model.T_Sys_RoleInfo role = rolebll.GetModel("WLDW");
63
-            //if (User.F_RoleId == role.F_RoleId)
64
-            //{
65
-            //    sql = " and F_ParentId=0 and F_CategoryId in ( select F_CategoryId from T_RepositoryCategory where F_CategoryName ='知识信息分类')"; 
62
+            Model.T_Sys_RoleInfo role = rolebll.GetModel("WLDW");
63
+            if (User.F_RoleId == role.F_RoleId)
64
+            {
65
+               sql = " and F_ParentId=0 and F_CategoryId not  in " +
66
+                    "( select F_CategoryId from T_RepositoryCategory where F_CategoryName in('表彰批评类','信息类'))"; 
66
              
67
              
67
-            //}
68
-      
68
+            }
69
+        
70
+
71
+
72
+
69
 
73
 
70
             dt = new BLL.T_RepositoryCategory().GetList(" 1=1 " + sql).Tables[0];
74
             dt = new BLL.T_RepositoryCategory().GetList(" 1=1 " + sql).Tables[0];
71
             List<Model.TreeModel> modelList = BindTree(dt, "0");
75
             List<Model.TreeModel> modelList = BindTree(dt, "0");

+ 124 - 44
CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/knowledge/KnowledgeController.cs

20
         private BLL.T_Sys_RoleInfo rolebll = new BLL.T_Sys_RoleInfo();
20
         private BLL.T_Sys_RoleInfo rolebll = new BLL.T_Sys_RoleInfo();
21
 
21
 
22
         // 获取知识库列表
22
         // 获取知识库列表
23
-        public ActionResult GetList(string title, string content,string keywords, string pid,int deptid=0)
23
+        public ActionResult GetList(string title, string content,string keywords, string pid,int deptid=0,int deptids=0)
24
         {
24
         {
25
             string issub = RequestString.GetQueryString("issub");
25
             string issub = RequestString.GetQueryString("issub");
26
             string ispass = RequestString.GetQueryString("ispass");
26
             string ispass = RequestString.GetQueryString("ispass");
71
 
71
 
72
             if (deptid >0)
72
             if (deptid >0)
73
             {
73
             {
74
-                sql += "and   F_CreateBy in( select F_UserId from T_Sys_UserAccount where F_DeptId ='" + deptid + "')";
74
+              sql += "and   F_CreateBy in( select F_UserId from T_Sys_UserAccount where F_DeptId ='" + deptid + "')";
75
+            }
76
+            if (deptids > 0)
77
+            {
78
+                sql += $" and F_DeptId='{deptids}'";
79
+                // sql += "and   F_CreateBy in( select F_UserId from T_Sys_UserAccount where F_DeptId ='" + deptid + "')";
75
             }
80
             }
76
             if (User .F_RoleCode =="WLDW")
81
             if (User .F_RoleCode =="WLDW")
77
             {
82
             {
99
                 "T_RepositoryInformation a",
104
                 "T_RepositoryInformation a",
100
                 "F_RepositoryId",
105
                 "F_RepositoryId",
101
                 "*,(select F_CategoryName   from T_RepositoryCategory  where F_CategoryId =a.F_CategoryId  )as CategoryName" +
106
                 "*,(select F_CategoryName   from T_RepositoryCategory  where F_CategoryId =a.F_CategoryId  )as CategoryName" +
102
-                ",dbo.GetDeptName(CONVERT (int ,(select F_DeptId  from T_Sys_UserAccount  where F_UserId = a.F_CreateBy)) ) DeptName ",
107
+                ",dbo.GetDeptName(CONVERT (int ,(select F_DeptId  from T_Sys_UserAccount  where F_UserId = a.F_CreateBy)) ) DeptName,dbo.GetDeptName(F_DeptId) DeptNames ",
103
                 sql,
108
                 sql,
104
                 "ORDER BY F_RepositoryId desc",
109
                 "ORDER BY F_RepositoryId desc",
105
                 pagesize,
110
                 pagesize,
239
             }
244
             }
240
             int recordCount = 0;
245
             int recordCount = 0;
241
             dt = BLL.PagerBLL.GetListPager(
246
             dt = BLL.PagerBLL.GetListPager(
242
-                "T_RepositoryAudit",
247
+                "T_RepositoryAudit a ",
243
                 "F_AuditId",
248
                 "F_AuditId",
244
                 "*",
249
                 "*",
245
                 sql,
250
                 sql,
256
                 {
261
                 {
257
                     var preContent = ""; var afterContent = "";
262
                     var preContent = ""; var afterContent = "";
258
                     var predis = ""; var afterdis = "";
263
                     var predis = ""; var afterdis = "";
259
-                    var title = ""; var ptitle = ""; var atitle = "";
264
+                    var title = ""; var ptitle = ""; var atitle = "";string deptname = "";
265
+                    string CategoryName = "";
266
+                    
260
                     if (x.F_PreLogID != null)
267
                     if (x.F_PreLogID != null)
261
                     {
268
                     {
262
                         Model.T_RepositoryLog logModel = logList.Where(y => y.F_LogId == x.F_PreLogID.Value).FirstOrDefault();
269
                         Model.T_RepositoryLog logModel = logList.Where(y => y.F_LogId == x.F_PreLogID.Value).FirstOrDefault();
265
                             preContent = logModel.F_Content;
272
                             preContent = logModel.F_Content;
266
                             predis = logModel.F_Description;
273
                             predis = logModel.F_Description;
267
                             ptitle = logModel.F_Title;
274
                             ptitle = logModel.F_Title;
275
+                            if (logModel.F_DeptId >0)
276
+                            {
277
+                                var dept = new BLL.T_Sys_Department().GetModel(logModel.F_DeptId.Value);
278
+                                if (dept != null)
279
+                                    deptname = dept.F_DeptName;
280
+                            }
281
+                            if (logModel.F_IntExpand1 > 0)
282
+                            {
283
+                                var Category = new BLL.T_RepositoryCategory().GetModel(logModel.F_IntExpand1.Value);
284
+                                if (Category != null)
285
+                                    CategoryName = Category.F_CategoryName ;
286
+                            }
287
+
268
                         }
288
                         }
269
                     }
289
                     }
270
                     if (x.F_AfterLogID != null)
290
                     if (x.F_AfterLogID != null)
275
                             afterContent = logModel.F_Content;
295
                             afterContent = logModel.F_Content;
276
                             afterdis = logModel.F_Description;
296
                             afterdis = logModel.F_Description;
277
                             atitle = logModel.F_Title;
297
                             atitle = logModel.F_Title;
298
+                            if (logModel.F_DeptId > 0)
299
+                            {
300
+                                var dept = new BLL.T_Sys_Department().GetModel(logModel.F_DeptId.Value);
301
+                                if (dept != null)
302
+                                    deptname = dept.F_DeptName;
303
+                            }
304
+                            if (logModel.F_IntExpand1 > 0)
305
+                            {
306
+                                var Category = new BLL.T_RepositoryCategory().GetModel(logModel.F_IntExpand1.Value);
307
+                                if (Category != null)
308
+                                    CategoryName = Category.F_CategoryName;
309
+                            }
278
                         }
310
                         }
279
                     }
311
                     }
280
                     if (ptitle != "")
312
                     if (ptitle != "")
291
                         F_AfterDescription = afterdis,
323
                         F_AfterDescription = afterdis,
292
                         F_ISPass = x.F_ISPass,
324
                         F_ISPass = x.F_ISPass,
293
                         F_AuditRemark = x.F_AuditRemark,
325
                         F_AuditRemark = x.F_AuditRemark,
294
-                       
326
+                        DeptName= deptname,
327
+                        CategoryName= CategoryName
328
+
295
                     };
329
                     };
296
                 }),
330
                 }),
297
                 total = recordCount
331
                 total = recordCount
530
 
564
 
531
         [Authority]
565
         [Authority]
532
         //添加知识库
566
         //添加知识库
533
-        public ActionResult AddInfo(string title, string con, string pid,string key, int issub=1, int keyid = 0,int demandsid=0)
567
+        public ActionResult AddInfo(string title, string con, string pid,string key, int deptid = 0, int issub=1, int keyid = 0,int demandsid=0)
534
         {
568
         {
535
             Model.T_RepositoryInformation dModel = new Model.T_RepositoryInformation();
569
             Model.T_RepositoryInformation dModel = new Model.T_RepositoryInformation();
536
             if (string.IsNullOrEmpty(title))
570
             if (string.IsNullOrEmpty(title))
541
             dModel.F_Title = title.Trim();
575
             dModel.F_Title = title.Trim();
542
             dModel.F_Content = WebHelper.UrlDecode(con.Trim());
576
             dModel.F_Content = WebHelper.UrlDecode(con.Trim());
543
             dModel.F_CategoryId = int.Parse(pid);
577
             dModel.F_CategoryId = int.Parse(pid);
578
+            dModel.F_DeptId = deptid;
579
+            
544
             dModel.F_Description = WebHelper.NoHtml(WebHelper.UrlDecode(con.Trim()));
580
             dModel.F_Description = WebHelper.NoHtml(WebHelper.UrlDecode(con.Trim()));
581
+            if (User.F_RoleCode=="GLY")
582
+            {
583
+                dModel.F_ISPass = 1;
584
+            }
585
+            else 
545
             dModel.F_ISPass = 0;
586
             dModel.F_ISPass = 0;
546
             dModel.F_ISSubmitAudit = issub;
587
             dModel.F_ISSubmitAudit = issub;
547
             dModel.F_CreateOn = DateTime.Now;
588
             dModel.F_CreateOn = DateTime.Now;
569
                 }
610
                 }
570
                 dModel.F_RepositoryId = b;
611
                 dModel.F_RepositoryId = b;
571
                 int logid = addLog(dModel, 1);
612
                 int logid = addLog(dModel, 1);
572
-                int auditid = addaudit(b, 1, null, logid);
573
-                new BLL.T_RepositoryInformation().UpdateAuditID(b, auditid);
613
+                if (User.F_RoleCode != "GLY")
614
+                {
615
+                    int auditid = addaudit(b, 1, null, logid);
616
+                    new BLL.T_RepositoryInformation().UpdateAuditID(b, auditid);
617
+                   
618
+
619
+                }
620
+                else
621
+                {
622
+                    Task.Run(() =>
623
+                    {
624
+                        WebClient web = new WebClient();
625
+                        web.Encoding = Encoding.UTF8;
626
+                        string Dataurl = web.DownloadString(FrontUrl + "Affairs/kinfo_add?id=" + b);
627
+
628
+                    }).ContinueWith(p =>
629
+                    {
630
+                        System.Diagnostics.Debug.WriteLine(DateTime.Now);
631
+                    });
632
+                }
574
                 return Success("添加成功");
633
                 return Success("添加成功");
575
             }
634
             }
576
             else
635
             else
581
         }
640
         }
582
         [Authority]
641
         [Authority]
583
         //编辑知识库
642
         //编辑知识库
584
-        public ActionResult EditInfo(string infoid, string title, string con, string pid,string key, int? issub, int keyid = 0)
643
+        public ActionResult EditInfo(string infoid, string title, string con, string pid,string key, int? issub,int deptid=0, int keyid = 0)
585
         {
644
         {
586
             Model.T_RepositoryInformation dModel = infoBLL.GetModel(int.Parse(infoid.Trim()));
645
             Model.T_RepositoryInformation dModel = infoBLL.GetModel(int.Parse(infoid.Trim()));
587
             if (dModel != null)
646
             if (dModel != null)
607
                 {
666
                 {
608
                     dModel.F_ISSubmitAudit = issub;
667
                     dModel.F_ISSubmitAudit = issub;
609
                 }
668
                 }
669
+                if (deptid>0)
670
+                    dModel.F_DeptId  = deptid;
610
                 dModel.F_KeyWords = key;
671
                 dModel.F_KeyWords = key;
611
-            
612
-                Model.T_RepositoryAudit audModel = new Model.T_RepositoryAudit();
613
-                if (dModel.F_AuditID != null)
614
-                    audModel = new BLL.T_RepositoryAudit().GetModel(dModel.F_AuditID.Value);
615
 
672
 
616
-                int logid = addLog(dModel, 2);
617
-                if (logid > 0)
618
-                {
619
-                    string content = $"{User.F_UserName}({User.F_UserCode })编辑知识库{  dModel.F_Title }";
620
-                    string Operation = OperationLogController
621
-                        .AddOperationList(content, User.F_UserCode, Common.DTRequest.GetIP(), 1, 4594, dModel.F_RepositoryId);
673
+                    Model.T_RepositoryAudit audModel = new Model.T_RepositoryAudit();
674
+                    if (dModel.F_AuditID != null)
675
+                        audModel = new BLL.T_RepositoryAudit().GetModel(dModel.F_AuditID.Value);
622
 
676
 
623
-                    int auditid = addaudit(int.Parse(infoid.Trim()), 2, audModel.F_AfterLogID, logid);
624
-                    new BLL.T_RepositoryInformation().UpdateAuditID(int.Parse(infoid.Trim()), auditid);
625
-                    infoBLL.UpdateSubAudit(int.Parse(infoid.Trim()), 1);
626
-                    return Success("保存成功");
627
-                }
628
-                else
629
-                {
630
-                    return Success("保存失败");
631
-                }
677
+                    int logid = addLog(dModel, 2);
678
+                    if (logid > 0)
679
+                    {
680
+                        string content = $"{User.F_UserName}({User.F_UserCode })编辑知识库{  dModel.F_Title }";
681
+                        string Operation = OperationLogController
682
+                            .AddOperationList(content, User.F_UserCode, Common.DTRequest.GetIP(), 1, 4594, dModel.F_RepositoryId);
683
+
684
+                        int auditid = addaudit(int.Parse(infoid.Trim()), 2, audModel.F_AfterLogID, logid);
685
+                        new BLL.T_RepositoryInformation().UpdateAuditID(int.Parse(infoid.Trim()), auditid);
686
+                        infoBLL.UpdateSubAudit(int.Parse(infoid.Trim()), 1);
687
+                        return Success("保存成功");
688
+                    }
689
+                    else
690
+                    {
691
+                        return Success("保存失败");
692
+                    }
693
+                
694
+               
632
             }
695
             }
633
             else
696
             else
634
             {
697
             {
647
                     Model.T_RepositoryInformation dModel = infoBLL.GetModel(int.Parse(str.Trim()));
710
                     Model.T_RepositoryInformation dModel = infoBLL.GetModel(int.Parse(str.Trim()));
648
                     if (dModel != null)
711
                     if (dModel != null)
649
                     {
712
                     {
650
-                        Model.T_RepositoryAudit audModel = new Model.T_RepositoryAudit();
651
-                        if (dModel.F_AuditID != null)
652
-                            audModel = new BLL.T_RepositoryAudit().GetModel(dModel.F_AuditID.Value);
713
+                        if (User .F_RoleCode =="GLY")
714
+                        {
715
+                           if ( infoBLL.Delete(dModel.F_RepositoryId))
716
+                            {
717
+                                string content = $"{User.F_UserName}({User.F_UserCode })删除知识库{  dModel.F_Title }";
718
+                                string Operation = OperationLogController
719
+                                    .AddOperationList(content, User.F_UserCode, Common.DTRequest.GetIP(), 2, 4594, dModel.F_RepositoryId);
720
+                                c++;
721
+                            }
653
 
722
 
654
-                        int logid = addLog(dModel, 3);
655
-                        if (logid > 0)
723
+                        }
724
+                        else
656
                         {
725
                         {
657
-                            string content = $"{User.F_UserName}({User.F_UserCode })删除知识库{  dModel.F_Title }";
658
-                            string Operation = OperationLogController
659
-                                .AddOperationList(content, User.F_UserCode, Common.DTRequest.GetIP(), 2, 4594, dModel.F_RepositoryId);
660
-
661
-                            int auditid = addaudit(int.Parse(str.Trim()), 3, audModel.F_AfterLogID, logid);
662
-                            infoBLL.UpdateSubAudit(int.Parse(str.Trim()), 1);
663
-                            infoBLL.UpdateAuditID(int.Parse(str.Trim()), auditid);
664
-                            c++;
726
+                            Model.T_RepositoryAudit audModel = new Model.T_RepositoryAudit();
727
+                            if (dModel.F_AuditID != null)
728
+                                audModel = new BLL.T_RepositoryAudit().GetModel(dModel.F_AuditID.Value);
729
+
730
+                            int logid = addLog(dModel, 3);
731
+                            if (logid > 0)
732
+                            {
733
+                                string content = $"{User.F_UserName}({User.F_UserCode })删除知识库{  dModel.F_Title }";
734
+                                string Operation = OperationLogController
735
+                                    .AddOperationList(content, User.F_UserCode, Common.DTRequest.GetIP(), 2, 4594, dModel.F_RepositoryId);
736
+
737
+                                int auditid = addaudit(int.Parse(str.Trim()), 3, audModel.F_AfterLogID, logid);
738
+                                infoBLL.UpdateSubAudit(int.Parse(str.Trim()), 1);
739
+                                infoBLL.UpdateAuditID(int.Parse(str.Trim()), auditid);
740
+                                c++;
741
+                            }
665
                         }
742
                         }
743
+                       
666
                     }
744
                     }
667
                 }
745
                 }
668
                 if (c == ids.Length)
746
                 if (c == ids.Length)
768
                                 infoModel.F_Content = logModel.F_Content;
846
                                 infoModel.F_Content = logModel.F_Content;
769
                                 infoModel.F_ISPass = ispass;
847
                                 infoModel.F_ISPass = ispass;
770
                                 infoModel.F_KeyWords = logModel.F_KeyWords;
848
                                 infoModel.F_KeyWords = logModel.F_KeyWords;
849
+                                infoModel.F_DeptId = logModel.F_DeptId;
850
+
771
                                 infoModel.F_Key = logModel.F_IntExpand2;
851
                                 infoModel.F_Key = logModel.F_IntExpand2;
772
                                 string content = $"{User.F_UserName}({User.F_UserCode })审核通过了知识库{  infoModel.F_Title }修改";
852
                                 string content = $"{User.F_UserName}({User.F_UserCode })审核通过了知识库{  infoModel.F_Title }修改";
773
                                 string Operation = OperationLogController
853
                                 string Operation = OperationLogController
835
             logModel.F_Action = action;
915
             logModel.F_Action = action;
836
             logModel.F_Description = rmodel.F_Description;
916
             logModel.F_Description = rmodel.F_Description;
837
             logModel.F_IntExpand1 = rmodel.F_CategoryId;
917
             logModel.F_IntExpand1 = rmodel.F_CategoryId;
838
-
839
-            if(action==4)
918
+            logModel.F_DeptId = rmodel.F_DeptId;
919
+            if (action==4)
840
             {
920
             {
841
                 logModel.F_Title = rmodel.F_Title;
921
                 logModel.F_Title = rmodel.F_Title;
842
                 logModel.F_Content = User.F_UserCode +"扣分"+Math .Abs ((float )rmodel.F_Score )+
922
                 logModel.F_Content = User.F_UserCode +"扣分"+Math .Abs ((float )rmodel.F_Score )+

+ 6 - 1
CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/report/BusinessController.cs

237
         /// </summary>
237
         /// </summary>
238
         /// <returns></returns>
238
         /// <returns></returns>
239
         [Authority]
239
         [Authority]
240
-        public ActionResult GetYQCountList(int isdc = 0, int deptid = 0)
240
+        public ActionResult GetYQCountList(int isdc = 0, int deptid = 0,int type=0)
241
         {
241
         {
242
             string starttime = RequestString.GetQueryString("starttime");
242
             string starttime = RequestString.GetQueryString("starttime");
243
             string endtime = RequestString.GetQueryString("endtime");
243
             string endtime = RequestString.GetQueryString("endtime");
263
                     sqlwhere += "and a.F_MainDeptId='" + deptid + "'";
263
                     sqlwhere += "and a.F_MainDeptId='" + deptid + "'";
264
                 }
264
                 }
265
             }
265
             }
266
+            if (type != 0)
267
+            {
268
+                sqlwhere += " and a.F_InfoType = '" + type + "' ";
269
+            }
270
+
266
             string sql = " select* from(select dbo.GetDeptNames(F_MainDeptId) F_DeptName, F_WorkOrderId, F_ComContent, F_AssignTime, F_LimitTime, " +
271
             string sql = " select* from(select dbo.GetDeptNames(F_MainDeptId) F_DeptName, F_WorkOrderId, F_ComContent, F_AssignTime, F_LimitTime, " +
267
                 "F_DealTime, (SELECT COUNT(1) FROM T_Sys_WorkOFFDays WITH(NOLOCK) WHERE F_OffState = 1 AND F_OffDate<= CONVERT(varchar(100),(case when" +
272
                 "F_DealTime, (SELECT COUNT(1) FROM T_Sys_WorkOFFDays WITH(NOLOCK) WHERE F_OffState = 1 AND F_OffDate<= CONVERT(varchar(100),(case when" +
268
                 " a.F_DealTime is null" +
273
                 " a.F_DealTime is null" +

+ 5 - 4
CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/workorder/AffairsController.cs

29
 
29
 
30
 namespace CallCenterApi.Interface.Controllers.workorder
30
 namespace CallCenterApi.Interface.Controllers.workorder
31
 {
31
 {
32
- //[Authority]
32
+  //[Authority]
33
     public class AffairsController : BaseController
33
     public class AffairsController : BaseController
34
     {
34
     {
35
 
35
 
1770
                         else
1770
                         else
1771
                         {
1771
                         {
1772
                             keyValuePairs.Add("F_Administrative", "0");
1772
                             keyValuePairs.Add("F_Administrative", "0");
1773
-                        }
1773
+                        } 
1774
 
1774
 
1775
                     }
1775
                     }
1776
 
1776
 
1829
                                     }
1829
                                     }
1830
 
1830
 
1831
                                 }
1831
                                 }
1832
-                                catch
1832
+                                catch(Exception e)
1833
                                 {
1833
                                 {
1834
-
1834
+                                    LogFactory.GetLogger("签收").Error(e.Message );
1835
+                                     return Error("签收失败");
1835
                                 }
1836
                                 }
1836
 
1837
 
1837
 
1838
 

+ 100 - 6
CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/workorder/WorkOrderController.cs

99
             int pagesize = 10;
99
             int pagesize = 10;
100
             string dealstarttime = HttpUtility.UrlDecode(RequestString.GetQueryString("dealstarttime"));
100
             string dealstarttime = HttpUtility.UrlDecode(RequestString.GetQueryString("dealstarttime"));
101
             string dealstrendtime = HttpUtility.UrlDecode(RequestString.GetQueryString("dealstrendtime"));
101
             string dealstrendtime = HttpUtility.UrlDecode(RequestString.GetQueryString("dealstrendtime"));
102
+
103
+            string workroder = HttpUtility.UrlDecode(RequestString.GetQueryString("workroder"));
104
+
102
             string Result = HttpUtility.UrlDecode(RequestString.GetQueryString("Result"));
105
             string Result = HttpUtility.UrlDecode(RequestString.GetQueryString("Result"));
103
             int isopen = RequestString.GetInt("isopen", -1);//是否公开
106
             int isopen = RequestString.GetInt("isopen", -1);//是否公开
104
 
107
 
137
 
140
 
138
                 sql += " and F_WorkOrderId in( select F_WorkOrderId   from T_Sys_Affairs  where CASE_SERIAL like'%" + strworkorderid + "%') ";
141
                 sql += " and F_WorkOrderId in( select F_WorkOrderId   from T_Sys_Affairs  where CASE_SERIAL like'%" + strworkorderid + "%') ";
139
             }
142
             }
143
+            if (!string .IsNullOrEmpty (workroder))
144
+
145
+            {
146
+                sql += $" and F_WorkOrderId in(select col from dbo.SplitToNvarchar('{workroder}',',' )) ";
147
+            }
148
+
140
             if (IsRelease > 0)
149
             if (IsRelease > 0)
141
             {
150
             {
142
                 if (IsRelease == 1)
151
                 if (IsRelease == 1)
4270
                         sql += " and (F_NoResult is null or F_NoResult ='') ";
4279
                         sql += " and (F_NoResult is null or F_NoResult ='') ";
4271
                     else
4280
                     else
4272
                         sql += " and F_NoResult is not  null and  F_NoResult !='' ";
4281
                         sql += " and F_NoResult is not  null and  F_NoResult !='' ";
4282
+                   
4273
 
4283
 
4274
                     sql += "  and F_WorkOrderID in(select F_WorkOrderID from T_Bus_Feedback WITH(NOLOCK) where F_State=1 and F_IsDelete=0 and F_Type in (1,2) ";
4284
                     sql += "  and F_WorkOrderID in(select F_WorkOrderID from T_Bus_Feedback WITH(NOLOCK) where F_State=1 and F_IsDelete=0 and F_Type in (1,2) ";
4275
                     if (User.F_RoleCode != "GLY" && User.F_RoleCode != "SPZ" && User.F_RoleCode != "SPZJZ" && User.F_RoleCode != "DDZG")
4285
                     if (User.F_RoleCode != "GLY" && User.F_RoleCode != "SPZ" && User.F_RoleCode != "SPZJZ" && User.F_RoleCode != "DDZG")
4444
             //string cols = "*,dbo.GetUserName(F_CreateUser) as UserName,dbo.GetDictionaryName(F_InfoType) as TypeName,dbo.GetOverState(F_WorkOrderId) as OverState,"
4454
             //string cols = "*,dbo.GetUserName(F_CreateUser) as UserName,dbo.GetDictionaryName(F_InfoType) as TypeName,dbo.GetOverState(F_WorkOrderId) as OverState,"
4445
             //    + "dbo.GetDictionaryName(F_InfoSource) as SourceName,dbo.GetWorkOrderAssign(F_WorkOrderId) as DeptName ,dbo.GetLimitTime(F_WorkOrderId) as LimitTime";
4455
             //    + "dbo.GetDictionaryName(F_InfoSource) as SourceName,dbo.GetWorkOrderAssign(F_WorkOrderId) as DeptName ,dbo.GetLimitTime(F_WorkOrderId) as LimitTime";
4446
             //string cols = "*,dbo.GetUserName(F_CreateUser) as UserName,dbo.GetDictionaryName(F_InfoType) as TypeName,dbo.GetDictionaryName(F_InfoSource) as SourceName";
4456
             //string cols = "*,dbo.GetUserName(F_CreateUser) as UserName,dbo.GetDictionaryName(F_InfoType) as TypeName,dbo.GetDictionaryName(F_InfoSource) as SourceName";
4447
-            string cols = "F_WorkOrderId,F_CusName,F_ComTitle,F_WorkState,F_MainDeptId,F_OtherDeptIds,F_DealTime,F_LeaveRecordId,F_CallRecordId,F_IsResult,F_IsProtect,F_IsReturn,F_CreateTime,dbo.GetUserName(F_CreateUser) as UserName,dbo.GetDictionaryName(F_InfoType) as TypeName,dbo.GetDictionaryName(F_InfoSource) as SourceName,dbo.GetDeptNames(F_MainDeptID3) AS EJDeptName,F_CloseTime,F_IsRelease,F_Identification,F_IsRelease,F_InfoSource " +
4457
+            string cols = "F_WorkOrderId,F_CusName,F_ComTitle,F_WorkState,F_MainDeptId,F_OtherDeptIds,F_IsProResultState,F_DealTime,F_LeaveRecordId,F_CallRecordId,F_IsResult,F_IsProtect,F_IsReturn,F_CreateTime,dbo.GetUserName(F_CreateUser) as UserName,dbo.GetDictionaryName(F_InfoType) as TypeName,dbo.GetDictionaryName(F_InfoSource) as SourceName,dbo.GetDeptNames(F_MainDeptID3) AS EJDeptName,F_CloseTime,F_IsRelease,F_Identification,F_IsRelease,F_InfoSource " +
4448
                 " ,(case when PATINDEX('%''" + User.F_DeptId + "''%',a.F_See)= 0  then 0  when  PATINDEX('%''" + User.F_DeptId + "''%',a.F_See) IS NULL then 0 else 1 end) as See,F_UnsuccessfulTime";
4458
                 " ,(case when PATINDEX('%''" + User.F_DeptId + "''%',a.F_See)= 0  then 0  when  PATINDEX('%''" + User.F_DeptId + "''%',a.F_See) IS NULL then 0 else 1 end) as See,F_UnsuccessfulTime";
4449
             if (isdc > 0)
4459
             if (isdc > 0)
4450
             {
4460
             {
4772
                     else if (Int32.Parse(strtab) == 18 && User.F_RoleCode == "WLDW")
4782
                     else if (Int32.Parse(strtab) == 18 && User.F_RoleCode == "WLDW")
4773
                     {
4783
                     {
4774
                         btns.Add(ButtonGroup.Append());//
4784
                         btns.Add(ButtonGroup.Append());//
4775
-                        btns.Add(ButtonGroup.AssignUnsuccessful());//
4785
+                       
4776
                         btns.Add(ButtonGroup.query());
4786
                         btns.Add(ButtonGroup.query());
4787
+                        if(dr["F_IsProResultState"] !=null && dr["F_IsProResultState"].ToString ()=="1")
4788
+                        {
4789
+                            btns.Add(ButtonGroup.AuditUnsuccessful());//
4790
+                        }
4791
+                        else
4792
+                        {
4793
+                            btns.Add(ButtonGroup.AssignUnsuccessful());//
4794
+                        }
4777
                     }
4795
                     }
4778
                     else
4796
                     else
4779
                         btns.Add(ButtonGroup.query());
4797
                         btns.Add(ButtonGroup.query());
5815
                     sql += " and F_WorkState in(6,7) ";
5833
                     sql += " and F_WorkState in(6,7) ";
5816
                     sql += " and F_IsProResult = '" + 2 + "' ";
5834
                     sql += " and F_IsProResult = '" + 2 + "' ";
5817
                     sql += "  and F_NoResult like'%" + User.F_DeptId + "%' ";
5835
                     sql += "  and F_NoResult like'%" + User.F_DeptId + "%' ";
5836
+                    sql += " and isnull(F_IsProResultState,0) !=1";
5818
                     //if (User.F_RoleCode != "GLY" && User.F_RoleCode != "SPZ" && User.F_RoleCode != "SPZJZ" && User.F_RoleCode != "DDZG")
5837
                     //if (User.F_RoleCode != "GLY" && User.F_RoleCode != "SPZ" && User.F_RoleCode != "SPZJZ" && User.F_RoleCode != "DDZG")
5819
                     //{
5838
                     //{
5820
                     //    sql += " and F_CreateUser='" + User.F_UserCode + "')";
5839
                     //    sql += " and F_CreateUser='" + User.F_UserCode + "')";
16147
             if (User.F_RoleCode == "WLDW" || User.F_RoleCode == "GLY" || User.F_RoleCode == "DDZG")
16166
             if (User.F_RoleCode == "WLDW" || User.F_RoleCode == "GLY" || User.F_RoleCode == "DDZG")
16148
             {
16167
             {
16149
                 string workorderid = RequestString.GetFormString("workorderid");
16168
                 string workorderid = RequestString.GetFormString("workorderid");
16150
-                int newlimittime = 7;
16169
+                int newlimittime = 5;
16151
                 string resdatetime = "";
16170
                 string resdatetime = "";
16152
                 string reason = RequestString.GetFormString("reason");
16171
                 string reason = RequestString.GetFormString("reason");
16153
                 string files = RequestString.GetFormString("files");
16172
                 string files = RequestString.GetFormString("files");
16161
                         return Error("该工单已超时,不能申请延时");
16180
                         return Error("该工单已超时,不能申请延时");
16162
                     }
16181
                     }
16163
                 }
16182
                 }
16164
-                var Delay = new BLL.T_Bus_DelayTime().GetModelList("F_WorkOrderId='" + modelT_Bus_WorkOrder.F_WorkOrderId + "' and F_IsAudit in (0,1) and F_CreateUser='" + User.F_DeptId + "'and F_AssignedId='" + modelT_Bus_AssignedInfo.F_Id + "'");
16183
+                var Delay = new BLL.T_Bus_DelayTime().GetModelList("F_WorkOrderId='" + 
16184
+                    modelT_Bus_WorkOrder.F_WorkOrderId + "' and F_IsAudit in (0,1) and F_CreateUser='" +
16185
+                    User.F_DeptId + "'and F_AssignedId='" + modelT_Bus_AssignedInfo.F_Id + "'");
16165
 
16186
 
16166
                 if (Delay != null && Delay.Count > 0)
16187
                 if (Delay != null && Delay.Count > 0)
16167
                 {
16188
                 {
17125
             }
17146
             }
17126
         }
17147
         }
17127
         /// <summary>
17148
         /// <summary>
17149
+        /// 已办未果通过
17150
+        /// </summary>
17151
+        /// <returns></returns>
17152
+        //[Authority]
17153
+        public ActionResult AuditTransfer(string reason, int state=0)
17154
+        {
17155
+
17156
+            string workorderid = RequestString.GetFormString("workorderid");
17157
+
17158
+
17159
+            if (User.F_RoleCode == "WLDW" )
17160
+            {
17161
+                Model.T_Bus_WorkOrder modelT_Bus_WorkOrder = workorderBLL.GetModel(workorderid);
17162
+              
17163
+               
17164
+                if (modelT_Bus_WorkOrder != null)
17165
+                {
17166
+                    #region 插入操作记录
17167
+                    Model.T_Bus_Operation oper = new Model.T_Bus_Operation();
17168
+                    oper.F_WorkOrderId = modelT_Bus_WorkOrder.F_WorkOrderId;
17169
+                    Dictionary<string, object> keyValuePairs = new Dictionary<string, object>();
17170
+                    string message = "";
17171
+                    if (state==0)
17172
+                    {
17173
+                        message = "审核不通过已办未果";
17174
+                        if (!string.IsNullOrEmpty(reason))
17175
+                            message += "原因:" + message;
17176
+                        keyValuePairs.Add("F_IsProResultState", 0);
17177
+                       
17178
+                    }
17179
+                    else
17180
+                    {
17181
+                        message = "审核通过已办未果";
17182
+                        if (!string.IsNullOrEmpty(reason))
17183
+                            message += "原因:" + message;
17184
+                        keyValuePairs.Add("F_IsProResultState", 2);
17185
+                        keyValuePairs.Add("F_IsProResult", 3);
17186
+                    }
17187
+
17188
+                    oper.F_State = modelT_Bus_WorkOrder.F_WorkState;
17189
+                    string userinfo = User.depname + "(" + User.F_UserCode + ")";
17190
+                    oper.F_Message = userinfo +  message + "";
17191
+                    oper.F_CreateUser = User.F_UserCode;
17192
+                    oper.F_CreateTime = DateTime.Now;
17193
+                    oper.F_IsDelete = 0;
17194
+                    operBLL.Add(oper);
17195
+                    #endregion
17196
+                    if (workorderBLL.UpdateWorkOrder(modelT_Bus_WorkOrder.F_Id, keyValuePairs))
17197
+                        return Success("成功");
17198
+                    else
17199
+                        return Error("失败");
17200
+                }
17201
+                else
17202
+                {
17203
+                    return Error("工单不存在");
17204
+                }
17205
+
17206
+            }
17207
+            return Error("权限不足");
17208
+
17209
+        }
17210
+        /// <summary>
17128
         ///追问回复
17211
         ///追问回复
17129
         /// </summary>
17212
         /// </summary>
17130
         /// <returns></returns>
17213
         /// <returns></returns>
17169
                                 keyValuePairs.Add("F_AdditionalReply", modelT_Bus_WorkOrder.F_AdditionalReply + "<br/>" + message);
17252
                                 keyValuePairs.Add("F_AdditionalReply", modelT_Bus_WorkOrder.F_AdditionalReply + "<br/>" + message);
17170
                             }
17253
                             }
17171
 
17254
 
17172
-                            keyValuePairs.Add("F_IsProResult", 3);
17255
+                           
17256
+                            if (User .F_RoleCode =="EJWLDW")
17257
+                            {
17258
+                                keyValuePairs.Add("F_IsProResultState", 1); 
17259
+                            }
17260
+                            else
17261
+                            {
17262
+                                keyValuePairs.Add("F_IsProResult", 3);
17263
+                            }
17264
+
17265
+
17266
+
17173
                             bool n = workorderBLL.UpdateWorkOrder(modelT_Bus_WorkOrder.F_Id, keyValuePairs);
17267
                             bool n = workorderBLL.UpdateWorkOrder(modelT_Bus_WorkOrder.F_Id, keyValuePairs);
17174
                             if (!string.IsNullOrEmpty(files))
17268
                             if (!string.IsNullOrEmpty(files))
17175
                             {
17269
                             {
20226
                                 //结案
20320
                                 //结案
20227
                                 if (nexttype == 0)
20321
                                 if (nexttype == 0)
20228
                                 {
20322
                                 {
20229
-                                    if (issatisfie == 0)
20323
+                                    if (issatisfie <= 0)
20230
                                         keyValuePairs.Add("F_ToBereply", 1);
20324
                                         keyValuePairs.Add("F_ToBereply", 1);
20231
                                     keyValuePairs.Add("F_IsClosed", 1);
20325
                                     keyValuePairs.Add("F_IsClosed", 1);
20232
                                     // modelT_Bus_WorkOrder.F_IsClosed = 1;
20326
                                     // modelT_Bus_WorkOrder.F_IsClosed = 1;

+ 3 - 3
CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/workorder/hb_affairsController.cs

404
                                 {
404
                                 {
405
                                     var obj = new
405
                                     var obj = new
406
                                     {
406
                                     {
407
-                                        code = "0",
407
+                                        code = "1",
408
                                         message = "已推送过延时结果"
408
                                         message = "已推送过延时结果"
409
                                     };
409
                                     };
410
                                     return Content(obj.ToJson());
410
                                     return Content(obj.ToJson());
418
                                     modelT_Bus_WorkOrder.F_LimitTime.Value
418
                                     modelT_Bus_WorkOrder.F_LimitTime.Value
419
                                      .AddHours(tss);
419
                                      .AddHours(tss);
420
                                 des = ",原定办结时间" + modelT_Bus_DelayTime.F_OldTime + ",申请延长到" + modelT_Bus_DelayTime.F_NewTime;
420
                                 des = ",原定办结时间" + modelT_Bus_DelayTime.F_OldTime + ",申请延长到" + modelT_Bus_DelayTime.F_NewTime;
421
-                                int n = DbHelperSQL.ExecuteSql(" update T_Bus_WorkOrder set F_LimitTime='" + modelT_Bus_WorkOrder.F_LimitTime 
421
+                                int n = DbHelperSQL.ExecuteSql(" update T_Bus_WorkOrder set F_LimitTime='" + modelT_Bus_DelayTime.F_NewTime.Value 
422
                                     + "'   where F_Id ='" + modelT_Bus_WorkOrder.F_Id + "'");
422
                                     + "'   where F_Id ='" + modelT_Bus_WorkOrder.F_Id + "'");
423
 
423
 
424
                                 if (modelT_Bus_AssignedInfo != null)
424
                                 if (modelT_Bus_AssignedInfo != null)
425
                                 {
425
                                 {
426
-                                    modelT_Bus_AssignedInfo.F_LimitTime = modelT_Bus_WorkOrder.F_LimitTime;
426
+                                    modelT_Bus_AssignedInfo.F_LimitTime = modelT_Bus_DelayTime.F_NewTime.Value;
427
                                     assignBLL.Update(modelT_Bus_AssignedInfo);
427
                                     assignBLL.Update(modelT_Bus_AssignedInfo);
428
                                 }
428
                                 }
429
                                 if (!string.IsNullOrEmpty(modelT_Bus_WorkOrder.F_SubWorkorder1))
429
                                 if (!string.IsNullOrEmpty(modelT_Bus_WorkOrder.F_SubWorkorder1))

+ 4 - 0
CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Models/Common/ButtonGroup.cs

249
         {
249
         {
250
             return new button(62, "抽查");
250
             return new button(62, "抽查");
251
         }
251
         }
252
+        public static button AuditUnsuccessful()
253
+        {
254
+            return new button(68, "已办未果审核");
255
+        }
252
         /// <summary>
256
         /// <summary>
253
         /// 已办未果通过
257
         /// 已办未果通过
254
         /// </summary>
258
         /// </summary>

+ 3 - 0
CallCenterApi/CallCenterApi.Model/T_RepositoryInformation.cs

168
         /// </summary>
168
         /// </summary>
169
         public string F_DeductUser { set; get; }
169
         public string F_DeductUser { set; get; }
170
 
170
 
171
+
172
+        public int? F_DeptId { set; get; }
173
+
171
         #endregion Model
174
         #endregion Model
172
 
175
 
173
     }
176
     }

+ 2 - 0
CallCenterApi/CallCenterApi.Model/T_RepositoryLog.cs

139
         {
139
         {
140
             set;get;
140
             set;get;
141
         }
141
         }
142
+
143
+        public int ?F_DeptId { set; get; }
142
         #endregion Model
144
         #endregion Model
143
     }
145
     }
144
 }
146
 }