From feacd4a4b456cb1947996b6985a84f1aa4722d65 Mon Sep 17 00:00:00 2001 From: qushutong <1976590620@qq.com> Date: Wed, 13 Nov 2024 16:45:09 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AF=89=E6=B1=82=E7=94=B3=E8=AF=89+=20?= =?UTF-8?q?=E7=94=B3=E8=AF=89=E5=AE=A1=E6=A0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/elink/esua/epdc/dto/item/ItemDTO.java | 12 +++++ .../epdc/dto/item/result/AppealResultDTO.java | 44 +++++++++++++++++++ .../item/controller/ItemController.java | 16 +++++++ .../epdc/modules/item/entity/ItemEntity.java | 11 +++++ .../modules/item/service/ItemService.java | 2 + .../item/service/PushToCityGridService.java | 10 ++--- .../item/service/impl/ItemServiceImpl.java | 28 +++++++++++- .../impl/PushToCityGridServiceImpl.java | 4 +- 8 files changed, 120 insertions(+), 7 deletions(-) create mode 100644 esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/AppealResultDTO.java diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/ItemDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/ItemDTO.java index f14024196..0958913a7 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/ItemDTO.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/ItemDTO.java @@ -277,4 +277,16 @@ public class ItemDTO implements Serializable { private String backItemResult; + + private String jjqk; + private Integer pjjg; + + // 审核结果 + private String shjg; + // 处理时间 + private String clsj; + // 审核意见 + private String shyj; + private Integer appealFlag; + } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/AppealResultDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/AppealResultDTO.java new file mode 100644 index 000000000..98c869d50 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/AppealResultDTO.java @@ -0,0 +1,44 @@ +package com.elink.esua.epdc.dto.item.result; + +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * + * @description: 诉求申诉结果 + * @author qushutong + * @date 2024/11/13 10:23 + * @param + * @return + * @Version1.0 + **/ +@NoArgsConstructor +@Data +public class AppealResultDTO { + + private static final long serialVersionUID = 6430172710732648497L; + /** + * clrId : 处理人唯一标识 + * cldw : 处理单位 + * pjjg : 01 + * shyj : 审核意见 + * cldwId : 处理单位唯一标识 + * shjg : 01 + * clr : 处理人 + * jjqk : 01 + * sqid : e2d096bd7e62462ebc28bb89bde737c0 + * clsj : 处理时间 + */ + private String clrId; + private String cldw; + private String pjjg; + private String shyj; + private String cldwId; + private String shjg; + private String clr; + private String jjqk; + private String sqid; + private String clsj; + + +} 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 896e0577e..d7ad00e61 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 @@ -927,6 +927,22 @@ public class ItemController { return itemService.getDissatisfied(params); } + /** + * + * @description: 市级青诉即办平台审核诉求申诉申请的处置结果。 + * @author qushutong + * @date 2024/11/13 15:24 + * @param + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @Version1.0 + **/ + @PostMapping("case/backAudit") + public Result backAudit(@RequestBody AppealResultDTO resultDTO){ + itemService.backAudit(resultDTO); + + return new Result(); + + } } 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 4fb341aeb..4f6ed9ba0 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 @@ -304,4 +304,15 @@ public class ItemEntity extends BaseEpdcEntity { */ private Integer evaluationSystemFlag; + + private String jjqk; + private Integer pjjg; + // 审核结果 + private String shjg; + // 处理时间 + private String clsj; + // 审核意见 + private String shyj; + private Integer appealFlag; + } 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 08e509be8..fae0a4c4a 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 @@ -867,4 +867,6 @@ public interface ItemService extends BaseService { void backItem(ItemDTO dto); Result> getDissatisfied( Map params); + + void backAudit(AppealResultDTO resultDTO); } 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 7308cadb9..40e27ef98 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 @@ -274,7 +274,7 @@ public interface PushToCityGridService { /** * 诉求申诉 */ - void appeal(AppealFormDTO appealFormDTO); + String appeal(AppealFormDTO appealFormDTO); @@ -351,10 +351,6 @@ public interface PushToCityGridService { List hotLineBackResult(); - - - - /** * * @description: 2.39设置诉求最终办理结果已接收接口–2024-10新增 @@ -366,4 +362,8 @@ public interface PushToCityGridService { **/ String updateBackResult(UpdateAppealSendDTO dto); + + + + } 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 11df914d4..bb6eeda6b 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 @@ -6236,7 +6236,20 @@ public class ItemServiceImpl extends BaseServiceImpl implem appealFormDTO.setShjg(appealAuditFormDTO.getShjg()); appealFormDTO.setSqid(appealAuditFormDTO.getSqid()); appealFormDTO.setSsyy(appealAuditFormDTO.getSsyy()); - pushToCityGridServiceImpl.appeal(appealFormDTO); + String appeal = pushToCityGridServiceImpl.appeal(appealFormDTO); + if (NumConstant.ZERO_STR.equals(JSONObject.parseObject(appeal).get("code").toString())) { + itemDTO.setJjqk(appealAuditFormDTO.getJjqk()); + if("01".equals(appealAuditFormDTO.getPjjg())){ + itemDTO.setPjjg(2); + }else if("03".equals(appealAuditFormDTO.getPjjg())){ + itemDTO.setPjjg(0); + }else{ + itemDTO.setPjjg(1); + } + itemDTO.setAppealFlag(1); + ItemEntity itemEntity = ConvertUtils.sourceToTarget(itemDTO, ItemEntity.class); + baseDao.updateById(itemEntity); + } return new Result(); } @@ -7317,4 +7330,17 @@ public class ItemServiceImpl extends BaseServiceImpl implem PageData itemDTOPageData = new PageData<>(list, page.getTotal()); return new Result>().ok(itemDTOPageData); } + + @Override + public void backAudit(AppealResultDTO resultDTO) { + ItemEntity item = baseDao.getItemBySqid(resultDTO.getSqid()); + item.setShjg(resultDTO.getShjg()); + item.setClsj(resultDTO.getClsj()); + item.setShyj(resultDTO.getShyj()); + if("01".equals(resultDTO.getShjg())){ + item.setSolutionInfo(item.getJjqk()); + item.setEvaluationScore(item.getPjjg()); + } + baseDao.updateById(item); + } } 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 7e1bce51a..88fa9fc6c 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 @@ -1596,10 +1596,12 @@ public class PushToCityGridServiceImpl implements PushToCityGridService { @Override - public void appeal(AppealFormDTO appealFormDTO) { + public String appeal(AppealFormDTO appealFormDTO) { String result = cityGridApi.sendItemToCity(appealFormDTO, PushToCityGridConstant.APPEAL, "诉求申诉"); saveLog(appealFormDTO.getCzr().getId(), "", "诉求申诉", PushToCityGridConstant.APPEAL, JSONObject.toJSONString(appealFormDTO), result); + + return result; }