diff --git a/esua-epdc/epdc-cloud-gateway-shibei b/esua-epdc/epdc-cloud-gateway-shibei index 4a4caf14c..93f353e1a 160000 --- a/esua-epdc/epdc-cloud-gateway-shibei +++ b/esua-epdc/epdc-cloud-gateway-shibei @@ -1 +1 @@ -Subproject commit 4a4caf14c35de0d4678fd94d141da3661b549c1e +Subproject commit 93f353e1aed743c80b0c66938c0af142a806ef5b diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/AppealSuperviseResultDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/AppealSuperviseResultDTO.java index 233fce4dd..63921bf97 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/AppealSuperviseResultDTO.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/AppealSuperviseResultDTO.java @@ -4,6 +4,8 @@ import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Data; import lombok.NoArgsConstructor; +import javax.validation.constraints.NotBlank; + @NoArgsConstructor @Data public class AppealSuperviseResultDTO { @@ -11,6 +13,7 @@ public class AppealSuperviseResultDTO { /** * 诉求标识 */ + @NotBlank(message = "诉求ID不能为空") @JsonProperty("sqid") private String sqid; diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/AppealWhistleFeedbackResultDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/AppealWhistleFeedbackResultDTO.java index ccf9cf2af..d452d44e8 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/AppealWhistleFeedbackResultDTO.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/AppealWhistleFeedbackResultDTO.java @@ -4,6 +4,8 @@ import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Data; import lombok.NoArgsConstructor; +import javax.validation.constraints.NotBlank; + @NoArgsConstructor @Data public class AppealWhistleFeedbackResultDTO { @@ -11,6 +13,7 @@ public class AppealWhistleFeedbackResultDTO { /** * 唯一标识 */ + @NotBlank(message = "诉求ID不能为空") @JsonProperty("sqid") private String sqid; diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/AppealWhistleReportRejectResultDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/AppealWhistleReportRejectResultDTO.java index a76264bcc..4bbdd4820 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/AppealWhistleReportRejectResultDTO.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/AppealWhistleReportRejectResultDTO.java @@ -4,6 +4,8 @@ import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Data; import lombok.NoArgsConstructor; +import javax.validation.constraints.NotBlank; + @NoArgsConstructor @Data public class AppealWhistleReportRejectResultDTO { @@ -11,6 +13,7 @@ public class AppealWhistleReportRejectResultDTO { /** * 唯一标识 */ + @NotBlank(message = "诉求ID不能为空") @JsonProperty("sqid") private String sqid; 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 934ce5cc7..2a83c2922 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 @@ -52,6 +52,11 @@ public enum ItemGridPlatformHandleStatusEnum { HANDLE_HCSB(1103, "上报核查"), HANDLE_ZCZ(1104, "再处置"), + //**********市级青诉即办平台状态********** + HANDLE_QSJB_DB(2018, "诉求督办"), + HANDLE_QSJB_BH(2020, "吹哨驳回"), + HANDLE_QSJB_FK(2021, "吹哨反馈"), + HANDLE_OTHER(999, "派遣中"); 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 9ae52e413..fb242bfca 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 @@ -455,45 +455,45 @@ public class ItemController { } /** - * 接受市平台诉求督办 + * 市级青诉即办平台对区（市）诉求进行在线督办 * - * @param formDto + * @param formDTO * @return com.elink.esua.epdc.commons.tools.utils.Result * @author zhy * @date 2022/10/21 16:13 */ @PostMapping("gov/case/supervise") - public Result supervise(@RequestBody AppealSuperviseResultDTO formDto) { - ValidatorUtils.validateEntity(formDto); - return itemService.supervise(formDto); + public Result supervise(@RequestBody AppealSuperviseResultDTO formDTO) { + ValidatorUtils.validateEntity(formDTO); + return itemService.supervise(formDTO); } /** - * 接受市平台吹哨驳回 + * 市级平台驳回区（市）上报的吹哨诉求 * - * @param formDto + * @param formDTO * @return com.elink.esua.epdc.commons.tools.utils.Result * @author zhy * @date 2022/10/21 16:13 */ @PostMapping("gov/case/whistle/reportreject") - public Result reportReject(@RequestBody AppealWhistleReportRejectResultDTO formDto) { - ValidatorUtils.validateEntity(formDto); - return itemService.reportReject(formDto); + public Result reportReject(@RequestBody AppealWhistleReportRejectResultDTO formDTO) { + ValidatorUtils.validateEntity(formDTO); + return itemService.reportReject(formDTO); } /** - * 接受市平台吹哨反馈 + * 市级平台向区（市）平台反馈吹哨诉求的处置结果 * - * @param formDto + * @param formDTO * @return com.elink.esua.epdc.commons.tools.utils.Result * @author zhy * @date 2022/10/21 16:13 */ @PostMapping("gov/case/whistle/feedback") - public Result feedback(@RequestBody AppealWhistleFeedbackResultDTO formDto) { - ValidatorUtils.validateEntity(formDto); - return itemService.feedback(formDto); + public Result feedback(@RequestBody AppealWhistleFeedbackResultDTO formDTO) { + ValidatorUtils.validateEntity(formDTO); + return itemService.feedback(formDTO); } } 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 452f73284..5f7fa936a 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 @@ -455,6 +455,16 @@ public interface ItemDao extends BaseDao { */ String getSqid(@Param("itemId") String itemId); + /** + * 根据诉求ID查询项目信息 + * + * @param sqid + * @return java.lang.String + * @author zhy + * @date 2022/9/19 10:51 + */ + ItemEntity getItemBySqid(@Param("sqid") String sqid); + /** * 获取市平台诉求ID * 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 b7b3c1a86..0bb224ec7 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 @@ -666,31 +666,31 @@ public interface ItemService extends BaseService { /** * 接受市平台诉求督办 * - * @param formDto + * @param formDTO * @return com.elink.esua.epdc.commons.tools.utils.Result * @author zhy * @date 2022/10/21 16:16 */ - Result supervise(AppealSuperviseResultDTO formDto); + Result supervise(AppealSuperviseResultDTO formDTO); /** * 接受市平台吹哨驳回 * - * @param formDto + * @param formDTO * @return com.elink.esua.epdc.commons.tools.utils.Result * @author zhy * @date 2022/10/21 16:16 */ - Result reportReject(AppealWhistleReportRejectResultDTO formDto); + Result reportReject(AppealWhistleReportRejectResultDTO formDTO); /** * 接受市平台吹哨反馈 * - * @param formDto + * @param formDTO * @return com.elink.esua.epdc.commons.tools.utils.Result * @author zhy * @date 2022/10/21 16:16 */ - Result feedback(AppealWhistleFeedbackResultDTO formDto); + Result feedback(AppealWhistleFeedbackResultDTO 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 82f82bb5b..b6cf5c5f7 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 @@ -4070,17 +4070,72 @@ public class ItemServiceImpl extends BaseServiceImpl implem } @Override - public Result supervise(AppealSuperviseResultDTO formDto){ + public Result supervise(AppealSuperviseResultDTO formDTO) { + ItemHandleProcessEntity process = new ItemHandleProcessEntity(); + ItemEntity item = baseDao.getItemBySqid(formDTO.getSqid()); + if (item == null) { + return new Result().error("未查到相关项目，诉求ID：" + formDTO.getSqid()); + } + process.setItemId(item.getId()); + process.setState(ItemGridPlatformHandleStatusEnum.HANDLE_QSJB_DB.getValue()); + process.setHandleAdvice(formDTO.getDbnr()); + process.setOutHandleAdvice(formDTO.getDbnr()); + process.setHandlerDept("青诉即办平台"); + process.setHandlerDeptId(1L); + process.setGridPartyname(formDTO.getDbr()); + itemHandleProcessDao.insert(process); + + // 更新创建时间 + process.setCreatedTime(DateUtils.parse(formDTO.getDbsj(), DateUtils.DATE_TIME_PATTERN)); + itemHandleProcessDao.updateById(process); return new Result(); } @Override - public Result reportReject(AppealWhistleReportRejectResultDTO formDto){ + public Result reportReject(AppealWhistleReportRejectResultDTO formDTO) { + ItemHandleProcessEntity process = new ItemHandleProcessEntity(); + ItemEntity item = baseDao.getItemBySqid(formDTO.getSqid()); + if (item == null) { + return new Result().error("未查到相关项目，诉求ID：" + formDTO.getSqid()); + } + process.setItemId(item.getId()); + process.setState(ItemGridPlatformHandleStatusEnum.HANDLE_QSJB_DB.getValue()); + process.setHandleAdvice(formDTO.getBhyy()); + process.setOutHandleAdvice(formDTO.getBhyy()); + process.setHandlerDept("青诉即办平台"); + process.setHandlerDeptId(1L); + process.setGridPartyid(formDTO.getBhrId()); + process.setGridPartyname(formDTO.getBhr()); + itemHandleProcessDao.insert(process); + + // 更新创建时间 + process.setCreatedTime(DateUtils.parse(formDTO.getBhsj(), DateUtils.DATE_TIME_PATTERN)); + itemHandleProcessDao.updateById(process); return new Result(); } @Override - public Result feedback(AppealWhistleFeedbackResultDTO formDto){ + public Result feedback(AppealWhistleFeedbackResultDTO formDTO) { + ItemHandleProcessEntity process = new ItemHandleProcessEntity(); + ItemEntity item = baseDao.getItemBySqid(formDTO.getSqid()); + if (item == null) { + return new Result().error("未查到相关项目，诉求ID：" + formDTO.getSqid()); + } + process.setItemId(item.getId()); + process.setState(ItemGridPlatformHandleStatusEnum.HANDLE_QSJB_DB.getValue()); + process.setHandleAdvice(formDTO.getCljg()); + process.setOutHandleAdvice(formDTO.getCljg()); + process.setHandlerDept("青诉即办平台"); + process.setHandlerDeptId(1L); + process.setGridPartyid(formDTO.getClrId()); + process.setGridPartyname(formDTO.getClr()); + process.setGridUnitid(formDTO.getCldwId()); + process.setGridUnitname(formDTO.getCldw()); + itemHandleProcessDao.insert(process); + + // 更新创建时间 + process.setCreatedTime(DateUtils.parse(formDTO.getFksj(), DateUtils.DATE_TIME_PATTERN)); + itemHandleProcessDao.updateById(process); return new Result(); } } 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 edb12b9be..f039d34d9 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 @@ -2143,6 +2143,18 @@ AND id = #{itemId} + +