Browse Source

修改bug

lvzhikai 4 years ago
parent
commit
ce969b48d7

+ 7 - 1
src/main/java/com/chinaitop/depot/keeperAccount/controller/StorageAccountRecordController.java

@@ -44,7 +44,7 @@ public class StorageAccountRecordController {
44 44
     	@ApiImplicitParam(name="endDate", value="结束时间", paramType="query")
45 45
     })
46 46
 	public PageInfo<Map<String, Object>> sumAccountList(HttpServletRequest request, Integer pageNum, Integer pageSize, 
47
-			Integer lspz, Integer lsxz, String startDate, String endDate) {
47
+			Integer lspz, Integer lsxz, String year, String month) {
48 48
 		Map<String, Object> map = new HashMap<String, Object>();
49 49
 		if (lspz != null) {
50 50
 			map.put("pz", lspz+"");
@@ -52,6 +52,12 @@ public class StorageAccountRecordController {
52 52
 		if (lsxz != null) {
53 53
 			map.put("hwxz", lsxz+"");
54 54
 		}
55
+		if (year != null) {
56
+			map.put("year", year+"");
57
+		}
58
+		if (month != null) {
59
+			map.put("month", month+"");
60
+		}
55 61
 		if (pageNum!=null && pageSize!=null) {
56 62
 			PageHelper.startPage(pageNum, pageSize);
57 63
 		}

+ 6 - 0
src/main/java/com/chinaitop/depot/keeperAccount/mapper/StorageAccountRecordMapper.xml

@@ -475,6 +475,12 @@
475 475
 	    <if test="hwxz != null">
476 476
 	        and hwxz = #{hwxz} 
477 477
 	    </if>
478
+	    <if test="year != null">
479
+	        and YEAR(rq) = #{year}
480
+	    </if>
481
+	    <if test="month != null">
482
+	        and MONTH(rq) = #{month}
483
+	    </if>
478 484
 	) fcbgz 
479 485
 	group by fcbgz.hwxz, fcbgz.lspz, DATE_FORMAT(fcbgz.rq,'%Y-%m') 
480 486
 	order by fcbgz.rq desc