From 2f4c7188dafef10903ab5fbdf29f06cd710216a2 Mon Sep 17 00:00:00 2001 From: Jackwang Date: Mon, 1 Feb 2021 18:00:55 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E9=A1=B9=E7=9B=AE=E5=BB=B6=E6=9C=9F-?= =?UTF-8?q?=E7=86=94=E6=96=AD=E3=80=91-=E3=80=90=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E8=AE=B0=E5=BD=95=E6=98=BE=E7=A4=BA=E3=80=91-=EF=BC=88?= =?UTF-8?q?=E7=8E=8B=E7=AB=A5=EF=BC=89-2021/2/1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/item/result/ItemHandleListDTO.java | 100 ++++++++++++++++++ .../controller/ItemFusingDelayController.java | 7 +- .../modules/item/dao/ItemFusingDelayDao.java | 14 ++- .../item/service/ItemFusingDelayService.java | 3 +- .../impl/ItemFusingDelayServiceImpl.java | 55 ++++++++-- .../mapper/item/ItemFusingDelayDao.xml | 97 +++++++++++++++++ 6 files changed, 263 insertions(+), 13 deletions(-) create mode 100644 esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemHandleListDTO.java diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemHandleListDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemHandleListDTO.java new file mode 100644 index 000000000..1c88944c8 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemHandleListDTO.java @@ -0,0 +1,100 @@ +package com.elink.esua.epdc.dto.item.result; + +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + +/** + * 项目熔断-延期记录 + * @Author wangtong + * @Date 2021/2/1 17:42 + */ +@Data +public class ItemHandleListDTO implements Serializable { + private static final long serialVersionUID = -5197394552788076724L; + + /** + * 项目ID + */ + private String id; + /** + * 项目内容 + */ + private String itemContent; + /** + * 转项目时间 + */ + private Date createdTime; + /** + * 提交人 + */ + private String nickName; + + /** + * 手机号 + */ + private String mobile; + /** + * 项目满意度 + */ + private String evaluationScore; + /** + * 支持数 + */ + private Integer approveNum; + /** + * 反对数 + */ + private Integer opposeNum; + /** + * 评论数 + */ + private Integer commentNum; + /** + * 浏览数 + */ + private Integer browseNum; + /** + * 参与数 + */ + private Integer participantsNum; + + /** + * 项目编号 + */ + private String itemCode; + + //------------------------------------------------- + + /** + * 申请状态 + */ + private String state; + + /** + * 申请状态名称 + */ + private String stateName; + + /** + * 处理状态 + */ + private String handleState; + + /** + * 处理状态名称 + */ + private String handleStateName; + + /** + * 延期开始时间 + */ + private String delayStartTime; + + /** + * 延期结束时间 + */ + private String delayEndTime; + +} diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/ItemFusingDelayController.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/ItemFusingDelayController.java index a53ce3e90..8c37698d3 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/ItemFusingDelayController.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/ItemFusingDelayController.java @@ -27,6 +27,7 @@ import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup; import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup; import com.elink.esua.epdc.dto.item.ItemFusingDelayDTO; import com.elink.esua.epdc.dto.item.form.ItemFusingDelayInsertDTO; +import com.elink.esua.epdc.dto.item.result.ItemHandleListDTO; import com.elink.esua.epdc.modules.item.excel.ItemFusingDelayExcel; import com.elink.esua.epdc.modules.item.service.ItemFusingDelayService; import org.springframework.beans.factory.annotation.Autowired; @@ -51,9 +52,9 @@ public class ItemFusingDelayController { private ItemFusingDelayService itemFusingDelayService; @GetMapping("page") - public Result> page(@RequestParam Map params){ - PageData page = itemFusingDelayService.page(params); - return new Result>().ok(page); + public Result> page(@RequestParam Map params){ + PageData page = itemFusingDelayService.page(params); + return new Result>().ok(page); } @GetMapping("{id}") diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/dao/ItemFusingDelayDao.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/dao/ItemFusingDelayDao.java index d033a2797..f0ff37547 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/dao/ItemFusingDelayDao.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/dao/ItemFusingDelayDao.java @@ -18,9 +18,13 @@ package com.elink.esua.epdc.modules.item.dao; import com.elink.esua.epdc.commons.mybatis.dao.BaseDao; +import com.elink.esua.epdc.dto.item.result.ItemHandleListDTO; import com.elink.esua.epdc.modules.item.entity.ItemFusingDelayEntity; import org.apache.ibatis.annotations.Mapper; +import java.util.List; +import java.util.Map; + /** * 项目熔断/延期记录表 * @@ -29,5 +33,13 @@ import org.apache.ibatis.annotations.Mapper; */ @Mapper public interface ItemFusingDelayDao extends BaseDao { - + + /** + * @describe: 项目 熔断-延期记录列表 + * @author wangtong + * @date 2021/2/1 17:51 + * @params [params] + * @return java.util.List + */ + List selectHandleItemsList(Map params); } \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/ItemFusingDelayService.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/ItemFusingDelayService.java index ffec71356..f59f23ff2 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/ItemFusingDelayService.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/ItemFusingDelayService.java @@ -21,6 +21,7 @@ import com.elink.esua.epdc.commons.mybatis.service.BaseService; import com.elink.esua.epdc.commons.tools.page.PageData; import com.elink.esua.epdc.dto.item.ItemFusingDelayDTO; import com.elink.esua.epdc.dto.item.form.ItemFusingDelayInsertDTO; +import com.elink.esua.epdc.dto.item.result.ItemHandleListDTO; import com.elink.esua.epdc.modules.item.entity.ItemFusingDelayEntity; import java.util.List; @@ -42,7 +43,7 @@ public interface ItemFusingDelayService extends BaseService page(Map params); + PageData page(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/ItemFusingDelayServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemFusingDelayServiceImpl.java index 9174fcf41..467609b42 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemFusingDelayServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemFusingDelayServiceImpl.java @@ -21,11 +21,18 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl; import com.elink.esua.epdc.commons.tools.constant.FieldConstant; +import com.elink.esua.epdc.commons.tools.constant.OrganizationTypeConstant; import com.elink.esua.epdc.commons.tools.exception.RenException; import com.elink.esua.epdc.commons.tools.page.PageData; +import com.elink.esua.epdc.commons.tools.security.user.SecurityUser; +import com.elink.esua.epdc.commons.tools.security.user.UserDetail; import com.elink.esua.epdc.commons.tools.utils.ConvertUtils; +import com.elink.esua.epdc.commons.tools.utils.Result; +import com.elink.esua.epdc.dto.SysDeptDTO; import com.elink.esua.epdc.dto.item.ItemFusingDelayDTO; import com.elink.esua.epdc.dto.item.form.ItemFusingDelayInsertDTO; +import com.elink.esua.epdc.dto.item.result.ItemHandleListDTO; +import com.elink.esua.epdc.modules.feign.AdminFeignClient; import com.elink.esua.epdc.modules.item.dao.ItemFusingDelayDao; import com.elink.esua.epdc.modules.item.entity.ItemFusingDelayEntity; import com.elink.esua.epdc.modules.item.redis.ItemFusingDelayRedis; @@ -35,6 +42,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import java.util.ArrayList; import java.util.Arrays; import java.util.List; import java.util.Map; @@ -51,13 +59,44 @@ public class ItemFusingDelayServiceImpl extends BaseServiceImpl page(Map params) { - IPage page = baseDao.selectPage( - getPage(params, FieldConstant.CREATED_TIME, false), - getWrapper(params) - ); - return getPageData(page, ItemFusingDelayDTO.class); + public PageData page(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()); + } + IPage page = getPage(params); + List list = baseDao.selectHandleItemsList(params); + return new PageData<>(list, page.getTotal()); } @Override @@ -90,8 +129,8 @@ public class ItemFusingDelayServiceImpl extends BaseServiceImpl wrapper = new QueryWrapper<>(queryData); ItemFusingDelayEntity handleInfo = baseDao.selectOne(wrapper); - if(handleInfo != null){ - throw new RenException("此项目已存在申请记录。"); + if(handleInfo != null && handleInfo.getState().equals(dto.getState())){ + throw new RenException("此项目已存在该项的申请记录。"); } ItemFusingDelayEntity entity = ConvertUtils.sourceToTarget(dto, ItemFusingDelayEntity.class); insert(entity); diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemFusingDelayDao.xml b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemFusingDelayDao.xml index d6ccb0bdb..5e58feeaa 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemFusingDelayDao.xml +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemFusingDelayDao.xml @@ -19,6 +19,103 @@ + \ No newline at end of file