guoyuepeng
/
qa-prevention-gwj
1
0
Fork 3
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/0205cmt' into 0205cmt

0927cmt
songwenxuan 2024-06-05 16:08:12 +08:00
parent 9909333a2c 2e41503d3b
commit 1881570348
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/com/zcloud/controller/mkmj/MkmjRelationController.java
View File

@ -7,6 +7,7 @@ import com.zcloud.service.mkmj.MkmjRelationService;
import com.zcloud.util.DateUtil;
import com.zcloud.util.Jurisdiction;
import com.zcloud.util.Tools;
import org.apache.commons.lang.StringUtils;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
@ -181,7 +182,14 @@ public class MkmjRelationController extends BaseController {
String errInfo = "success";
PageData pd = this.getPageData();
List<PageData> varList = mkmjRelationService.getAllCarAndPeopleInfoCountByArea(pd); //列出人闸机信息列表
map.put("varList", varList);
List<PageData> returnList = new ArrayList<>();
for(PageData pageData:varList){
if(StringUtils.equals(pageData.getString("AREA_NAME"),"辅建区")&&StringUtils.equals(pageData.getString("TYPE"),"person")){
continue;
}
returnList.add(pageData);
}
map.put("varList", returnList);
map.put("result", errInfo);
return map;
}