1

web/src/main/java/com/jpsoft/excellent/modules/base/controller/IncidentController.java

@@ -906,7 +906,7 @@ public class IncidentController {
 
     @ApiOperation(value="报表")
     @RequestMapping(value = "reportList",method = RequestMethod.POST)
-    public MessageResult<Map> reportList(String batch, String areaId, String specialClassId, @RequestAttribute String subject){
+    public MessageResult<Map> reportList(String batch, String areaId, String specialClassId, String isFinished, @RequestAttribute String subject){
         MessageResult<Map> msgResult = new MessageResult<>();
 
         List<Sort> sortList = new ArrayList<>();
@@ -923,6 +923,9 @@ public class IncidentController {
         if (StringUtils.isNotEmpty(specialClassId)) {
             searchParams.put("specialClassId","%"+specialClassId+"%");
         }
+        if (StringUtils.isNotEmpty(isFinished)) {
+            searchParams.put("isFinished",isFinished);
+        }
 
         Page<Incident> page = incidentService.pageSearch(searchParams,1,10000,false,sortList);
         for(Incident incident : page.getResult()){
@@ -944,7 +947,7 @@ public class IncidentController {
 
     @ApiOperation(value="导出报表")
     @RequestMapping(value = "reportListXls",method = RequestMethod.POST)
-    public String reportListXls(String batch, String areaId, String specialClassId, @RequestAttribute String subject){
+    public String reportListXls(String batch, String areaId, String specialClassId, String isFinished, @RequestAttribute String subject){
         String downloadUrl = "";
 
         //新建文档
@@ -1007,6 +1010,9 @@ public class IncidentController {
         if (StringUtils.isNotEmpty(specialClassId)) {
             searchParams.put("specialClassId","%"+specialClassId+"%");
         }
+        if (StringUtils.isNotEmpty(isFinished)) {
+            searchParams.put("isFinished",isFinished);
+        }
 
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
         Page<Incident> page = incidentService.pageSearch(searchParams,1,10000,false,sortList);