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 324083630..4d1794c71 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 @@ -79,6 +79,20 @@ public class ItemController { return new Result>().ok(page); } + /** + * 项目驳回列表 + * + * @Params: [params] + * @Return: com.elink.esua.epdc.commons.tools.utils.Result> + * @Author: liuchuang + * @Date: 2019/9/16 9:56 + */ + @GetMapping("rejectPage") + public Result> rejectPage(@RequestParam Map params) { + PageData page = itemService.listOfItemsForPCReject(params); + return new Result>().ok(page); + } + /** * 项目处理详情 * @@ -272,6 +286,19 @@ public class ItemController { List list= itemService.unExportList(params); ExcelUtils.exportExcelToTarget(response, "null", list, StayItemExcel.class); } + + /** + * 项目管理 - 驳回导出 + * @param params + * @param response + * @throws Exception + */ + @GetMapping("rejectUnexport") + public void rejectUnexport(@RequestParam Map params, HttpServletResponse response) throws Exception { + List list= itemService.rejectUnexport(params); + ExcelUtils.exportExcelToTarget(response, "null", list, StayItemExcel.class); + } + /** * 项目管理 - 已超时 -导出 * @param params diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/dao/ItemDao.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/dao/ItemDao.java index 9e2ecc49a..60a282998 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/dao/ItemDao.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/dao/ItemDao.java @@ -147,6 +147,16 @@ public interface ItemDao extends BaseDao { */ List selectListOfPendingHandleItems(Map params); + /** + * PC端项目驳回列表 + * + * @Params: [params] + * @Return: java.util.List + * @Author: liuchuang + * @Date: 2019/9/12 18:21 + */ + List listOfItemsForPCReject(Map params); + /** * PC端项目详情 * 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 a865d58ca..6e467d22d 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 @@ -66,6 +66,16 @@ public interface ItemService extends BaseService { */ PageData listOfItemsForPCEnd(Map params); + /** + * PC端项目驳回列表 + * + * @Params: [params] + * @Return: com.elink.esua.epdc.commons.tools.page.PageData + * @Author: liuchuang + * @Date: 2019/9/12 18:17 + */ + PageData listOfItemsForPCReject(Map params); + /** * 默认查询 * @@ -453,6 +463,15 @@ public interface ItemService extends BaseService { */ List unExportList(Map params); + /** + * @describe: 结案申请驳回导出 + * @author wgf + * @date 2022/09/08 + * @params [params] + * @return list + */ + List rejectUnexport(Map params); + void itemTimeOut(); /** 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 c92ba3e39..1ba8f390e 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 @@ -241,6 +241,46 @@ public class ItemServiceImpl extends BaseServiceImpl implem return new PageData<>(list, page.getTotal()); } + @Override + public PageData listOfItemsForPCReject(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()) || OrganizationTypeConstant.ORG_TYPE_COMMUNITY_PARTY.equals(user.getTypeKey())) { + deptIdList = user.getDeptIdList(); + } else { + deptIdList.add(user.getDeptId()); + } + if(OrganizationTypeConstant.ORG_TYPE_COMMUNITY_PARTY.equals(user.getTypeKey())){ + params.put("isRemind", "isRemind"); + } + 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.listOfItemsForPCReject(params); + return new PageData<>(list, page.getTotal()); + } + @Override public List list(Map params) { List entityList = baseDao.selectList(getWrapper(params)); @@ -2427,6 +2467,47 @@ public class ItemServiceImpl extends BaseServiceImpl implem return list; } + /** + * + * @param params + * @return + */ + @Override + public List rejectUnexport(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.listOfItemsForPCReject(params); + return list; + } + /** * 分类信息处理 * diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml index 55ea7c7c3..a674576bf 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml @@ -519,6 +519,7 @@ ) process on process.ITEM_ID = item.ID WHERE item.DEL_FLAG = '0' and (item.IS_PEOPLE = '0' or (item.PEOPLE_FLAG = '0' and (process.state is null or process.state not in (11,15)))) + and (process.state != 14 or process.state is null) AND item.PEOPLE_FLAG = #{peopleFlag} @@ -578,6 +579,100 @@ item.CREATED_TIME DESC + +