fix 90669 企业标准计划库--查询后勾选导出,导出的是查询的数据
This commit is contained in:
+13
-2
@@ -9,6 +9,7 @@ import com.jero.common.aspect.annotation.AutoLog;
|
||||
import com.jero.common.exception.JeroBootException;
|
||||
import com.jero.common.system.base.controller.JeroController;
|
||||
import com.jero.common.util.MessageUtils;
|
||||
import com.jero.common.util.oConvertUtils;
|
||||
import com.jero.modules.laws.enterprise.entity.EnterpriseStandardPlan;
|
||||
import com.jero.modules.laws.enterprise.entity.vo.EnterpriseStandardPlanVo;
|
||||
import com.jero.modules.laws.enterprise.service.EnterpriseStandardPlanService;
|
||||
@@ -25,7 +26,9 @@ import org.springframework.web.servlet.ModelAndView;
|
||||
import javax.annotation.Resource;
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import javax.servlet.http.HttpServletResponse;
|
||||
import java.util.Arrays;
|
||||
import java.util.List;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
/**
|
||||
* @Description: 企业标准计划库
|
||||
@@ -113,8 +116,16 @@ public class EnterpriseStandardPlanController extends JeroController<EnterpriseS
|
||||
IPage<EnterpriseStandardPlanVo> pageList = esPlanService.queryPageList(enterpriseStandardPlan, req, page);
|
||||
// 获取数据
|
||||
List<EnterpriseStandardPlanVo> records = pageList.getRecords();
|
||||
|
||||
return super.exportListXls(records, EnterpriseStandardPlanVo.class, "企业标准计划库");
|
||||
// 过滤选中数据
|
||||
List<EnterpriseStandardPlanVo> exportList;
|
||||
String selections = req.getParameter("selections");
|
||||
if (oConvertUtils.isNotEmpty(selections)) {
|
||||
List<String> selectionList = Arrays.asList(selections.split(","));
|
||||
exportList = records.stream().filter(item -> selectionList.contains(item.getId())).collect(Collectors.toList());
|
||||
} else {
|
||||
exportList = records;
|
||||
}
|
||||
return super.exportListXls(exportList, EnterpriseStandardPlanVo.class, "企业标准计划库");
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user