From 73ceaaa73dd6b73808aac425c70e0d9184f9f415 Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Fri, 19 Apr 2024 17:33:53 +0800
Subject: [PATCH] 校园安全+议事问题优化
---
src/main/java/org/springblade/modules/task/service/impl/TaskPlaceSelfCheckServiceImpl.java | 24 +++++++++++++++---------
1 files changed, 15 insertions(+), 9 deletions(-)
diff --git a/src/main/java/org/springblade/modules/task/service/impl/TaskPlaceSelfCheckServiceImpl.java b/src/main/java/org/springblade/modules/task/service/impl/TaskPlaceSelfCheckServiceImpl.java
index 2da3a52..bf20c1c 100644
--- a/src/main/java/org/springblade/modules/task/service/impl/TaskPlaceSelfCheckServiceImpl.java
+++ b/src/main/java/org/springblade/modules/task/service/impl/TaskPlaceSelfCheckServiceImpl.java
@@ -137,16 +137,22 @@
@Override
@Transactional(rollbackFor = Exception.class)
- public Boolean savePlace(TaskPlaceSelfCheckVO taskPlaceSelfCheck) {
+ public Boolean savePlace(TaskPlaceSelfCheckVO taskPlaceSelfCheck) {
taskPlaceSelfCheck.setCreateUser(AuthUtil.getUserId());
// 1.保存任务表
- ITaskService bean2 = SpringUtils.getBean(ITaskService.class);
- Long aLong = bean2.saveTask(CommonConstant.NUMBER_ONE, DictConstant.FIRE_SELF_CHECK_NOTICE, 1,
- "", AuthUtil.getUserId(), taskPlaceSelfCheck.getHouseCode(), CommonConstant.NUMBER_SEVEN, 1);
- if (aLong <= 0) {
+ ITaskService iTaskService = SpringUtils.getBean(ITaskService.class);
+ Long restults;
+ if (taskPlaceSelfCheck.getType().equals("2")) {
+ restults = iTaskService.saveTask(CommonConstant.NUMBER_ONE, DictConstant.FIRE_SCHOOL_CHECK_NOTICE, 1,
+ "", AuthUtil.getUserId(), taskPlaceSelfCheck.getHouseCode(), CommonConstant.NUMBER_FOUR, 1);
+ } else {
+ restults = iTaskService.saveTask(CommonConstant.NUMBER_ONE, DictConstant.FIRE_SELF_CHECK_NOTICE, 1,
+ "", AuthUtil.getUserId(), taskPlaceSelfCheck.getHouseCode(), CommonConstant.NUMBER_SEVEN, 1);
+ }
+ if (restults <= 0) {
return false;
}
- taskPlaceSelfCheck.setTaskId(aLong);
+ taskPlaceSelfCheck.setTaskId(restults);
// 2.保存任务详情
boolean save = save(taskPlaceSelfCheck);
if (save) {
@@ -245,17 +251,17 @@
}
@Override
- public Integer getCount(String neiCode, int i) {
+ public Integer getCount(String neiCode, int status, int type) {
// 获取请求头中的角色别名
String roleName = SpringUtils.getRequestParam("roleName");
if (AuthUtils.isMj(roleName)) {
- return baseMapper.getCount(neiCode, i, AuthUtil.getUserId());
+ return baseMapper.getCount(neiCode, status, AuthUtil.getUserId(), type);
}
return 0;
}
@Override
public TaskPlaceSelfCheckEntity getDetailByTaskId(Long taskId) {
- return baseMapper.getDetailByTaskId( taskId);
+ return baseMapper.getDetailByTaskId(taskId);
}
}
--
Gitblit v1.9.3