From 3eee4ef8dddb8d113490dc84ed174e1faa09b00f Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期四, 01 七月 2021 11:30:15 +0800
Subject: [PATCH] 修改bug
---
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventVisitingTasksServiceImpl.java | 65 +++++++++++++++++++++++---------
1 files changed, 47 insertions(+), 18 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventVisitingTasksServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventVisitingTasksServiceImpl.java
index bcf663a..497e674 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventVisitingTasksServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventVisitingTasksServiceImpl.java
@@ -176,26 +176,41 @@
@Transactional
@Override
- public R delete(String ids, Long communityId) {
- String[] idarr = ids.split(",");
+ public R delete(IdDTO idDTO, Long communityId) {
+ StringBuilder rt = new StringBuilder();
+ String[] idarr = idDTO.getId().split(",");
for(String id:idarr){
if(StringUtils.isEmpty(id)){
continue;
}
- EventVisitingTasksDO eventVisitingTasksDO = eventVisitingTasksMapper.selectOne(new QueryWrapper<EventVisitingTasksDO>().eq("id",Long.valueOf(id)).eq("grid_member_community",communityId));
- if(eventVisitingTasksDO == null){
- throw new RuntimeException("无权限");
+ String error = toDelete(Long.valueOf(id));
+ if(!StringUtils.isEmpty(error)){
+ rt.append(rt);
}
- eventVisitingTasksMapper.deleteById(Long.valueOf(id));
+ }
+ if(!StringUtils.isEmpty(rt)){
+ return R.fail("部分删除失败:"+rt.toString());
}
return R.ok();
+ }
+
+ private String toDelete(Long id) {
+ EventVisitingTasksDO eventVisitingTasksDO = eventVisitingTasksMapper.selectById(id);
+ if(eventVisitingTasksDO == null){
+ return "["+id+"]数据不存在;";
+ }
+ if(!Objects.equals(eventVisitingTasksDO.getEventStatus(),EventTasksStatusEnum.DZF.getCode())){
+ return "["+eventVisitingTasksDO.getVisiterName()+"]状态不可删除;";
+ }
+ eventVisitingTasksMapper.deleteById(Long.valueOf(id));
+ return null;
}
@Override
public R visitorList(EventVisitListQuery query) {
IPage<EventVisitListVO> page = eventVisitingTasksMapper.visitorList(new Page(query.getPageNum(),query.getPageSize()),query);
page.getRecords().stream().forEach(e->{
- List<EventVisitingTasksDO> list = eventVisitingTasksMapper.selectList(new QueryWrapper<EventVisitingTasksDO>().eq("visiter_id",e.getId()).orderByDesc("id"));
+ List<EventVisitingTasksDO> list = eventVisitingTasksMapper.selectList(new QueryWrapper<EventVisitingTasksDO>().eq("visiter_id",e.getId()).orderByDesc("id").last("limit 0,1"));
if(!CollectionUtils.isEmpty(list)){
e.setCreateAt(list.get(0).getCreateAt());
e.setEventStatus(list.get(0).getEventStatus());
@@ -339,13 +354,13 @@
@Transactional(rollbackFor = Exception.class)
@Override
- public R cancel(Long id) {
+ public R cancel(IdDTO idDTO) {
- EventVisitingTasksDO eventVisitingTasksDO = eventVisitingTasksMapper.selectById(id);
+ EventVisitingTasksDO eventVisitingTasksDO = eventVisitingTasksMapper.selectById(Long.valueOf(idDTO.getId()));
if(eventVisitingTasksDO == null || eventVisitingTasksDO.getEventStatus() != EventTasksStatusEnum.DZF.getCode()){
return R.fail("当前状态不可撤销");
}
- int rt = eventVisitingTasksMapper.cancel(id,EventTasksStatusEnum.YCX.getCode());
+ int rt = eventVisitingTasksMapper.cancel(eventVisitingTasksDO.getId(),EventTasksStatusEnum.YCX.getCode());
if(rt > 0){
return R.ok();
}
@@ -354,13 +369,13 @@
@Transactional(rollbackFor = Exception.class)
@Override
- public R reset(Long id) {
+ public R reset(IdDTO idDTO) {
- EventVisitingTasksDO eventVisitingTasksDO = eventVisitingTasksMapper.selectById(id);
+ EventVisitingTasksDO eventVisitingTasksDO = eventVisitingTasksMapper.selectById(Long.valueOf(idDTO.getId()));
if(eventVisitingTasksDO == null || eventVisitingTasksDO.getEventStatus() != EventTasksStatusEnum.YCX.getCode()){
return R.fail("当前状态不可恢复");
}
- int rt = eventVisitingTasksMapper.updateEventStatus(id,EventTasksStatusEnum.DZF.getCode());
+ int rt = eventVisitingTasksMapper.updateEventStatus(eventVisitingTasksDO.getId(),EventTasksStatusEnum.DZF.getCode());
if(rt > 0){
return R.ok();
}
@@ -397,17 +412,32 @@
if(eventVisitingTasksDO == null || eventVisitingTasksDO.getEventStatus() != EventTasksStatusEnum.DZF.getCode()){
return R.fail("当前状态不可完成走访");
}
+
+ //查询当前人员是否是(精神障碍,吸毒,刑满释放,社区矫正),如果是这四种状态，option参数为必填参数
+ String label = this.baseMapper.getPopulationLabel(eventVisitingTasksDO.getVisiterId());
+ if(StringUtils.isNotEmpty(label)){
+ if(label.contains("精神障碍") || label.contains("吸毒") || label.contains("刑满释放") || label.contains("社区矫正")){
+ if(StringUtils.isNotEmpty(taskCompleteDTO.getOption())){
+ return R.fail("请选择异常状态");
+ }
+ }
+ }
+
EventVisitingTasksDO complete = new EventVisitingTasksDO();
BeanUtils.copyProperties(taskCompleteDTO,complete);
- if(taskCompleteDTO.getException().intValue() == 0){
+ if(taskCompleteDTO.getException() == 0){
complete.setEventStatus(EventTasksStatusEnum.ZJJJ.getCode());
}else{
complete.setEventStatus(EventTasksStatusEnum.YC.getCode());
}
complete.setSubmitDate(DateUtil.parse(taskCompleteDTO.getSubmitDate(), DatePattern.NORM_DATETIME_FORMAT));
- JSONObject json = JSONObject.parseObject(eventVisitingTasksDO.getTableContentJson());
- json.put("check",taskCompleteDTO.getOption());
- complete.setTableContentJson(json.toJSONString());
+ if(StringUtils.isNotEmpty(eventVisitingTasksDO.getTableContentJson())){
+ JSONObject json = JSONObject.parseObject(eventVisitingTasksDO.getTableContentJson());
+ if(StringUtils.isNotEmpty(taskCompleteDTO.getOption())){
+ json.put("check",taskCompleteDTO.getOption());
+ }
+ complete.setTableContentJson(json.toJSONString());
+ }
if(!StringUtils.isEmpty(taskCompleteDTO.getImgList())){
taskCompleteDTO.getImgList().forEach(e->{
@@ -512,6 +542,5 @@
}
return false;
}
-
}
--
Gitblit v1.7.1