From 48d13e2a93e47667f5c5b533f054f251f60f3e1f Mon Sep 17 00:00:00 2001 From: weikai <123456> Date: Mon, 16 Nov 2020 10:11:30 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90pc=E7=AB=AF=20=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E7=AE=A1=E7=90=86=20-=20=E5=B7=B2=E8=B6=85=E6=97=B6=E3=80=91?= =?UTF-8?q?=E3=80=90=E6=B7=BB=E5=8A=A0=E5=AF=BC=E5=87=BA=E3=80=91=E9=AD=8F?= =?UTF-8?q?=E5=87=AF=202020-11-16?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../item/controller/ItemController.java | 20 ++++- .../item/excel/ItemTimeoutNewExcel.java | 86 +++++++++++++++++++ .../item/service/ItemTimeoutService.java | 8 ++ .../service/impl/ItemTimeoutServiceImpl.java | 43 ++++++++++ 4 files changed, 156 insertions(+), 1 deletion(-) create mode 100644 esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/excel/ItemTimeoutNewExcel.java diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/ItemController.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/ItemController.java index 30e3ba017..ca8205bc0 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/ItemController.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/ItemController.java @@ -38,6 +38,7 @@ import com.elink.esua.epdc.dto.item.result.ItemTimeOutDTO; import com.elink.esua.epdc.dto.result.KpiEvaluationAmountResultDTO; import com.elink.esua.epdc.dto.result.KpiItemHandleAmountResultDTO; import com.elink.esua.epdc.modules.item.excel.ItemExcel; +import com.elink.esua.epdc.modules.item.excel.ItemTimeoutNewExcel; import com.elink.esua.epdc.modules.item.excel.StayItemExcel; import com.elink.esua.epdc.modules.item.service.ItemService; import com.elink.esua.epdc.modules.item.service.ItemTimeoutService; @@ -258,9 +259,26 @@ public class ItemController { return new Result().ok(returnDto); } + /** + * 项目管理 - 导出 + * @param params + * @param response + * @throws Exception + */ @GetMapping("unexport") public void unexport(@RequestParam Map params, HttpServletResponse response) throws Exception { List list= itemService.unExportList(params); - ExcelUtils.exportExcelToTarget(response, "待处理项目", list, StayItemExcel.class); + ExcelUtils.exportExcelToTarget(response, "null", list, StayItemExcel.class); + } + /** + * 项目管理 - 已超时 -导出 + * @param params + * @param response + * @throws Exception + */ + @GetMapping("itemOutexport") + public void itemOutExport(@RequestParam Map params, HttpServletResponse response) throws Exception { + List list= itemTimeoutService.itemOutExportList(params); + ExcelUtils.exportExcelToTarget(response, "已超时", list, ItemTimeoutNewExcel.class); } } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/excel/ItemTimeoutNewExcel.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/excel/ItemTimeoutNewExcel.java new file mode 100644 index 000000000..ac73f6689 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/excel/ItemTimeoutNewExcel.java @@ -0,0 +1,86 @@ +package com.elink.esua.epdc.modules.item.excel; + +import cn.afterturn.easypoi.excel.annotation.Excel; +import lombok.Data; + +@Data +public class ItemTimeoutNewExcel { + + /** + * 项目编号 + */ + @Excel(name = "项目编号") + private String itemCode; + + /** + * 项目内容 + */ + @Excel(name = "项目内容") + private String itemContent; + + /** + * 项目状态 + */ + @Excel(name = "项目状态") + private String itemState; + /** + * 项目统计年月 + */ + @Excel(name = "项目统计年月") + private String totalYearMonth; + /** + * 项目发布时间 + */ + @Excel(name = "项目发布时间") + private String distributeTime; + /** + *最近一次处理时间 + */ + @Excel(name = "最近一次处理时间") + private String lastHandleTime; + /** + * 转项目时间 + */ + @Excel(name = "转项目时间") + private String itemCreatedTime; + /** + * 提交人 + */ + @Excel(name = "提交人") + private String nickName; + /** + * 电话 + */ + @Excel(name = "电话") + private String mobile; + /** + * 项目满意度 + */ + @Excel(name = "项目满意度") + private String evaluationScore; + /** + * 支持数 + */ + @Excel(name = "支持数") + private Integer approveNum; + /** + * 反对数 + */ + @Excel(name = "反对数") + private Integer opposeNum; + /** + * 评论数 + */ + @Excel(name = "评论数") + private Integer commentNum; + /** + * 浏览数 + */ + @Excel(name = "浏览数") + private Integer browseNum; + /** + * 参与数 + */ + @Excel(name = "参与数") + private Integer participantsNum; +} diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/ItemTimeoutService.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/ItemTimeoutService.java index 62c520a36..46b4deca1 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/ItemTimeoutService.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/ItemTimeoutService.java @@ -111,4 +111,12 @@ public interface ItemTimeoutService extends BaseService { * @Date: 2020/6/16 */ ItemTimeOutDTO selectItemTimeOutById(String id); + /** + * @describe: 已超时 - 导出 + * @author wk + * @date 2020/11/16 + * @params [params] + * @return list + */ + List itemOutExportList(Map params); } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemTimeoutServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemTimeoutServiceImpl.java index 1230e19bd..1a1c9c36f 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemTimeoutServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemTimeoutServiceImpl.java @@ -161,4 +161,47 @@ public class ItemTimeoutServiceImpl extends BaseServiceImpl itemOutExportList(Map params) { + UserDetail user = SecurityUser.getUser(); + if (null == user) { + throw new RuntimeException("获取用户信息失败"); + } + if (OrganizationTypeConstant.ORG_TYPE_DISTRICT_DEPT.equals(user.getTypeKey())) { + if (params.get("streetId") != null && !"".equals(params.get("streetId"))) { + Result resultdept = adminFeignClient.getSysDeptInfo(Long.parseLong(params.get("streetId").toString())); + SysDeptDTO dept = resultdept.getData(); + Object deptId = params.get("streetId"); + if (OrganizationTypeConstant.ORG_TYPE_DISTRICT_DEPT.equals(dept.getTypeKey())) { + params.put("districtDeptId", deptId); + params.remove("streetId"); + } + } + } + //部门ID列表 + List deptIdList = new ArrayList<>(); + // 判断是否为网格，不为网格只能查看本部门下的项目数据 + if (OrganizationTypeConstant.ORG_TYPE_GRID_PARTY.equals(user.getTypeKey())) { + deptIdList = user.getDeptIdList(); + } else { + deptIdList.add(user.getDeptId()); + } + params.put("deptIdList", null); + if (null != deptIdList && deptIdList.size() > 0) { + params.put("deptIdList", deptIdList); + } + if (null != params.get("itemCode")) { + params.put("itemCode", params.get("itemCode").toString().trim()); + } + List list = baseDao.selectListOfPendingHandleItems(params); + return list; + } + }