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 a1e9e5f..97e43c0 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
@@ -18,13 +18,8 @@
 package com.elink.esua.epdc.modules.conflict.controller;
 
 import com.elink.esua.epdc.commons.tools.constant.Constant;
-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;
 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.conflict.form.ConflictMediateHistoryFormDTO;
 import com.elink.esua.epdc.dto.conflict.result.ConflictMediateDetailResultDTO;
@@ -49,26 +44,47 @@ public class AppConflictController {
     @Autowired
     private ConflictMediateService conflictMediateService;
 
+    /**
+     * 工作端 - 综治矛调提报记录
+     *
+     * @param formDto
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List < com.elink.esua.epdc.dto.conflict.result.ConflictMediateHistoryResultDTO>>
+     * @author work@yujt.net.cn
+     * @date 2020/6/11 15:07
+     */
     @GetMapping("listHistory")
-    public Result<List<ConflictMediateHistoryResultDTO>> listHistory(@RequestBody ConflictMediateHistoryFormDTO formDto) throws Exception {
-        //效验数据
-        ValidatorUtils.validateEntity(formDto, AddGroup.class, DefaultGroup.class);
+    public Result<List<ConflictMediateHistoryResultDTO>> listHistory(@RequestBody ConflictMediateHistoryFormDTO formDto) {
+        // 效验数据
+        ValidatorUtils.validateEntity(formDto);
         List<ConflictMediateHistoryResultDTO> list = conflictMediateService.listHistory(formDto);
         return new Result<List<ConflictMediateHistoryResultDTO>>().ok(list);
     }
 
-    @GetMapping("getById")
-    public Result<ConflictMediateDetailResultDTO> getById(@RequestBody ConflictMediateDetailFormDTO formDto) throws Exception {
+    /**
+     * 工作端 - 获取综治矛调详细信息
+     *
+     * @param conflictId
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.conflict.result.ConflictMediateDetailResultDTO>
+     * @author work@yujt.net.cn
+     * @date 2020/6/11 15:07
+     */
+    @GetMapping("getById/{conflictId}")
+    public Result<ConflictMediateDetailResultDTO> getById(@PathVariable("conflictId") String conflictId) {
         //效验数据
-        ValidatorUtils.validateEntity(formDto, AddGroup.class, DefaultGroup.class);
-        ConflictMediateDetailResultDTO data = conflictMediateService.getById(formDto);
+        ConflictMediateDetailResultDTO data = conflictMediateService.getById(conflictId);
         return new Result<ConflictMediateDetailResultDTO>().ok(data);
     }
 
+    /**
+     * 工作端 - 综治矛调提报
+     *
+     * @param formDto
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
+     * @author work@yujt.net.cn
+     * @date 2020/6/11 15:06
+     */
     @PostMapping("submit")
-    public Result submit(@RequestBody ConflictMediateFormDTO formDto) throws Exception {
-        UserDetail user = SecurityUser.getUser();
-        formDto.setUserId(user.getId());
+    public Result submit(@RequestBody ConflictMediateFormDTO formDto) {
         conflictMediateService.submit(formDto);
         return new Result();
     }
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 cbdc574..fcc5dcf 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,8 +18,8 @@
 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.dto.conflict.result.ConflictMediateHistoryResultDTO;
 import com.elink.esua.epdc.modules.conflict.entity.ConflictMediateEntity;
 import org.apache.ibatis.annotations.Mapper;
 
@@ -53,15 +53,6 @@ public interface ConflictMediateDao extends BaseDao<ConflictMediateEntity> {
      * @author zhangyuan
      * @since 2020/5/21 14:54
      */
-    List<ConflictMediateEntity> listConflictMediate(ConflictMediateHistoryFormDTO dto);
+    List<ConflictMediateHistoryResultDTO> 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/entity/ConflictMediateEntity.java b/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/conflict/entity/ConflictMediateEntity.java
index 16de7ff..9804559 100644
--- a/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/conflict/entity/ConflictMediateEntity.java
+++ b/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/conflict/entity/ConflictMediateEntity.java
@@ -35,7 +35,7 @@ import java.util.Date;
 @TableName("epdc_conflict_mediate")
 public class ConflictMediateEntity extends DeptScope {
 
-	private static final long serialVersionUID = 1L;
+	private static final long serialVersionUID = 4325729627079127823L;
 
     /**
      * 提交人ID
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 468d8eb..c26b603 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,6 @@ 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;
@@ -131,10 +130,10 @@ public interface ConflictMediateService extends BaseService<ConflictMediateEntit
     /**
      * 工作端--矛盾调解 详情
      *
-     * @param dto
+     * @param conflictId
      * @return void
      * @author zhangyuan
      * @date 2020-06-10
      */
-    ConflictMediateDetailResultDTO getById(ConflictMediateDetailFormDTO dto);
+    ConflictMediateDetailResultDTO getById(String conflictId);
 }
\ 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 30df82e..a16c2d9 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
@@ -22,15 +22,16 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl;
 import com.elink.esua.epdc.commons.mybatis.utils.DeptEntityUtils;
 import com.elink.esua.epdc.commons.tools.constant.FieldConstant;
+import com.elink.esua.epdc.commons.tools.constant.NumConstant;
 import com.elink.esua.epdc.commons.tools.exception.RenException;
 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.ConvertUtils;
+import com.elink.esua.epdc.commons.tools.utils.DateUtils;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dto.ParentAndAllDeptDTO;
 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;
@@ -83,7 +84,7 @@ public class ConflictMediateServiceImpl extends BaseServiceImpl<ConflictMediateD
     public List<ConflictMediateDTO> export(Map<String, Object> params) {
         List<ConflictMediateEntity> entityList = baseDao.selectList(getWrapper(params));
         for (int i = 0; i < entityList.size(); i++) {
-            entityList.get(i).setId(i+1+"");
+            entityList.get(i).setId(i + 1 + "");
         }
         return ConvertUtils.sourceToTarget(entityList, ConflictMediateDTO.class);
     }
@@ -128,31 +129,40 @@ public class ConflictMediateServiceImpl extends BaseServiceImpl<ConflictMediateD
     @Transactional(rollbackFor = Exception.class)
     public void submit(ConflictMediateFormDTO dto) {
         UserDetail user = SecurityUser.getUser();
-        ConflictMediateEntity entity = ConvertUtils.sourceToTarget(dto, ConflictMediateEntity.class);
-        if (user != null) {
-            entity.setUserName(user.getRealName());
-            ParentAndAllDeptDTO parentAndAllDeptDTO = getParentAndAllDeptDTO(user.getDeptId().toString());
-            // 保存机构，及其他冗余字段。
-            DeptEntityUtils.loadDeptInfo(
-                    ConvertUtils.sourceToTarget(parentAndAllDeptDTO, DeptEntityUtils.DeptDto.class),
-                    entity
-            );
+        if (null == user) {
+            throw new RenException("获取用户信息失败");
         }
+        ConflictMediateEntity entity = ConvertUtils.sourceToTarget(dto, ConflictMediateEntity.class);
+        entity.setUserId(user.getId());
+        entity.setUserName(user.getRealName());
+        entity.setSubmitTime(DateUtils.parse(dto.getSubmitTime(), DateUtils.DATE_PATTERN));
+        ParentAndAllDeptDTO parentAndAllDeptDTO = getParentAndAllDeptDTO(user.getDeptId().toString());
+        // 保存机构，及其他冗余字段。
+        DeptEntityUtils.loadDeptInfo(
+                ConvertUtils.sourceToTarget(parentAndAllDeptDTO, DeptEntityUtils.DeptDto.class),
+                entity
+        );
         insert(entity);
     }
 
     @Override
     public List<ConflictMediateHistoryResultDTO> listHistory(ConflictMediateHistoryFormDTO dto) {
+        UserDetail user = SecurityUser.getUser();
+        if (null == user) {
+            throw new RenException("获取用户信息失败");
+        }
         // sql limit条件转换
-        dto.setPageIndex((dto.getPageIndex() - 1) * dto.getPageSize());
-        List<ConflictMediateEntity> entity = baseDao.listConflictMediate(dto);
-        return ConvertUtils.sourceToTarget(entity, ConflictMediateHistoryResultDTO.class);
+        dto.setPageIndex((dto.getPageIndex() - NumConstant.ONE) * dto.getPageSize());
+        dto.setUserId(String.valueOf(user.getId()));
+        return baseDao.listConflictMediate(dto);
     }
 
     @Override
-    public ConflictMediateDetailResultDTO getById(ConflictMediateDetailFormDTO dto) {
-        ConflictMediateEntity entity = baseDao.getById(dto);
-        return ConvertUtils.sourceToTarget(entity, ConflictMediateDetailResultDTO.class);
+    public ConflictMediateDetailResultDTO getById(String conflictId) {
+        ConflictMediateEntity conflictMediateEntity = this.baseDao.selectById(conflictId);
+        ConflictMediateDetailResultDTO resultDto = ConvertUtils.sourceToTarget(conflictMediateEntity, ConflictMediateDetailResultDTO.class);
+        resultDto.setSubmitTime(DateUtils.format(conflictMediateEntity.getSubmitTime(), DateUtils.DATE_PATTERN));
+        return resultDto;
     }
 
     /**
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 c318983..7692f46 100644
--- a/epdc-cloud-property/src/main/resources/mapper/conflict/ConflictMediateDao.xml
+++ b/epdc-cloud-property/src/main/resources/mapper/conflict/ConflictMediateDao.xml
@@ -3,34 +3,9 @@
 
 <mapper namespace="com.elink.esua.epdc.modules.conflict.dao.ConflictMediateDao">
 
-    <resultMap type="com.elink.esua.epdc.modules.conflict.entity.ConflictMediateEntity" id="conflictMediateMap">
-        <result property="id" column="ID"/>
-        <result property="userId" column="USER_ID"/>
-        <result property="userName" column="USER_NAME"/>
-        <result property="conflictType" column="CONFLICT_TYPE"/>
-        <result property="conflictReason" column="CONFLICT_REASON"/>
-        <result property="involvedNum" column="INVOLVED_NUM"/>
-        <result property="mainstayLeader" column="MAINSTAY_LEADER"/>
-        <result property="responsibleDept" column="RESPONSIBLE_DEPT"/>
-        <result property="responsiblePeople" column="RESPONSIBLE_PEOPLE"/>
-        <result property="majorMeasures" column="MAJOR_MEASURES"/>
-        <result property="currentSituation" column="CURRENT_SITUATION"/>
-        <result property="remark" column="REMARK"/>
-        <result property="submitTime" column="SUBMIT_TIME"/>
-        <result property="delFlag" column="DEL_FLAG"/>
-        <result property="revision" column="REVISION"/>
-        <result property="createdBy" column="CREATED_BY"/>
-        <result property="createdTime" column="CREATED_TIME"/>
-        <result property="updatedBy" column="UPDATED_BY"/>
-        <result property="updatedTime" column="UPDATED_TIME"/>
-        <result property="parentDeptIds" column="PARENT_DEPT_IDS"/>
-        <result property="parentDeptNames" column="PARENT_DEPT_NAMES"/>
-        <result property="allDeptIds" column="ALL_DEPT_IDS"/>
-        <result property="allDeptNames" column="ALL_DEPT_NAMES"/>
-    </resultMap>
     <sql id="Base_Column_List">
         ID,	USER_ID,	USER_NAME,	CONFLICT_TYPE,	CONFLICT_REASON,	INVOLVED_NUM,	MAINSTAY_LEADER,	RESPONSIBLE_DEPT,
-	RESPONSIBLE_PEOPLE,	MAJOR_MEASURES,	CURRENT_SITUATION,	REMARK,	SUBMIT_TIME,
+	RESPONSIBLE_PEOPLE,	MAJOR_MEASURES,	CURRENT_SITUATION,	REMARK,	DATE_FORMAT( SUBMIT_TIME, '%Y-%m-%d' ) AS SUBMIT_TIME,
 	DEL_FLAG,	CREATED_BY,	CREATED_TIME,	UPDATED_BY,	UPDATED_TIME,	PARENT_DEPT_IDS,
         PARENT_DEPT_NAMES,	ALL_DEPT_IDS,	ALL_DEPT_NAMES
     </sql>
@@ -56,24 +31,16 @@
         ORDER BY
         CREATED_TIME DESC
     </select>
-    <select id="listConflictMediate" resultType="com.elink.esua.epdc.modules.conflict.entity.ConflictMediateEntity">
+    <select id="listConflictMediate" resultType="com.elink.esua.epdc.dto.conflict.result.ConflictMediateHistoryResultDTO">
         SELECT
-        <include refid="Base_Column_List"/>
+            t.id,
+            DATE_FORMAT( t.SUBMIT_TIME, '%Y-%m-%d' ) submitTime
         FROM
-        epdc_conflict_mediate
+            epdc_conflict_mediate t
         WHERE
-        DEL_FLAG = '0'
+            DEL_FLAG = '0' and t.USER_ID = #{userId} and t.CREATED_TIME &lt;= STR_TO_DATE( #{timestamp}, '%Y-%m-%d %H:%i:%s' )
         ORDER BY
-        CREATED_TIME DESC
+            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>
\ No newline at end of file