|
|
@ -480,11 +480,7 @@ public class ClueServiceImpl implements ClueService {
|
|
|
|
|
|
|
|
|
|
|
|
@Override
|
|
|
|
@Override
|
|
|
|
public Boolean judgeMember(Long memberId) {
|
|
|
|
public Boolean judgeMember(Long memberId) {
|
|
|
|
Long clueId = clueMiddleRepository.judgeMember(memberId);
|
|
|
|
return clueMiddleRepository.judgeMember(memberId) != null;
|
|
|
|
if (clueId != null) {
|
|
|
|
|
|
|
|
return true;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
return false;
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
/**
|
|
|
@ -641,10 +637,10 @@ public class ClueServiceImpl implements ClueService {
|
|
|
|
String remark = dynamicTaskDto.getRemark();
|
|
|
|
String remark = dynamicTaskDto.getRemark();
|
|
|
|
boolean flag = false;
|
|
|
|
boolean flag = false;
|
|
|
|
if (taskId == null) {
|
|
|
|
if (taskId == null) {
|
|
|
|
|
|
|
|
flag = true;
|
|
|
|
if (dynamicTaskDto.getWhichUserId() == null) {
|
|
|
|
if (dynamicTaskDto.getWhichUserId() == null) {
|
|
|
|
throw new BadRequestException("添加失败");
|
|
|
|
throw new BadRequestException("添加失败");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
dynamicTaskDto.setUserId(dynamicTaskDto.getWhichUserId());
|
|
|
|
|
|
|
|
TaskQueryCriteria taskQueryCriteria = new TaskQueryCriteria();
|
|
|
|
TaskQueryCriteria taskQueryCriteria = new TaskQueryCriteria();
|
|
|
|
taskQueryCriteria.setCreateBy(dynamicTaskDto.getWhichUserId());
|
|
|
|
taskQueryCriteria.setCreateBy(dynamicTaskDto.getWhichUserId());
|
|
|
|
taskQueryCriteria.setIsForm(2);
|
|
|
|
taskQueryCriteria.setIsForm(2);
|
|
|
@ -652,7 +648,6 @@ public class ClueServiceImpl implements ClueService {
|
|
|
|
JSONArray taskList = JSONUtil.parseArray(body);
|
|
|
|
JSONArray taskList = JSONUtil.parseArray(body);
|
|
|
|
if (CollUtil.isNotEmpty(taskList) && taskList.size() == 1) {
|
|
|
|
if (CollUtil.isNotEmpty(taskList) && taskList.size() == 1) {
|
|
|
|
taskId = taskList.getJSONObject(0).getLong("id");
|
|
|
|
taskId = taskList.getJSONObject(0).getLong("id");
|
|
|
|
flag = true;
|
|
|
|
|
|
|
|
} else {
|
|
|
|
} else {
|
|
|
|
throw new BadRequestException("添加失败");
|
|
|
|
throw new BadRequestException("添加失败");
|
|
|
|
}
|
|
|
|
}
|
|
|
@ -682,6 +677,7 @@ public class ClueServiceImpl implements ClueService {
|
|
|
|
clueMiddle.setTaskId(taskId);
|
|
|
|
clueMiddle.setTaskId(taskId);
|
|
|
|
clueMiddle.setOptimisticVersion(DefaultNumberConstants.ZERO_NUMBER);
|
|
|
|
clueMiddle.setOptimisticVersion(DefaultNumberConstants.ZERO_NUMBER);
|
|
|
|
clueMiddle.setClueStage(DefaultNumberConstants.ZERO_NUMBER);
|
|
|
|
clueMiddle.setClueStage(DefaultNumberConstants.ZERO_NUMBER);
|
|
|
|
|
|
|
|
clueMiddle.setClueStageTime(new Date());
|
|
|
|
clueMiddle.setClueCallStatus(DefaultNumberConstants.ZERO_NUMBER);
|
|
|
|
clueMiddle.setClueCallStatus(DefaultNumberConstants.ZERO_NUMBER);
|
|
|
|
clueMiddle.setClueType(DefaultNumberConstants.TWO_NUMBER);
|
|
|
|
clueMiddle.setClueType(DefaultNumberConstants.TWO_NUMBER);
|
|
|
|
if (StringUtils.isNotBlank(remark)) {
|
|
|
|
if (StringUtils.isNotBlank(remark)) {
|
|
|
|