From b011bd6481707b75ae1aecddba029115fa9a6a43 Mon Sep 17 00:00:00 2001
From: 罗元桥 <2376770955@qq.com>
Date: 星期五, 02 七月 2021 17:56:20 +0800
Subject: [PATCH] Merge branch 'test' into 'master'
---
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventVisitingTasksServiceImpl.java | 32 ++++++++++++++++++++++++++------
1 files changed, 26 insertions(+), 6 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 a04c7bf..fdc397b 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
@@ -236,6 +236,12 @@
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));
+
return R.ok(eventVisitingTasksDetailsVO);
}
return R.fail();
@@ -412,17 +418,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->{
@@ -435,7 +456,7 @@
});
}
if(!CollectionUtils.isEmpty(taskCompleteDTO.getVideoList())){
- taskCompleteDTO.getVosList().forEach(e->{
+ taskCompleteDTO.getVideoList().forEach(e->{
createResource(eventVisitingTasksDO.getId(),taskCompleteDTO.getUserId(),2,3,e);
});
}
@@ -527,6 +548,5 @@
}
return false;
}
-
}
--
Gitblit v1.7.1