diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiWorkConflictController.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiWorkConflictController.java deleted file mode 100644 index 3f55a97..0000000 --- a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiWorkConflictController.java +++ /dev/null @@ -1,60 +0,0 @@ -package com.elink.esua.epdc.controller; - -import com.elink.esua.epdc.commons.tools.utils.Result; -import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils; -import com.elink.esua.epdc.dto.conflict.form.ConflictMediateFormDTO; -import com.elink.esua.epdc.dto.psychology.form.PsychologyAnswerFormDTO; -import com.elink.esua.epdc.dto.psychology.form.PsychologySubmitAnswerFormDTO; -import com.elink.esua.epdc.dto.psychology.form.PsychologyUnansweredFormDTO; -import com.elink.esua.epdc.dto.psychology.result.PsychologyAnswerOfMineResultDTO; -import com.elink.esua.epdc.dto.psychology.result.PsychologyUnansweredResultDTO; -import com.elink.esua.epdc.service.WorkConflictService; -import com.elink.esua.epdc.service.WorkPropertyService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import java.util.List; - -/** - * @author: qushutong - * @Date: 2020/5/12 11:11 - * @Description: 物业相关 - */ -@RestController -@RequestMapping("work/conflict") -public class ApiWorkConflictController { - - @Autowired - private WorkConflictService workConflictService; - -// /** -// * 工作端--待解答的心理咨询问题列表 -// * -// * @return com.elink.esua.epdc.commons.tools.utils.Result < PsychologyUnansweredResultDTO > -// * @params [formDto] -// * @author zhangyuan -// * @since 2020/6/9 15:33 -// */ -// @GetMapping("psychology/listQuestion") -// public Result> listQuestion(PsychologyUnansweredFormDTO formDto) { -// return workPropertyService.listUnansweredQuestion(formDto); -// } - - /** - * 工作端--矛盾纠纷提交 - * - * @return com.elink.esua.epdc.commons.tools.utils.Result - * @params [formDto] - * @author zhangyuan - * @since 2020/6/9 15:33 - */ - @PostMapping("conflict/submit") - public Result submit(ConflictMediateFormDTO formDto) { - ValidatorUtils.validateEntity(formDto); - return workConflictService.submit(formDto); - } - -} diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiWorkPropertyController.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiWorkPropertyController.java index f0f8b4f..e66aba9 100644 --- a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiWorkPropertyController.java +++ b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiWorkPropertyController.java @@ -2,6 +2,11 @@ package com.elink.esua.epdc.controller; import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils; +import com.elink.esua.epdc.dto.conflict.form.ConflictMediateDetailFormDTO; +import com.elink.esua.epdc.dto.conflict.form.ConflictMediateFormDTO; +import com.elink.esua.epdc.dto.conflict.form.ConflictMediateHistoryFormDTO; +import com.elink.esua.epdc.dto.conflict.result.ConflictMediateDetailResultDTO; +import com.elink.esua.epdc.dto.conflict.result.ConflictMediateHistoryResultDTO; import com.elink.esua.epdc.dto.psychology.form.PsychologyAnswerFormDTO; import com.elink.esua.epdc.dto.psychology.form.PsychologySubmitAnswerFormDTO; import com.elink.esua.epdc.dto.psychology.form.PsychologyUnansweredFormDTO; @@ -68,4 +73,43 @@ public class ApiWorkPropertyController { return workPropertyService.submitAnswer(formDto); } + /** + * 工作端--矛盾纠纷历史上报列表 + * + * @return com.elink.esua.epdc.commons.tools.utils.Result < List < ConflictMediateHistoryResultDTO > > + * @params [formDto] + * @author zhangyuan + * @since 2020/6/9 15:33 + */ + @GetMapping("conflict/listHistory") + public Result> listHistory(ConflictMediateHistoryFormDTO formDto) { + return workPropertyService.listHistory(formDto); + } + + /** + * 工作端--矛盾调解 详情 + * + * @return com.elink.esua.epdc.commons.tools.utils.Result < PsychologyUnansweredResultDTO > + * @params [formDto] + * @author zhangyuan + * @since 2020/6/9 15:33 + */ + @GetMapping("conflict/getById") + public Result getById(ConflictMediateDetailFormDTO formDto) { + return workPropertyService.getById(formDto); + } + + /** + * 工作端--矛盾纠纷提交 + * + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @params [formDto] + * @author zhangyuan + * @since 2020/6/9 15:33 + */ + @PostMapping("conflict/submit") + public Result submit(ConflictMediateFormDTO formDto) { + ValidatorUtils.validateEntity(formDto); + return workPropertyService.submit(formDto); + } } diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/WorkConflictFeignClient.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/WorkConflictFeignClient.java deleted file mode 100644 index 5ca0abf..0000000 --- a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/WorkConflictFeignClient.java +++ /dev/null @@ -1,59 +0,0 @@ -package com.elink.esua.epdc.feign; - -import com.elink.esua.epdc.commons.tools.constant.ServiceConstant; -import com.elink.esua.epdc.commons.tools.utils.Result; -import com.elink.esua.epdc.config.FeignRequestInterceptor; -import com.elink.esua.epdc.dto.psychology.form.PsychologyAnswerFormDTO; -import com.elink.esua.epdc.dto.psychology.form.PsychologySubmitAnswerFormDTO; -import com.elink.esua.epdc.dto.psychology.form.PsychologyUnansweredFormDTO; -import com.elink.esua.epdc.dto.psychology.result.PsychologyAnswerOfMineResultDTO; -import com.elink.esua.epdc.dto.psychology.result.PsychologyUnansweredResultDTO; -import com.elink.esua.epdc.feign.fallback.WorkPropertyFeignClientFallback; -import org.springframework.cloud.openfeign.FeignClient; -import org.springframework.http.MediaType; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; - -import java.util.List; - -/** - * 项目模块调用-移动app端 - * - * @Author zhangyuan - * @Date 2020/6/9 16:39 - */ -@FeignClient(name = ServiceConstant.EPDC_EVENTS_SERVER, fallback = WorkPropertyFeignClientFallback.class, configuration = FeignRequestInterceptor.class) -public interface WorkConflictFeignClient { - - /*** - * 工作端--待解答的心理咨询问题列表 - * @param fromDTO - * @return com.elink.esua.epdc.commons.tools.utils.Result < PsychologyAnswerListResultDTO > - * @author zhangyuan - * @date 2020/6/8 9:25 - */ - @GetMapping(value = "news/epdc-app/psychology/listUnansweredQuestion", consumes = MediaType.APPLICATION_JSON_VALUE) - Result> listUnansweredQuestion(@RequestBody PsychologyUnansweredFormDTO fromDTO); - - /*** - * 工作端--待解答的心理咨询问题列表 - * @param fromDTO - * @return com.elink.esua.epdc.commons.tools.utils.Result < PsychologyAnswerListResultDTO > - * @author zhangyuan - * @date 2020/6/8 9:25 - */ - @GetMapping(value = "news/epdc-app/psychology/listMyQuestion", consumes = MediaType.APPLICATION_JSON_VALUE) - Result> listMyQuestion(@RequestBody PsychologyAnswerFormDTO fromDTO); - - /*** - * 工作端--待解答的心理咨询问题列表 - * @param fromDTO - * @return com.elink.esua.epdc.commons.tools.utils.Result < PsychologyAnswerListResultDTO > - * @author zhangyuan - * @date 2020/6/8 9:25 - */ - @PostMapping(value = "news/epdc-app/psychology/submitAnswer", consumes = MediaType.APPLICATION_JSON_VALUE) - Result submitAnswer(@RequestBody PsychologySubmitAnswerFormDTO fromDTO); - -} diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/WorkPropertyFeignClient.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/WorkPropertyFeignClient.java index a4bcc77..8de3cb6 100644 --- a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/WorkPropertyFeignClient.java +++ b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/WorkPropertyFeignClient.java @@ -3,7 +3,11 @@ package com.elink.esua.epdc.feign; import com.elink.esua.epdc.commons.tools.constant.ServiceConstant; import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.config.FeignRequestInterceptor; +import com.elink.esua.epdc.dto.conflict.form.ConflictMediateDetailFormDTO; import com.elink.esua.epdc.dto.conflict.form.ConflictMediateFormDTO; +import com.elink.esua.epdc.dto.conflict.form.ConflictMediateHistoryFormDTO; +import com.elink.esua.epdc.dto.conflict.result.ConflictMediateDetailResultDTO; +import com.elink.esua.epdc.dto.conflict.result.ConflictMediateHistoryResultDTO; import com.elink.esua.epdc.dto.psychology.form.PsychologyAnswerFormDTO; import com.elink.esua.epdc.dto.psychology.form.PsychologySubmitAnswerFormDTO; import com.elink.esua.epdc.dto.psychology.form.PsychologyUnansweredFormDTO; @@ -47,6 +51,36 @@ public interface WorkPropertyFeignClient { @GetMapping(value = "news/epdc-app/psychology/listMyQuestion", consumes = MediaType.APPLICATION_JSON_VALUE) Result> listMyQuestion(@RequestBody PsychologyAnswerFormDTO fromDTO); + /*** + * 工作端--待解答的心理咨询问题列表 + * @param fromDTO + * @return com.elink.esua.epdc.commons.tools.utils.Result < PsychologyAnswerListResultDTO > + * @author zhangyuan + * @date 2020/6/8 9:25 + */ + @PostMapping(value = "news/epdc-app/psychology/submitAnswer", consumes = MediaType.APPLICATION_JSON_VALUE) + Result submitAnswer(@RequestBody PsychologySubmitAnswerFormDTO fromDTO); + + /*** + * 工作端--矛盾纠纷历史上报列表 + * @param fromDTO + * @return com.elink.esua.epdc.commons.tools.utils.Result < ConflictMediateHistoryResultDTO > + * @author zhangyuan + * @date 2020/6/8 9:25 + */ + @GetMapping(value = "news/epdc-app/conflict/listHistory", consumes = MediaType.APPLICATION_JSON_VALUE) + Result> listHistory(@RequestBody ConflictMediateHistoryFormDTO fromDTO); + + /*** + * 工作端--矛盾调解 详情 + * @param fromDTO + * @return com.elink.esua.epdc.commons.tools.utils.Result < ConflictMediateDetailResultDTO > + * @author zhangyuan + * @date 2020/6/8 9:25 + */ + @GetMapping(value = "news/epdc-app/conflict/getById", consumes = MediaType.APPLICATION_JSON_VALUE) + Result getById(@RequestBody ConflictMediateDetailFormDTO fromDTO); + /*** * 工作端--矛盾纠纷提交 * @param fromDTO @@ -54,7 +88,6 @@ public interface WorkPropertyFeignClient { * @author zhangyuan * @date 2020/6/8 9:25 */ - @PostMapping(value = "news/epdc-app/conflictmediate/submit", consumes = MediaType.APPLICATION_JSON_VALUE) + @PostMapping(value = "news/epdc-app/conflict/submit", consumes = MediaType.APPLICATION_JSON_VALUE) Result submit(@RequestBody ConflictMediateFormDTO fromDTO); - } diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/fallback/WorkConflictFeignClientFallback.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/fallback/WorkConflictFeignClientFallback.java deleted file mode 100644 index 083f485..0000000 --- a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/fallback/WorkConflictFeignClientFallback.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.elink.esua.epdc.feign.fallback; - -import com.elink.esua.epdc.commons.tools.constant.ServiceConstant; -import com.elink.esua.epdc.commons.tools.utils.ModuleUtils; -import com.elink.esua.epdc.commons.tools.utils.Result; -import com.elink.esua.epdc.dto.psychology.form.PsychologyAnswerFormDTO; -import com.elink.esua.epdc.dto.psychology.form.PsychologySubmitAnswerFormDTO; -import com.elink.esua.epdc.dto.psychology.form.PsychologyUnansweredFormDTO; -import com.elink.esua.epdc.dto.psychology.result.PsychologyAnswerOfMineResultDTO; -import com.elink.esua.epdc.dto.psychology.result.PsychologyUnansweredResultDTO; -import com.elink.esua.epdc.feign.WorkConflictFeignClient; -import com.elink.esua.epdc.feign.WorkPropertyFeignClient; -import org.springframework.stereotype.Component; - -import java.util.List; - -/** - * @Author zhangyuan - * @Date 2020/6/9 16:39 - */ -@Component -public class WorkConflictFeignClientFallback implements WorkConflictFeignClient { - - @Override - public Result> listUnansweredQuestion(PsychologyUnansweredFormDTO formDto) { - return ModuleUtils.feignConError(ServiceConstant.EPDC_PROPERTY_SERVER, "listUnansweredQuestion", formDto); - } - - @Override - public Result> listMyQuestion(PsychologyAnswerFormDTO formDto) { - return ModuleUtils.feignConError(ServiceConstant.EPDC_PROPERTY_SERVER, "listMyQuestion", formDto); - } - - @Override - public Result submitAnswer(PsychologySubmitAnswerFormDTO formDto) { - return ModuleUtils.feignConError(ServiceConstant.EPDC_PROPERTY_SERVER, "submitAnswer", formDto); - } - -} diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/fallback/WorkPropertyFeignClientFallback.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/fallback/WorkPropertyFeignClientFallback.java index 03e9010..3307f13 100644 --- a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/fallback/WorkPropertyFeignClientFallback.java +++ b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/fallback/WorkPropertyFeignClientFallback.java @@ -3,7 +3,11 @@ package com.elink.esua.epdc.feign.fallback; import com.elink.esua.epdc.commons.tools.constant.ServiceConstant; import com.elink.esua.epdc.commons.tools.utils.ModuleUtils; import com.elink.esua.epdc.commons.tools.utils.Result; +import com.elink.esua.epdc.dto.conflict.form.ConflictMediateDetailFormDTO; import com.elink.esua.epdc.dto.conflict.form.ConflictMediateFormDTO; +import com.elink.esua.epdc.dto.conflict.form.ConflictMediateHistoryFormDTO; +import com.elink.esua.epdc.dto.conflict.result.ConflictMediateDetailResultDTO; +import com.elink.esua.epdc.dto.conflict.result.ConflictMediateHistoryResultDTO; import com.elink.esua.epdc.dto.psychology.form.PsychologyAnswerFormDTO; import com.elink.esua.epdc.dto.psychology.form.PsychologySubmitAnswerFormDTO; import com.elink.esua.epdc.dto.psychology.form.PsychologyUnansweredFormDTO; @@ -31,9 +35,23 @@ public class WorkPropertyFeignClientFallback implements WorkPropertyFeignClient return ModuleUtils.feignConError(ServiceConstant.EPDC_PROPERTY_SERVER, "listMyQuestion", formDto); } + @Override + public Result submitAnswer(PsychologySubmitAnswerFormDTO formDto) { + return ModuleUtils.feignConError(ServiceConstant.EPDC_PROPERTY_SERVER, "submitAnswer", formDto); + } + + @Override + public Result> listHistory(ConflictMediateHistoryFormDTO formDto) { + return ModuleUtils.feignConError(ServiceConstant.EPDC_PROPERTY_SERVER, "listHistory", formDto); + } + + @Override + public Result getById(ConflictMediateDetailFormDTO formDto) { + return ModuleUtils.feignConError(ServiceConstant.EPDC_PROPERTY_SERVER, "getById", formDto); + } + @Override public Result submit(ConflictMediateFormDTO formDto) { return ModuleUtils.feignConError(ServiceConstant.EPDC_PROPERTY_SERVER, "submit", formDto); } - } diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/WorkConflictService.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/WorkConflictService.java deleted file mode 100644 index 6ba6ae3..0000000 --- a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/WorkConflictService.java +++ /dev/null @@ -1,52 +0,0 @@ -package com.elink.esua.epdc.service; - -import com.elink.esua.epdc.commons.tools.utils.Result; -import com.elink.esua.epdc.dto.conflict.form.ConflictMediateFormDTO; -import com.elink.esua.epdc.dto.psychology.form.PsychologyAnswerFormDTO; -import com.elink.esua.epdc.dto.psychology.form.PsychologySubmitAnswerFormDTO; -import com.elink.esua.epdc.dto.psychology.form.PsychologyUnansweredFormDTO; -import com.elink.esua.epdc.dto.psychology.result.PsychologyAnswerOfMineResultDTO; -import com.elink.esua.epdc.dto.psychology.result.PsychologyUnansweredResultDTO; - -import java.util.List; - - -/** - * @author: zhangyuan - * @Date: 2020/5/12 13:21 - * @Description: 心理咨询 - */ -public interface WorkConflictService { - - /** - * 工作端--待解答的心理咨询问题列表 - * - * @param formDto 查询参数 - * @return com.elink.esua.epdc.commons.tools.utils.Result> - * @author zhangyuan - * @date 2020/6/8 09:15 - */ - Result> listUnansweredQuestion(PsychologyUnansweredFormDTO formDto); - - /** - * 工作端--心理咨询-我回答的问题列表 - * - * @param formDto 查询参数 - * @return com.elink.esua.epdc.commons.tools.utils.Result> - * @author zhangyuan - * @date 2020/6/8 09:15 - */ - Result> listMyQuestion(PsychologyAnswerFormDTO formDto); - - - /** - * 工作端--矛盾纠纷提交 - * - * @param formDto 参数 - * @return com.elink.esua.epdc.commons.tools.utils.Result - * @author zhangyuan - * @date 2020/6/8 09:15 - */ - Result submit(ConflictMediateFormDTO formDto); - -} diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/WorkPropertyService.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/WorkPropertyService.java index 2bd6a0e..35fcd3d 100644 --- a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/WorkPropertyService.java +++ b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/WorkPropertyService.java @@ -1,6 +1,11 @@ package com.elink.esua.epdc.service; import com.elink.esua.epdc.commons.tools.utils.Result; +import com.elink.esua.epdc.dto.conflict.form.ConflictMediateDetailFormDTO; +import com.elink.esua.epdc.dto.conflict.form.ConflictMediateFormDTO; +import com.elink.esua.epdc.dto.conflict.form.ConflictMediateHistoryFormDTO; +import com.elink.esua.epdc.dto.conflict.result.ConflictMediateDetailResultDTO; +import com.elink.esua.epdc.dto.conflict.result.ConflictMediateHistoryResultDTO; import com.elink.esua.epdc.dto.psychology.form.PsychologyAnswerFormDTO; import com.elink.esua.epdc.dto.psychology.form.PsychologySubmitAnswerFormDTO; import com.elink.esua.epdc.dto.psychology.form.PsychologyUnansweredFormDTO; @@ -37,7 +42,6 @@ public interface WorkPropertyService { */ Result> listMyQuestion(PsychologyAnswerFormDTO formDto); - /** * 工作端--心理咨询-我回答的问题列表 * @@ -48,4 +52,34 @@ public interface WorkPropertyService { */ Result submitAnswer(PsychologySubmitAnswerFormDTO formDto); + /** + * 工作端--矛盾纠纷历史上报列表 + * + * @param formDto 查询参数 + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author zhangyuan + * @date 2020/6/8 09:15 + */ + Result> listHistory(ConflictMediateHistoryFormDTO formDto); + + /** + * 工作端--矛盾调解 详情 + * + * @param formDto 查询参数 + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author zhangyuan + * @date 2020/6/8 09:15 + */ + Result getById(ConflictMediateDetailFormDTO formDto); + + /** + * 工作端--矛盾纠纷提交 + * + * @param formDto 参数 + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @author zhangyuan + * @date 2020/6/8 09:15 + */ + Result submit(ConflictMediateFormDTO formDto); + } diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/impl/WorkConflictServiceImpl.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/impl/WorkConflictServiceImpl.java deleted file mode 100644 index 8c5319f..0000000 --- a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/impl/WorkConflictServiceImpl.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.elink.esua.epdc.service.impl; - -import com.elink.esua.epdc.commons.tools.utils.Result; -import com.elink.esua.epdc.dto.conflict.form.ConflictMediateFormDTO; -import com.elink.esua.epdc.dto.psychology.form.PsychologyAnswerFormDTO; -import com.elink.esua.epdc.dto.psychology.form.PsychologyUnansweredFormDTO; -import com.elink.esua.epdc.dto.psychology.result.PsychologyAnswerOfMineResultDTO; -import com.elink.esua.epdc.dto.psychology.result.PsychologyUnansweredResultDTO; -import com.elink.esua.epdc.feign.WorkPropertyFeignClient; -import com.elink.esua.epdc.service.WorkConflictService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.util.List; - - -/** - * @author: zhangyuan - * @Date: 2020/6/9 13:23 - * @Description: 心理咨询 - */ -@Service -public class WorkConflictServiceImpl implements WorkConflictService { - - @Autowired - private WorkPropertyFeignClient workPropertyFeignClient; - - @Override - public Result> listUnansweredQuestion(PsychologyUnansweredFormDTO formDto) { - - return workPropertyFeignClient.listUnansweredQuestion(formDto); - } - - @Override - public Result> listMyQuestion(PsychologyAnswerFormDTO formDto) { - - return workPropertyFeignClient.listMyQuestion(formDto); - } - - @Override - public Result submit(ConflictMediateFormDTO formDto) { - - return workPropertyFeignClient.submit(formDto); - } - -} diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/impl/WorkPropertyServiceImpl.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/impl/WorkPropertyServiceImpl.java index a7aa27c..05312eb 100644 --- a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/impl/WorkPropertyServiceImpl.java +++ b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/impl/WorkPropertyServiceImpl.java @@ -1,6 +1,11 @@ package com.elink.esua.epdc.service.impl; import com.elink.esua.epdc.commons.tools.utils.Result; +import com.elink.esua.epdc.dto.conflict.form.ConflictMediateDetailFormDTO; +import com.elink.esua.epdc.dto.conflict.form.ConflictMediateFormDTO; +import com.elink.esua.epdc.dto.conflict.form.ConflictMediateHistoryFormDTO; +import com.elink.esua.epdc.dto.conflict.result.ConflictMediateDetailResultDTO; +import com.elink.esua.epdc.dto.conflict.result.ConflictMediateHistoryResultDTO; import com.elink.esua.epdc.dto.psychology.form.PsychologyAnswerFormDTO; import com.elink.esua.epdc.dto.psychology.form.PsychologySubmitAnswerFormDTO; import com.elink.esua.epdc.dto.psychology.form.PsychologyUnansweredFormDTO; @@ -40,7 +45,24 @@ public class WorkPropertyServiceImpl implements WorkPropertyService { @Override public Result submitAnswer(PsychologySubmitAnswerFormDTO formDto) { - return workPropertyFeignClient.submit(formDto); + return workPropertyFeignClient.submitAnswer(formDto); } + @Override + public Result> listHistory(ConflictMediateHistoryFormDTO formDto) { + + return workPropertyFeignClient.listHistory(formDto); + } + + @Override + public Result getById(ConflictMediateDetailFormDTO formDto) { + + return workPropertyFeignClient.getById(formDto); + } + + @Override + public Result submit(ConflictMediateFormDTO formDto) { + + return workPropertyFeignClient.submit(formDto); + } }