From 8b7258c9427882bb1798f1502eaa35184c6e374e Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Fri, 09 Aug 2024 14:29:18 +0800
Subject: [PATCH] 短信指定楼栋发送
---
src/main/java/org/springblade/modules/task/service/impl/TaskCampusReportingEventServiceImpl.java | 54 +++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 41 insertions(+), 13 deletions(-)
diff --git a/src/main/java/org/springblade/modules/task/service/impl/TaskCampusReportingEventServiceImpl.java b/src/main/java/org/springblade/modules/task/service/impl/TaskCampusReportingEventServiceImpl.java
index 6cc75ce..0239945 100644
--- a/src/main/java/org/springblade/modules/task/service/impl/TaskCampusReportingEventServiceImpl.java
+++ b/src/main/java/org/springblade/modules/task/service/impl/TaskCampusReportingEventServiceImpl.java
@@ -16,20 +16,24 @@
*/
package org.springblade.modules.task.service.impl;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.apache.commons.lang3.StringUtils;
import org.springblade.common.constant.DictConstant;
+import org.springblade.common.exception.CustomException;
import org.springblade.core.secure.utils.AuthUtil;
+import org.springblade.modules.place.entity.PlaceEntity;
+import org.springblade.modules.place.service.IPlaceService;
import org.springblade.modules.task.dto.TaskCampusReportingEventDTO;
-import org.springblade.modules.task.entity.TaskBailReportingEventEntity;
import org.springblade.modules.task.entity.TaskCampusReportingEventEntity;
-import org.springblade.modules.task.service.ITaskService;
-import org.springblade.modules.task.vo.TaskCampusReportingEventVO;
import org.springblade.modules.task.mapper.TaskCampusReportingEventMapper;
import org.springblade.modules.task.service.ITaskCampusReportingEventService;
-import org.springblade.core.mp.base.BaseServiceImpl;
+import org.springblade.modules.task.service.ITaskService;
+import org.springblade.modules.task.vo.TaskCampusReportingEventVO;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service;
-import com.baomidou.mybatisplus.core.metadata.IPage;
import javax.annotation.Resource;
import java.util.Date;
@@ -43,34 +47,58 @@
@Service
public class TaskCampusReportingEventServiceImpl extends ServiceImpl<TaskCampusReportingEventMapper, TaskCampusReportingEventEntity> implements ITaskCampusReportingEventService {
- @Resource
+ @Autowired
+ @Lazy
private ITaskService taskService;
+
+ @Autowired
+ private IPlaceService placeService;
+
@Override
public IPage<TaskCampusReportingEventVO> selectTaskCampusReportingEventPage(IPage<TaskCampusReportingEventVO> page, TaskCampusReportingEventVO taskCampusReportingEvent) {
return page.setRecords(baseMapper.selectTaskCampusReportingEventPage(page, taskCampusReportingEvent));
}
+ /**
+ * 自定义新增
+ * @param reporting
+ * @return
+ */
@Override
public Boolean saveCampusReporting(TaskCampusReportingEventDTO reporting) {
- Long aLong = taskService.saveTask(1, DictConstant.CAMPUS_SECURITY_INSPECTION, 1 , "", AuthUtil.getUserId(),reporting.getHouseCode(),reporting.getReportType());
+ Long aLong = taskService.saveTask(1, DictConstant.CAMPUS_SECURITY_INSPECTION, 1 , "",
+ AuthUtil.getUserId(),reporting.getHouseCode(),reporting.getReportType(),0);
if (aLong > 0) {
+ // 通过houseCode 获取场所id
+ QueryWrapper<PlaceEntity> queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("is_deleted",0).eq("house_code",reporting.getHouseCode());
+ PlaceEntity placeEntity = placeService.getOne(queryWrapper);
+ reporting.setPlaceId(placeEntity.getId());
reporting.setTaskId(aLong);
reporting.setCheckUserId(AuthUtil.getUserId());
- return baseMapper.insert(reporting) > 0 ? true : false;
+ return baseMapper.insert(reporting) > 0;
}
return false;
}
@Override
- public Boolean updateCampusReporting(TaskCampusReportingEventDTO taskCampusReportingEvent) {
- Integer integer = StringUtils.isBlank(taskCampusReportingEvent.getConfirmFlag()) ? null : Integer.valueOf(taskCampusReportingEvent.getConfirmFlag());
+ public Boolean updateCampusReporting(TaskCampusReportingEventDTO taskCampusReportingEvent) {
+ Integer integer = null==taskCampusReportingEvent.getStatus() ? null : taskCampusReportingEvent.getStatus();
Long aLong = taskService.updateTask(null, null, null, "", AuthUtil.getUserId(), taskCampusReportingEvent.getTaskId(), integer);
if (aLong > 0) {
- taskCampusReportingEvent.setConfirmUserId(AuthUtil.getUserId());
- taskCampusReportingEvent.setConfirmTime(new Date());
- return baseMapper.updateById(taskCampusReportingEvent) > 0 ? true : false;
+ if (null!=taskCampusReportingEvent.getStatus()
+ && taskCampusReportingEvent.getStatus()!=4) {
+ taskCampusReportingEvent.setConfirmFlag(taskCampusReportingEvent.getStatus().toString());
+ taskCampusReportingEvent.setConfirmUserId(AuthUtil.getUserId());
+ taskCampusReportingEvent.setConfirmTime(new Date());
+ }
+ Boolean b = baseMapper.updateById(taskCampusReportingEvent) > 0;
+ if (b) {
+ return b;
+ }
+ throw new CustomException("更新失败！");
}
return false;
}
--
Gitblit v1.9.3