工作端--矛盾纠纷历史上报列表,工作端--矛盾调解 详情 app接口

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.conflict.form.ConflictMediateHistoryFormDTO;
-import com.elink.esua.epdc.dto.psychology.result.*;
+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")
+    @GetMapping("listHistory")
-//    public Result<List<PsychologistResultDTO>> listPsychiatrist(@RequestBody PsychologistFormDTO formDto) throws Exception {
+    public Result<List<ConflictMediateHistoryResultDTO>> listHistory(@RequestBody ConflictMediateHistoryFormDTO formDto) throws Exception {
-//        //效验数据
+        //效验数据
-//        ValidatorUtils.validateEntity(formDto, AddGroup.class, DefaultGroup.class);
+        ValidatorUtils.validateEntity(formDto, AddGroup.class, DefaultGroup.class);
-//        List<PsychologistResultDTO> list = psychologistService.listPsychiatrist(formDto);
+        List<ConflictMediateHistoryResultDTO> list = conflictMediateService.listHistory(formDto);
-//        return new Result<List<PsychologistResultDTO>>().ok(list);
+        return new Result<List<ConflictMediateHistoryResultDTO>>().ok(list);
-//    }
+    }
+
+    @GetMapping("getById")
+    public Result<ConflictMediateDetailResultDTO> getById(@RequestBody ConflictMediateDetailFormDTO formDto) throws Exception {
+        //效验数据
+        ValidatorUtils.validateEntity(formDto, AddGroup.class, DefaultGroup.class);
+        ConflictMediateDetailResultDTO data = conflictMediateService.getById(formDto);
+        return new Result<ConflictMediateDetailResultDTO>().ok(data);
+    }
 
     @PostMapping("submit")
     public Result submit(@RequestBody ConflictMediateFormDTO formDto) throws Exception {

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;
+
 /**
  * 矛盾纠纷调解情况
  *
@@ -30,4 +34,23 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface ConflictMediateDao extends BaseDao<ConflictMediateEntity> {
 
+    /**
+     * 工作端--矛盾纠纷历史上报列表
+     *
+     * @return java.util.List<com.elink.esua.epdc.modules.psychology.entity.PsychologistEntity>
+     * @params [params]
+     * @author zhangyuan
+     * @since 2020/5/21 14:54
+     */
+    List<ConflictMediateEntity> 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);
 }

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<ConflictMediateEntit
      *
      * @param dto
      * @return void
-     * @author generator
+     * @author zhangyuan
      * @date 2020-06-10
      */
     void submit(ConflictMediateFormDTO dto);
 
+    /**
+     * 工作端--矛盾纠纷历史上报列表
+     *
+     * @param dto
+     * @return void
+     * @author zhangyuan
+     * @date 2020-06-10
+     */
+    List<ConflictMediateHistoryResultDTO> listHistory(ConflictMediateHistoryFormDTO dto);
+
+    /**
+     * 工作端--矛盾调解 详情
+     *
+     * @param dto
+     * @return void
+     * @author zhangyuan
+     * @date 2020-06-10
+     */
+    ConflictMediateDetailResultDTO getById(ConflictMediateDetailFormDTO dto);
 }

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;
@@ -108,4 +112,18 @@ public class ConflictMediateServiceImpl extends BaseServiceImpl<ConflictMediateD
         ConflictMediateEntity entity = ConvertUtils.sourceToTarget(dto, ConflictMediateEntity.class);
         insert(entity);
     }
+
+    @Override
+    public List<ConflictMediateHistoryResultDTO> listHistory(ConflictMediateHistoryFormDTO dto) {
+        // sql limit条件转换
+        dto.setPageIndex((dto.getPageIndex() - 1) * dto.getPageSize());
+        List<ConflictMediateEntity> 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);
+    }
 }

epdc-cloud-property/src/main/resources/mapper/conflict/ConflictMediateDao.xml

@@ -23,6 +23,29 @@
         <result property="updatedBy" column="UPDATED_BY"/>
         <result property="updatedTime" column="UPDATED_TIME"/>
     </resultMap>
-
+    <sql id="Base_Column_List">
-
+        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
+    </sql>
+    <select id="listConflictMediate" resultType="com.elink.esua.epdc.modules.conflict.entity.ConflictMediateEntity">
+        SELECT
+        <include refid="Base_Column_List"/>
+        FROM
+        epdc_conflict_mediate
+        WHERE
+        DEL_FLAG = '0'
+        ORDER BY
+        CREATED_TIME DESC
+        LIMIT #{pageIndex},  #{pageSize};
+    </select>
+    <select id="getById" resultType="com.elink.esua.epdc.modules.conflict.entity.ConflictMediateEntity">
+        SELECT
+        <include refid="Base_Column_List"/>
+        FROM
+        epdc_conflict_mediate
+        WHERE
+        DEL_FLAG = '0'
+        AND ID = #{conflictId}
+    </select>
 </mapper>