new

saicLogistics/src/main/java/com/fuzamei/mapper/OperationHistoryMapper.xml

@@ -116,7 +116,7 @@
 		select
 			count(*)
 		from 
-			operation_history
+			operation_history_admin
 		<where>
 			operator_id=#{userId}
 			<if test="operationTypeId!=null">

saicLogistics/src/test/java/com/fuzamei/web/OperationHistoryActionTest.java

@@ -8,10 +8,15 @@ import org.springframework.beans.factory.annotation.Autowired;
 import com.alibaba.fastjson.JSON;
 import com.fuzamei.baseTest.BaseJunit4Test;
 import com.fuzamei.entity.Params;
+import com.fuzamei.service.OperationHistoryService;
+import com.fuzamei.util.PageDTO;
 
 public class OperationHistoryActionTest extends BaseJunit4Test{
 	@Autowired
 	private OperationHistoryAction operationHistoryAction;
+
+	@Autowired
+	private OperationHistoryService operationHistoryService;
 	
 	/*@Test
 	public void test01(){
@@ -24,4 +29,19 @@ public class OperationHistoryActionTest extends BaseJunit4Test{
 		String jsonString = JSON.toJSONString(result,true);
 		System.out.println(jsonString);
 	}*/
+	
+	@Test
+	public void test02(){
+		Params params=new Params();
+		params.setUserId(9001);
+		params.setStartPage(0);
+		params.setPage(1);
+		params.setRowNum(10);
+		params.setStartTime(null);
+		params.setEndTime(null);
+		params.setOperationTypeId(null);
+		PageDTO result = operationHistoryService.queryOperationHistory(params);
+		String jsonString = JSON.toJSONString(result,true);
+		System.out.println(jsonString);
+	}
 }