diff --git a/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/DeptDTO.java b/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/DeptDTO.java new file mode 100644 index 000000000..c5e1bfa15 --- /dev/null +++ b/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/DeptDTO.java @@ -0,0 +1,92 @@ +/** + * Copyright (c) 2018 人人开源 All rights reserved. + *

+ * https://www.renren.io + *

+ * 版权所有，侵权必究！ + */ + +package com.elink.esua.epdc.dto; + +import lombok.Data; + +import java.io.Serializable; + +/** + * 部门管理 + * + * @author Mark sunlightcs@gmail.com + * @since 1.0.0 + */ +@Data +public class DeptDTO implements Serializable { + private static final long serialVersionUID = 1L; + + private Long id; + + /** + * 上级ID + */ + private Long pid; + /** + * 所有上级ID，用逗号分开 + */ + private String pids; + /** + * 部门名称 + */ + private String name; + /** + * 排序 + */ + private Integer sort; + + /** + * 上级部门名称 + */ + private String parentName; + + /** + * 部门类型键值 + */ + private String typeKey; + + /** + * 部门编码 + */ + private String partyCode; + + /** + * 地址 + */ + private String address; + + /** + * 联系方式 + */ + private String mobile; + + /** + * 经度 + */ + private String longitude; + + /** + * 纬度 + */ + private String latitude; + + /** + * 所属地区码（所属组织地区码） + */ + private String areaCode; + + /**第三方编码 + */ + private String infoCode; + + /** + * 市中心区划编码 + */ + private String disCenterZoningCode; +} diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/controller/SysDeptController.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/controller/SysDeptController.java index 4df5fcddb..4c12f0abb 100644 --- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/controller/SysDeptController.java +++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/controller/SysDeptController.java @@ -346,7 +346,7 @@ public class SysDeptController { } /** - * @param [deptId] + * @param deptId * @return com.elink.esua.epdc.commons.tools.utils.Result * @describe: 获得部门类型 * @author wangtong @@ -513,4 +513,12 @@ public class SysDeptController { return new Result().ok(sysDeptService.getDept(formDTO)); } + @GetMapping("option/list") + @ApiOperation("下拉列表") + public Result> listOption(@RequestParam Map params) { + List list = sysDeptService.listDefault(params); + + return new Result>().ok(list); + } + } diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/SysDeptService.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/SysDeptService.java index ab465f76a..bd8b42260 100644 --- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/SysDeptService.java +++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/SysDeptService.java @@ -34,6 +34,16 @@ public interface SysDeptService extends BaseService { List list(Map params); + /** + * 默认列表，无数据权限 + * + * @param params + * @return java.util.List + * @author zhy + * @date 2022/10/11 14:46 + */ + List listDefault(Map params); + SysDeptDTO get(Long id); void save(SysDeptDTO dto); diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java index e14f6b962..f18e3ee6f 100644 --- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java +++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java @@ -129,6 +129,13 @@ public class SysDeptServiceImpl extends BaseServiceImpl listDefault(Map params) { + List entityList = baseDao.getList(params); + + return ConvertUtils.sourceToTarget(entityList, DeptDTO.class); + } + @Override public List subList(String pid) { QueryWrapper wrapper = new QueryWrapper<>(); diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/SysDeptDao.xml b/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/SysDeptDao.xml index 7f70be9d2..a5332f21f 100644 --- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/SysDeptDao.xml +++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/SysDeptDao.xml @@ -12,6 +12,12 @@ #{id} + + AND t1.pid = #{pid} + + + AND t1.type_key = #{typeKey} + order by t1.sort asc diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/ItemPendingHandleDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/ItemPendingHandleDTO.java index c2de40a42..0a360513e 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/ItemPendingHandleDTO.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/ItemPendingHandleDTO.java @@ -75,6 +75,11 @@ public class ItemPendingHandleDTO implements Serializable { */ private String isRemind; + /** + * 剩余小时数 + */ + private Integer remainTime; + /** * 头像 */ diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemAppealPageResultDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemAppealPageResultDTO.java index ccbfcdde6..bc79dfb5f 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemAppealPageResultDTO.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemAppealPageResultDTO.java @@ -116,7 +116,8 @@ public class ItemAppealPageResultDTO implements Serializable { private String evaluationTime; /** - * 是否提醒社区处理(1:提示) + * 是否提醒社区处理(1:红灯，2黄灯，3绿灯) */ private String isRemind; + } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/service/impl/IssueServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/service/impl/IssueServiceImpl.java index 9e642f524..bcfaff473 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/service/impl/IssueServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/service/impl/IssueServiceImpl.java @@ -472,10 +472,11 @@ public class IssueServiceImpl extends BaseServiceImpl imp itemEntity.setPeopleFlag("0");//民生诉求 //民生诉求所属网格对应的所属社区的市中心编码 Result result = adminFeignClient.getCompleteDept(issueEntity.getGridId()); - if(!result.success()){ + if (!result.success()) { throw new RenException(result.getMsg()); } - itemEntity.setSerialNum(itemServiceImpl.getSerialNum("MS" + result.getData().getCommunityDisCenterZoningCode())); + String code = result.getData().getCommunityDisCenterZoningCode(); + itemEntity.setSerialNum(itemServiceImpl.getSerialNum("MS" + code)); return itemEntity; } 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 4dfb8daba..c15910e6f 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 @@ -349,6 +349,19 @@ public class ItemController { return new Result>().ok(page); } + /** + * @describe: 北尚诉求列表(不满意列表) + * @author wgf + * @date 2022/10/10 08:39 + * @params [dto] + * @return com.elink.esua.epdc.commons.tools.utils.Result> + */ + @GetMapping("getItemAppealPageUnsatisfactory") + public Result> getItemAppealPageUnsatisfactory(@RequestParam Map params){ + PageData page = itemService.getItemAppealPageUnsatisfactory(params); + return new Result>().ok(page); + } + /** * @describe: 北尚诉求详情 * @author wangtong diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/PushToCityGridController.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/PushToCityGridController.java index 3c4c29881..9f8308944 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/PushToCityGridController.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/PushToCityGridController.java @@ -6,8 +6,6 @@ import com.elink.esua.epdc.modules.item.service.PushToCityGridService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; -import javax.management.relation.RelationSupport; - @RestController @RequestMapping("PushToCity") public class PushToCityGridController { @@ -52,7 +50,7 @@ public class PushToCityGridController { */ @PostMapping("AppealReporting") public Result AppealReporting(String processId, String source){ - return pushToCityGridService.AppealReporting(processId, source); + return pushToCityGridService.appealReporting(processId, source); } /** @@ -65,7 +63,7 @@ public class PushToCityGridController { */ @PostMapping("ReportRejection") public Result ReportRejection(ItemHandleProcessDTO dto){ - return pushToCityGridService.ReportRejection(dto.getItemId()); + return pushToCityGridService.reportRejection(dto.getItemId()); } /** @@ -78,6 +76,6 @@ public class PushToCityGridController { */ @PostMapping("AppealHandling") public Result AppealHandling(@RequestBody ItemHandleProcessDTO dto){ - return pushToCityGridService.AppealHandling(dto); + return pushToCityGridService.appealHandling(dto); } } 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 86f899497..04004d699 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 @@ -410,6 +410,15 @@ public interface ItemDao extends BaseDao { */ List getItemAppealPage(Map params); + /** + * @describe: 北尚诉求列表(不满意列表) + * @author wgf + * @date 2022/10/10 08:39 + * @params [dto] + * @return com.elink.esua.epdc.commons.tools.utils.Result> + */ + List getItemAppealPageUnsatisfactory(Map params); + /** * @return com.elink.esua.epdc.dto.item.result.ItemAppealDetailResultDTO * @describe: 北尚诉求详情 diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/entity/ItemEntity.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/entity/ItemEntity.java index 9656ebd2a..0555631cc 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/entity/ItemEntity.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/entity/ItemEntity.java @@ -153,6 +153,10 @@ public class ItemEntity extends BaseEpdcEntity { */ private Double issueLongitude; + /** + * 满意度评价状态(0-不可评价，1-可评价) + */ + private String evaluationState; /** * 满意度评价得分 */ 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 f00387c19..e92c4c20e 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 @@ -542,6 +542,15 @@ public interface ItemService extends BaseService { */ PageData getItemAppealPage(Map params); + /** + * @describe: 北尚诉求列表(不满意列表) + * @author wgf + * @date 2022/10/10 08:39 + * @params [dto] + * @return com.elink.esua.epdc.commons.tools.utils.Result> + */ + PageData getItemAppealPageUnsatisfactory(Map params); + /** * @describe: 北尚诉求详情 * @author wangtong diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/PushToCityGridService.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/PushToCityGridService.java index 92bf8c61a..60646335c 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/PushToCityGridService.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/PushToCityGridService.java @@ -107,7 +107,7 @@ public interface PushToCityGridService { * @author LZN * @date 2022/9/19 10:22 */ - Result AppealReporting(String processId,String source); + Result appealReporting(String processId, String source); /** * 事件感知 @@ -127,7 +127,7 @@ public interface PushToCityGridService { * @author LZN * @date 2022/9/19 10:43 */ - Result ReportRejection(String id); + Result reportRejection(String id); /** * 诉求处理 @@ -137,7 +137,7 @@ public interface PushToCityGridService { * @author LZN * @date 2022/9/19 11:01 */ - Result AppealHandling(ItemHandleProcessDTO dto); + Result appealHandling(ItemHandleProcessDTO dto); /** * 2.8 诉求退件 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 b8cc42811..108ecbedc 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 @@ -77,7 +77,7 @@ public class ItemFusingDelayServiceImpl extends BaseServiceImpl page(Map params) { UserDetail user = SecurityUser.getUser(); if (null == user) { - throw new RuntimeException("获取用户信息失败"); + throw new RenException("获取用户信息失败"); } if (OrganizationTypeConstant.ORG_TYPE_DISTRICT_DEPT.equals(user.getTypeKey())) { if (params.get("streetId") != null && !"".equals(params.get("streetId"))) { 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 4d3c4a8da..78180a5a6 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 @@ -228,7 +228,7 @@ public class ItemServiceImpl extends BaseServiceImpl implem public PageData listOfItemsForPCEnd(Map params) { UserDetail user = SecurityUser.getUser(); if (null == user) { - throw new RuntimeException("获取用户信息失败"); + throw new RenException("获取用户信息失败"); } if (OrganizationTypeConstant.ORG_TYPE_DISTRICT_DEPT.equals(user.getTypeKey())) { if (params.get("streetId") != null && !"".equals(params.get("streetId"))) { @@ -273,7 +273,7 @@ public class ItemServiceImpl extends BaseServiceImpl implem public List listEqPc(ItemWorkListFormDTO formDTO) { UserDetail user = SecurityUser.getUser(); if (null == user) { - throw new RuntimeException("获取用户信息失败"); + throw new RenException("获取用户信息失败"); } if (OrganizationTypeConstant.ORG_TYPE_DISTRICT_DEPT.equals(user.getTypeKey())) { if (formDTO.getStreetId() != null && !"".equals(formDTO.getStreetId())) { @@ -318,7 +318,7 @@ public class ItemServiceImpl extends BaseServiceImpl implem public PageData listOfItemsForPCReject(Map params) { UserDetail user = SecurityUser.getUser(); if (null == user) { - throw new RuntimeException("获取用户信息失败"); + throw new RenException("获取用户信息失败"); } if (OrganizationTypeConstant.ORG_TYPE_DISTRICT_DEPT.equals(user.getTypeKey())) { if (params.get("streetId") != null && !"".equals(params.get("streetId"))) { @@ -358,7 +358,7 @@ public class ItemServiceImpl extends BaseServiceImpl implem public List rejectListEqPc(ItemWorkListFormDTO formDTO) { UserDetail user = SecurityUser.getUser(); if (null == user) { - throw new RuntimeException("获取用户信息失败"); + throw new RenException("获取用户信息失败"); } if (OrganizationTypeConstant.ORG_TYPE_DISTRICT_DEPT.equals(user.getTypeKey())) { if (formDTO.getStreetId() != null && !"".equals(formDTO.getStreetId())) { @@ -488,11 +488,11 @@ public class ItemServiceImpl extends BaseServiceImpl implem public Result submitLawItem(ItemLawSubmitDTO formDto) { UserDetail userDetail = SecurityUser.getUser(); if (null == userDetail) { - throw new RuntimeException("获取用户信息失败"); + throw new RenException("获取用户信息失败"); } if (!(StringUtils.isNotBlank(userDetail.getTypeKey()) && OrganizationTypeConstant.ORG_TYPE_STREET_PARTY.equals(userDetail.getTypeKey()))) { - throw new RuntimeException("请用街道账号进行上报"); + throw new RenException("请用街道账号进行上报"); } ItemEntity itemEntity = new ItemEntity(); /** @@ -508,6 +508,7 @@ public class ItemServiceImpl extends BaseServiceImpl implem itemEntity.setDistributeTime(new Date()); itemEntity.setGrid("执法诉求" + userDetail.getDeptName()); itemEntity.setGridId(userDetail.getDeptId()); + itemEntity.setItemContent(formDto.getLawContent()); itemEntity.setItemVoice(formDto.getItemVoice()); itemEntity.setDuration(formDto.getDuration()); @@ -528,8 +529,18 @@ public class ItemServiceImpl extends BaseServiceImpl implem if (!dtoResult.success()) { throw new RenException(dtoResult.getMsg()); } + + // 因为是街道账号，所以上级一定是市北区委 + Long pids = dtoResult.getData().getPid(); + String pnames = dtoResult.getData().getParentName(); + itemEntity.setParentDeptIds(pids + ""); + itemEntity.setParentDeptNames(pnames); + itemEntity.setAllDeptIds(pids + "," + userDetail.getDeptId()); + itemEntity.setAllDeptNames(pnames + "-" + userDetail.getDeptName()); + // 流水号 - itemEntity.setSerialNum(getSerialNum("ZF" + dtoResult.getData().getDisCenterZoningCode())); + String code = dtoResult.getData().getDisCenterZoningCode(); + itemEntity.setSerialNum(getSerialNum("ZF" + code)); baseDao.insert(itemEntity); //插入项目部门关联表 itemDeptService.savePeopleSubmitInfo(itemEntity); @@ -1272,12 +1283,12 @@ public class ItemServiceImpl extends BaseServiceImpl implem public List listOfItemHandleProgressByMobile(String itemId) { List list = baseDao.selectListOfItemHandleProgressByMobile(itemId); // 处理多次拼接处理人信息问题 - for(ItemHandleProgressResultDTO dto : list){ + for (ItemHandleProgressResultDTO dto : list) { String advice = dto.getAdvice(); // 对包含【h_s】的数据进行重新组装 - if(advice.contains("h_s")){ - String hsStr = advice.substring(advice.indexOf("h_s"),advice.length()); - String adviceOld = advice.substring(0,advice.indexOf(" 办理人：")); + if (advice.contains("h_s") && advice.contains(" 办理人：")) { + String hsStr = advice.substring(advice.indexOf("h_s"), advice.length()); + String adviceOld = advice.substring(0, advice.indexOf(" 办理人：")); String adviceNew = adviceOld + hsStr; dto.setAdvice(adviceNew); } @@ -1378,7 +1389,7 @@ public class ItemServiceImpl extends BaseServiceImpl implem // 发送菜单消息-待处理项目-吹哨部门 this.sendWhistlingDeptItemHandleMenuNotice(deptIds, null); // 网格吹哨,上报市平台 - pushToCityGridService.AppealReporting(handleProcessEntity.getId(), NumConstant.ZERO_STR); + pushToCityGridService.appealReporting(handleProcessEntity.getId(), NumConstant.ZERO_STR); log.info("网格吹哨，上报市平台-结束"); // 上报网格化平台（社区吹哨） } else if (ItemHandleCategoryEnum.HANDLE_REPORT.getValue() == dto.getHandleCategory()) { @@ -1390,7 +1401,7 @@ public class ItemServiceImpl extends BaseServiceImpl implem log.info("处理项目-上报网格化平台-if结束"); //社区吹哨，上报市平台 - pushToCityGridService.AppealReporting(handleProcessEntity.getId(), NumConstant.ZERO_STR); + pushToCityGridService.appealReporting(handleProcessEntity.getId(), NumConstant.ZERO_STR); log.info("社区吹哨-上报市平台-结束"); // 结案申请 } else if (ItemHandleCategoryEnum.HANDLE_CLOSING_CASE_APPLY.getValue() == dto.getHandleCategory()) { @@ -1451,11 +1462,11 @@ public class ItemServiceImpl extends BaseServiceImpl implem longTreeSet.addAll(newDeptIds); List deptIds = new ArrayList<>(longTreeSet); - // 网格结案，社区结案，上报市平台 - pushToCityGridService.AppealReporting(handleProcessEntity.getId(), NumConstant.ZERO_STR); + // 网格结案申请，社区结案申请，上报市平台 +// pushToCityGridService.AppealReporting(handleProcessEntity.getId(), NumConstant.ZERO_STR); // 发送菜单消息-待处理项目-吹哨部门 this.sendWhistlingDeptItemHandleMenuNotice(deptIds, null); - pushToCityGridService.AppealHandling(ConvertUtils.sourceToTarget(handleProcessEntity, ItemHandleProcessDTO.class)); + pushToCityGridService.appealHandling(ConvertUtils.sourceToTarget(handleProcessEntity, ItemHandleProcessDTO.class)); log.info("处理项目-结案申请-if结束"); } else { handleProcessEntity.setState(dto.getHandleCategory()); @@ -1904,7 +1915,7 @@ public class ItemServiceImpl extends BaseServiceImpl implem ItemWorkListFormDTO formDTO = new ItemWorkListFormDTO(); UserDetail user = SecurityUser.getUser(); if (null == user) { - throw new RuntimeException("获取用户信息失败"); + throw new RenException("获取用户信息失败"); } if (OrganizationTypeConstant.ORG_TYPE_DISTRICT_DEPT.equals(user.getTypeKey())) { if (formDTO.getStreetId() != null && !"".equals(formDTO.getStreetId())) { @@ -2136,7 +2147,7 @@ public class ItemServiceImpl extends BaseServiceImpl implem */ private SendEventFormDto packageSendEventEntity(ItemEntity itemEntity, ItemHandleSubmitFormDTO dto) throws Exception { SendEventFormDto sendDto = new SendEventFormDto(); - SendInputInfoFormDto formDto = new SendInputInfoFormDto(); + //推送类别（事件上报） sendDto.setSENDTYPE(CommonConstants.SEND_TYPE); //上报 @@ -2158,7 +2169,7 @@ public class ItemServiceImpl extends BaseServiceImpl implem //事件来源 sendDto.setSJLY(CommonConstants.PARTY_EVENT_SOURCE_ZF); //备注 - sendDto.setBZXX(getItemLawNote(itemEntity.getId())); + sendDto.setBZXX(getItemLawNote(itemEntity.getId(), itemEntity.getSerialNum())); } //执法诉求和发展诉求gridId存的是街道id,需要单独查 Result streetResult = adminFeignClient.getSysDeptInfo(itemEntity.getGridId()); @@ -2184,9 +2195,9 @@ public class ItemServiceImpl extends BaseServiceImpl implem } //备注 log.info("上报网格化平台dto：" + dto); - sendDto.setBZXX(dto.getHandleAdvice()); + sendDto.setBZXX(dto.getHandleAdvice()+" 诉求编码：" + itemEntity.getSerialNum()); if (StringUtils.isNotBlank(dto.getHandleAdviceRemark())) { - sendDto.setBZXX(sendDto.getBZXX() + "\n不予受理详细说明：" + dto.getHandleAdviceRemark()); + sendDto.setBZXX(sendDto.getBZXX() + "\n不予受理详细说明：" + dto.getHandleAdviceRemark() + "\n诉求编码：" + itemEntity.getSerialNum()); } Result deptResult = adminFeignClient.getDeptInfoCode(itemEntity.getGridId()); @@ -2298,7 +2309,7 @@ public class ItemServiceImpl extends BaseServiceImpl implem } //查询所对应的大类 CategoryEntity thirdCate = categoryDao.selectById(thirdId); - if (null == thirdCate) { + if (null == thirdCate || StringUtils.isBlank(thirdCate.getEventCategoryCode())) { sendDto.setSJLYU("21"); sendDto.setSJDL("2199"); return; @@ -2337,13 +2348,14 @@ public class ItemServiceImpl extends BaseServiceImpl implem return result; } - private String getItemLawNote(String itemId) { + private String getItemLawNote(String itemId, String serialNum) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("item_id", itemId); wrapper.eq("del_flag", "0"); ItemLawEntity itemLaw = itemLawDao.selectOne(wrapper); String result = "主办单位：" + itemLaw.getHostUnit() + "\n\n" - + "协办单位：" + itemLaw.getAssistUnit(); + + "协办单位：" + itemLaw.getAssistUnit() + "\n\n" + + "诉求编码：" + serialNum; return result; } @@ -2825,7 +2837,12 @@ public class ItemServiceImpl extends BaseServiceImpl implem ItemGridPlatformHandleStatusEnum.HANDLE_YQSQ.getValue() == dto.getState() || ItemGridPlatformHandleStatusEnum.HANDLE_SQBJ.getValue() == dto.getState() || ItemGridPlatformHandleStatusEnum.HANDLE_XSSQ.getValue() == dto.getState()) { - pushToCityGridService.AppealReporting(dto.getId(), NumConstant.ONE_STR); + +// pushToCityGridService.appealReporting(dto.getId(), NumConstant.ONE_STR); + } + // 网格化平台，处置完成 + if (ItemGridPlatformHandleStatusEnum.HANDLE_CL.getValue() == dto.getState()) { + pushToCityGridService.appealHandling(dto); } } @@ -3138,9 +3155,17 @@ public class ItemServiceImpl extends BaseServiceImpl implem } else if (NumConstant.ONE_STR.equals(formDto.getPeopleFlag())) { //执法诉求所属街道的市中心编码 Result dtoResult = adminFeignClient.getSysDeptInfo(entity.getGridId()); - if (!dtoResult.success()) { + if (dtoResult.success()) { code = dtoResult.getData().getDisCenterZoningCode(); + // 因为是街道账号，所以上级一定是市北区委 + Long pids = dtoResult.getData().getPid(); + String pnames = dtoResult.getData().getParentName(); + entity.setParentDeptIds(pids + ""); + entity.setParentDeptNames(pnames); + entity.setAllDeptIds(pids + "," + entity.getGridId()); + entity.setAllDeptNames(pnames + "-" + entity.getGrid()); } + entity.setSerialNum(getSerialNum("FZ" + code)); } baseDao.insert(entity); @@ -3348,7 +3373,7 @@ public class ItemServiceImpl extends BaseServiceImpl implem public List unExportList(Map params) { UserDetail user = SecurityUser.getUser(); if (null == user) { - throw new RuntimeException("获取用户信息失败"); + throw new RenException("获取用户信息失败"); } if (OrganizationTypeConstant.ORG_TYPE_DISTRICT_DEPT.equals(user.getTypeKey())) { if (params.get("streetId") != null && !"".equals(params.get("streetId"))) { @@ -3388,7 +3413,7 @@ public class ItemServiceImpl extends BaseServiceImpl implem public List rejectUnexport(Map params) { UserDetail user = SecurityUser.getUser(); if (null == user) { - throw new RuntimeException("获取用户信息失败"); + throw new RenException("获取用户信息失败"); } if (OrganizationTypeConstant.ORG_TYPE_DISTRICT_DEPT.equals(user.getTypeKey())) { if (params.get("streetId") != null && !"".equals(params.get("streetId"))) { @@ -3464,6 +3489,23 @@ public class ItemServiceImpl extends BaseServiceImpl implem } + @Override + public PageData getItemAppealPageUnsatisfactory(@RequestParam Map params) { + UserDetail user = SecurityUser.getUser(); + //部门ID列表 + List deptIdList = user.getDeptIdList(); + params.put("deptIdList", null); + if (null != deptIdList && deptIdList.size() > 0) { + params.put("deptIdList", deptIdList); + } + IPage page = getPage(params); + List list = baseDao.getItemAppealPageUnsatisfactory(params); + Map map = listItemHandleDept(); + list.forEach(item -> item.setItemHandleDeptId(map.get(item.getId()))); + return new PageData<>(list, page.getTotal()); + + } + @Override public Result getItemAppealDetail(String id) { ItemAppealDetailResultDTO result = baseDao.getItemAppealDetail(id); @@ -3496,7 +3538,7 @@ public class ItemServiceImpl extends BaseServiceImpl implem public PageData getExaminePage(Map params) { UserDetail user = SecurityUser.getUser(); if (null == user) { - throw new RuntimeException("获取用户信息失败"); + throw new RenException("获取用户信息失败"); } params.put("deptId", user.getDeptId()); IPage page = getPage(params); @@ -3511,7 +3553,7 @@ public class ItemServiceImpl extends BaseServiceImpl implem UserDetail user = SecurityUser.getUser(); if (null == user) { - throw new RuntimeException("获取用户信息失败"); + throw new RenException("获取用户信息失败"); } formDTO.setDeptId(user.getDeptId()); List list = baseDao.getExaminePageEqPc(formDTO); @@ -3523,7 +3565,7 @@ public class ItemServiceImpl extends BaseServiceImpl implem public Result examineCase(ExamineCaseFormDTO formDto) { UserDetail user = SecurityUser.getUser(); if (null == user) { - throw new RuntimeException("获取用户信息失败"); + throw new RenException("获取用户信息失败"); } ItemHandleProcessEntity process = new ItemHandleProcessEntity(); @@ -3543,12 +3585,12 @@ public class ItemServiceImpl extends BaseServiceImpl implem throw new RenException("审批标识有误"); } itemHandleProcessDao.insert(process); - //同意的时候，上报诉求处理 - if (NumConstant.ZERO_STR.equals(formDto.getCheckFlag())) { - // 社区审批，上报市平台 - pushToCityGridService.AppealReporting(process.getId(), NumConstant.ZERO_STR); - //pushToCityGridService.AppealHandling(ConvertUtils.sourceToTarget(process, ItemHandleProcessDTO.class)); - } +// // 结案申请，同意的时候，上报诉求处理 +// if (NumConstant.ZERO_STR.equals(formDto.getCheckFlag())) { +// // 社区审批，上报市平台 +//// pushToCityGridService.AppealReporting(process.getId(), NumConstant.ZERO_STR); +// //pushToCityGridService.AppealHandling(ConvertUtils.sourceToTarget(process, ItemHandleProcessDTO.class)); +// } if ("0".equals(formDto.getCheckFlag())) { //发送结案申请至街道网格化平台 @@ -3636,7 +3678,7 @@ public class ItemServiceImpl extends BaseServiceImpl implem public String getSerialNum(String prefix) { String serialNum = prefix; String dateStr = DateUtils.format(new Date(), DateUtils.DATE_TIME); - serialNum = serialNum + dateStr + "-"; + serialNum = serialNum + "-" + dateStr + "-"; String key = RedisKeys.getSerialNumKey(serialNum); String numStr; @@ -3717,6 +3759,8 @@ public class ItemServiceImpl extends BaseServiceImpl implem itemHandleProcessDto.setGridPartyname("结案"); itemHandleProcessDto.setGridTaskcnname("区中心"); item.setItemState(ItemHandleCategoryEnum.HANDLE_CLOSING_CASE.getValue()); + // 可以进行评价了 + item.setEvaluationState(NumConstant.ONE_STR); updateById(item); } else if ("1".equals(formDto.getState())) { itemHandleProcessDto.setState(ItemGridPlatformHandleStatusEnum.HANDLE_BH.getValue()); @@ -3739,7 +3783,7 @@ public class ItemServiceImpl extends BaseServiceImpl implem if ("1".equals(formDto.getState())) { // 上报驳回，上报市平台 log.info("上报驳回，上报市平台" + itemHandleProcessDto.getId()); - pushToCityGridService.ReportRejection(itemHandleProcessDto.getId()); + pushToCityGridService.reportRejection(itemHandleProcessDto.getId()); } else if ("0".equals(formDto.getState())) { // 诉求审核，上报市平台 pushToCityGridService.appealAudit(itemHandleProcessDto.getId()); 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 1a1c9c36f..4880791cb 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 @@ -22,6 +22,7 @@ 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; @@ -115,7 +116,7 @@ public class ItemTimeoutServiceImpl extends BaseServiceImpl listOfItemsForPCEnd(Map params) { UserDetail user = SecurityUser.getUser(); if (null == user) { - throw new RuntimeException("获取用户信息失败"); + throw new RenException("获取用户信息失败"); } if (OrganizationTypeConstant.ORG_TYPE_DISTRICT_DEPT.equals(user.getTypeKey())) { if (params.get("streetId") != null && !"".equals(params.get("streetId"))) { @@ -172,7 +173,7 @@ public class ItemTimeoutServiceImpl extends BaseServiceImpl itemOutExportList(Map params) { UserDetail user = SecurityUser.getUser(); if (null == user) { - throw new RuntimeException("获取用户信息失败"); + throw new RenException("获取用户信息失败"); } if (OrganizationTypeConstant.ORG_TYPE_DISTRICT_DEPT.equals(user.getTypeKey())) { if (params.get("streetId") != null && !"".equals(params.get("streetId"))) { diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/PushToCityGridServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/PushToCityGridServiceImpl.java index f72c7389f..c68647e28 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/PushToCityGridServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/PushToCityGridServiceImpl.java @@ -439,7 +439,7 @@ public class PushToCityGridServiceImpl implements PushToCityGridService { * @date 2022/9/19 10:22 */ @Override - public Result AppealReporting(String processId, String source) { + public Result appealReporting(String processId, String source) { ItemHandleProcessToCityResultDTO item = itemHandleProcessDao.getAppealReporting(processId); if (null == item) { log.error("流程节点不存在"); @@ -528,7 +528,7 @@ public class PushToCityGridServiceImpl implements PushToCityGridService { * @date 2022/9/19 10:44 */ @Override - public Result ReportRejection(String id) { + public Result reportRejection(String id) { String ids = id; // ItemGridPlatformHandleStatusEnum.HANDLE_BH.getValue(); ItemHandleProcessToCityResultDTO item = itemHandleProcessDao.getReportRejection(ids); if (null == item) { @@ -587,7 +587,7 @@ public class PushToCityGridServiceImpl implements PushToCityGridService { * @date 2022/9/19 11:02 */ @Override - public Result AppealHandling(ItemHandleProcessDTO processDTO) { + public Result appealHandling(ItemHandleProcessDTO processDTO) { String id = processDTO.getId(); AppealHandlingToCityResultDTO item = itemHandleProcessDao.getAppealHandling(id, processDTO.getItemId()); 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 0d9e91917..dc46f0273 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 @@ -1723,6 +1723,9 @@ SELECT i.id, i.NICK_NAME, i.CREATED_TIME, + case when (getworkminute(i.CREATED_TIME,now()) / 60 > 8) then '1' + when (getworkminute(i.CREATED_TIME,now()) / 60 > 6 and getworkminute(i.CREATED_TIME,now()) / 60 <=8) then '2' + when (getworkminute(i.CREATED_TIME,now()) / 60 <= 6) then '3' else '' end as isRemind, i.ITEM_STATE, i.SERIAL_NUM, i.GRID as gridName, @@ -1749,8 +1752,7 @@ else '' end as evaluationScoreName, i.EVALUATION_CONTENT, - i.EVALUATION_TIME, - (case when (process.STATE = 1001 and HOUR( timediff( now(), i.CREATED_TIME) ) >= 24) then '1' else '' end) as isRemind + i.EVALUATION_TIME FROM epdc_item i left join ( select b.ID,b.ITEM_ID,b.CREATED_TIME,b.state @@ -1812,6 +1814,102 @@ order by i.CREATED_TIME desc + + +