Merge remote-tracking branch 'origin/dev_memo' into dev_memo

# Conflicts:
#	epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/MemoDifficultyController.java
#	epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/MemoWorkDiaryController.java

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

@@ -1,5 +1,6 @@
 package com.epmet.dto;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -20,16 +21,19 @@ public class MemoAttachmentDTO implements Serializable {
     /**
      * 主键
      */
+    @JsonIgnore
 	private String id;
 
     /**
      * 客户ID
      */
+    @JsonIgnore
 	private String customerId;
 
     /**
-     * REMIND_MSG.ID
+     * REMIND_MSG.ID  业务(工作日志、难点堵点、人员关怀)表Id
      */
+    @JsonIgnore
 	private String remindMsgId;
 
     /**
@@ -70,21 +74,25 @@ public class MemoAttachmentDTO implements Serializable {
     /**
      * 排序字段
      */
+    @JsonIgnore
 	private Integer sort;
 
     /**
      * 删除标记 0：未删除，1：已删除
      */
+    @JsonIgnore
 	private String delFlag;
 
     /**
      * 乐观锁
      */
+    @JsonIgnore
 	private Integer revision;
 
     /**
      * 创建人
      */
+    @JsonIgnore
 	private String createdBy;
 
     /**
@@ -95,11 +103,13 @@ public class MemoAttachmentDTO implements Serializable {
     /**
      * 更新人
      */
+    @JsonIgnore
 	private String updatedBy;
 
     /**
      * 更新时间
      */
+    @JsonIgnore
 	private Date updatedTime;
 
 }

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

@@ -4,6 +4,7 @@ import lombok.Data;
 
 import java.io.Serializable;
 import java.util.Date;
+import java.util.List;
 
 
 /**
@@ -82,4 +83,5 @@ public class MemoDifficultyDTO implements Serializable {
      */
 	private Date updatedTime;
 
+	private List<MemoAttachmentDTO> attachmentList;
 }

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

@@ -1,9 +1,11 @@
 package com.epmet.dto;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
 import java.io.Serializable;
 import java.util.Date;
+import java.util.List;
 
 
 /**
@@ -40,6 +42,7 @@ public class MemoWorkDiaryDTO implements Serializable {
     /**
      * 提醒时间
      */
+    @JsonFormat(pattern="yyyy-MM-dd HH:mm")
     private Date remindTime;
 
     /**
@@ -60,6 +63,7 @@ public class MemoWorkDiaryDTO implements Serializable {
     /**
      * 创建时间
      */
+    @JsonFormat(pattern="yyyy-MM-dd HH:mm")
 	private Date createdTime;
 
     /**
@@ -72,4 +76,9 @@ public class MemoWorkDiaryDTO implements Serializable {
      */
 	private Date updatedTime;
 
+    /**
+     * 附件
+     */
+    private List<MemoAttachmentDTO> attachmentList;
+
 }

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

@@ -0,0 +1,68 @@
+package com.epmet.dto.form;
+
+import com.epmet.commons.tools.validator.group.CustomerClientShowGroup;
+import com.epmet.dto.MemoAttachmentDTO;
+import lombok.Data;
+import org.hibernate.validator.constraints.Length;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+
+/**
+ * 备忘录-难点读点
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-03-15
+ */
+@Data
+public class AddMemoDifficultyFromDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+    public interface AddMemoDifficulty extends CustomerClientShowGroup {}
+
+    /**
+     * id
+     */
+    private String id;
+
+    /**
+     * 内容
+     */
+    @NotBlank(message = "难点堵点内容不能为空", groups = { AddMemoDifficulty.class })
+    @Length(max = 500, message = "难点堵点内容最长为50个字", groups = { AddMemoDifficulty.class })
+	private String content;
+
+    /**
+     * 解决方式
+     */
+	private String resolveWay;
+
+    /**
+     * 备注
+     */
+	private String remark;
+
+    /**
+     * 计划执行时间
+     */
+	private Date scheduledTime;
+
+    /**
+     * 提醒时间
+     */
+    private Date remindTime;
+
+    /**
+     * 附件集合
+     */
+	private List<MemoAttachmentDTO> attachmentList;
+
+    //token中客户ID
+    private String customerId;
+    //token中用户Id
+    private String userId;
+
+}

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

@@ -0,0 +1,34 @@
+package com.epmet.dto.form;
+
+import com.epmet.commons.tools.validator.group.CustomerClientShowGroup;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+
+
+/**
+ * 备忘录-难点读点
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-03-15
+ */
+@Data
+public class MemoDifficultyDetailFromDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+    public interface Detail extends CustomerClientShowGroup {}
+
+    /**
+     * id
+     */
+    @NotBlank(message = "难点堵点Id不能为空", groups = { Detail.class })
+    private String id;
+    /**
+     * 阅读标记1 已读；0未读
+     */
+    @NotNull(message = "阅读标记不能为空", groups = { Detail.class })
+    private Integer readFlag;
+
+}

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

@@ -0,0 +1,25 @@
+package com.epmet.dto.form;
+
+import com.epmet.commons.tools.dto.form.PageFormDTO;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+/**
+ * @Description
+ * @Author zhaoqifeng
+ * @Date 2022/3/15 15:09
+ */
+@NoArgsConstructor
+@Data
+public class MemoWorkDiaryFormDTO extends PageFormDTO implements Serializable {
+    private static final long serialVersionUID = 3101320969471756516L;
+    private String userId;
+    private String id;
+    private String readFlag = "0";
+    private String content;
+    private String workType;
+    private String startTime;
+    private String endTime;
+}

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

@@ -1,5 +1,6 @@
 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.aop.NoRepeatSubmit;
@@ -7,6 +8,7 @@ import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.exception.EpmetException;
 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.Result;
 import com.epmet.commons.tools.validator.AssertUtils;
 import com.epmet.commons.tools.validator.ValidatorUtils;
@@ -15,6 +17,8 @@ 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.service.MemoDifficultyService;
 import org.apache.poi.xwpf.usermodel.XWPFDocument;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -54,18 +58,17 @@ public class MemoDifficultyController {
 
     @NoRepeatSubmit
     @PostMapping("save")
-    public Result save(@RequestBody MemoDifficultyDTO dto){
+    public Result save(@LoginUser TokenDto tokenDTO, @RequestBody AddMemoDifficultyFromDTO dto){
-        //效验数据
+        ValidatorUtils.validateEntity(dto, AddMemoDifficultyFromDTO.AddMemoDifficulty.class);
-        ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+        dto.setCustomerId(tokenDTO.getCustomerId());
+        dto.setUserId(tokenDTO.getUserId());
         memoDifficultyService.save(dto);
         return new Result();
     }
 
     @NoRepeatSubmit
     @PostMapping("update")
-    public Result update(@RequestBody MemoDifficultyDTO dto){
+    public Result update(@RequestBody AddMemoDifficultyFromDTO dto){
-        //效验数据
-        ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
         memoDifficultyService.update(dto);
         return new Result();
     }
@@ -78,6 +81,11 @@ public class MemoDifficultyController {
         return new Result();
     }
 
+    @PostMapping("detail")
+    public Result<MemoDifficultyDTO> detail(@RequestBody MemoDifficultyDetailFromDTO fromDTO){
+        return new Result<MemoDifficultyDTO>().ok(memoDifficultyService.detail(fromDTO));
+    }
+
     @PostMapping("/{id}/exportWord")
     public void exportWord(@PathVariable("id") String id, HttpServletResponse response) throws Exception {
         URL resource = this.getClass().getClassLoader().getResource("templates/memo_difficulty_export_template.docx");

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

@@ -2,9 +2,11 @@ package com.epmet.controller;
 
 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.page.PageData;
 import com.epmet.commons.tools.utils.DateUtils;
+import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.AssertUtils;
 import com.epmet.commons.tools.validator.ValidatorUtils;
@@ -12,6 +14,7 @@ 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.MemoWorkDiaryDTO;
+import com.epmet.dto.form.MemoWorkDiaryFormDTO;
 import com.epmet.service.MemoWorkDiaryService;
 import org.apache.poi.xwpf.usermodel.XWPFDocument;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -42,14 +45,15 @@ public class MemoWorkDiaryController {
     private MemoWorkDiaryService memoWorkDiaryService;
 
     @RequestMapping("page")
-    public Result<PageData<MemoWorkDiaryDTO>> page(@RequestParam Map<String, Object> params){
+    public Result<PageData<MemoWorkDiaryDTO>> page(@LoginUser TokenDto tokenDto, @RequestBody MemoWorkDiaryFormDTO formDTO){
-        PageData<MemoWorkDiaryDTO> page = memoWorkDiaryService.page(params);
+        formDTO.setUserId(tokenDto.getUserId());
+        PageData<MemoWorkDiaryDTO> page = memoWorkDiaryService.page(formDTO);
         return new Result<PageData<MemoWorkDiaryDTO>>().ok(page);
     }
 
-    @RequestMapping(value = "{id}",method = {RequestMethod.POST,RequestMethod.GET})
+    @RequestMapping(method = {RequestMethod.POST,RequestMethod.GET})
-    public Result<MemoWorkDiaryDTO> get(@PathVariable("id") String id){
+    public Result<MemoWorkDiaryDTO> get(@RequestBody MemoWorkDiaryFormDTO formDTO){
-        MemoWorkDiaryDTO data = memoWorkDiaryService.get(id);
+        MemoWorkDiaryDTO data = memoWorkDiaryService.get(formDTO);
         return new Result<MemoWorkDiaryDTO>().ok(data);
     }
 

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

@@ -1,9 +1,13 @@
 package com.epmet.dao;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.dto.MemoWorkDiaryDTO;
+import com.epmet.dto.form.MemoWorkDiaryFormDTO;
 import com.epmet.entity.MemoWorkDiaryEntity;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 /**
  * 备忘录-工作日志
  *
@@ -12,5 +16,15 @@ import org.apache.ibatis.annotations.Mapper;
  */
 @Mapper
 public interface MemoWorkDiaryDao extends BaseDao<MemoWorkDiaryEntity> {
+
+    /**
+     * 查询列表
+     *
+     * @Param formDTO
+     * @Return {@link List< MemoWorkDiaryDTO>}
+     * @Author zhaoqifeng
+     * @Date 2022/3/15 15:31
+     */
+    List<MemoWorkDiaryDTO> getPage(MemoWorkDiaryFormDTO formDTO);
 	
 }

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/MemoAttachmentEntity.java

@@ -1,5 +1,7 @@
 package com.epmet.entity;
 
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
@@ -24,7 +26,7 @@ public class MemoAttachmentEntity extends BaseEpmetEntity {
 	private String customerId;
 
     /**
-     * REMIND_MSG.ID
+     * REMIND_MSG.ID 业务(工作日志、难点堵点、人员关怀)表Id
      */
 	private String remindMsgId;
 
@@ -68,4 +70,9 @@ public class MemoAttachmentEntity extends BaseEpmetEntity {
      */
 	private Integer sort;
 
+	/**
+	 * 物理删除
+	 */
+	@TableField(fill = FieldFill.INSERT)
+	private String delFlag;
 }

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

@@ -75,4 +75,24 @@ public interface MemoAttachmentService extends BaseService<MemoAttachmentEntity>
      * @date 2022-03-15
      */
     void delete(String[] ids);
+
+    /**
+     * 根据备忘录ID查询附件
+     *
+     * @Param memoId
+     * @Return {@link List< MemoAttachmentDTO>}
+     * @Author zhaoqifeng
+     * @Date 2022/3/15 15:56
+     */
+    List<MemoAttachmentDTO> getListByMemoId(String memoId);
+
+    /**
+     * 根据备忘录ID删除附件
+     *
+     * @Param memoId
+     * @Return
+     * @Author zhaoqifeng
+     * @Date 2022/3/15 15:57
+     */
+    void deleteByMemoId(String memoId);
 }

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

@@ -3,6 +3,8 @@ package com.epmet.service;
 import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.dto.MemoDifficultyDTO;
+import com.epmet.dto.form.AddMemoDifficultyFromDTO;
+import com.epmet.dto.form.MemoDifficultyDetailFromDTO;
 import com.epmet.entity.MemoDifficultyEntity;
 
 import java.util.List;
@@ -54,7 +56,7 @@ public interface MemoDifficultyService extends BaseService<MemoDifficultyEntity>
      * @author generator
      * @date 2022-03-15
      */
-    void save(MemoDifficultyDTO dto);
+    void save(AddMemoDifficultyFromDTO dto);
 
     /**
      * 默认更新
@@ -64,7 +66,7 @@ public interface MemoDifficultyService extends BaseService<MemoDifficultyEntity>
      * @author generator
      * @date 2022-03-15
      */
-    void update(MemoDifficultyDTO dto);
+    void update(AddMemoDifficultyFromDTO dto);
 
     /**
      * 批量删除
@@ -75,4 +77,11 @@ public interface MemoDifficultyService extends BaseService<MemoDifficultyEntity>
      * @date 2022-03-15
      */
     void delete(String[] ids);
+
+    /**
+     * 详情接口
+     * @author generator
+     * @date 2022-03-15
+     */
+    MemoDifficultyDTO detail(MemoDifficultyDetailFromDTO fromDTO);
 }

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

@@ -3,10 +3,10 @@ package com.epmet.service;
 import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.dto.MemoWorkDiaryDTO;
+import com.epmet.dto.form.MemoWorkDiaryFormDTO;
 import com.epmet.entity.MemoWorkDiaryEntity;
 
 import java.util.List;
-import java.util.Map;
 
 /**
  * 备忘录-工作日志
@@ -19,32 +19,32 @@ public interface MemoWorkDiaryService extends BaseService<MemoWorkDiaryEntity> {
     /**
      * 默认分页
      *
-     * @param params
+     * @param formDTO
      * @return PageData<MemoWorkDiaryDTO>
      * @author generator
      * @date 2022-03-15
      */
-    PageData<MemoWorkDiaryDTO> page(Map<String, Object> params);
+    PageData<MemoWorkDiaryDTO> page(MemoWorkDiaryFormDTO formDTO);
 
     /**
      * 默认查询
      *
-     * @param params
+     * @param formDTO
      * @return java.util.List<MemoWorkDiaryDTO>
      * @author generator
      * @date 2022-03-15
      */
-    List<MemoWorkDiaryDTO> list(Map<String, Object> params);
+    List<MemoWorkDiaryDTO> list(MemoWorkDiaryFormDTO formDTO);
 
     /**
      * 单条查询
      *
-     * @param id
+     * @param formDTO
      * @return MemoWorkDiaryDTO
      * @author generator
      * @date 2022-03-15
      */
-    MemoWorkDiaryDTO get(String id);
+    MemoWorkDiaryDTO get(MemoWorkDiaryFormDTO formDTO);
 
     /**
      * 默认保存

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

@@ -1,5 +1,6 @@
 package com.epmet.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
@@ -10,11 +11,13 @@ import com.epmet.dao.MemoAttachmentDao;
 import com.epmet.dto.MemoAttachmentDTO;
 import com.epmet.entity.MemoAttachmentEntity;
 import com.epmet.service.MemoAttachmentService;
+import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 
@@ -80,4 +83,41 @@ public class MemoAttachmentServiceImpl extends BaseServiceImpl<MemoAttachmentDao
         baseDao.deleteBatchIds(Arrays.asList(ids));
     }
 
+    /**
+     * 根据备忘录ID查询附件
+     *
+     * @param memoId
+     * @Param memoId
+     * @Return {@link List< MemoAttachmentDTO>}
+     * @Author zhaoqifeng
+     * @Date 2022/3/15 15:56
+     */
+    @Override
+    public List<MemoAttachmentDTO> getListByMemoId(String memoId) {
+        LambdaQueryWrapper<MemoAttachmentEntity> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(MemoAttachmentEntity::getRemindMsgId, memoId);
+        wrapper.orderByAsc(MemoAttachmentEntity::getSort);
+        List<MemoAttachmentEntity> list = baseDao.selectList(wrapper);
+        if (CollectionUtils.isEmpty(list)) {
+            return Collections.emptyList();
+        }
+        return ConvertUtils.sourceToTarget(list, MemoAttachmentDTO.class);
+    }
+
+    /**
+     * 根据备忘录ID删除附件
+     *
+     * @param memoId
+     * @Param memoId
+     * @Return
+     * @Author zhaoqifeng
+     * @Date 2022/3/15 15:57
+     */
+    @Override
+    public void deleteByMemoId(String memoId) {
+        LambdaQueryWrapper<MemoAttachmentEntity> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(MemoAttachmentEntity::getRemindMsgId, memoId);
+        baseDao.delete(wrapper);
+    }
+
 }

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

@@ -7,10 +7,20 @@ import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.dao.MemoDifficultyDao;
+import com.epmet.dto.MemoAttachmentDTO;
+import com.epmet.dto.MemoAttrDTO;
 import com.epmet.dto.MemoDifficultyDTO;
+import com.epmet.dto.form.AddMemoDifficultyFromDTO;
+import com.epmet.dto.form.MemoDifficultyDetailFromDTO;
+import com.epmet.entity.MemoAttachmentEntity;
+import com.epmet.entity.MemoAttrEntity;
 import com.epmet.entity.MemoDifficultyEntity;
+import com.epmet.service.MemoAttachmentService;
+import com.epmet.service.MemoAttrService;
 import com.epmet.service.MemoDifficultyService;
+import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -26,6 +36,10 @@ import java.util.Map;
  */
 @Service
 public class MemoDifficultyServiceImpl extends BaseServiceImpl<MemoDifficultyDao, MemoDifficultyEntity> implements MemoDifficultyService {
+    @Autowired
+    private MemoAttrService memoAttrService;
+    @Autowired
+    private MemoAttachmentService memoAttachmentService;
 
 
     @Override
@@ -61,16 +75,46 @@ public class MemoDifficultyServiceImpl extends BaseServiceImpl<MemoDifficultyDao
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void save(MemoDifficultyDTO dto) {
+    public void save(AddMemoDifficultyFromDTO dto) {
+        //1.新增难点堵点数据
         MemoDifficultyEntity entity = ConvertUtils.sourceToTarget(dto, MemoDifficultyEntity.class);
         insert(entity);
+        //2.新增备忘录记录数据
+        MemoAttrEntity memoAttr = new MemoAttrEntity();
+        memoAttr.setId(entity.getCustomerId());
+        memoAttr.setCustomerId(dto.getCustomerId());
+        memoAttr.setRemindTime(dto.getRemindTime());
+        memoAttr.setType("difficulty");
+        memoAttr.setReceiver(dto.getUserId());
+        memoAttrService.insert(memoAttr);
+        //3.新增难点堵点附件数据
+        if(CollectionUtils.isNotEmpty(dto.getAttachmentList())){
+            List<MemoAttachmentEntity> list = ConvertUtils.sourceToTarget(dto.getAttachmentList(), MemoAttachmentEntity.class);
+            list.forEach(l->l.setRemindMsgId(entity.getId()));
+            memoAttachmentService.insertBatch(list);
+        }
     }
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void update(MemoDifficultyDTO dto) {
+    public void update(AddMemoDifficultyFromDTO dto) {
+        //1.更新难点堵点主表数据
         MemoDifficultyEntity entity = ConvertUtils.sourceToTarget(dto, MemoDifficultyEntity.class);
         updateById(entity);
+        //2.附件表数据全删全增
+        memoAttachmentService.deleteByMemoId(dto.getId());
+        if(CollectionUtils.isNotEmpty(dto.getAttachmentList())){
+            List<MemoAttachmentEntity> list = ConvertUtils.sourceToTarget(dto.getAttachmentList(), MemoAttachmentEntity.class);
+            list.forEach(l->l.setRemindMsgId(entity.getId()));
+            memoAttachmentService.insertBatch(list);
+        }
+        //3.判断更新提醒记录表提醒时间
+        if(null != dto.getRemindTime()){
+            MemoAttrDTO memoAttr = new MemoAttrDTO();
+            memoAttr.setId(dto.getId());
+            memoAttr.setRemindTime(dto.getRemindTime());
+            memoAttrService.update(memoAttr);
+        }
     }
 
     @Override
@@ -80,4 +124,15 @@ public class MemoDifficultyServiceImpl extends BaseServiceImpl<MemoDifficultyDao
         baseDao.deleteBatchIds(Arrays.asList(ids));
     }
 
+    @Override
+    public MemoDifficultyDTO detail(MemoDifficultyDetailFromDTO fromDTO) {
+        //1.查询难点堵点主表数据
+        MemoDifficultyEntity entity = baseDao.selectById(fromDTO.getId());
+        MemoDifficultyDTO resultDTO = ConvertUtils.sourceToTarget(entity, MemoDifficultyDTO.class);
+        //2.查询对应附件数据
+        List<MemoAttachmentDTO> attachmentList = memoAttachmentService.getListByMemoId(fromDTO.getId());
+        resultDTO.setAttachmentList(attachmentList);
+        return resultDTO;
+    }
+
 }

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

@@ -1,22 +1,25 @@
 package com.epmet.service.impl;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
-import com.epmet.commons.tools.constant.FieldConstant;
+import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.dao.MemoWorkDiaryDao;
+import com.epmet.dto.MemoAttrDTO;
 import com.epmet.dto.MemoWorkDiaryDTO;
+import com.epmet.dto.form.MemoWorkDiaryFormDTO;
 import com.epmet.entity.MemoWorkDiaryEntity;
+import com.epmet.service.MemoAttachmentService;
+import com.epmet.service.MemoAttrService;
 import com.epmet.service.MemoWorkDiaryService;
-import org.apache.commons.lang3.StringUtils;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import javax.annotation.Resource;
 import java.util.Arrays;
 import java.util.List;
-import java.util.Map;
 
 /**
  * 备忘录-工作日志
@@ -27,36 +30,44 @@ import java.util.Map;
 @Service
 public class MemoWorkDiaryServiceImpl extends BaseServiceImpl<MemoWorkDiaryDao, MemoWorkDiaryEntity> implements MemoWorkDiaryService {
 
+    @Resource
+    private MemoAttrService memoAttrService;
+    @Resource
+    private MemoAttachmentService memoAttachmentService;
 
     @Override
-    public PageData<MemoWorkDiaryDTO> page(Map<String, Object> params) {
+    public PageData<MemoWorkDiaryDTO> page(MemoWorkDiaryFormDTO formDTO) {
-        IPage<MemoWorkDiaryEntity> page = baseDao.selectPage(
+        PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize());
-                getPage(params, FieldConstant.CREATED_TIME, false),
+        List<MemoWorkDiaryDTO> list =  baseDao.getPage(formDTO);
-                getWrapper(params)
+        PageInfo<MemoWorkDiaryDTO> pageInfo = new PageInfo<>(list);
-        );
+        return new PageData<>(list, pageInfo.getTotal());
-        return getPageData(page, MemoWorkDiaryDTO.class);
     }
 
     @Override
-    public List<MemoWorkDiaryDTO> list(Map<String, Object> params) {
+    public List<MemoWorkDiaryDTO> list(MemoWorkDiaryFormDTO formDTO) {
-        List<MemoWorkDiaryEntity> entityList = baseDao.selectList(getWrapper(params));
+        List<MemoWorkDiaryDTO> list =  baseDao.getPage(formDTO);
 
-        return ConvertUtils.sourceToTarget(entityList, MemoWorkDiaryDTO.class);
+        return list;
-    }
-
-    private QueryWrapper<MemoWorkDiaryEntity> getWrapper(Map<String, Object> params){
-        String id = (String)params.get(FieldConstant.ID_HUMP);
-
-        QueryWrapper<MemoWorkDiaryEntity> wrapper = new QueryWrapper<>();
-        wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
-
-        return wrapper;
     }
 
     @Override
-    public MemoWorkDiaryDTO get(String id) {
+    public MemoWorkDiaryDTO get(MemoWorkDiaryFormDTO formDTO) {
-        MemoWorkDiaryEntity entity = baseDao.selectById(id);
+        MemoWorkDiaryEntity entity = baseDao.selectById(formDTO.getId());
-        return ConvertUtils.sourceToTarget(entity, MemoWorkDiaryDTO.class);
+        MemoWorkDiaryDTO dto = ConvertUtils.sourceToTarget(entity, MemoWorkDiaryDTO.class);
+        //获取提醒时间
+        MemoAttrDTO memoAttr = memoAttrService.get(formDTO.getId());
+        if (null != memoAttr && null != dto) {
+            dto.setRemindTime(memoAttr.getRemindTime());
+        }
+        //获取附件列表
+        //更新阅读状态
+        if (NumConstant.ONE_STR.equals(formDTO.getReadFlag())) {
+            MemoAttrDTO memoAttrDTO = new MemoAttrDTO();
+            memoAttrDTO.setId(formDTO.getId());
+            memoAttrDTO.setReadFlag(NumConstant.ONE);
+            memoAttrService.update(memoAttrDTO);
+        }
+        return dto;
     }
 
     @Override

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

@@ -5,4 +5,33 @@
 
 
 
+    <select id="getPage" resultType="com.epmet.dto.MemoWorkDiaryDTO">
+        SELECT
+            a.ID,
+            a.CUSTOMER_ID,
+            a.WORK_TYPE,
+            a.CONTENT,
+            b.REMIND_TIME,
+            a.CREATED_TIME
+        FROM memo_work_diary a
+        INNER JOIN memo_attr b ON a.ID = b.ID AND b.DEL_FLAG = '0'
+        WHERE
+            a.DEL_FLAG = '0'
+            AND a.CREATED_BY = #{userId}
+            <if test='null != content and "" != content'>
+                AND a.CONTENT LIKE concat('%', #{content}, '%')
+            </if>
+            <if test='null != workType and "" != workType'>
+                AND a.WORK_TYPE LIKE concat('%', #{workType}, '%')
+            </if>
+            <if test='null != startTime and "" != startTime'>
+                AND DATE_FORMAT(a.CREATED_TIME, "%Y-%m-%d") &gt;= #{startTime}
+            </if>
+            <if test='null != endTime and "" != endTime'>
+                AND DATE_FORMAT(a.CREATED_TIME, "%Y-%m-%d") &lt;= #{endTime}
+            </if>
+        ORDER BY a.CREATED_TIME DESC
+    </select>
+
+
 </mapper>