详情加返参

epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/MemoDifficultyDTO.java

@@ -74,6 +74,7 @@ public class MemoDifficultyDTO implements Serializable {
     /**
      * 创建时间
      */
+    @JsonFormat(pattern="yyyy-MM-dd HH:mm")
 	private Date createdTime;
 
     /**

epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/AddMemoDifficultyFromDTO.java

@@ -59,6 +59,12 @@ public class AddMemoDifficultyFromDTO implements Serializable {
     @JsonFormat(pattern="yyyy-MM-dd HH:mm")
     private Date remindTime;
 
+    /**
+     * 创建时间
+     */
+    @JsonFormat(pattern="yyyy-MM-dd HH:mm")
+    private Date createdTime;
+
     /**
      * 附件集合
      */

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/MemoDifficultyController.java

@@ -1,23 +1,19 @@
 package com.epmet.controller;
 
-import com.epmet.commons.tools.annotation.LoginUser;
 import cn.afterturn.easypoi.word.WordExportUtil;
 import cn.hutool.core.bean.BeanUtil;
+import com.epmet.commons.tools.annotation.LoginUser;
 import com.epmet.commons.tools.aop.NoRepeatSubmit;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.exception.EpmetException;
 import com.epmet.commons.tools.exception.ExceptionUtils;
 import com.epmet.commons.tools.page.PageData;
-import com.epmet.commons.tools.utils.DateUtils;
 import com.epmet.commons.tools.security.dto.TokenDto;
+import com.epmet.commons.tools.utils.DateUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.AssertUtils;
 import com.epmet.commons.tools.validator.ValidatorUtils;
-import com.epmet.commons.tools.validator.group.AddGroup;
-import com.epmet.commons.tools.validator.group.DefaultGroup;
-import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.dto.MemoDifficultyDTO;
-import com.epmet.dto.MemoWorkDiaryDTO;
 import com.epmet.dto.form.AddMemoDifficultyFromDTO;
 import com.epmet.dto.form.MemoDifficultyDetailFromDTO;
 import com.epmet.dto.form.MemoDifficultyFormDTO;
@@ -35,7 +31,6 @@ import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
-import java.net.URL;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
@@ -96,8 +91,8 @@ public class MemoDifficultyController {
     }
 
     @PostMapping("detail")
-    public Result<MemoDifficultyDTO> detail(@RequestBody MemoDifficultyDetailFromDTO fromDTO){
+    public Result<AddMemoDifficultyFromDTO> detail(@RequestBody MemoDifficultyDetailFromDTO fromDTO){
-        return new Result<MemoDifficultyDTO>().ok(memoDifficultyService.detail(fromDTO));
+        return new Result<AddMemoDifficultyFromDTO>().ok(memoDifficultyService.detail(fromDTO));
     }
 
     @PostMapping("/{id}/exportWord")

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/MemoDifficultyDao.java

@@ -3,9 +3,11 @@ package com.epmet.dao;
 import com.epmet.commons.mybatis.dao.BaseDao;
 import com.epmet.dto.MemoDifficultyDTO;
 import com.epmet.dto.MemoWorkDiaryDTO;
+import com.epmet.dto.form.AddMemoDifficultyFromDTO;
 import com.epmet.dto.form.MemoDifficultyFormDTO;
 import com.epmet.entity.MemoDifficultyEntity;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -23,4 +25,6 @@ public interface MemoDifficultyDao extends BaseDao<MemoDifficultyEntity> {
      * @Author sun
      */
     List<MemoDifficultyDTO> getPage(MemoDifficultyFormDTO formDTO);
+
+    AddMemoDifficultyFromDTO selectByDifficutyId(@Param("id") String id);
 }

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/MemoDifficultyService.java

@@ -84,5 +84,5 @@ public interface MemoDifficultyService extends BaseService<MemoDifficultyEntity>
      * @author generator
      * @date 2022-03-15
      */
-    MemoDifficultyDTO detail(MemoDifficultyDetailFromDTO fromDTO);
+    AddMemoDifficultyFromDTO detail(MemoDifficultyDetailFromDTO fromDTO);
 }

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/MemoDifficultyServiceImpl.java

@@ -142,14 +142,13 @@ public class MemoDifficultyServiceImpl extends BaseServiceImpl<MemoDifficultyDao
     }
 
     @Override
-    public MemoDifficultyDTO detail(MemoDifficultyDetailFromDTO fromDTO) {
+    public AddMemoDifficultyFromDTO detail(MemoDifficultyDetailFromDTO fromDTO) {
         //0.判断已读，则修改已读标记
         if (fromDTO.getReadFlag() == NumConstant.ONE) {
             memoAttrService.setReaded(fromDTO.getId());
         }
         //1.查询难点堵点主表数据
-        MemoDifficultyEntity entity = baseDao.selectById(fromDTO.getId());
+        AddMemoDifficultyFromDTO resultDTO = baseDao.selectByDifficutyId(fromDTO.getId());
-        MemoDifficultyDTO resultDTO = ConvertUtils.sourceToTarget(entity, MemoDifficultyDTO.class);
         //2.查询对应附件数据
         List<MemoAttachmentDTO> attachmentList = memoAttachmentService.getListByMemoId(fromDTO.getId());
         resultDTO.setAttachmentList(attachmentList);

epmet-module/gov-project/gov-project-server/src/main/resources/mapper/MemoDifficultyDao.xml

@@ -37,4 +37,22 @@
         ORDER BY md.created_time DESC
     </select>
 
+    <select id="selectByDifficutyId" resultType="com.epmet.dto.form.AddMemoDifficultyFromDTO">
+        SELECT
+            md.id,
+            md.customer_id,
+            md.content,
+            md.resolve_way,
+            md.remark,
+            md.scheduled_time,
+            md.created_time,
+            ma.remind_time
+        FROM
+            memo_difficulty md
+        INNER JOIN memo_attr ma ON md.id = ma.id and ma.del_flag = '0'
+        WHERE
+            md.del_flag = '0'
+        AND md.id = #{id}
+    </select>
+
 </mapper>