Bladeren bron

增加仓房参数

gaodd 5 jaren geleden
bovenliggende
commit
dfe12d2447

+ 1 - 1
src/main/java/com/unissoft/ventilation/controller/ProcessAuditController.java

@@ -56,7 +56,7 @@ public class ProcessAuditController {
56 56
 	/**
57 57
 	 * 机械通风列表
58 58
 	 */
59
-    @ApiOperation(value = "分页条件查询", notes = "提交参数(type必填):{\"pageIndex\":1,\"pageSize\":10,  \"condition\":\"{\'type\':\'\',\'startTime\':\'\',\'endTime\':\'\'}\"}")
59
+    @ApiOperation(value = "分页条件查询", notes = "提交参数(type、houseId必填):{\"pageIndex\":1,\"pageSize\":10,  \"condition\":\"{\'type\':\'\',\'houseId\':\'\',\'startTime\':\'\',\'endTime\':\'\'}\"}")
60 60
     @PostMapping("/getPage")
61 61
     public ResultView getPage(@RequestBody PageParam pageParam) throws Exception{
62 62
     	Page<ProcessAudit> page = processAuditService.getPage(pageParam);

+ 3 - 0
src/main/java/com/unissoft/ventilation/service/impl/ProcessAuditServiceImpl.java

@@ -149,6 +149,9 @@ public class ProcessAuditServiceImpl extends ServiceImpl<ProcessAuditMapper, Pro
149 149
 			if(StringUtils.isNotBlank(object.optString("type"))){
150 150
 				ew.eq("type",object.optString("type"));
151 151
 			}
152
+			if(StringUtils.isNotBlank(object.optString("houseId"))){
153
+				ew.eq("house_id",object.optString("houseId"));
154
+			}
152 155
 			 
153 156
 			if (StringUtils.isNotBlank(object.optString("startTime")) || StringUtils.isNotBlank(object.optString("endTime"))){
154 157
                 ew.between("operation_time", object.optString("endTime"), object.optString("startTime"));