diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/excel/rejectEventsExcel.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/excel/rejectEventsExcel.java index 35140ca26..c9472f812 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/excel/rejectEventsExcel.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/excel/rejectEventsExcel.java @@ -2,7 +2,6 @@ package com.elink.esua.epdc.modules.events.excel; import cn.afterturn.easypoi.excel.annotation.Excel; import lombok.Data; -import org.springframework.format.annotation.DateTimeFormat; @Data public class rejectEventsExcel { 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 ca701e53a..30e3ba017 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.StayItemExcel; import com.elink.esua.epdc.modules.item.service.ItemService; import com.elink.esua.epdc.modules.item.service.ItemTimeoutService; import org.springframework.beans.factory.annotation.Autowired; @@ -256,4 +257,10 @@ public class ItemController { ItemTimeOutDTO returnDto = itemTimeoutService.selectItemTimeOutById(id); return new Result().ok(returnDto); } + + @GetMapping("unexport") + public void unexport(@RequestParam Map params, HttpServletResponse response) throws Exception { + List list= itemService.unExportList(params); + ExcelUtils.exportExcelToTarget(response, "待处理项目", list, StayItemExcel.class); + } } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/excel/StayItemExcel.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/excel/StayItemExcel.java new file mode 100644 index 000000000..84e8c3b71 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/excel/StayItemExcel.java @@ -0,0 +1,67 @@ +package com.elink.esua.epdc.modules.item.excel; + +import cn.afterturn.easypoi.excel.annotation.Excel; +import lombok.Data; + +import java.util.Date; + +@Data +public class StayItemExcel { + + /** + * 项目内容 + */ + @Excel(name="项目内容") + private String itemContent; + /** + * 转项目时间 + */ + @Excel(name="转项目时间") + private Date createdTime; + /** + * 提交人 + */ + @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; + + /** + * 项目编号 + */ + private String itemCode; +} diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/ItemService.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/ItemService.java index 46f3d90b6..f15968ac6 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/ItemService.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/ItemService.java @@ -425,4 +425,12 @@ public interface ItemService extends BaseService { * @return com.elink.esua.epdc.commons.tools.utils.Result */ Result rejectItemSatisfactionInfo(RejectRecordDTO dto); + /** + * @describe: 导出 + * @author wk + * @date 2020/11/16 + * @params [params] + * @return list + */ + List unExportList(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/ItemServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java index 150db8b6c..a848f49a1 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java @@ -1603,6 +1603,47 @@ public class ItemServiceImpl extends BaseServiceImpl implem return new Result(); } + /** + * + * @param params + * @return + */ + @Override + public List unExportList(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; + } + /** * * 分类信息处理