diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiWorkItemController.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiWorkItemController.java index 4f1cac5ff..a1b40ea07 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiWorkItemController.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiWorkItemController.java @@ -1,5 +1,6 @@ package com.elink.esua.epdc.controller; +import com.elink.esua.epdc.commons.tools.page.PageData; import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils; import com.elink.esua.epdc.dto.EventDeptFormDTO; @@ -16,6 +17,7 @@ import java.util.Map; /** * 移动端接口-项目模块 + * * @Author LPF * @Date 2019/11/18 13:32 */ @@ -28,6 +30,7 @@ public class ApiWorkItemController { /** * 项目统计 + * * @Params: [formDto] * @Return: com.elink.esua.epdc.commons.tools.utils.Result * @Author: lipengfei @@ -37,64 +40,69 @@ public class ApiWorkItemController { public Result itemStatistics(ItemStatisticsFormDTO formDto) { return workItemService.getItemStatistics(formDto); } + /** * 项目列表 + * * @Params: [ formDto] - * @Return: com.elink.esua.epdc.commons.tools.utils.Result> + * @Return: com.elink.esua.epdc.commons.tools.utils.Result> * @Author: lipengfei * @Date: 2019/11/19 16:34 */ @GetMapping("list") public Result> listItems(ItemFormDTO formDto) { - return workItemService.listItems( formDto); + return workItemService.listItems(formDto); } /** * 项目列表(新) + * * @Params: [ formDto] - * @Return: com.elink.esua.epdc.commons.tools.utils.Result> + * @Return: com.elink.esua.epdc.commons.tools.utils.Result> * @Author: wgf * @Date: 2022/09/22 11:34 */ @GetMapping("listEqPc") public Result> listEqPc(ItemWorkListFormDTO formDTO) { - return workItemService.listEqPc( formDTO); + return workItemService.listEqPc(formDTO); } /** * 项目驳回列表(新) + * * @Params: [ formDto] - * @Return: com.elink.esua.epdc.commons.tools.utils.Result> + * @Return: com.elink.esua.epdc.commons.tools.utils.Result> * @Author: wgf * @Date: 2022/09/22 11:34 */ @GetMapping("rejectListEqPc") public Result> rejectListEqPc(ItemWorkListFormDTO formDTO) { - return workItemService.rejectListEqPc( formDTO); + return workItemService.rejectListEqPc(formDTO); } /** * 诉求项目列表(工作端) + * * @Params: [ formDto] - * @Return: com.elink.esua.epdc.commons.tools.utils.Result> + * @Return: com.elink.esua.epdc.commons.tools.utils.Result> * @Author: wgf * @Date: 2022/09/22 11:34 */ @GetMapping("appealListEqPc") public Result> appealListEqPc(ItemWorkAppealListFormDTO formDTO) { - return workItemService.appealListEqPc( formDTO); + return workItemService.appealListEqPc(formDTO); } /** + * @return com.elink.esua.epdc.commons.tools.utils.Result<> * @describe: 获取社区结案审批列表(工作端) * @author wgf * @date 2022/9/4 17:44 * @params [params] - * @return com.elink.esua.epdc.commons.tools.utils.Result<> */ @GetMapping("getExaminePageEqPc") public Result> getExaminePageEqPc(ItemExamineWorkListFormDTO formDTO) { - return workItemService.getExaminePageEqPc( formDTO); + return workItemService.getExaminePageEqPc(formDTO); } /** @@ -125,6 +133,7 @@ public class ApiWorkItemController { /** * 项目详情 + * * @Params: [id] * @Return: com.elink.esua.epdc.commons.tools.utils.Result * @Author: lipengfei @@ -137,6 +146,7 @@ public class ApiWorkItemController { /** * 网格化平台项目处理进展拉去 + * * @Params: [id] * @Return: com.elink.esua.epdc.commons.tools.utils.Result<> * @Author: wgf @@ -149,6 +159,7 @@ public class ApiWorkItemController { /** * 获取满意度评价结果 + * * @Params: [evaluationFormDTO] * @Return: com.elink.esua.epdc.commons.tools.utils.Result * @Author: lipengfei @@ -158,8 +169,10 @@ public class ApiWorkItemController { public Result> evaluation(EvaluationFormDTO evaluationFormDTO) { return workItemService.evaluation(evaluationFormDTO); } + /** * 获取可吹哨部门 + * * @Params: [evaluationFormDTO] * @Return: com.elink.esua.epdc.commons.tools.utils.Result * @Author: lipengfei @@ -174,8 +187,10 @@ public class ApiWorkItemController { public Result handleSubmit(@RequestBody ItemHandleSubmitFormDTO dto) { return workItemService.handleSubmit(dto); } + /** * 获取满意度评价部门 + * * @Params: [evaluationFormDTO] * @Return: com.elink.esua.epdc.commons.tools.utils.Result * @Author: lipengfei @@ -185,8 +200,10 @@ public class ApiWorkItemController { public Result> evaluationDept(EvaluationFormDTO evaluationFormDTO) { return workItemService.evaluationDept(evaluationFormDTO); } + /** * 项目处理进度 + * * @Params: [ItemProcessFormDTO] * @Return: com.elink.esua.epdc.commons.tools.utils.Result * @Author: lipengfei @@ -215,7 +232,7 @@ public class ApiWorkItemController { * @return com.elink.esua.epdc.commons.tools.utils.Result> * @Author yinzuomei * @Description 获取当前部门可做操作 - * * @Date 2020/1/13 16:48 + * * @Date 2020/1/13 16:48 **/ @GetMapping("handleCategory") public Result> queryHandleCategories(EventDeptFormDTO formDto) { @@ -223,24 +240,24 @@ public class ApiWorkItemController { } /** - * @describe: 工作端-执法诉求上报 - * @author wangtong - * @date 2022/9/3 10:10 - * @params [formDto] - * @return com.elink.esua.epdc.commons.tools.utils.Result - */ + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @describe: 工作端-执法诉求上报 + * @author wangtong + * @date 2022/9/3 10:10 + * @params [formDto] + */ @PostMapping("submitLawItem") public Result submitLawItem(@RequestBody ItemLawSubmitDTO formDto) { return workItemService.submitLawItem(formDto); } /** - * @describe: 工作端我的上报列表-执法诉求 - * @author wangtong - * @date 2022/9/3 18:37 - * @params [evaluationFormDTO] - * @return com.elink.esua.epdc.commons.tools.utils.Result> - */ + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @describe: 工作端我的上报列表-执法诉求 + * @author wangtong + * @date 2022/9/3 18:37 + * @params [evaluationFormDTO] + */ @GetMapping("getLawItemList") public Result> getLawItemList(ItemAppealPageDTO dto) { ValidatorUtils.validateEntity(dto); @@ -248,26 +265,80 @@ public class ApiWorkItemController { } /** - * @describe: 工作端执法诉求详情 - * @author wangtong - * @date 2022/9/3 18:37 - * @params [id] - * @return com.elink.esua.epdc.commons.tools.utils.Result - */ + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @describe: 工作端执法诉求详情 + * @author wangtong + * @date 2022/9/3 18:37 + * @params [id] + */ @GetMapping("getLawItemDetail/{id}") public Result getLawItemDetail(@PathVariable String id) { return workItemService.getLawItemDetail(id); } /** - * @describe: 工作端-执法诉求-满意度评价 - * @author wangtong - * @date 2022/9/13 16:41 - * @params [evaluationFormDTO] - * @return com.elink.esua.epdc.commons.tools.utils.Result - */ + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @describe: 工作端-执法诉求-满意度评价 + * @author wangtong + * @date 2022/9/13 16:41 + * @params [evaluationFormDTO] + */ @PostMapping("zfEvaluation") public Result zfEvaluation(@RequestBody EvaluationFormDTO evaluationFormDTO) { return workItemService.zfEvaluation(evaluationFormDTO); } + + /** + * 初审列表 + * + * @Param params + * @Return {@link Result< PageData< ItemPendingHandleDTO>>} + * @Author zhaoqifeng + * @Date 2022/11/18 14:52 + */ + @PostMapping("firstCheckPage") + public Result> firstCheckPage(@RequestBody Map params) { + return workItemService.firstCheckPage(params); + } + + /** + * 终审列表 + * + * @Param params + * @Return {@link Result< PageData< ItemPendingHandleDTO>>} + * @Author zhaoqifeng + * @Date 2022/11/18 14:52 + */ + @PostMapping("endCheckPage") + public Result> endCheckPage(@RequestBody Map params) { + return workItemService.endCheckPage(params); + } + + /** + * 诉求初验结果 + * + * @Param dto + * @Return {@link Result} + * @Author zhaoqifeng + * @Date 2022/11/18 14:52 + */ + @PostMapping("earlyInspection") + public Result earlyInspection(@RequestBody ItemInspectionFormDTO dto) { + ValidatorUtils.validateEntity(dto); + return workItemService.earlyInspection(dto); + } + + /** + * 诉求终验结果 + * + * @Param dto + * @Return {@link Result} + * @Author zhaoqifeng + * @Date 2022/11/18 14:52 + */ + @PostMapping("endInspection") + public Result endInspection(@RequestBody ItemInspectionFormDTO dto) { + ValidatorUtils.validateEntity(dto); + return workItemService.endInspection(dto); + } } diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/WorkItemFeignClient.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/WorkItemFeignClient.java index f567bf1b9..6b1adb635 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/WorkItemFeignClient.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/WorkItemFeignClient.java @@ -1,6 +1,7 @@ package com.elink.esua.epdc.feign; import com.elink.esua.epdc.commons.tools.constant.ServiceConstant; +import com.elink.esua.epdc.commons.tools.page.PageData; import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.config.FeignRequestInterceptor; import com.elink.esua.epdc.dto.EventDeptFormDTO; @@ -14,13 +15,14 @@ import org.springframework.http.MediaType; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RequestBody; import java.util.List; import java.util.Map; /** * 项目模块调用-移动app端 + * * @Author LPF * @Date 2019/11/18 16:39 */ @@ -28,9 +30,9 @@ import java.util.Map; public interface WorkItemFeignClient { - /** * 项目统计 + * * @Params: [formDto] * @Return: com.elink.esua.epdc.commons.tools.utils.Result * @Author: lipengfei @@ -38,10 +40,12 @@ public interface WorkItemFeignClient { */ @GetMapping(value = "events/work/item/statistics", consumes = MediaType.APPLICATION_JSON_VALUE) Result itemStatistics(ItemStatisticsFormDTO formDto); + /** * 项目列表 + * * @Params: [formDto] - * @Return: com.elink.esua.epdc.commons.tools.utils.Result> + * @Return: com.elink.esua.epdc.commons.tools.utils.Result> * @Author: lipengfei * @Date: 2019/11/19 16:42 */ @@ -50,8 +54,9 @@ public interface WorkItemFeignClient { /** * 项目列表(新) + * * @Params: [ formDto] - * @Return: com.elink.esua.epdc.commons.tools.utils.Result> + * @Return: com.elink.esua.epdc.commons.tools.utils.Result> * @Author: wgf * @Date: 2022/09/22 11:34 */ @@ -60,8 +65,9 @@ public interface WorkItemFeignClient { /** * 项目驳回列表(新) + * * @Params: [ formDto] - * @Return: com.elink.esua.epdc.commons.tools.utils.Result> + * @Return: com.elink.esua.epdc.commons.tools.utils.Result> * @Author: wgf * @Date: 2022/09/22 11:34 */ @@ -70,8 +76,9 @@ public interface WorkItemFeignClient { /** * 项目诉求列表(工作端) + * * @Params: [ formDto] - * @Return: com.elink.esua.epdc.commons.tools.utils.Result> + * @Return: com.elink.esua.epdc.commons.tools.utils.Result> * @Author: wgf * @Date: 2022/09/22 11:34 */ @@ -79,11 +86,11 @@ public interface WorkItemFeignClient { Result> appealListEqPc(ItemWorkAppealListFormDTO formDTO); /** + * @return com.elink.esua.epdc.commons.tools.utils.Result<> * @describe: 获取社区结案审批列表(工作端) * @author wgf * @date 2022/9/4 17:44 * @params [params] - * @return com.elink.esua.epdc.commons.tools.utils.Result<> */ @GetMapping(value = "events/work/item/getExaminePageEqPc", consumes = MediaType.APPLICATION_JSON_VALUE) Result> getExaminePageEqPc(ItemExamineWorkListFormDTO formDTO); @@ -112,8 +119,9 @@ public interface WorkItemFeignClient { /** * 项目详情 + * * @Params: [formDto] - * @Return: com.elink.esua.epdc.commons.tools.utils.Result> + * @Return: com.elink.esua.epdc.commons.tools.utils.Result> * @Author: lipengfei * @Date: 2019/11/19 16:42 */ @@ -122,6 +130,7 @@ public interface WorkItemFeignClient { /** * 网格化平台项目处理进展拉去 + * * @Params: [id] * @Return: com.elink.esua.epdc.commons.tools.utils.Result<> * @Author: wgf @@ -132,6 +141,7 @@ public interface WorkItemFeignClient { /** * 获取满意度评价结果 + * * @Params: [evaluationFormDTO] * @Return: com.elink.esua.epdc.commons.tools.utils.Result * @Author: lipengfei @@ -139,8 +149,10 @@ public interface WorkItemFeignClient { */ @GetMapping(value = "events/work/item/evaluation", consumes = MediaType.APPLICATION_JSON_VALUE) Result> evaluation(EvaluationFormDTO evaluationFormDTO); + /** * 获取可吹哨部门 + * * @Return: com.elink.esua.epdc.commons.tools.utils.Result * @Author: lipengfei * @Date: 2019/11/19 16:34 @@ -150,6 +162,7 @@ public interface WorkItemFeignClient { /** * 项目处理 + * * @Return: com.elink.esua.epdc.commons.tools.utils.Result * @Author: lipengfei * @Date: 2019/11/19 16:34 @@ -159,6 +172,7 @@ public interface WorkItemFeignClient { /** * 获取满意度评价部门 + * * @Params: [evaluationFormDTO] * @Return: com.elink.esua.epdc.commons.tools.utils.Result * @Author: lipengfei @@ -169,13 +183,14 @@ public interface WorkItemFeignClient { /** * 项目处理进度 + * * @Params: [ItemProcessFormDTO] * @Return: com.elink.esua.epdc.commons.tools.utils.Result * @Author: lipengfei * @Date: 2019/11/19 16:34 */ @GetMapping(value = "events/work/item/processList", consumes = MediaType.APPLICATION_JSON_VALUE) - Result> processList(ItemProcessFormDTO dto) ; + Result> processList(ItemProcessFormDTO dto); /** * 项目消息列表 @@ -199,32 +214,76 @@ public interface WorkItemFeignClient { Result> queryHandleCategories(EventDeptFormDTO formDto); /** + * @return com.elink.esua.epdc.commons.tools.utils.Result * @describe: 工作端-执法诉求上报 * @author wangtong * @date 2022/9/3 10:10 * @params [formDto] - * @return com.elink.esua.epdc.commons.tools.utils.Result */ @PostMapping(value = "events/work/item/submitLawItem", consumes = MediaType.APPLICATION_JSON_VALUE) Result submitLawItem(ItemLawSubmitDTO formDto); /** + * @return com.elink.esua.epdc.commons.tools.utils.Result> * @describe: 工作端我的上报列表-执法诉求 * @author wangtong * @date 2022/9/3 18:37 * @params [evaluationFormDTO] - * @return com.elink.esua.epdc.commons.tools.utils.Result> */ @GetMapping(value = "events/work/item/getLawItemList", consumes = MediaType.APPLICATION_JSON_VALUE) Result> getLawItemList(ItemAppealPageDTO dto); /** + * @return com.elink.esua.epdc.commons.tools.utils.Result * @describe: 工作端执法诉求详情 * @author wangtong * @date 2022/9/3 18:37 * @params [id] - * @return com.elink.esua.epdc.commons.tools.utils.Result */ @GetMapping(value = "events/work/item/getLawItemDetail/{id}", consumes = MediaType.APPLICATION_JSON_VALUE) Result getLawItemDetail(@PathVariable String id); + + /** + * 初审列表 + * + * @Param params + * @Return {@link Result< PageData< ItemPendingHandleDTO>>} + * @Author zhaoqifeng + * @Date 2022/11/18 14:55 + */ + @PostMapping(value = "events/work/item/firstCheckPage", consumes = MediaType.APPLICATION_JSON_VALUE) + Result> firstCheckPage(@RequestBody Map params); + + /** + * 终审列表 + * + * @Param params + * @Return {@link Result< PageData< ItemPendingHandleDTO>>} + * @Author zhaoqifeng + * @Date 2022/11/18 14:56 + */ + @PostMapping(value = "events/work/item/endCheckPage", consumes = MediaType.APPLICATION_JSON_VALUE) + Result> endCheckPage(@RequestBody Map params); + + /** + * 诉求初验结果 + * + * @Param dto + * @Return {@link Result} + * @Author zhaoqifeng + * @Date 2022/11/18 14:56 + */ + @PostMapping(value = "events/work/item/earlyInspection", consumes = MediaType.APPLICATION_JSON_VALUE) + Result earlyInspection(@RequestBody ItemInspectionFormDTO dto); + + /** + * 诉求终验结果 + * + * @Param dto + * @Return {@link Result} + * @Author zhaoqifeng + * @Date 2022/11/18 14:56 + */ + @PostMapping(value = "events/work/item/endInspection", consumes = MediaType.APPLICATION_JSON_VALUE) + Result endInspection(@RequestBody ItemInspectionFormDTO dto); } diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/WorkItemFeignClientFallback.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/WorkItemFeignClientFallback.java index f87696194..f967301a5 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/WorkItemFeignClientFallback.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/WorkItemFeignClientFallback.java @@ -1,6 +1,7 @@ package com.elink.esua.epdc.feign.fallback; import com.elink.esua.epdc.commons.tools.constant.ServiceConstant; +import com.elink.esua.epdc.commons.tools.page.PageData; import com.elink.esua.epdc.commons.tools.utils.ModuleUtils; import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.dto.EventDeptFormDTO; @@ -23,11 +24,11 @@ import java.util.Map; public class WorkItemFeignClientFallback implements WorkItemFeignClient { - @Override public Result itemStatistics(ItemStatisticsFormDTO formDto) { return ModuleUtils.feignConError(ServiceConstant.EPDC_EVENTS_SERVER, "itemStatistics", formDto); } + @Override public Result> listItems(ItemFormDTO formDto) { return ModuleUtils.feignConError(ServiceConstant.EPDC_EVENTS_SERVER, "listItems", formDto); @@ -77,14 +78,17 @@ public class WorkItemFeignClientFallback implements WorkItemFeignClient { public Result> evaluation(EvaluationFormDTO evaluationFormDTO) { return ModuleUtils.feignConError(ServiceConstant.EPDC_EVENTS_SERVER, "evaluation", evaluationFormDTO); } + @Override public Result> whistlingDept(EventDeptFormDTO formDto) { - return ModuleUtils.feignConError(ServiceConstant.EPDC_EVENTS_SERVER, "whistlingDept",formDto); + return ModuleUtils.feignConError(ServiceConstant.EPDC_EVENTS_SERVER, "whistlingDept", formDto); } + @Override public Result handleSubmit(ItemHandleSubmitFormDTO dto) { return ModuleUtils.feignConError(ServiceConstant.EPDC_EVENTS_SERVER, "handleSubmit"); } + @Override public Result> evaluationDept(EvaluationFormDTO evaluationFormDTO) { return ModuleUtils.feignConError(ServiceConstant.EPDC_EVENTS_SERVER, "evaluationDept", evaluationFormDTO); @@ -102,22 +106,42 @@ public class WorkItemFeignClientFallback implements WorkItemFeignClient { @Override public Result> queryHandleCategories(EventDeptFormDTO formDto) { - return ModuleUtils.feignConError(ServiceConstant.EPDC_EVENTS_SERVER, "queryHandleCategories",formDto); + return ModuleUtils.feignConError(ServiceConstant.EPDC_EVENTS_SERVER, "queryHandleCategories", formDto); } @Override public Result submitLawItem(ItemLawSubmitDTO formDto) { - return ModuleUtils.feignConError(ServiceConstant.EPDC_EVENTS_SERVER, "submitLawItem",formDto); + return ModuleUtils.feignConError(ServiceConstant.EPDC_EVENTS_SERVER, "submitLawItem", formDto); } @Override public Result> getLawItemList(ItemAppealPageDTO dto) { - return ModuleUtils.feignConError(ServiceConstant.EPDC_EVENTS_SERVER, "getLawItemList",dto); + return ModuleUtils.feignConError(ServiceConstant.EPDC_EVENTS_SERVER, "getLawItemList", dto); } @Override public Result getLawItemDetail(@PathVariable String id) { - return ModuleUtils.feignConError(ServiceConstant.EPDC_EVENTS_SERVER, "getLawItemDetail",id); + return ModuleUtils.feignConError(ServiceConstant.EPDC_EVENTS_SERVER, "getLawItemDetail", id); + } + + @Override + public Result> firstCheckPage(Map params) { + return ModuleUtils.feignConError(ServiceConstant.EPDC_EVENTS_SERVER, "firstCheckPage", params); + } + + @Override + public Result> endCheckPage(Map params) { + return ModuleUtils.feignConError(ServiceConstant.EPDC_EVENTS_SERVER, "endCheckPage", params); + } + + @Override + public Result earlyInspection(ItemInspectionFormDTO dto) { + return ModuleUtils.feignConError(ServiceConstant.EPDC_EVENTS_SERVER, "earlyInspection", dto); + } + + @Override + public Result endInspection(ItemInspectionFormDTO dto) { + return ModuleUtils.feignConError(ServiceConstant.EPDC_EVENTS_SERVER, "endInspection", dto); } } diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/WorkItemService.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/WorkItemService.java index 341e4f6dc..ab7c39c6c 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/WorkItemService.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/WorkItemService.java @@ -1,20 +1,19 @@ package com.elink.esua.epdc.service; +import com.elink.esua.epdc.commons.tools.page.PageData; import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.dto.EventDeptFormDTO; import com.elink.esua.epdc.dto.item.ItemEvaluateDeptDTO; import com.elink.esua.epdc.dto.item.ItemPendingHandleDTO; import com.elink.esua.epdc.dto.item.form.*; import com.elink.esua.epdc.dto.item.result.*; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestParam; import java.util.List; import java.util.Map; /** * 项目模块-移动App端 + * * @Author LPF * @Date 2019/11/18 13:34 */ @@ -22,16 +21,19 @@ public interface WorkItemService { /** * 项目统计 + * * @Params: [userDetail, deptId] * @Return: com.elink.esua.epdc.commons.tools.utils.Result * @Author: lipengfei * @Date: 2019/11/18 13:27 */ Result getItemStatistics(ItemStatisticsFormDTO formDto); + /** * 项目列表 + * * @Params: [userDetail, formDto] - * @Return: com.elink.esua.epdc.commons.tools.utils.Result> + * @Return: com.elink.esua.epdc.commons.tools.utils.Result> * @Author: lipengfei * @Date: 2019/11/19 16:37 */ @@ -39,8 +41,9 @@ public interface WorkItemService { /** * 项目列表(新) + * * @Params: [ formDto] - * @Return: com.elink.esua.epdc.commons.tools.utils.Result> + * @Return: com.elink.esua.epdc.commons.tools.utils.Result> * @Author: wgf * @Date: 2022/09/22 11:34 */ @@ -48,8 +51,9 @@ public interface WorkItemService { /** * 项目驳回列表(新) + * * @Params: [ formDto] - * @Return: com.elink.esua.epdc.commons.tools.utils.Result> + * @Return: com.elink.esua.epdc.commons.tools.utils.Result> * @Author: wgf * @Date: 2022/09/22 11:34 */ @@ -57,19 +61,20 @@ public interface WorkItemService { /** * 项目诉求列表(工作端) + * * @Params: [ formDto] - * @Return: com.elink.esua.epdc.commons.tools.utils.Result> + * @Return: com.elink.esua.epdc.commons.tools.utils.Result> * @Author: wgf * @Date: 2022/09/22 11:34 */ Result> appealListEqPc(ItemWorkAppealListFormDTO formDTO); /** + * @return com.elink.esua.epdc.commons.tools.utils.Result<> * @describe: 获取社区结案审批列表(工作端) * @author wgf * @date 2022/9/4 17:44 * @params [params] - * @return com.elink.esua.epdc.commons.tools.utils.Result<> */ Result> getExaminePageEqPc(ItemExamineWorkListFormDTO formDTO); @@ -95,6 +100,7 @@ public interface WorkItemService { /** * 项目详情 + * * @Params: [userDetail, itemId] * @Return: com.elink.esua.epdc.commons.tools.utils.Result * @Author: lipengfei @@ -104,29 +110,36 @@ public interface WorkItemService { /** * 网格化平台项目处理进展拉去 + * * @Params: [id] * @Return: com.elink.esua.epdc.commons.tools.utils.Result<> * @Author: wgf * @Date: 2022/09/23 16:34 */ Result getGridPlatformProcess(String itemId); + /** * 获取满意度评价结果 + * * @Params: [evaluationFormDTO] * @Return: com.elink.esua.epdc.commons.tools.utils.Result * @Author: lipengfei * @Date: 2019/11/19 16:34 */ Result> evaluation(EvaluationFormDTO evaluationFormDTO); + /** * 获取可吹哨部门 + * * @Return: com.elink.esua.epdc.commons.tools.utils.Result * @Author: lipengfei * @Date: 2019/11/19 16:34 */ Result> whistlingDept(EventDeptFormDTO formDto); + /** * 项目处理 + * * @Return: com.elink.esua.epdc.commons.tools.utils.Result * @Author: lipengfei * @Date: 2019/11/19 16:34 @@ -135,14 +148,17 @@ public interface WorkItemService { /** * 获取满意度评价部门 + * * @Params: [evaluationFormDTO] * @Return: com.elink.esua.epdc.commons.tools.utils.Result * @Author: lipengfei * @Date: 2019/11/19 16:34 */ Result> evaluationDept(EvaluationFormDTO evaluationFormDTO); + /** * 项目处理进度 + * * @Params: [ItemProcessFormDTO] * @Return: com.elink.esua.epdc.commons.tools.utils.Result * @Author: lipengfei @@ -170,38 +186,78 @@ public interface WorkItemService { Result> queryHandleCategories(EventDeptFormDTO formDto); /** + * @return com.elink.esua.epdc.commons.tools.utils.Result * @describe: 工作端-执法诉求上报 * @author wangtong * @date 2022/9/3 10:10 * @params [formDto] - * @return com.elink.esua.epdc.commons.tools.utils.Result */ Result submitLawItem(ItemLawSubmitDTO formDto); /** + * @return com.elink.esua.epdc.commons.tools.utils.Result> * @describe: 工作端我的上报列表-执法诉求 * @author wangtong * @date 2022/9/3 18:37 * @params [evaluationFormDTO] - * @return com.elink.esua.epdc.commons.tools.utils.Result> */ Result> getLawItemList(ItemAppealPageDTO dto); /** + * @return com.elink.esua.epdc.commons.tools.utils.Result * @describe: 工作端执法诉求详情 * @author wangtong * @date 2022/9/3 18:37 * @params [id] - * @return com.elink.esua.epdc.commons.tools.utils.Result */ Result getLawItemDetail(String id); /** + * @return com.elink.esua.epdc.commons.tools.utils.Result * @describe: 工作端-执法诉求-满意度评价 * @author wangtong * @date 2022/9/13 16:41 * @params [evaluationFormDTO] - * @return com.elink.esua.epdc.commons.tools.utils.Result */ Result zfEvaluation(EvaluationFormDTO evaluationFormDTO); + + /** + * 初审列表 + * + * @Param params + * @Return {@link PageData< ItemPendingHandleDTO>} + * @Author zhaoqifeng + * @Date 2022/11/18 15:00 + */ + Result> firstCheckPage(Map params); + + /** + * 终审列表 + * + * @Param params + * @Return {@link PageData< ItemPendingHandleDTO>} + * @Author zhaoqifeng + * @Date 2022/11/18 15:00 + */ + Result> endCheckPage(Map params); + + /** + * 诉求初验结果 + * + * @Param dto + * @Return + * @Author zhaoqifeng + * @Date 2022/11/18 15:00 + */ + Result earlyInspection(ItemInspectionFormDTO dto); + + /** + * 诉求终验结果 + * + * @Param dto + * @Return + * @Author zhaoqifeng + * @Date 2022/11/18 15:00 + */ + Result endInspection(ItemInspectionFormDTO dto); } diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/WorkItemServiceImpl.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/WorkItemServiceImpl.java index d1041529e..991a3799e 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/WorkItemServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/WorkItemServiceImpl.java @@ -1,5 +1,6 @@ package com.elink.esua.epdc.service.impl; +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; import com.elink.esua.epdc.commons.tools.utils.Result; @@ -20,6 +21,7 @@ import java.util.Map; /** * 项目模块-移动app端 + * * @Author LPF * @Date 2019/11/18 16:34 */ @@ -37,6 +39,7 @@ public class WorkItemServiceImpl implements WorkItemService { /** * 项目统计 + * * @Params: [formDto] * @Return: com.elink.esua.epdc.commons.tools.utils.Result * @Author: lipengfei @@ -98,6 +101,7 @@ public class WorkItemServiceImpl implements WorkItemService { public Result> evaluation(EvaluationFormDTO evaluationFormDTO) { return workItemFeignClient.evaluation(evaluationFormDTO); } + @Override public Result> whistlingDept(EventDeptFormDTO formDto) { return workItemFeignClient.whistlingDept(formDto); @@ -140,7 +144,7 @@ public class WorkItemServiceImpl implements WorkItemService { if (null == user) { throw new RuntimeException("获取用户信息失败"); } - dto.setUserId("zfsq"+user.getId()); + dto.setUserId("zfsq" + user.getId()); return workItemFeignClient.getLawItemList(dto); } @@ -155,10 +159,66 @@ public class WorkItemServiceImpl implements WorkItemService { if (null == user) { throw new RuntimeException("获取用户信息失败"); } - evaluationFormDTO.setUserId("zfsq"+user.getId().toString()); + evaluationFormDTO.setUserId("zfsq" + user.getId().toString()); evaluationFormDTO.setUserName(user.getUsername()); evaluationFormDTO.setDeptId(user.getDeptId()); return itemFeignClient.evaluation(evaluationFormDTO); } + /** + * 初审列表 + * + * @param params + * @Param params + * @Return {@link PageData < ItemPendingHandleDTO>} + * @Author zhaoqifeng + * @Date 2022/11/18 15:00 + */ + @Override + public Result> firstCheckPage(Map params) { + return workItemFeignClient.firstCheckPage(params); + } + + /** + * 终审列表 + * + * @param params + * @Param params + * @Return {@link PageData< ItemPendingHandleDTO>} + * @Author zhaoqifeng + * @Date 2022/11/18 15:00 + */ + @Override + public Result> endCheckPage(Map params) { + return workItemFeignClient.endCheckPage(params); + } + + /** + * 诉求初验结果 + * + * @param dto + * @Param dto + * @Return + * @Author zhaoqifeng + * @Date 2022/11/18 15:00 + */ + @Override + public Result earlyInspection(ItemInspectionFormDTO dto) { + return workItemFeignClient.earlyInspection(dto); + } + + /** + * 诉求终验结果 + * + * @param dto + * @Param dto + * @Return + * @Author zhaoqifeng + * @Date 2022/11/18 15:00 + */ + @Override + public Result endInspection(ItemInspectionFormDTO dto) { + return workItemFeignClient.endInspection(dto); + } + } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/WorkItemController.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/WorkItemController.java index ec9f0ada5..282da0eeb 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/WorkItemController.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/WorkItemController.java @@ -1,12 +1,13 @@ package com.elink.esua.epdc.modules.item.controller; +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.utils.Result; import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils; import com.elink.esua.epdc.dto.EventDeptFormDTO; import com.elink.esua.epdc.dto.item.ItemEvaluateDeptDTO; -import com.elink.esua.epdc.dto.item.ItemPendingHandleDTO; import com.elink.esua.epdc.dto.item.ItemHandleProcessDTO; +import com.elink.esua.epdc.dto.item.ItemPendingHandleDTO; import com.elink.esua.epdc.dto.item.form.*; import com.elink.esua.epdc.dto.item.result.*; import com.elink.esua.epdc.modules.item.service.*; @@ -14,9 +15,11 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import java.util.List; +import java.util.Map; /** * 移动端-项目表 + * * @Author LC * @Date 2019/9/9 16:44 */ @@ -82,11 +85,11 @@ public class WorkItemController { } /** + * @return com.elink.esua.epdc.commons.tools.utils.Result> * @describe: 获取社区结案审批列表 * @author wgf * @date 2022/9/23 17:44 * @params [params] - * @return com.elink.esua.epdc.commons.tools.utils.Result> */ @GetMapping("getExaminePageEqPc") public Result> getExaminePageEqPc(@RequestBody ItemExamineWorkListFormDTO formDTO) { @@ -109,11 +112,11 @@ public class WorkItemController { } /** + * @return com.elink.esua.epdc.commons.tools.utils.Result * @describe: 社区审批结案申请 * @author wgf * @date 2022/9/23 10:18 * @params [formDto] - * @return com.elink.esua.epdc.commons.tools.utils.Result */ @PostMapping("examineCaseWork") public Result examineCaseWork(@RequestBody ExamineCaseFormDTO formDto) { @@ -129,8 +132,10 @@ public class WorkItemController { pushToCityGridService.again(ss); return new Result(); } + /** * 项目统计--工作端 + * * @Params: [formDto] * @Return: com.elink.esua.epdc.commons.tools.utils.Result * @Author: liuchuang @@ -141,10 +146,12 @@ public class WorkItemController { formDto.setDeptIdList(SecurityUser.getUser().getDeptIdList()); return this.itemService.getItemStatistics(formDto); } + /** * 项目列表--工作端 + * * @Params: [formDto] - * @Return: com.elink.esua.epdc.commons.tools.utils.Result> + * @Return: com.elink.esua.epdc.commons.tools.utils.Result> * @Author: lipengfei * @Date: 2019/11/19 16:46 */ @@ -153,10 +160,12 @@ public class WorkItemController { ValidatorUtils.validateEntity(formDto); return this.itemService.listItemsByWork(formDto); } + /** * 项目消息列表--工作端 + * * @Params: [formDto] - * @Return: com.elink.esua.epdc.commons.tools.utils.Result> + * @Return: com.elink.esua.epdc.commons.tools.utils.Result> * @Author: lipengfei * @Date: 2019/11/19 16:46 */ @@ -166,8 +175,10 @@ public class WorkItemController { ValidatorUtils.validateEntity(formDto); return this.itemInformationService.notice(formDto); } + /** * 项目详情--工作端 + * * @Params: [id] * @Return: com.elink.esua.epdc.commons.tools.utils.Result * @Author: lipengfei @@ -177,8 +188,10 @@ public class WorkItemController { public Result getItemDetail(@PathVariable String id) { return this.itemService.getItemDetailByWork(id); } + /** * 获取满意度评价结果--工作端 + * * @Params: [evaluationFormDTO] * @Return: com.elink.esua.epdc.commons.tools.utils.Result * @Author: lipengfei @@ -192,8 +205,10 @@ public class WorkItemController { List deptEvaluateResultDTOS = itemEvaluateDeptService.listOfDeptEvaluateByItemId(evaluationFormDTO.getItemId()); return new Result>().ok(deptEvaluateResultDTOS); } + /** * 获取可吹哨部门--工作端 + * * @Return: com.elink.esua.epdc.commons.tools.utils.Result * @Author: lipengfei * @Date: 2019/11/19 16:34 @@ -202,8 +217,10 @@ public class WorkItemController { public Result> whistlingDept(@RequestBody EventDeptFormDTO formDto) { return this.itemService.whistlingDept(formDto); } + /** * 项目处理提交--工作端 + * * @Params: [dto] * @Return: com.elink.esua.epdc.commons.tools.utils.Result * @Author: lipengfei @@ -214,8 +231,10 @@ public class WorkItemController { ValidatorUtils.validateEntity(dto); return itemService.submitItem(dto); } + /** * 获取满意度评价部门--工作端 + * * @Params: [evaluationFormDTO] * @Return: com.elink.esua.epdc.commons.tools.utils.Result * @Author: lipengfei @@ -229,8 +248,10 @@ public class WorkItemController { List evaluateDeptDTOS = itemDeptService.listOfEvaluateDepts(evaluationFormDTO.getItemId(), SecurityUser.getDeptId()); return new Result>().ok(evaluateDeptDTOS); } + /** * 获项目处理进度--工作端 + * * @Params: [ItemProcessFormDTO] * @Return: com.elink.esua.epdc.commons.tools.utils.Result * @Author: lipengfei @@ -256,11 +277,11 @@ public class WorkItemController { } /** + * @return com.elink.esua.epdc.commons.tools.utils.Result * @describe: 工作端-执法诉求上报 * @author wangtong * @date 2022/9/3 10:10 * @params [formDto] - * @return com.elink.esua.epdc.commons.tools.utils.Result */ @PostMapping("submitLawItem") public Result submitLawItem(@RequestBody ItemLawSubmitDTO formDto) { @@ -268,11 +289,11 @@ public class WorkItemController { } /** + * @return com.elink.esua.epdc.commons.tools.utils.Result> * @describe: 工作端我的上报列表-执法诉求 * @author wangtong * @date 2022/9/3 18:37 * @params [evaluationFormDTO] - * @return com.elink.esua.epdc.commons.tools.utils.Result> */ @GetMapping("getLawItemList") public Result> getLawItemList(@RequestBody ItemAppealPageDTO dto) { @@ -280,14 +301,72 @@ public class WorkItemController { } /** + * @return com.elink.esua.epdc.commons.tools.utils.Result * @describe: 工作端执法诉求详情 * @author wangtong * @date 2022/9/3 18:37 * @params [id] - * @return com.elink.esua.epdc.commons.tools.utils.Result */ @GetMapping("getLawItemDetail/{id}") public Result getLawItemDetail(@PathVariable String id) { return itemService.getItemAppealDetail(id); } + + /** + * 初审列表 + * + * @Param params + * @Return {@link Result< PageData< ItemPendingHandleDTO>>} + * @Author zhaoqifeng + * @Date 2022/11/18 14:52 + */ + @PostMapping("firstCheckPage") + public Result> firstCheckPage(@RequestBody Map params) { + PageData page = itemService.firstCheckPage(params); + return new Result>().ok(page); + } + + /** + * 终审列表 + * + * @Param params + * @Return {@link Result< PageData< ItemPendingHandleDTO>>} + * @Author zhaoqifeng + * @Date 2022/11/18 14:52 + */ + @PostMapping("endCheckPage") + public Result> endCheckPage(@RequestBody Map params) { + PageData page = itemService.endCheckPage(params); + return new Result>().ok(page); + } + + /** + * 诉求初验结果 + * + * @Param dto + * @Return {@link Result} + * @Author zhaoqifeng + * @Date 2022/11/18 14:52 + */ + @PostMapping("earlyInspection") + public Result earlyInspection(@RequestBody ItemInspectionFormDTO dto) { + ValidatorUtils.validateEntity(dto); + itemService.earlyInspection(dto); + return new Result(); + } + + /** + * 诉求终验结果 + * + * @Param dto + * @Return {@link Result} + * @Author zhaoqifeng + * @Date 2022/11/18 14:52 + */ + @PostMapping("endInspection") + public Result endInspection(@RequestBody ItemInspectionFormDTO dto) { + ValidatorUtils.validateEntity(dto); + itemService.endInspection(dto); + return new Result(); + } }