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 f91dbbb4a..7f722bc80 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 @@ -446,6 +446,14 @@ public class SysDeptController { return new Result(); } + /** + * 获取坐标所处网格 + * + * @param formDTO + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @author zhy + * @date 2022/9/6 14:44 + */ @PostMapping("gis/getGridByCoordinate") public Result getGridByCoordinate(@RequestBody GisFormDTO formDTO) { return new Result().ok(sysDeptService.getCoordinate(formDTO)); @@ -463,4 +471,18 @@ public class SysDeptController { public Result> getOptions(@RequestBody GisGridFormDTO dto) { return new Result>().ok(gisService.listGridOption(dto)); } + + /** + * 更新北上诉办公司信息 + * + * @param + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @author zhy + * @date 2022/9/4 17:29 + */ + @GetMapping("company/list") + public Result getCompanyList() { + sysDeptService.getCompanyList(); + return new Result(); + } } diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/GisService.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/GisService.java index a6c23766b..befceb997 100644 --- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/GisService.java +++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/GisService.java @@ -114,4 +114,5 @@ public interface GisService extends BaseService { * @date 2022/9/5 10:08 */ List listGridOption(GisGridFormDTO dto); + } \ No newline at end of file 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 414b284f2..a6aaeed25 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 @@ -367,4 +367,15 @@ public interface SysDeptService extends BaseService { * @date 2022/9/5 15:35 */ GisGridDTO getCoordinate(GisFormDTO formDTO); + + /** + * 获取公司信息 + * + * @param + * @return void + * @author zhy + * @date 2022/9/6 14:46 + */ + void getCompanyList(); + } 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 e881cb2ef..e16819c41 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 @@ -1446,6 +1446,13 @@ public class SysDeptServiceImpl extends BaseServiceImpl urlParams = new HashMap<>(); + String resultStr = httpUtil.getCompanyStr(urlParams); + System.out.println(resultStr); + } + /** * @return java.lang.String * @describe: 访问外部接口获取部门（社区）地区编码 diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/utils/HttpUtil.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/utils/HttpUtil.java index 5d9d9f0d4..6c483a5ab 100644 --- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/utils/HttpUtil.java +++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/utils/HttpUtil.java @@ -32,7 +32,7 @@ public class HttpUtil { /** * gis地图获取 */ - private final String GET_GIS_COORDINATE_URL = "http://120.221.72.15:6081/arcgis/rest/services/sbwgh/xzqh/MapServer/2/query"; + private final String GET_GIS_COORDINATE_URL = "http://120.221.72.83:9090/arcgis/rest/services/sbwgh/xzqh/MapServer/2/query"; /** * 公司信息获取 diff --git a/esua-epdc/epdc-cloud-commons-shibei b/esua-epdc/epdc-cloud-commons-shibei index ed1f6f4ef..66154aa34 160000 --- a/esua-epdc/epdc-cloud-commons-shibei +++ b/esua-epdc/epdc-cloud-commons-shibei @@ -1 +1 @@ -Subproject commit ed1f6f4ef632059e42f23759eb09be038f806b13 +Subproject commit 66154aa34097995cc8411ae3ede7179ba3c1d182 diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiItemController.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiItemController.java index f4e288116..9d16a6547 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiItemController.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiItemController.java @@ -119,4 +119,17 @@ public class ApiItemController { formDto.setUserId(userDetail.getUserId()); return itemService.getItemListByUserId(formDto); } + + /** + * @describe: 接受网格化平台项目处理结果：结案/驳回 + * @author wangtong + * @date 2022/9/6 17:03 + * @params [formDto] + * @return com.elink.esua.epdc.commons.tools.utils.Result + */ + @PostMapping("pushItemProcess") + public Result pushItemProcess(@RequestBody AcceptPlantformProcessDTO formDto) { + return itemService.pushItemProcess(formDto); + } + } diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/ItemFeignClient.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/ItemFeignClient.java index 5e54c5c05..43160b279 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/ItemFeignClient.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/ItemFeignClient.java @@ -121,4 +121,14 @@ public interface ItemFeignClient { */ @GetMapping(value = "events/epdc-app/item/getItemListByUserId", consumes = MediaType.APPLICATION_JSON_VALUE) Result> getItemListByUserId(PeopleItemFormDTO formDto); + + /** + * @describe: 接受网格化平台项目处理结果：结案/驳回 + * @author wangtong + * @date 2022/9/6 17:03 + * @params [formDto] + * @return com.elink.esua.epdc.commons.tools.utils.Result + */ + @PostMapping(value = "events/item/pushItemProcess", consumes = MediaType.APPLICATION_JSON_VALUE) + Result pushItemProcess(AcceptPlantformProcessDTO formDto); } diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/ItemFeignClientFallback.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/ItemFeignClientFallback.java index 7fa2bca60..9b669425f 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/ItemFeignClientFallback.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/ItemFeignClientFallback.java @@ -70,4 +70,9 @@ public class ItemFeignClientFallback implements ItemFeignClient { public Result> getItemListByUserId(PeopleItemFormDTO formDto) { return ModuleUtils.feignConError(ServiceConstant.EPDC_EVENTS_SERVER, "getItemListByUserId", formDto); } + + @Override + public Result pushItemProcess(AcceptPlantformProcessDTO formDto) { + return ModuleUtils.feignConError(ServiceConstant.EPDC_EVENTS_SERVER, "pushItemProcess", formDto); + } } diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/ItemService.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/ItemService.java index 59e4c11e9..339f2b404 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/ItemService.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/ItemService.java @@ -104,4 +104,13 @@ public interface ItemService { * @return com.elink.esua.epdc.commons.tools.utils.Result> */ Result> getItemListByUserId(PeopleItemFormDTO formDto); + + /** + * @describe: 接受网格化平台项目处理结果：结案/驳回 + * @author wangtong + * @date 2022/9/6 17:03 + * @params [formDto] + * @return com.elink.esua.epdc.commons.tools.utils.Result + */ + Result pushItemProcess(AcceptPlantformProcessDTO formDto); } diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/ItemServiceImpl.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/ItemServiceImpl.java index 18c5a6ae3..6baf3de04 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/ItemServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/ItemServiceImpl.java @@ -206,4 +206,9 @@ public class ItemServiceImpl implements ItemService { ); return listResult; } + + @Override + public Result pushItemProcess(AcceptPlantformProcessDTO formDto) { + return itemFeignClient.pushItemProcess(formDto); + } } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/AcceptPlantformProcessDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/AcceptPlantformProcessDTO.java new file mode 100644 index 000000000..06048ddac --- /dev/null +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/AcceptPlantformProcessDTO.java @@ -0,0 +1,44 @@ +package com.elink.esua.epdc.dto.item.form; + +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import java.io.Serializable; +import java.util.List; + +/** + * @program: esua-epdc + * @description: + * @author: wangtong + * @create: 2022-09-06 16:26 + **/ +@Data +public class AcceptPlantformProcessDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 记录唯一标识 + */ + @NotBlank(message = "唯一标识不可为空") + private String p_recId; + + /** + *状态：0通过 1驳回 + */ + @NotBlank(message = "审批不可为空") + private String state; + + /** + *处理意见 + */ + @NotNull(message = "处理意见不可为空") + private String handleAdvice; + + /** + * + */ + private List images; + +} diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/enums/ItemGridPlatformHandleStatusEnum.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/enums/ItemGridPlatformHandleStatusEnum.java index 99558930d..01fc9f817 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/enums/ItemGridPlatformHandleStatusEnum.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/enums/ItemGridPlatformHandleStatusEnum.java @@ -26,7 +26,10 @@ public enum ItemGridPlatformHandleStatusEnum { HANDLE_CL(45, "处置完成"), HANDLE_PZ(70, "批转"), HANDLE_TD(75, "退单"), - HANDLE_BJ(80, "办结"); + HANDLE_BJ(80, "办结"), + HANDLE_BH(1065, "驳回"), + HANDLE_CX(1066, "撤消办理"); + 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 42a25cf5e..324083630 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 @@ -30,6 +30,7 @@ import com.elink.esua.epdc.dto.events.form.EventDeleteCommentsFormDTO; import com.elink.esua.epdc.dto.form.KpiMetaDataOfEventsFormDTO; import com.elink.esua.epdc.dto.item.ItemDTO; import com.elink.esua.epdc.dto.item.ItemPendingHandleDTO; +import com.elink.esua.epdc.dto.item.form.AcceptPlantformProcessDTO; import com.elink.esua.epdc.dto.item.form.ExamineCaseFormDTO; import com.elink.esua.epdc.dto.item.form.HandleResultDTOSFormDTO; import com.elink.esua.epdc.dto.item.form.ItemHandleSubmitFormDTO; @@ -346,5 +347,18 @@ public class ItemController { ValidatorUtils.validateEntity(formDto); return itemService.examineCase(formDto); } + + /** + * @describe: 接受网格化平台项目处理结果：结案/驳回 + * @author wangtong + * @date 2022/9/6 17:03 + * @params [formDto] + * @return com.elink.esua.epdc.commons.tools.utils.Result + */ + @PostMapping("pushItemProcess") + public Result pushItemProcess(@RequestBody AcceptPlantformProcessDTO formDto) { + ValidatorUtils.validateEntity(formDto); + return itemService.pushItemProcess(formDto); + } } 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 9a02d64f6..2d9878012 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 @@ -526,4 +526,13 @@ public interface ItemService extends BaseService { * @return com.elink.esua.epdc.commons.tools.utils.Result */ Result examineCase(ExamineCaseFormDTO formDto); + + /** + * @describe: 接受网格化平台项目处理结果：结案/驳回 + * @author wangtong + * @date 2022/9/6 17:03 + * @params [formDto] + * @return com.elink.esua.epdc.commons.tools.utils.Result + */ + Result pushItemProcess(AcceptPlantformProcessDTO formDto); } 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 2684989df..a8d536c50 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 @@ -1393,7 +1393,7 @@ public class ItemServiceImpl extends BaseServiceImpl implem successFlag = YesOrNoEnum.YES.value(); } this.saveInterfaceLog(dto.getId(), InterfaceLogBusinessTypeEnum.REPORT_ITEM.getValue(), - ApiConstants.newSendInputInfo, successFlag, XstreamUtil.objectToXml(sendEventFormDto), + ApiConstants.sendEventUrl, successFlag, XstreamUtil.objectToXml(sendEventFormDto), XstreamUtil.objectToXml(sendResult)); log.info("处理项目-上报网格化平台-存储日志结束"); return sendResult; @@ -1511,7 +1511,6 @@ public class ItemServiceImpl extends BaseServiceImpl implem sendDto.setSJZT(CommonConstants.PARTY_ITEM_ZT_ONE); } } - sendDto.setSENDACTDEFID(CommonConstants.PARTY_SEND_TO); //推送端记录唯一标识 sendDto.setUID(UUID.randomUUID().toString().trim().replaceAll("-", "")); //事件领域 @@ -1888,6 +1887,7 @@ public class ItemServiceImpl extends BaseServiceImpl implem // 拉取处理情况 for (ItemGridPlatformDTO dto : gridPlatformDTOList) { + //获取网格化平台的处理进展 EventProcessHisResultDto processHistory = shiBeiCityGridApi.getHistoryByRecId(dto.getTaskid()); String successFlag = YesOrNoEnum.NO.value(); String returnMsgBody = ""; @@ -1896,7 +1896,7 @@ public class ItemServiceImpl extends BaseServiceImpl implem returnMsgBody = XstreamUtil.objectToXml(processHistory); List progressList = processHistory.getHISTORY(); if (null != progressList && progressList.size() > 0) { - // 删除已有处理记录 + // 删除已有的<网格化平台处理记录> this.removeOldHandleProcess(dto.getId()); // 保存新的处理记录 this.insertNewHandleProcess(progressList, dto.getReferenceId(), dto.getId()); @@ -2521,4 +2521,51 @@ public class ItemServiceImpl extends BaseServiceImpl implem return serialNum + numStr; } + @Override + @Transactional(rollbackFor = Exception.class) + public Result pushItemProcess(AcceptPlantformProcessDTO formDto) { + String successFlag = YesOrNoEnum.NO.value(); + String returnMsgBody = ""; + ItemGridPlatformDTO itemPlat = itemGridPlatformService.getInfoByTaskId(formDto.getP_recId()); + if(null == itemPlat){ + // 保存接口调用日志 + this.saveInterfaceLog("", InterfaceLogBusinessTypeEnum.ACCEPT_ITEM_PROCESS.getValue(), + ApiConstants.acceptItemProcess, successFlag, formDto.getP_recId(), returnMsgBody); + return new Result().error("未查到相关事件信息"); + } + // 插入项目处理进度表 + ItemHandleProcessDTO itemHandleProcessDto = new ItemHandleProcessDTO(); + itemHandleProcessDto.setId(UUID.randomUUID().toString().replaceAll("-", "")); + itemHandleProcessDto.setItemId(itemPlat.getReferenceId()); + if("0".equals(formDto.getState())){ + itemHandleProcessDto.setState(ItemGridPlatformHandleStatusEnum.HANDLE_JA.getValue()); + ItemEntity item = baseDao.selectById(itemPlat.getReferenceId()); + item.setItemState(ItemHandleCategoryEnum.HANDLE_CLOSING_CASE.getValue()); + updateById(item); + }else if("1".equals(formDto.getState())){ + itemHandleProcessDto.setState(ItemGridPlatformHandleStatusEnum.HANDLE_BH.getValue()); + }else{ + // 保存接口调用日志 + this.saveInterfaceLog(itemPlat.getReferenceId(), InterfaceLogBusinessTypeEnum.ACCEPT_ITEM_PROCESS.getValue(), + ApiConstants.acceptItemProcess, successFlag, formDto.getP_recId(), returnMsgBody); + return new Result().error("状态信息有误"); + } + itemHandleProcessDto.setHandleAdvice(formDto.getHandleAdvice()); + itemHandleProcessDto.setOutHandleAdvice(formDto.getHandleAdvice()); + itemHandleProcessDto.setHandlerDept("网格化平台"); + itemHandleProcessDto.setCreatedTime(new Date()); + itemHandleProcessDto.setUpdatedTime(new Date()); + itemHandleProcessService.saveItemHandleProcess(itemHandleProcessDto); + //项目处理意见图片保存 + if (formDto.getImages() != null && formDto.getImages().size() > 0) { + imgService.saveImages(formDto.getImages(), itemHandleProcessDto.getId(), ImageConstant.TYPE_IMAGE_ITEM_OUT_HANDLE); + } + successFlag = YesOrNoEnum.YES.value(); + // 保存接口调用日志 + this.saveInterfaceLog(itemPlat.getReferenceId(), InterfaceLogBusinessTypeEnum.ACCEPT_ITEM_PROCESS.getValue(), + ApiConstants.acceptItemProcess, successFlag, formDto.getP_recId(), returnMsgBody); + return new Result().ok("操作成功"); + } + + } 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 6ac995ab8..ab3141e69 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 @@ -1416,6 +1416,8 @@ inner join (select *,max(CREATED_TIME) as maxTime from epdc_item_handle_process where DEL_FLAG='0' + and CLOSE_CHECK_ID=#{deptId} + and STATE=11 group by ITEM_ID )max_it on it.ITEM_ID=max_it.ITEM_ID and it.CREATED_TIME=max_it.maxTime diff --git a/esua-epdc/epdc-module/epdc-webservice/src/main/java/com/elink/esua/epdc/enums/ItemGridPlatformHandleStatusEnum.java b/esua-epdc/epdc-module/epdc-webservice/src/main/java/com/elink/esua/epdc/enums/ItemGridPlatformHandleStatusEnum.java index 5c3782f87..1a5a62090 100644 --- a/esua-epdc/epdc-module/epdc-webservice/src/main/java/com/elink/esua/epdc/enums/ItemGridPlatformHandleStatusEnum.java +++ b/esua-epdc/epdc-module/epdc-webservice/src/main/java/com/elink/esua/epdc/enums/ItemGridPlatformHandleStatusEnum.java @@ -25,7 +25,8 @@ public enum ItemGridPlatformHandleStatusEnum { HANDLE_CL(45, "处置完成"), HANDLE_PZ(70, "批转"), HANDLE_TD(75, "退单"), - HANDLE_BJ(80, "办结"); + HANDLE_BH(1065, "驳回"); +