Merge branch 'dev_memo' into develop

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

@@ -31,7 +31,7 @@ public class MemoDifficultyFormDTO extends PageFormDTO implements Serializable {
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private String scheduledEndTime;
     /**
-     * 起始创建时间
+     * 起始创建时间Y-%m-%d
      */
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private String startTime;

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

@@ -81,7 +81,8 @@ public class MemoDifficultyController {
 
     @NoRepeatSubmit
     @PostMapping("update")
-    public Result update(@RequestBody AddMemoDifficultyFromDTO dto){
+    public Result update(@LoginUser TokenDto tokenDTO, @RequestBody AddMemoDifficultyFromDTO dto){
+        dto.setCustomerId(tokenDTO.getCustomerId());
         memoDifficultyService.update(dto);
         return new Result();
     }

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

@@ -86,7 +86,8 @@ public class MemoConcernServiceImpl extends BaseServiceImpl<MemoConcernDao, Memo
         insert(entity);
 
         //保存属性
-        MemoAttrDTO attr = ConvertUtils.sourceToTarget(dto, MemoAttrDTO.class);;
+        MemoAttrDTO attr = ConvertUtils.sourceToTarget(dto, MemoAttrDTO.class);
+        attr.setId(entity.getId());
         attr.setType(MemoConstant.WORK_DIARY);
         attr.setReadFlag(NumConstant.ZERO);
         attr.setReceiver(dto.getCreatedBy());

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

@@ -31,6 +31,8 @@ import org.springframework.transaction.annotation.Transactional;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.stream.Collectors;
 
 /**
  * 备忘录-难点读点
@@ -84,7 +86,7 @@ public class MemoDifficultyServiceImpl extends BaseServiceImpl<MemoDifficultyDao
         insert(entity);
         //2.新增备忘录记录数据
         MemoAttrEntity memoAttr = new MemoAttrEntity();
-        memoAttr.setId(entity.getCustomerId());
+        memoAttr.setId(entity.getId());
         memoAttr.setCustomerId(dto.getCustomerId());
         memoAttr.setRemindTime(dto.getRemindTime());
         memoAttr.setType("difficulty");
@@ -92,8 +94,14 @@ public class MemoDifficultyServiceImpl extends BaseServiceImpl<MemoDifficultyDao
         memoAttrService.insert(memoAttr);
         //3.新增难点堵点附件数据
         if (CollectionUtils.isNotEmpty(dto.getAttachmentList())) {
-            List<MemoAttachmentEntity> list = ConvertUtils.sourceToTarget(dto.getAttachmentList(), MemoAttachmentEntity.class);
+            AtomicInteger i = new AtomicInteger(NumConstant.ZERO);
-            list.forEach(l -> l.setRemindMsgId(entity.getId()));
+            List<MemoAttachmentEntity> list = dto.getAttachmentList().stream().map(item -> {
+                MemoAttachmentEntity e = ConvertUtils.sourceToTarget(item, MemoAttachmentEntity.class);
+                e.setCustomerId(dto.getCustomerId());
+                e.setRemindMsgId(entity.getId());
+                e.setSort(i.getAndIncrement());
+                return e;
+            }).collect(Collectors.toList());
             memoAttachmentService.insertBatch(list);
         }
     }
@@ -107,8 +115,14 @@ public class MemoDifficultyServiceImpl extends BaseServiceImpl<MemoDifficultyDao
         //2.附件表数据全删全增
         memoAttachmentService.deleteByMemoId(dto.getId());
         if (CollectionUtils.isNotEmpty(dto.getAttachmentList())) {
-            List<MemoAttachmentEntity> list = ConvertUtils.sourceToTarget(dto.getAttachmentList(), MemoAttachmentEntity.class);
+            AtomicInteger i = new AtomicInteger(NumConstant.ZERO);
-            list.forEach(l -> l.setRemindMsgId(entity.getId()));
+            List<MemoAttachmentEntity> list = dto.getAttachmentList().stream().map(item -> {
+                MemoAttachmentEntity e = ConvertUtils.sourceToTarget(item, MemoAttachmentEntity.class);
+                e.setCustomerId(dto.getCustomerId());
+                e.setRemindMsgId(dto.getId());
+                e.setSort(i.getAndIncrement());
+                return e;
+            }).collect(Collectors.toList());
             memoAttachmentService.insertBatch(list);
         }
         //3.判断更新提醒记录表提醒时间

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

@@ -86,7 +86,8 @@ public class MemoWorkDiaryServiceImpl extends BaseServiceImpl<MemoWorkDiaryDao,
         insert(entity);
 
         //保存属性
-        MemoAttrDTO attr = ConvertUtils.sourceToTarget(dto, MemoAttrDTO.class);;
+        MemoAttrDTO attr = ConvertUtils.sourceToTarget(dto, MemoAttrDTO.class);
+        attr.setId(entity.getId());
         attr.setType(MemoConstant.WORK_DIARY);
         attr.setReadFlag(NumConstant.ZERO);
         attr.setReceiver(dto.getCreatedBy());