elink-star
/
epmet-cloud-zhengwu-yantai
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

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

feature/evaluate
zxc 4 years ago
parent
a3faae5bc5 0328a84ad8
commit
d968906c8d
17 changed files with 421 additions and 70 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 3
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcPartyServiceCenterServiceImpl.java
  2. 11
      epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/MemoConcernDTO.java
  3. 29
      epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/MemoConcernFormDTO.java
  4. 47
      epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/MemoDifficultyFormDTO.java
  5. 12
      epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/constant/MemoConstant.java
  6. 23
      epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/MemoConcernController.java
  7. 6
      epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/MemoDifficultyController.java
  8. 7
      epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/MemoWorkDiaryController.java
  9. 14
      epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/MemoConcernDao.java
  10. 12
      epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/MemoDifficultyDao.java
  11. 8
      epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/MemoConcernService.java
  12. 3
      epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/MemoDifficultyService.java
  13. 127
      epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/MemoConcernServiceImpl.java
  14. 35
      epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/MemoDifficultyServiceImpl.java
  15. 75
      epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/MemoWorkDiaryServiceImpl.java
  16. 45
      epmet-module/gov-project/gov-project-server/src/main/resources/mapper/MemoConcernDao.xml
  17. 34
      epmet-module/gov-project/gov-project-server/src/main/resources/mapper/MemoDifficultyDao.xml

3
epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcPartyServiceCenterServiceImpl.java
View File

@ -148,7 +148,8 @@ public class IcPartyServiceCenterServiceImpl extends BaseServiceImpl<IcPartyServ
}
});
if (CollectionUtils.isNotEmpty(names)){
throw new EpmetException(names.stream().collect(Collectors.joining("、")) + "存在未来时间的预约事项,不允许删除");
// throw new EpmetException(names.stream().collect(Collectors.joining("、")) + "存在未来时间的预约事项,不允许删除");
throw new EpmetException(EpmetErrorCode.MATTER_EXISTS_APPOINTMENT_ERROR.getCode());
}
baseDao.deleteBatchIds(centerIds);
baseDao.delMatters(centerIds);

11
epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/MemoConcernDTO.java
View File

@ -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;
/**
@ -55,11 +57,13 @@ public class MemoConcernDTO implements Serializable {
/**
* 计划执行时间
*/
@JsonFormat(pattern="yyyy-MM-dd HH:mm")
private Date scheduledTime;
/**
* 实际执行时间
*/
@JsonFormat(pattern="yyyy-MM-dd HH:mm")
private Date actualTime;
/**
@ -70,6 +74,7 @@ public class MemoConcernDTO implements Serializable {
/**
* 提醒时间
*/
@JsonFormat(pattern="yyyy-MM-dd HH:mm")
private Date remindTime;
/**
@ -90,6 +95,7 @@ public class MemoConcernDTO implements Serializable {
/**
* 创建时间
*/
@JsonFormat(pattern="yyyy-MM-dd HH:mm")
private Date createdTime;
/**
@ -101,5 +107,8 @@ public class MemoConcernDTO implements Serializable {
* 更新时间
*/
private Date updatedTime;
/**
* 附件
*/
private List<MemoAttachmentDTO> attachmentList;
}

29
epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/MemoConcernFormDTO.java
View File

@ -0,0 +1,29 @@
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 17:11
*/
@NoArgsConstructor
@Data
public class MemoConcernFormDTO extends PageFormDTO implements Serializable {
private static final long serialVersionUID = -2355555089163762829L;
private String userId;
private String id;
private String readFlag = "0";
private String content;
private String concernType;
private String resiName;
private String status;
private String startTime;
private String endTime;
private String scheduledStartTime;
private String scheduledEndTime;
}

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

@ -0,0 +1,47 @@
package com.epmet.dto.form;
import com.epmet.commons.tools.dto.form.PageFormDTO;
import lombok.Data;
import lombok.NoArgsConstructor;
import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serializable;
/**
* @Description 难点堵点列表
* @Author sun
*/
@NoArgsConstructor
@Data
public class MemoDifficultyFormDTO extends PageFormDTO implements Serializable {
private static final long serialVersionUID = 3101320969471756516L;
/**
* 内容摘要
*/
private String content;
/**
* 起始预计处理时间
*/
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private String scheduledStartTime;
/**
* 终止预计处理时间
*/
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private String scheduledEndTime;
/**
* 起始创建时间
*/
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private String startTime;
/**
* 终止创建时间
*/
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private String endTime;
//token中用户Id
private String userId;
}

12
epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/constant/MemoConstant.java
View File

@ -0,0 +1,12 @@
package com.epmet.constant;
/**
* @Description
* @Author zhaoqifeng
* @Date 2022/3/15 16:56
*/
public interface MemoConstant {
String WORK_DIARY = "work_diary";
String CONCERN = "concern";
String DIFFICULTY = "difficulty";
}

23
epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/MemoConcernController.java
View File

@ -2,10 +2,12 @@ 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.exception.EpmetErrorCode;
import com.epmet.commons.tools.exception.EpmetException;
import com.epmet.commons.tools.page.PageData;
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;
@ -14,7 +16,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.MemoConcernDTO;
import com.epmet.dto.MemoWorkDiaryDTO;
import com.epmet.dto.form.MemoConcernFormDTO;
import com.epmet.service.MemoConcernService;
import org.apache.poi.xwpf.usermodel.XWPFDocument;
import org.springframework.beans.factory.annotation.Autowired;
@ -41,31 +43,36 @@ public class MemoConcernController {
private MemoConcernService memoConcernService;
@RequestMapping("page")
public Result<PageData<MemoConcernDTO>> page(@RequestParam Map<String, Object> params){
PageData<MemoConcernDTO> page = memoConcernService.page(params);
public Result<PageData<MemoConcernDTO>> page(@LoginUser TokenDto tokenDto, @RequestBody MemoConcernFormDTO formDTO){
formDTO.setUserId(tokenDto.getUserId());
PageData<MemoConcernDTO> page = memoConcernService.page(formDTO);
return new Result<PageData<MemoConcernDTO>>().ok(page);
}
@RequestMapping(value = "{id}",method = {RequestMethod.POST,RequestMethod.GET})
public Result<MemoConcernDTO> get(@PathVariable("id") String id){
MemoConcernDTO data = memoConcernService.get(id);
@RequestMapping(method = {RequestMethod.POST,RequestMethod.GET})
public Result<MemoConcernDTO> get(@RequestBody MemoConcernFormDTO formDTO){
MemoConcernDTO data = memoConcernService.get(formDTO);
return new Result<MemoConcernDTO>().ok(data);
}
@NoRepeatSubmit
@PostMapping("save")
public Result save(@RequestBody MemoConcernDTO dto){
public Result save(@LoginUser TokenDto tokenDto, @RequestBody MemoConcernDTO dto){
//效验数据
ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
dto.setCustomerId(tokenDto.getCustomerId());
dto.setCreatedBy(tokenDto.getUserId());
memoConcernService.save(dto);
return new Result();
}
@NoRepeatSubmit
@PostMapping("update")
public Result update(@RequestBody MemoConcernDTO dto){
public Result update(@LoginUser TokenDto tokenDto, @RequestBody MemoConcernDTO dto){
//效验数据
ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
dto.setCustomerId(tokenDto.getCustomerId());
memoConcernService.update(dto);
return new Result();
}

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

@ -19,6 +19,7 @@ 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;
import com.epmet.service.MemoDifficultyService;
import org.apache.poi.xwpf.usermodel.XWPFDocument;
import org.springframework.beans.factory.annotation.Autowired;
@ -45,8 +46,9 @@ public class MemoDifficultyController {
private MemoDifficultyService memoDifficultyService;
@RequestMapping("page")
public Result<PageData<MemoDifficultyDTO>> page(@RequestParam Map<String, Object> params){
PageData<MemoDifficultyDTO> page = memoDifficultyService.page(params);
public Result<PageData<MemoDifficultyDTO>> page(@LoginUser TokenDto tokenDto, @RequestBody MemoDifficultyFormDTO formDTO){
formDTO.setUserId(tokenDto.getUserId());
PageData<MemoDifficultyDTO> page = memoDifficultyService.page(formDTO);
return new Result<PageData<MemoDifficultyDTO>>().ok(page);
}

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

@ -59,18 +59,21 @@ public class MemoWorkDiaryController {
@NoRepeatSubmit
@PostMapping("save")
public Result save(@RequestBody MemoWorkDiaryDTO dto){
public Result save(@LoginUser TokenDto tokenDto, @RequestBody MemoWorkDiaryDTO dto){
//效验数据
ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
dto.setCustomerId(tokenDto.getCustomerId());
dto.setCreatedBy(tokenDto.getUserId());
memoWorkDiaryService.save(dto);
return new Result();
}
@NoRepeatSubmit
@PostMapping("update")
public Result update(@RequestBody MemoWorkDiaryDTO dto){
public Result update(@LoginUser TokenDto tokenDto, @RequestBody MemoWorkDiaryDTO dto){
//效验数据
ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
dto.setCustomerId(tokenDto.getCustomerId());
memoWorkDiaryService.update(dto);
return new Result();
}

14
epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/MemoConcernDao.java
View File

@ -1,9 +1,13 @@
package com.epmet.dao;
import com.epmet.commons.mybatis.dao.BaseDao;
import com.epmet.dto.MemoConcernDTO;
import com.epmet.dto.form.MemoConcernFormDTO;
import com.epmet.entity.MemoConcernEntity;
import org.apache.ibatis.annotations.Mapper;
import java.util.List;
/**
* 备忘录-人文关怀
*
@ -12,5 +16,13 @@ import org.apache.ibatis.annotations.Mapper;
*/
@Mapper
public interface MemoConcernDao extends BaseDao<MemoConcernEntity> {
/**
* 查询列表
*
* @Param formDTO
* @Return {@link List < MemoConcernDTO>}
* @Author zhaoqifeng
* @Date 2022/3/15 15:31
*/
List<MemoConcernDTO> getPage(MemoConcernFormDTO formDTO);
}

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

@ -1,9 +1,14 @@
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.MemoDifficultyFormDTO;
import com.epmet.entity.MemoDifficultyEntity;
import org.apache.ibatis.annotations.Mapper;
import java.util.List;
/**
* 备忘录-难点读点
*
@ -12,5 +17,10 @@ import org.apache.ibatis.annotations.Mapper;
*/
@Mapper
public interface MemoDifficultyDao extends BaseDao<MemoDifficultyEntity> {
/**
* 难点堵点查询列表
* @Author sun
*/
List<MemoDifficultyDTO> getPage(MemoDifficultyFormDTO formDTO);
}

8
epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/MemoConcernService.java
View File

@ -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.MemoConcernDTO;
import com.epmet.dto.form.MemoConcernFormDTO;
import com.epmet.entity.MemoConcernEntity;
import java.util.List;
import java.util.Map;
/**
* 备忘录-人文关怀
@ -24,7 +24,7 @@ public interface MemoConcernService extends BaseService<MemoConcernEntity> {
* @author generator
* @date 2022-03-15
*/
PageData<MemoConcernDTO> page(Map<String, Object> params);
PageData<MemoConcernDTO> page(MemoConcernFormDTO formDTO);
/**
* 默认查询
@ -34,7 +34,7 @@ public interface MemoConcernService extends BaseService<MemoConcernEntity> {
* @author generator
* @date 2022-03-15
*/
List<MemoConcernDTO> list(Map<String, Object> params);
List<MemoConcernDTO> list(MemoConcernFormDTO formDTO);
/**
* 单条查询
@ -44,7 +44,7 @@ public interface MemoConcernService extends BaseService<MemoConcernEntity> {
* @author generator
* @date 2022-03-15
*/
MemoConcernDTO get(String id);
MemoConcernDTO get(MemoConcernFormDTO formDTO);
/**
* 默认保存

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

@ -4,6 +4,7 @@ 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.MemoDifficultyFormDTO;
import com.epmet.dto.form.MemoDifficultyDetailFromDTO;
import com.epmet.entity.MemoDifficultyEntity;
@ -26,7 +27,7 @@ public interface MemoDifficultyService extends BaseService<MemoDifficultyEntity>
* @author generator
* @date 2022-03-15
*/
PageData<MemoDifficultyDTO> page(Map<String, Object> params);
PageData<MemoDifficultyDTO> page(MemoDifficultyFormDTO formDTO);
/**
* 默认查询

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

@ -1,22 +1,31 @@
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.constant.MemoConstant;
import com.epmet.dao.MemoConcernDao;
import com.epmet.dto.MemoAttachmentDTO;
import com.epmet.dto.MemoAttrDTO;
import com.epmet.dto.MemoConcernDTO;
import com.epmet.dto.form.MemoConcernFormDTO;
import com.epmet.entity.MemoAttachmentEntity;
import com.epmet.entity.MemoConcernEntity;
import com.epmet.service.MemoAttachmentService;
import com.epmet.service.MemoAttrService;
import com.epmet.service.MemoConcernService;
import org.apache.commons.lang3.StringUtils;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import org.apache.commons.collections4.CollectionUtils;
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;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.stream.Collectors;
/**
* 备忘录-人文关怀
@ -27,36 +36,47 @@ import java.util.Map;
@Service
public class MemoConcernServiceImpl extends BaseServiceImpl<MemoConcernDao, MemoConcernEntity> implements MemoConcernService {
@Resource
private MemoAttrService memoAttrService;
@Resource
private MemoAttachmentService memoAttachmentService;
@Override
public PageData<MemoConcernDTO> page(Map<String, Object> params) {
IPage<MemoConcernEntity> page = baseDao.selectPage(
getPage(params, FieldConstant.CREATED_TIME, false),
getWrapper(params)
);
return getPageData(page, MemoConcernDTO.class);
public PageData<MemoConcernDTO> page(MemoConcernFormDTO formDTO) {
PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize());
List<MemoConcernDTO> list = baseDao.getPage(formDTO);
PageInfo<MemoConcernDTO> pageInfo = new PageInfo<>(list);
return new PageData<>(list, pageInfo.getTotal());
}
@Override
public List<MemoConcernDTO> list(Map<String, Object> params) {
List<MemoConcernEntity> entityList = baseDao.selectList(getWrapper(params));
return ConvertUtils.sourceToTarget(entityList, MemoConcernDTO.class);
}
private QueryWrapper<MemoConcernEntity> getWrapper(Map<String, Object> params){
String id = (String)params.get(FieldConstant.ID_HUMP);
QueryWrapper<MemoConcernEntity> wrapper = new QueryWrapper<>();
wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
return wrapper;
public List<MemoConcernDTO> list(MemoConcernFormDTO formDTO) {
List<MemoConcernDTO> list = baseDao.getPage(formDTO);
return list;
}
@Override
public MemoConcernDTO get(String id) {
MemoConcernEntity entity = baseDao.selectById(id);
return ConvertUtils.sourceToTarget(entity, MemoConcernDTO.class);
public MemoConcernDTO get(MemoConcernFormDTO formDTO) {
MemoConcernEntity entity = baseDao.selectById(formDTO.getId());
MemoConcernDTO dto = ConvertUtils.sourceToTarget(entity, MemoConcernDTO.class);
if (null != dto) {
//获取提醒时间
MemoAttrDTO memoAttr = memoAttrService.get(formDTO.getId());
if (null != memoAttr) {
dto.setRemindTime(memoAttr.getRemindTime());
}
//获取附件列表
List<MemoAttachmentDTO> attachmentList = memoAttachmentService.getListByMemoId(formDTO.getId());
dto.setAttachmentList(attachmentList);
}
//更新阅读状态
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
@ -64,6 +84,28 @@ public class MemoConcernServiceImpl extends BaseServiceImpl<MemoConcernDao, Memo
public void save(MemoConcernDTO dto) {
MemoConcernEntity entity = ConvertUtils.sourceToTarget(dto, MemoConcernEntity.class);
insert(entity);
//保存属性
MemoAttrDTO attr = ConvertUtils.sourceToTarget(dto, MemoAttrDTO.class);;
attr.setType(MemoConstant.WORK_DIARY);
attr.setReadFlag(NumConstant.ZERO);
attr.setReceiver(dto.getCreatedBy());
memoAttrService.save(attr);
//删除原来的附件
memoAttachmentService.deleteByMemoId(entity.getId());
//保存新的照片
if (CollectionUtils.isNotEmpty(dto.getAttachmentList())) {
AtomicInteger i = new AtomicInteger(NumConstant.ZERO);
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);
}
}
@Override
@ -71,6 +113,30 @@ public class MemoConcernServiceImpl extends BaseServiceImpl<MemoConcernDao, Memo
public void update(MemoConcernDTO dto) {
MemoConcernEntity entity = ConvertUtils.sourceToTarget(dto, MemoConcernEntity.class);
updateById(entity);
//时间有变动时保存属性，readFlag变为0
MemoAttrDTO attr = memoAttrService.get(dto.getId());
if (dto.getRemindTime() != attr.getRemindTime()) {
attr.setRemindTime(dto.getRemindTime());
attr.setReadFlag(NumConstant.ZERO);
attr.setUpdatedTime(null);
memoAttrService.update(attr);
}
//删除原来的附件
memoAttachmentService.deleteByMemoId(entity.getId());
//保存新的照片
if (CollectionUtils.isNotEmpty(dto.getAttachmentList())) {
AtomicInteger i = new AtomicInteger(NumConstant.ZERO);
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);
}
}
@Override
@ -78,6 +144,13 @@ public class MemoConcernServiceImpl extends BaseServiceImpl<MemoConcernDao, Memo
public void delete(String[] ids) {
// 逻辑删除（@TableLogic 注解）
baseDao.deleteBatchIds(Arrays.asList(ids));
List<String> list = Arrays.asList(ids);
baseDao.deleteBatchIds(list);
memoAttrService.delete(ids);
list.forEach(id -> {
//删除附件
memoAttachmentService.deleteByMemoId(id);
});
}
}

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

@ -1,9 +1,9 @@
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.MemoDifficultyDao;
@ -11,6 +11,7 @@ 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.MemoDifficultyFormDTO;
import com.epmet.dto.form.MemoDifficultyDetailFromDTO;
import com.epmet.entity.MemoAttachmentEntity;
import com.epmet.entity.MemoAttrEntity;
@ -18,6 +19,9 @@ import com.epmet.entity.MemoDifficultyEntity;
import com.epmet.service.MemoAttachmentService;
import com.epmet.service.MemoAttrService;
import com.epmet.service.MemoDifficultyService;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import oracle.sql.NUMBER;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
@ -43,12 +47,11 @@ public class MemoDifficultyServiceImpl extends BaseServiceImpl<MemoDifficultyDao
@Override
public PageData<MemoDifficultyDTO> page(Map<String, Object> params) {
IPage<MemoDifficultyEntity> page = baseDao.selectPage(
getPage(params, FieldConstant.CREATED_TIME, false),
getWrapper(params)
);
return getPageData(page, MemoDifficultyDTO.class);
public PageData<MemoDifficultyDTO> page(MemoDifficultyFormDTO formDTO) {
PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize());
List<MemoDifficultyDTO> list = baseDao.getPage(formDTO);
PageInfo<MemoDifficultyDTO> pageInfo = new PageInfo<>(list);
return new PageData<>(list, pageInfo.getTotal());
}
@Override
@ -58,8 +61,8 @@ public class MemoDifficultyServiceImpl extends BaseServiceImpl<MemoDifficultyDao
return ConvertUtils.sourceToTarget(entityList, MemoDifficultyDTO.class);
}
private QueryWrapper<MemoDifficultyEntity> getWrapper(Map<String, Object> params){
String id = (String)params.get(FieldConstant.ID_HUMP);
private QueryWrapper<MemoDifficultyEntity> getWrapper(Map<String, Object> params) {
String id = (String) params.get(FieldConstant.ID_HUMP);
QueryWrapper<MemoDifficultyEntity> wrapper = new QueryWrapper<>();
wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
@ -88,9 +91,9 @@ public class MemoDifficultyServiceImpl extends BaseServiceImpl<MemoDifficultyDao
memoAttr.setReceiver(dto.getUserId());
memoAttrService.insert(memoAttr);
//3.新增难点堵点附件数据
if(CollectionUtils.isNotEmpty(dto.getAttachmentList())){
if (CollectionUtils.isNotEmpty(dto.getAttachmentList())) {
List<MemoAttachmentEntity> list = ConvertUtils.sourceToTarget(dto.getAttachmentList(), MemoAttachmentEntity.class);
list.forEach(l->l.setRemindMsgId(entity.getId()));
list.forEach(l -> l.setRemindMsgId(entity.getId()));
memoAttachmentService.insertBatch(list);
}
}
@ -103,13 +106,13 @@ public class MemoDifficultyServiceImpl extends BaseServiceImpl<MemoDifficultyDao
updateById(entity);
//2.附件表数据全删全增
memoAttachmentService.deleteByMemoId(dto.getId());
if(CollectionUtils.isNotEmpty(dto.getAttachmentList())){
if (CollectionUtils.isNotEmpty(dto.getAttachmentList())) {
List<MemoAttachmentEntity> list = ConvertUtils.sourceToTarget(dto.getAttachmentList(), MemoAttachmentEntity.class);
list.forEach(l->l.setRemindMsgId(entity.getId()));
list.forEach(l -> l.setRemindMsgId(entity.getId()));
memoAttachmentService.insertBatch(list);
}
//3.判断更新提醒记录表提醒时间
if(null != dto.getRemindTime()){
if (null != dto.getRemindTime()) {
MemoAttrDTO memoAttr = new MemoAttrDTO();
memoAttr.setId(dto.getId());
memoAttr.setRemindTime(dto.getRemindTime());
@ -126,6 +129,10 @@ public class MemoDifficultyServiceImpl extends BaseServiceImpl<MemoDifficultyDao
@Override
public MemoDifficultyDTO detail(MemoDifficultyDetailFromDTO fromDTO) {
//0.判断已读，则修改已读标记
if (fromDTO.getReadFlag() == NumConstant.ONE) {
memoAttrService.setReaded(fromDTO.getId());
}
//1.查询难点堵点主表数据
MemoDifficultyEntity entity = baseDao.selectById(fromDTO.getId());
MemoDifficultyDTO resultDTO = ConvertUtils.sourceToTarget(entity, MemoDifficultyDTO.class);

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

@ -4,22 +4,28 @@ import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
import com.epmet.commons.tools.constant.NumConstant;
import com.epmet.commons.tools.page.PageData;
import com.epmet.commons.tools.utils.ConvertUtils;
import com.epmet.constant.MemoConstant;
import com.epmet.dao.MemoWorkDiaryDao;
import com.epmet.dto.MemoAttachmentDTO;
import com.epmet.dto.MemoAttrDTO;
import com.epmet.dto.MemoWorkDiaryDTO;
import com.epmet.dto.form.MemoWorkDiaryFormDTO;
import com.epmet.entity.MemoAttachmentEntity;
import com.epmet.entity.MemoWorkDiaryEntity;
import com.epmet.service.MemoAttachmentService;
import com.epmet.service.MemoAttrService;
import com.epmet.service.MemoWorkDiaryService;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import org.apache.commons.collections4.CollectionUtils;
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.concurrent.atomic.AtomicInteger;
import java.util.stream.Collectors;
/**
* 备忘录-工作日志
@ -46,7 +52,6 @@ public class MemoWorkDiaryServiceImpl extends BaseServiceImpl<MemoWorkDiaryDao,
@Override
public List<MemoWorkDiaryDTO> list(MemoWorkDiaryFormDTO formDTO) {
List<MemoWorkDiaryDTO> list = baseDao.getPage(formDTO);
return list;
}
@ -54,12 +59,16 @@ public class MemoWorkDiaryServiceImpl extends BaseServiceImpl<MemoWorkDiaryDao,
public MemoWorkDiaryDTO get(MemoWorkDiaryFormDTO formDTO) {
MemoWorkDiaryEntity entity = baseDao.selectById(formDTO.getId());
MemoWorkDiaryDTO dto = ConvertUtils.sourceToTarget(entity, MemoWorkDiaryDTO.class);
//获取提醒时间
MemoAttrDTO memoAttr = memoAttrService.get(formDTO.getId());
if (null != memoAttr && null != dto) {
dto.setRemindTime(memoAttr.getRemindTime());
if (null != dto) {
//获取提醒时间
MemoAttrDTO memoAttr = memoAttrService.get(formDTO.getId());
if (null != memoAttr) {
dto.setRemindTime(memoAttr.getRemindTime());
}
//获取附件列表
List<MemoAttachmentDTO> attachmentList = memoAttachmentService.getListByMemoId(formDTO.getId());
dto.setAttachmentList(attachmentList);
}
//获取附件列表
//更新阅读状态
if (NumConstant.ONE_STR.equals(formDTO.getReadFlag())) {
MemoAttrDTO memoAttrDTO = new MemoAttrDTO();
@ -75,6 +84,28 @@ public class MemoWorkDiaryServiceImpl extends BaseServiceImpl<MemoWorkDiaryDao,
public void save(MemoWorkDiaryDTO dto) {
MemoWorkDiaryEntity entity = ConvertUtils.sourceToTarget(dto, MemoWorkDiaryEntity.class);
insert(entity);
//保存属性
MemoAttrDTO attr = ConvertUtils.sourceToTarget(dto, MemoAttrDTO.class);;
attr.setType(MemoConstant.WORK_DIARY);
attr.setReadFlag(NumConstant.ZERO);
attr.setReceiver(dto.getCreatedBy());
memoAttrService.save(attr);
//删除原来的附件
memoAttachmentService.deleteByMemoId(entity.getId());
//保存新的照片
if (CollectionUtils.isNotEmpty(dto.getAttachmentList())) {
AtomicInteger i = new AtomicInteger(NumConstant.ZERO);
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);
}
}
@Override
@ -82,13 +113,43 @@ public class MemoWorkDiaryServiceImpl extends BaseServiceImpl<MemoWorkDiaryDao,
public void update(MemoWorkDiaryDTO dto) {
MemoWorkDiaryEntity entity = ConvertUtils.sourceToTarget(dto, MemoWorkDiaryEntity.class);
updateById(entity);
//时间有变动时保存属性，readFlag变为0
MemoAttrDTO attr = memoAttrService.get(dto.getId());
if (dto.getRemindTime() != attr.getRemindTime()) {
attr.setRemindTime(dto.getRemindTime());
attr.setReadFlag(NumConstant.ZERO);
attr.setUpdatedTime(null);
memoAttrService.update(attr);
}
//删除原来的附件
memoAttachmentService.deleteByMemoId(entity.getId());
//保存新的照片
if (CollectionUtils.isNotEmpty(dto.getAttachmentList())) {
AtomicInteger i = new AtomicInteger(NumConstant.ZERO);
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);
}
}
@Override
@Transactional(rollbackFor = Exception.class)
public void delete(String[] ids) {
// 逻辑删除（@TableLogic 注解）
baseDao.deleteBatchIds(Arrays.asList(ids));
List<String> list = Arrays.asList(ids);
baseDao.deleteBatchIds(list);
memoAttrService.delete(ids);
list.forEach(id -> {
//删除附件
memoAttachmentService.deleteByMemoId(id);
});
}
}

45
epmet-module/gov-project/gov-project-server/src/main/resources/mapper/MemoConcernDao.xml
View File

@ -3,6 +3,51 @@
<mapper namespace="com.epmet.dao.MemoConcernDao">
<select id="getPage" resultType="com.epmet.dto.MemoConcernDTO">
SELECT
a.ID,
a.CONCERN_TYPE,
a.RESI_NAME,
a.PHONE,
a.ADDRESS,
a.CONTENT,
a.SCHEDULED_TIME,
a.ACTUAL_TIME,
a.STATUS,
b.REMIND_TIME,
a.CREATED_TIME
FROM memo_concern 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 != resiName and "" != resiName'>
AND a.RESI_NAME LIKE concat('%', #{resiName}, '%')
</if>
<if test='null != concernType and "" != concernType'>
AND a.CONCERN_TYPE LIKE concat('%', #{concernType}, '%')
</if>
<if test='null != status and "" != status'>
AND a.STATUS = #{status}
</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>
<if test='null != scheduledStartTime and "" != scheduledStartTime'>
AND DATE_FORMAT(a.SCHEDULED_TIME, "%Y-%m-%d") &gt;= #{scheduledStartTime}
</if>
<if test='null != scheduledEndTime and "" != scheduledEndTime'>
AND DATE_FORMAT(a.SCHEDULED_TIME, "%Y-%m-%d") &lt;= #{scheduledEndTime}
</if>
ORDER BY a.CREATED_TIME DESC
</select>
</mapper>

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

@ -3,6 +3,38 @@
<mapper namespace="com.epmet.dao.MemoDifficultyDao">
<select id="getPage" resultType="com.epmet.dto.MemoDifficultyDTO">
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.created_by = #{userId}
<if test='null != content and "" != content'>
AND md.content LIKE concat('%', #{content}, '%')
</if>
<if test='null != scheduledStartTime and "" != scheduledStartTime'>
AND DATE_FORMAT(md.scheduled_time, "%Y-%m-%d") &gt;= #{scheduledStartTime}
</if>
<if test='null != scheduledEndTime and "" != scheduledEndTime'>
AND DATE_FORMAT(md.scheduled_time, "%Y-%m-%d") &lt;= #{scheduledEndTime}
</if>
<if test='null != startTime and "" != startTime'>
AND DATE_FORMAT(md.created_time, "%Y-%m-%d") &gt;= #{startTime}
</if>
<if test='null != endTime and "" != endTime'>
AND DATE_FORMAT(md.created_time, "%Y-%m-%d") &lt;= #{endTime}
</if>
ORDER BY md.created_time DESC
</select>
</mapper>
Write Preview
Loading…
Cancel
Save