From a7002e25ec105e5f73c27f91944f1c0b4991c355 Mon Sep 17 00:00:00 2001
From: puhanshu <a9236326>
Date: 星期四, 30 十二月 2021 14:23:41 +0800
Subject: [PATCH] Merge branch 'master' into test
---
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventVisitingTasksServiceImpl.java | 487 ++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 368 insertions(+), 119 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 ce29926..8c6fb6f 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
@@ -1,39 +1,50 @@
package com.panzhihua.service_grid.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.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.panzhihua.common.enums.EventTasksStatusEnum;
-import com.panzhihua.common.model.dtos.grid.*;
-import com.panzhihua.common.model.helper.AESUtil;
-import com.panzhihua.common.model.query.visit.EventTasksQuery;
-import com.panzhihua.common.model.query.visit.EventVisitListQuery;
-import com.panzhihua.common.model.vos.R;
-import com.panzhihua.common.model.vos.grid.EventDetailsVO;
-import com.panzhihua.common.model.vos.grid.EventResourceVO;
-import com.panzhihua.common.model.vos.visit.*;
-import com.panzhihua.common.utlis.CopyUtil;
-import com.panzhihua.common.utlis.StringUtils;
-import com.panzhihua.service_grid.dao.EventResourceMapper;
-import com.panzhihua.service_grid.dao.EventVisitingTasksMapper;
-import com.panzhihua.service_grid.model.dos.EventResourceDO;
-import com.panzhihua.service_grid.model.dos.EventVisitingTasksDO;
-import com.panzhihua.service_grid.service.EventResourceService;
-import com.panzhihua.service_grid.service.EventVisitingTasksService;
-import lombok.extern.slf4j.Slf4j;
+import java.util.*;
+
+import javax.annotation.Resource;
+
+import com.panzhihua.common.model.vos.community.ComMngPopulationCommunityTagsVo;
+import com.panzhihua.common.utlis.DateUtils;
+import com.panzhihua.common.utlis.LabelUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
-import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
+import com.alibaba.fastjson.JSONObject;
+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.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.panzhihua.common.enums.EventTasksStatusEnum;
+import com.panzhihua.common.enums.PopulPoliticalOutlookEnum;
+import com.panzhihua.common.model.dtos.EventResourceDTO;
+import com.panzhihua.common.model.dtos.IdDTO;
+import com.panzhihua.common.model.dtos.grid.*;
+import com.panzhihua.common.model.dtos.visit.EventVisitCompleteDTO;
+import com.panzhihua.common.model.helper.AESUtil;
+import com.panzhihua.common.model.query.visit.EventTasksQuery;
+import com.panzhihua.common.model.query.visit.EventVisitListQuery;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.grid.EventResourceVO;
+import com.panzhihua.common.model.vos.visit.*;
+import com.panzhihua.common.utlis.CopyUtil;
+import com.panzhihua.common.utlis.StringUtils;
+import com.panzhihua.service_grid.dao.EventGridDataMapper;
+import com.panzhihua.service_grid.dao.EventResourceMapper;
+import com.panzhihua.service_grid.dao.EventVisitingTasksMapper;
+import com.panzhihua.service_grid.model.dos.EventGridDataDO;
+import com.panzhihua.service_grid.model.dos.EventResourceDO;
+import com.panzhihua.service_grid.model.dos.EventVisitingTasksDO;
+import com.panzhihua.service_grid.service.EventResourceService;
+import com.panzhihua.service_grid.service.EventVisitingTasksService;
+
+import cn.hutool.core.date.DatePattern;
+import cn.hutool.core.date.DateUtil;
+import lombok.extern.slf4j.Slf4j;
/**
* @auther lyq
@@ -42,7 +53,8 @@
*/
@Slf4j
@Service
-public class EventVisitingTasksServiceImpl extends ServiceImpl<EventVisitingTasksMapper, EventVisitingTasksDO> implements EventVisitingTasksService {
+public class EventVisitingTasksServiceImpl extends ServiceImpl<EventVisitingTasksMapper, EventVisitingTasksDO>
+ implements EventVisitingTasksService {
@Resource
private EventVisitingTasksMapper eventVisitingTasksMapper;
@@ -52,6 +64,9 @@
@Resource
private EventResourceService eventResourceService;
+
+ @Resource
+ private EventGridDataMapper eventGridDataMapper;
@Value("${domain.aesKey:}")
private String aesKey;
@@ -74,14 +89,14 @@
/**
* 修改重点人群走访记录
- *
+ *
* @param eventVisitingTasksEditDTO
* @return 维护结果
*/
public R edit(EventVisitingTasksEditDTO eventVisitingTasksEditDTO) {
EventVisitingTasksDO eventVisitingTasksDO = new EventVisitingTasksDO();
BeanUtils.copyProperties(eventVisitingTasksEditDTO, eventVisitingTasksDO);
- //eventVisitingTasksDO.setUpdateAt(new Date());
+ // eventVisitingTasksDO.setUpdateAt(new Date());
if (eventVisitingTasksMapper.updateById(eventVisitingTasksDO) > 0) {
return R.ok();
}
@@ -90,7 +105,7 @@
/**
* 分页查找重点人群走访记录
- *
+ *
* @param pageEventVisitingTasksDTO
* @return 维护结果
*/
@@ -118,7 +133,8 @@
/**
* 查询重点人群走访记录详细信息
*
- * @param id 重点人群走访记录 id
+ * @param id
+ * 重点人群走访记录 id
* @return 查找结果
*/
public R<EventVisitingTasksDetailsVO> eventVisitingTasksDetails(Long id) {
@@ -126,9 +142,12 @@
if (eventVisitingTasksDO != null) {
EventVisitingTasksDetailsVO eventVisitingTasksDetailsVO = new EventVisitingTasksDetailsVO();
BeanUtils.copyProperties(eventVisitingTasksDO, eventVisitingTasksDetailsVO);
- eventVisitingTasksDetailsVO.setImgList(eventResourceMapper.findListByRefId(eventVisitingTasksDO.getId(), 2, 1));
- eventVisitingTasksDetailsVO.setVosList(eventResourceMapper.findListByRefId(eventVisitingTasksDO.getId(), 2, 2));
- eventVisitingTasksDetailsVO.setVideoList(eventResourceMapper.findListByRefId(eventVisitingTasksDO.getId(), 2, 3));
+ eventVisitingTasksDetailsVO
+ .setImgList(eventResourceMapper.findListByRefId(eventVisitingTasksDO.getId(), 2, 1));
+ eventVisitingTasksDetailsVO
+ .setVosList(eventResourceMapper.findListByRefId(eventVisitingTasksDO.getId(), 2, 2));
+ eventVisitingTasksDetailsVO
+ .setVideoList(eventResourceMapper.findListByRefId(eventVisitingTasksDO.getId(), 2, 3));
return R.ok(eventVisitingTasksDetailsVO);
}
return R.fail();
@@ -146,50 +165,126 @@
}
@Override
- public R taskList(EventTasksQuery query) {
+ public R taskList(EventTasksQuery query) throws Exception {
- IPage<EventVisitingTasksVO> page = eventVisitingTasksMapper.findListByPage(new Page(query.getPageNum(), query.getPageSize()), query);
+ IPage<EventVisitingTasksVO> page =
+ eventVisitingTasksMapper.findListByPage(new Page(query.getPageNum(), query.getPageSize()), query);
+ for (EventVisitingTasksVO eventVisitingTasksVO : page.getRecords()) {
+ if (eventVisitingTasksVO.getNationCode() != null) {
+ eventVisitingTasksVO
+ .setNation(PopulPoliticalOutlookEnum.getCnDescByName(eventVisitingTasksVO.getNationCode()));
+ }
+ //查询该人口的标签
+ List<ComMngPopulationCommunityTagsVo> communityTagsList = this.baseMapper.getCommunityTagList(eventVisitingTasksVO.getVisiterId());
+ String label = LabelUtils.assembleLabel(communityTagsList);
+ eventVisitingTasksVO.setLabel(label);
+ }
+ return R.ok(page);
+ }
+ @Override
+ public R appTaskList(EventTasksQuery query) throws Exception {
+
+ IPage<EventVisitingTasksVO> page =
+ eventVisitingTasksMapper.appFindListByPage(new Page(query.getPageNum(), query.getPageSize()), query);
+ for (EventVisitingTasksVO eventVisitingTasksVO : page.getRecords()) {
+ if (eventVisitingTasksVO.getNationCode() != null) {
+ eventVisitingTasksVO
+ .setNation(PopulPoliticalOutlookEnum.getCnDescByName(eventVisitingTasksVO.getNationCode()));
+ }
+
+ //查询该人口的标签
+ List<ComMngPopulationCommunityTagsVo> communityTagsList = this.baseMapper.getCommunityTagList(eventVisitingTasksVO.getVisiterId());
+ String label = LabelUtils.assembleLabel(communityTagsList);
+ eventVisitingTasksVO.setLabel(label);
+ }
return R.ok(page);
}
@Transactional
@Override
- public R delete(String ids, Long communityId) {
- String[] idarr = ids.split(",");
- for (String id : idarr) {
- if (StringUtils.isEmpty(id)) {
- continue;
+ public R delete(IdDTO idDTO, Long communityId) {
+ String[] ids = idDTO.getId().split(",");
+ for (String id : ids) {
+ EventVisitingTasksDO eventVisitingTasksDO = eventVisitingTasksMapper.selectById(Long.valueOf(id));
+ if (eventVisitingTasksDO != null) {
+ if (!Objects.equals(eventVisitingTasksDO.getEventStatus(), EventTasksStatusEnum.DZF.getCode())) {
+ return R.fail("您选择的走访任务中有已走访的不可删除");
+ }
+ eventVisitingTasksMapper.deleteById(id);
}
- EventVisitingTasksDO eventVisitingTasksDO = eventVisitingTasksMapper.selectOne(new QueryWrapper<EventVisitingTasksDO>().eq("id", Long.valueOf(id)).eq("grid_member_community", communityId));
- if (eventVisitingTasksDO == null) {
- throw new RuntimeException("无权限");
- }
- eventVisitingTasksMapper.deleteById(Long.valueOf(id));
}
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(id);
+ return null;
+ }
+
@Override
public R visitorList(EventVisitListQuery query) {
- IPage<EventVisitListVO> page = eventVisitingTasksMapper.visitorList(new Page(query.getPageNum(), query.getPageSize()), 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").last("limit 0,1"));
+ if (!CollectionUtils.isEmpty(list)) {
+ e.setCreateAt(list.get(0).getCreateAt());
+ e.setEventStatus(list.get(0).getEventStatus());
+ }
+ });
return R.ok(page);
}
@Override
public R list(EventTasksQuery query) {
- IPage<AppVisitTasksVO> page = eventVisitingTasksMapper.list(new Page(query.getPageNum(), query.getPageSize()), query);
+ IPage<AppVisitTasksVO> page =
+ eventVisitingTasksMapper.list(new Page(query.getPageNum(), query.getPageSize()), query);
return R.ok(page);
}
@Override
- public R detail(Long id) throws Exception {
+ public R detail(Long id){
EventVisitingTasksDO eventVisitingTasksDO = eventVisitingTasksMapper.selectById(id);
if (eventVisitingTasksDO != null) {
EventVisitingTasksDetailsVO eventVisitingTasksDetailsVO = new EventVisitingTasksDetailsVO();
BeanUtils.copyProperties(eventVisitingTasksDO, eventVisitingTasksDetailsVO);
- ;
- eventVisitingTasksDetailsVO.setVisiterTele(AESUtil.decrypt128(eventVisitingTasksDO.getVisiterTele(), aesKey));
+ if (StringUtils.isNotEmpty(eventVisitingTasksDO.getVisiterTele())) {
+ try {
+ eventVisitingTasksDetailsVO
+ .setVisiterPhone(AESUtil.decrypt128(eventVisitingTasksDO.getVisiterTele(), aesKey));
+ eventVisitingTasksDetailsVO
+ .setVisiterTele(AESUtil.decrypt128(eventVisitingTasksDO.getVisiterTele(), aesKey));
+ }catch (Exception e){
+ log.error("手机号码转义失败");
+ }
+ }
+ if(StringUtils.isNotEmpty(eventVisitingTasksDO.getTableContentJson())){
+ JSONObject jsonObject = JSONObject.parseObject(eventVisitingTasksDO.getTableContentJson());
+ eventVisitingTasksDetailsVO
+ .setTableContentJson(JSONObject.parseObject(eventVisitingTasksDO.getTableContentJson()));
+ if (jsonObject != null && jsonObject.get("check") != null) {
+ eventVisitingTasksDetailsVO.setOption(jsonObject.get("check").toString());
+ }
+ }
+
+ // 查询资源文件
+ eventVisitingTasksDetailsVO
+ .setImgList(eventResourceMapper.findListByRefId(eventVisitingTasksDO.getId(), 2, 1));
+ eventVisitingTasksDetailsVO
+ .setVosList(eventResourceMapper.findListByRefId(eventVisitingTasksDO.getId(), 2, 2));
+ eventVisitingTasksDetailsVO
+ .setVideoList(eventResourceMapper.findListByRefId(eventVisitingTasksDO.getId(), 2, 3));
+ eventVisitingTasksDetailsVO.setHappentAddress(eventVisitingTasksDO.getAddress());
return R.ok(eventVisitingTasksDetailsVO);
}
return R.fail();
@@ -197,57 +292,74 @@
@Transactional(rollbackFor = Exception.class)
@Override
- public R add(String ids, Long communityId, Long userId) {
- Map<String, Object> map = eventVisitingTasksMapper.findUserByCommunityId(communityId, 6);
- if (CollectionUtils.isEmpty(map)) {
- return R.fail("网格员不存在");
- }
- String[] id = ids.split(",");
+ public R add(IdDTO idDTO, Long communityId, Long userId) throws Exception {
+
+ // Map<String,Object> map = eventVisitingTasksMapper.findUserByCommunityId(communityId,6);
+ // if(CollectionUtils.isEmpty(map)){
+ // return R.fail("网格员不存在");
+ // }
+
+ StringBuilder rt = new StringBuilder();
+ String[] id = idDTO.getId().split(",");
for (String idstr : id) {
if (StringUtils.isEmpty(idstr)) {
continue;
}
- addVisitingTask(Long.valueOf(idstr), map, communityId, userId);
+ String error = addVisitingTask(Long.valueOf(idstr), idDTO.getGridId(), userId);
+ if (!StringUtils.isEmpty(error)) {
+ rt.append(error);
+ }
}
-
+ if (!StringUtils.isEmpty(rt)) {
+ return R.fail("部分新增失败" + rt.toString());
+ }
return R.ok();
}
@Override
- public List<EventVisitingTasksVO> exportTaskList(EventTasksQuery query) {
- IPage<EventVisitingTasksVO> page = eventVisitingTasksMapper.findListByPage(new Page(query.getPageNum(), query.getPageSize()), query);
-
+ public List<EventVisitingTasksVO> exportTaskList(EventTasksQuery query) throws Exception {
+ IPage<EventVisitingTasksVO> page =
+ eventVisitingTasksMapper.findListByPage(new Page(query.getPageNum(), query.getPageSize()), query);
return page.getRecords();
}
+ private String addVisitingTask(Long id, Long gridId, Long userId) throws Exception {
- private void addVisitingTask(Long id, Map<String, Object> gridMap, Long communityId, Long userId) {
+ Map<String, Object> map = eventVisitingTasksMapper.findPopulationById(id);
+ if (CollectionUtils.isEmpty(map)) {
+ return "被访问人ID[" + id + "]不存在;";
+ }
Integer count = eventVisitingTasksMapper.countNoneComplete(id);
if (count > 0) {
- return;
+ return "被访问人[" + map.get("name") + "]只能同时存在一条待走访任务;";
}
- Map<String, Object> map = eventVisitingTasksMapper.findPopulationById(id);
- if (CollectionUtils.isEmpty(map)) {
- return;
- }
+
EventVisitingTasksDO visitingTasksDO = new EventVisitingTasksDO();
-// visitingTasksDO.setGridMemberStreet(Long.valueOf(gridMap.get("street_id").toString()));
-// visitingTasksDO.setGridMemberCommunity(communityId);
-// visitingTasksDO.setGridMember(Long.valueOf(gridMap.get("user_id").toString()));
-// visitingTasksDO.setGridMemberName(gridMap.get("name").toString());
-// visitingTasksDO.setGridMenberTele(gridMap.get("phone") ==null?"":gridMap.get("phone").toString());
+ visitingTasksDO.setGridId(gridId);
+ // 查询网格
+ EventGridDataDO gridDataDO = eventGridDataMapper.selectById(gridId);
+ if (gridDataDO != null) {
+ visitingTasksDO.setGridMemberCommunity(gridDataDO.getGridCommunityId());
+ visitingTasksDO.setGridMemberStreet(gridDataDO.getGridStreetId());
+ }
+ // visitingTasksDO.setGridMemberStreet(Long.valueOf(gridMap.get("street_id").toString()));
+ // visitingTasksDO.setGridMemberCommunity(communityId);
+ // visitingTasksDO.setGridMember(Long.valueOf(gridMap.get("user_id").toString()));
+ // visitingTasksDO.setGridMemberName(gridMap.get("name").toString());
+ // visitingTasksDO.setGridMenberTele(gridMap.get("phone") ==null?"":gridMap.get("phone").toString());
visitingTasksDO.setVisiterId(Long.valueOf(map.get("id").toString()));
visitingTasksDO.setVisiterName(map.get("name").toString());
visitingTasksDO.setVisiterSex(Integer.valueOf(map.get("sex").toString()));
- visitingTasksDO.setVisiterTele(map.get("phone") == null ? "" : map.get("phone").toString());
+ visitingTasksDO.setVisiterTele(map.get("phone") == null ? null : map.get("phone").toString());
StringBuilder sb = new StringBuilder();
- sb.append(map.get("address")).append(map.get("road")).append(map.get("door_no")).append(map.get("floor")).append("栋").append(map.get("unit_no")).append("单元").append(map.get("house_no")).append("号");
+ sb.append(map.get("address")).append(map.get("road")).append(map.get("door_no")).append(map.get("floor"))
+ .append("栋").append(map.get("unit_no")).append("单元").append(map.get("house_no")).append("号");
visitingTasksDO.setVisiterAddress(sb.toString());
visitingTasksDO.setVisiterType(0);
visitingTasksDO.setActOpara(0);
if (map.get("lat") != null && map.get("lng") != null) {
- visitingTasksDO.setHappentLatLng(map.get("lat") + "-" + map.get("lng"));
+ visitingTasksDO.setHappentLatLng(map.get("lat") + "," + map.get("lng"));
}
visitingTasksDO.setEventStatus(EventTasksStatusEnum.DZF.getCode());
visitingTasksDO.setReporting(0);
@@ -255,18 +367,62 @@
visitingTasksDO.setUrgent(false);
visitingTasksDO.setUrgentDell(false);
visitingTasksDO.setCreateBy(userId);
+ visitingTasksDO.setOutOrLocal(
+ map.get("out_or_local") == null ? null : Integer.valueOf(map.get("out_or_local").toString()));
+
+ if (map.get("label") != null) {
+ List<String> option = getOption(map.get("label").toString());
+ if (!CollectionUtils.isEmpty(option)) {
+ JSONObject json = new JSONObject();
+ json.put("option", option);
+ visitingTasksDO.setTableContentJson(json.toJSONString());
+ }
+ }
+
eventVisitingTasksMapper.insert(visitingTasksDO);
+ return null;
+ }
+
+ private List<String> getOption(String label) {
+ List<String> option = new ArrayList<>();
+ if (!Objects.isNull(label)) {
+ if (label.contains("精神障碍")) {
+ option.add("精神障碍异常1");
+ option.add("精神障碍异常2");
+ option.add("精神障碍异常3");
+ option.add("精神障碍异常4");
+
+ } else if (label.contains("吸毒")) {
+ option.add("疑似复吸");
+ option.add("失联");
+ option.add("复吸");
+ option.add("空挂户");
+ } else if (label.contains("刑满释放")) {
+ option.add("刑满释放异常1");
+ option.add("刑满释放异常2");
+ option.add("刑满释放异常3");
+ option.add("刑满释放异常4");
+ } else if (label.contains("社区矫正")) {
+ option.add("社区矫正异常1");
+ option.add("社区矫正异常2");
+ option.add("社区矫正异常3");
+ option.add("社区矫正异常4");
+ }
+ option.add("无异常");
+ }
+ return option;
}
@Transactional(rollbackFor = Exception.class)
@Override
- public R cancel(Long id) {
+ public R cancel(IdDTO idDTO) {
- EventVisitingTasksDO eventVisitingTasksDO = eventVisitingTasksMapper.selectById(id);
- if (eventVisitingTasksDO == null || eventVisitingTasksDO.getEventStatus() != EventTasksStatusEnum.DZF.getCode()) {
+ 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(), 5);
if (rt > 0) {
return R.ok();
}
@@ -275,13 +431,14 @@
@Transactional(rollbackFor = Exception.class)
@Override
- public R reset(Long id) {
+ public R reset(IdDTO idDTO) {
- EventVisitingTasksDO eventVisitingTasksDO = eventVisitingTasksMapper.selectById(id);
- if (eventVisitingTasksDO == null || eventVisitingTasksDO.getEventStatus() != EventTasksStatusEnum.YCX.getCode()) {
+ EventVisitingTasksDO eventVisitingTasksDO = eventVisitingTasksMapper.selectById(Long.valueOf(idDTO.getId()));
+ if (eventVisitingTasksDO == null || eventVisitingTasksDO.getEventStatus() != 5) {
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();
}
@@ -292,7 +449,8 @@
@Override
public synchronized R start(Long id, Long userId) {
EventVisitingTasksDO eventVisitingTasksDO = eventVisitingTasksMapper.selectById(id);
- if (eventVisitingTasksDO == null || eventVisitingTasksDO.getEventStatus() != EventTasksStatusEnum.DZF.getCode()) {
+ if (eventVisitingTasksDO == null
+ || eventVisitingTasksDO.getEventStatus() != EventTasksStatusEnum.DZF.getCode()) {
return R.fail("当前状态不可开始走访");
}
Map<String, Object> map = eventVisitingTasksMapper.findUserById(userId);
@@ -303,7 +461,7 @@
start.setGridMember(Long.valueOf(map.get("user_id").toString()));
start.setGridMemberName(map.get("name").toString());
start.setGridMenberTele(map.get("phone") == null ? "" : map.get("phone").toString());
- start.setEventStatus(EventTasksStatusEnum.JXZ.getCode());
+ start.setEventStatus(EventTasksStatusEnum.YJJ.getCode());
int rt = eventVisitingTasksMapper.start(start);
if (rt > 0) {
return R.ok();
@@ -315,46 +473,84 @@
@Override
public R complete(EventVisitCompleteDTO taskCompleteDTO) {
EventVisitingTasksDO eventVisitingTasksDO = eventVisitingTasksMapper.selectById(taskCompleteDTO.getId());
- if (eventVisitingTasksDO == null || eventVisitingTasksDO.getEventStatus() != EventTasksStatusEnum.JXZ.getCode()) {
+ if (eventVisitingTasksDO == null
+ || eventVisitingTasksDO.getEventStatus() != EventTasksStatusEnum.DZF.getCode()) {
return R.fail("当前状态不可完成走访");
}
- if (taskCompleteDTO.getException().intValue() == 0) {
- taskCompleteDTO.setEventStatus(EventTasksStatusEnum.ZJJJ.getCode());
- } else {
- taskCompleteDTO.setEventStatus(EventTasksStatusEnum.YC.getCode());
+
+ // 查询当前人员是否是(精神障碍,吸毒,刑满释放,社区矫正),如果是这四种状态，option参数为必填参数
+ String label = this.baseMapper.getPopulationLabel(eventVisitingTasksDO.getVisiterId());
+ if (StringUtils.isNotEmpty(label)) {
+ if (label.contains("精神障碍") || label.contains("吸毒") || label.contains("刑满释放") || label.contains("社区矫正")) {
+ if(taskCompleteDTO.getException().equals(EventVisitingTasksDO.exception.yes) && StringUtils.isNotEmpty(taskCompleteDTO.getOption())){
+ return R.fail("请选择异常状态");
+ }
+// if (StringUtils.isNotEmpty(taskCompleteDTO.getOption())) {
+// return R.fail("请选择异常状态");
+// }
+ }
}
- if (!CollectionUtils.isEmpty(taskCompleteDTO.getImgList())) {
+ EventVisitingTasksDO complete = new EventVisitingTasksDO();
+ BeanUtils.copyProperties(taskCompleteDTO, complete);
+ complete.setEventStatus(EventTasksStatusEnum.YJJ.getCode());
+
+ complete.setSubmitDate(DateUtil.parse(taskCompleteDTO.getSubmitDate(), DatePattern.NORM_DATETIME_FORMAT));
+ 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 -> {
- createResource(eventVisitingTasksDO.getId(), eventVisitingTasksDO.getDellUserId(), 2, 1, e);
+ createResource(eventVisitingTasksDO.getId(), taskCompleteDTO.getUserId(), 2, 1, e);
});
}
if (!CollectionUtils.isEmpty(taskCompleteDTO.getVosList())) {
taskCompleteDTO.getVosList().forEach(e -> {
- createResource(eventVisitingTasksDO.getId(), eventVisitingTasksDO.getDellUserId(), 2, 2, e);
+ createResource(eventVisitingTasksDO.getId(), taskCompleteDTO.getUserId(), 2, 2, e);
});
}
if (!CollectionUtils.isEmpty(taskCompleteDTO.getVideoList())) {
- taskCompleteDTO.getVosList().forEach(e -> {
- createResource(eventVisitingTasksDO.getId(), eventVisitingTasksDO.getDellUserId(), 2, 3, e);
+ taskCompleteDTO.getVideoList().forEach(e -> {
+ createResource(eventVisitingTasksDO.getId(), taskCompleteDTO.getUserId(), 2, 3, e);
});
}
- int rt = eventVisitingTasksMapper.complete(taskCompleteDTO);
+
+ Map<String, Object> map = eventVisitingTasksMapper.findUserById(taskCompleteDTO.getUserId());
+ complete.setGridMemberStreet(Long.valueOf(map.get("street_id").toString()));
+ complete.setGridMemberCommunity(Long.valueOf(map.get("community_id").toString()));
+ complete.setGridMember(Long.valueOf(map.get("user_id").toString()));
+ complete.setGridMemberName(map.get("name").toString());
+ complete.setGridMenberTele(map.get("phone") == null ? "" : map.get("phone").toString());
+
+ int rt = eventVisitingTasksMapper.updateById(complete);
if (rt > 0) {
return R.ok();
}
return R.fail();
}
+ private void createResource(Long id, Long dellUserId, int classification, int type, EventResourceDTO resourceDTO) {
+ EventResourceDO eventResourceDO = new EventResourceDO();
+ eventResourceDO.setRefId(id);
+ eventResourceDO.setClassification(classification);
+ eventResourceDO.setType(type);
+ eventResourceDO.setCreateBy(dellUserId);
+ eventResourceDO.setUrl(resourceDTO.getUrl());
+ eventResourceDO.setResourceTime(resourceDTO.getResourceTime());
+ eventResourceMapper.insert(eventResourceDO);
+ }
+
@Override
public List<LcEventVisitingTasksListDTO> getUnUploadVisitingTask() {
- List<LcEventVisitingTasksListDTO> lcEventVisitingTasksList =new ArrayList<>();
- List<EventVisitingTasksDO> eventVisitingTasksList = baseMapper.selectList(
- new QueryWrapper<EventVisitingTasksDO>()
- .eq("lc_upload", false)
- .eq("event_status",2)
- );
- lcEventVisitingTasksList= CopyUtil.beanCopyList(eventVisitingTasksList,LcEventVisitingTasksListDTO.class);
+ List<LcEventVisitingTasksListDTO> lcEventVisitingTasksList = new ArrayList<>();
+ List<EventVisitingTasksDO> eventVisitingTasksList = baseMapper
+ .selectList(new QueryWrapper<EventVisitingTasksDO>().eq("lc_upload", false).eq("event_status", 2));
+ lcEventVisitingTasksList = CopyUtil.beanCopyList(eventVisitingTasksList, LcEventVisitingTasksListDTO.class);
lcEventVisitingTasksList.forEach(visitingTasks -> {
addVisitingTasksFile(visitingTasks);
});
@@ -362,12 +558,10 @@
}
private LcEventVisitingTasksListDTO addVisitingTasksFile(LcEventVisitingTasksListDTO visitingTasks) {
- //查询事件关联附件
+ // 查询事件关联附件
List<EventResourceDO> eventResourceDOList =
- eventResourceService.getBaseMapper().selectList(new LambdaQueryWrapper<EventResourceDO>()
- .eq(EventResourceDO::getClassification, 2)
- .eq(EventResourceDO::getRefId, visitingTasks.getId())
- );
+ eventResourceService.getBaseMapper().selectList(new LambdaQueryWrapper<EventResourceDO>()
+ .eq(EventResourceDO::getClassification, 2).eq(EventResourceDO::getRefId, visitingTasks.getId()));
List<EventResourceVO> picList = new ArrayList<>();
List<EventResourceVO> audioList = new ArrayList<>();
List<EventResourceVO> videoList = new ArrayList<>();
@@ -408,14 +602,69 @@
return false;
}
- private void createResource(Long id, Long dellUserId, int classification, int type, String url) {
- EventResourceDO eventResourceDO = new EventResourceDO();
- eventResourceDO.setRefId(id);
- eventResourceDO.setClassification(classification);
- eventResourceDO.setType(type);
- eventResourceDO.setCreateBy(dellUserId);
- eventResourceDO.setUrl(url);
- eventResourceMapper.insert(eventResourceDO);
+ /**
+ * 定时任务-给上月已走访的人员创建定时任务
+ * @return 执行结果
+ */
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public R timedTaskVisitingJobHandler(){
+
+ //需要创建的走访任务列表
+ List<EventVisitingTasksDO> saveList = new ArrayList<>();
+
+ //获取上月第一天时间
+ Date lastMonthFirst = DateUtils.getLastMonthFirst();
+ //获取上月最后一天时间
+ Date lastMonthEnd = DateUtils.getLastMonthEnd();
+
+ //查询上月已走访任务
+ List<EventVisitingTasksDO> visitingTasksList = this.baseMapper.selectList(new QueryWrapper<EventVisitingTasksDO>().lambda()
+ .eq(EventVisitingTasksDO::getEventStatus,EventVisitingTasksDO.eventStatus.yzf)
+ .ge(EventVisitingTasksDO::getSubmitDate,lastMonthFirst)
+ .le(EventVisitingTasksDO::getSubmitDate,lastMonthEnd));
+
+ visitingTasksList.forEach(visitingTask -> {
+ EventVisitingTasksDO visitingTasksDO = dataConversion(visitingTask);
+ saveList.add(visitingTasksDO);
+ });
+
+ if(saveList.size() > 0){
+ this.saveBatch(saveList);
+ }
+ return R.ok();
+ }
+
+ /**
+ * 数据转换
+ * @param oldVisitingTasksDO 请求参数
+ * @return 转换后的对象
+ */
+ private EventVisitingTasksDO dataConversion(EventVisitingTasksDO oldVisitingTasksDO){
+ //创建走访任务新对象
+ EventVisitingTasksDO visitingTasksDO = new EventVisitingTasksDO();
+ visitingTasksDO.setGridId(oldVisitingTasksDO.getGridId());
+ visitingTasksDO.setGridMemberCommunity(oldVisitingTasksDO.getGridMemberCommunity());
+ visitingTasksDO.setGridMemberStreet(oldVisitingTasksDO.getGridMemberStreet());
+ visitingTasksDO.setVisiterId(oldVisitingTasksDO.getVisiterId());
+ visitingTasksDO.setVisiterName(oldVisitingTasksDO.getVisiterName());
+ visitingTasksDO.setVisiterSex(oldVisitingTasksDO.getVisiterSex());
+ visitingTasksDO.setVisiterTele(oldVisitingTasksDO.getVisiterTele());
+ visitingTasksDO.setVisiterAddress(oldVisitingTasksDO.getVisiterAddress());
+ visitingTasksDO.setVisiterType(0);
+ visitingTasksDO.setActOpara(0);
+ visitingTasksDO.setHappentLatLng(oldVisitingTasksDO.getHappentLatLng());
+ visitingTasksDO.setEventStatus(EventTasksStatusEnum.DZF.getCode());
+ visitingTasksDO.setReporting(0);
+ visitingTasksDO.setInvalid(false);
+ visitingTasksDO.setUrgent(false);
+ visitingTasksDO.setUrgentDell(false);
+ visitingTasksDO.setCreateBy(oldVisitingTasksDO.getCreateBy());
+ visitingTasksDO.setOutOrLocal(oldVisitingTasksDO.getOutOrLocal());
+ if(oldVisitingTasksDO.getTableContentJson() != null){
+ visitingTasksDO.setTableContentJson(oldVisitingTasksDO.getTableContentJson());
+ }
+ return visitingTasksDO;
}
}
--
Gitblit v1.7.1