Ver código fonte

登陆记录新增web质量登记

李士越 1 ano atrás
pai
commit
59d890e179

+ 4 - 0
DK.Client/SystemModule/F_MST_0208.cs

@@ -108,6 +108,10 @@ namespace Dongke.IBOSS.PRD.Client.SystemModule
                 dt.Rows.Add(dr);
                 d++;
             }
+            dr = dt.NewRow();
+            dr[0] =  6;
+            dr[1] = "web质量登记";
+            dt.Rows.Add(dr); 
             cbActionType.DisplayMember = "actiontype";
             cbActionType.DataSource = dt;
             cbActionType.Text = "";

+ 27 - 16
DK.Service/SystemModuleLogic/SystemModuleLogicPartial.cs

@@ -1777,20 +1777,27 @@ namespace Dongke.IBOSS.PRD.Service.SystemModuleLogic
                                         	TP_MST_USERLOGINLOG.MAC,
                                         	COMPUTERNAME,
                                             ORGANIZATIONCODE,
-                                        CASE
-                                        		ACTIONTYPE 
-                                        		WHEN '0' THEN
-                                        		'pc登录' 
-                                        		WHEN '1' THEN
-                                        		'PC登出' 
-                                        		WHEN '2' THEN
-                                        		'移动设备登录' 
-                                        		WHEN '3' THEN
-                                        		'移动设备登出' 
-                                        		WHEN '4' THEN
-                                        		'PC登录MBC' ELSE 'PC登出MBC' 
-                                        	END ACTIONTYPE,
-                                        	IP ,IMEI,ACTIONTIME
+                                            CASE MAC
+	                                        WHEN 'xx:xx:xx:xx:xx:xx' THEN
+		                                    'web质量登记'
+	                                        ELSE
+	                                        CASE
+		                                    ACTIONTYPE 
+		                                    WHEN '0' THEN
+		                                    'pc登录' 
+		                                    WHEN '1' THEN
+		                                    'PC登出' 
+		                                    WHEN '2' THEN
+		                                    '移动设备登录' 
+		                                    WHEN '3' THEN
+		                                    '移动设备登出' 
+		                                    WHEN '4' THEN
+		                                    'PC登录MBC' ELSE 'PC登出MBC' 
+	                                        END 
+                                            END  as  ACTIONTYPE,
+                                        	IP ,
+                                            IMEI,
+                                            ACTIONTIME
                                         FROM
                                         	TP_MST_USERLOGINLOG
                                         	LEFT JOIN TP_MST_User U ON u.USERID = TP_MST_USERLOGINLOG.USERID
@@ -1812,10 +1819,14 @@ namespace Dongke.IBOSS.PRD.Service.SystemModuleLogic
                 }
                 if (!string.IsNullOrEmpty(cre.Properties["ActionType"].ToString()))
                 {
-                    sqlString += " AND  ActionType like :ActionType";
+                    if (cre.Properties["ActionType"].ToString()== "6")
+                    {
+                        sqlString += " AND  MAC = 'xx:xx:xx:xx:xx:xx'";
+                    }
+                    else { sqlString += " AND  ActionType like :ActionType"; }  
                 }
                 sqlString += @" ORDER BY
-                                        	ACTIONTIME DESC ";
+                                        	ACTIONTIME DESC";
                 paras = new OracleParameter[]{
                     new OracleParameter(":UserCode",'%'+cre.Properties["UserCode"].ToString()+'%'),
                     new OracleParameter(":UserName",'%'+cre.Properties["UserName"].ToString()+'%'),