From 0d255b339e2c09e0a791f7aae9c33ddae9d9e178 Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Wed, 10 Jun 2020 13:34:42 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E7=AB=AF--=E7=9F=9B=E7=9B=BE?= =?UTF-8?q?=E7=BA=A0=E7=BA=B7=E5=8E=86=E5=8F=B2=E4=B8=8A=E6=8A=A5=E5=88=97?= =?UTF-8?q?=E8=A1=A8,=E5=B7=A5=E4=BD=9C=E7=AB=AF--=E7=9F=9B=E7=9B=BE?= =?UTF-8?q?=E8=B0=83=E8=A7=A3=C2=A0=E8=AF=A6=E6=83=85=20app=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/AppConflictController.java | 31 ++++++++++++------- .../conflict/dao/ConflictMediateDao.java | 25 ++++++++++++++- .../service/ConflictMediateService.java | 25 ++++++++++++++- .../impl/ConflictMediateServiceImpl.java | 26 +++++++++++++--- .../mapper/conflict/ConflictMediateDao.xml | 27 ++++++++++++++-- 5 files changed, 114 insertions(+), 20 deletions(-) diff --git a/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/conflict/controller/AppConflictController.java b/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/conflict/controller/AppConflictController.java index 4488fa6..a1e9e5f 100644 --- a/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/conflict/controller/AppConflictController.java +++ b/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/conflict/controller/AppConflictController.java @@ -24,13 +24,12 @@ import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils; import com.elink.esua.epdc.commons.tools.validator.group.AddGroup; import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup; +import com.elink.esua.epdc.dto.conflict.form.ConflictMediateDetailFormDTO; import com.elink.esua.epdc.dto.conflict.form.ConflictMediateFormDTO; -import com.elink.esua.epdc.dto.psychology.form.*; -import com.elink.esua.epdc.dto.psychology.result.*; +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.modules.conflict.service.ConflictMediateService; -import com.elink.esua.epdc.modules.psychology.service.PsychologistService; -import com.elink.esua.epdc.modules.psychology.service.PsychologyAnswerService; -import com.elink.esua.epdc.modules.psychology.service.PsychologyQuestionService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -50,13 +49,21 @@ public class AppConflictController { @Autowired private ConflictMediateService conflictMediateService; -// @GetMapping("listPsychiatrist") -// public Result> listPsychiatrist(@RequestBody PsychologistFormDTO formDto) throws Exception { -// //效验数据 -// ValidatorUtils.validateEntity(formDto, AddGroup.class, DefaultGroup.class); -// List list = psychologistService.listPsychiatrist(formDto); -// return new Result>().ok(list); -// } + @GetMapping("listHistory") + public Result> listHistory(@RequestBody ConflictMediateHistoryFormDTO formDto) throws Exception { + //效验数据 + ValidatorUtils.validateEntity(formDto, AddGroup.class, DefaultGroup.class); + List list = conflictMediateService.listHistory(formDto); + return new Result>().ok(list); + } + + @GetMapping("getById") + public Result getById(@RequestBody ConflictMediateDetailFormDTO formDto) throws Exception { + //效验数据 + ValidatorUtils.validateEntity(formDto, AddGroup.class, DefaultGroup.class); + ConflictMediateDetailResultDTO data = conflictMediateService.getById(formDto); + return new Result().ok(data); + } @PostMapping("submit") public Result submit(@RequestBody ConflictMediateFormDTO formDto) throws Exception { diff --git a/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/conflict/dao/ConflictMediateDao.java b/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/conflict/dao/ConflictMediateDao.java index df0ae71..5b50b82 100644 --- a/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/conflict/dao/ConflictMediateDao.java +++ b/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/conflict/dao/ConflictMediateDao.java @@ -18,9 +18,13 @@ package com.elink.esua.epdc.modules.conflict.dao; import com.elink.esua.epdc.commons.mybatis.dao.BaseDao; +import com.elink.esua.epdc.dto.conflict.form.ConflictMediateDetailFormDTO; +import com.elink.esua.epdc.dto.conflict.form.ConflictMediateHistoryFormDTO; import com.elink.esua.epdc.modules.conflict.entity.ConflictMediateEntity; import org.apache.ibatis.annotations.Mapper; +import java.util.List; + /** * 矛盾纠纷调解情况 * @@ -29,5 +33,24 @@ import org.apache.ibatis.annotations.Mapper; */ @Mapper public interface ConflictMediateDao extends BaseDao { - + + /** + * 工作端--矛盾纠纷历史上报列表 + * + * @return java.util.List + * @params [params] + * @author zhangyuan + * @since 2020/5/21 14:54 + */ + List listConflictMediate(ConflictMediateHistoryFormDTO dto); + + /** + * 工作端--矛盾调解 详情 + * + * @return com.elink.esua.epdc.modules.psychology.entity.ConflictMediateDetailResultDTO + * @params [params] + * @author zhangyuan + * @since 2020/5/21 14:54 + */ + ConflictMediateEntity getById(ConflictMediateDetailFormDTO dto); } \ No newline at end of file diff --git a/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/conflict/service/ConflictMediateService.java b/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/conflict/service/ConflictMediateService.java index cf54c82..94061fb 100644 --- a/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/conflict/service/ConflictMediateService.java +++ b/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/conflict/service/ConflictMediateService.java @@ -20,7 +20,11 @@ package com.elink.esua.epdc.modules.conflict.service; import com.elink.esua.epdc.commons.mybatis.service.BaseService; import com.elink.esua.epdc.commons.tools.page.PageData; import com.elink.esua.epdc.dto.conflict.ConflictMediateDTO; +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.modules.conflict.entity.ConflictMediateEntity; import java.util.List; @@ -99,9 +103,28 @@ public interface ConflictMediateService extends BaseService listHistory(ConflictMediateHistoryFormDTO dto); + + /** + * 工作端--矛盾调解 详情 + * + * @param dto + * @return void + * @author zhangyuan + * @date 2020-06-10 + */ + ConflictMediateDetailResultDTO getById(ConflictMediateDetailFormDTO dto); } \ No newline at end of file diff --git a/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/conflict/service/impl/ConflictMediateServiceImpl.java b/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/conflict/service/impl/ConflictMediateServiceImpl.java index a4acd82..c0c250d 100644 --- a/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/conflict/service/impl/ConflictMediateServiceImpl.java +++ b/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/conflict/service/impl/ConflictMediateServiceImpl.java @@ -20,12 +20,16 @@ package com.elink.esua.epdc.modules.conflict.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl; +import com.elink.esua.epdc.commons.tools.constant.FieldConstant; import com.elink.esua.epdc.commons.tools.page.PageData; import com.elink.esua.epdc.commons.tools.utils.ConvertUtils; -import com.elink.esua.epdc.commons.tools.constant.FieldConstant; +import com.elink.esua.epdc.dto.conflict.ConflictMediateDTO; +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.modules.conflict.dao.ConflictMediateDao; -import com.elink.esua.epdc.dto.conflict.ConflictMediateDTO; import com.elink.esua.epdc.modules.conflict.entity.ConflictMediateEntity; import com.elink.esua.epdc.modules.conflict.redis.ConflictMediateRedis; import com.elink.esua.epdc.modules.conflict.service.ConflictMediateService; @@ -66,8 +70,8 @@ public class ConflictMediateServiceImpl extends BaseServiceImpl getWrapper(Map params){ - String id = (String)params.get(FieldConstant.ID_HUMP); + private QueryWrapper getWrapper(Map params) { + String id = (String) params.get(FieldConstant.ID_HUMP); QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); @@ -108,4 +112,18 @@ public class ConflictMediateServiceImpl extends BaseServiceImpl listHistory(ConflictMediateHistoryFormDTO dto) { + // sql limit条件转换 + dto.setPageIndex((dto.getPageIndex() - 1) * dto.getPageSize()); + List entity = baseDao.listConflictMediate(dto); + return ConvertUtils.sourceToTarget(entity, ConflictMediateHistoryResultDTO.class); + } + + @Override + public ConflictMediateDetailResultDTO getById(ConflictMediateDetailFormDTO dto) { + ConflictMediateEntity entity = baseDao.getById(dto); + return ConvertUtils.sourceToTarget(entity, ConflictMediateDetailResultDTO.class); + } } \ No newline at end of file diff --git a/epdc-cloud-property/src/main/resources/mapper/conflict/ConflictMediateDao.xml b/epdc-cloud-property/src/main/resources/mapper/conflict/ConflictMediateDao.xml index 51d279b..136f921 100644 --- a/epdc-cloud-property/src/main/resources/mapper/conflict/ConflictMediateDao.xml +++ b/epdc-cloud-property/src/main/resources/mapper/conflict/ConflictMediateDao.xml @@ -23,6 +23,29 @@ - - + + ID, USER_ID, CONFLICT_TYPE, CONFLICT_REASON, INVOLVED_NUM, MAINSTAY_LEADER, RESPONSIBLE_DEPT, + RESPONSIBLE_PEOPLE, MAJOR_MEASURES, CURRENT_SITUATION, REMARK, SUBMIT_TIME, + DEL_FLAG, CREATED_BY, CREATED_TIME, UPDATED_BY, UPDATED_TIME + + + \ No newline at end of file