From ced0a3f9e7aaacb8a5158a324836b5a2622ba9b3 Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Fri, 22 Dec 2023 17:43:48 +0800
Subject: [PATCH] 标签任务
---
src/main/java/org/springblade/modules/ownersCommittee/controller/OwnersCommitteeMemberController.java | 22 ++++++++++++++--------
src/main/java/org/springblade/modules/task/service/impl/TaskServiceImpl.java | 9 ++++++++-
src/main/java/org/springblade/modules/property/service/impl/PropertyCapitalApplyServiceImpl.java | 2 +-
src/main/java/org/springblade/modules/task/mapper/TaskMapper.xml | 15 +++++++++++++++
src/main/java/org/springblade/modules/task/mapper/TaskMapper.java | 2 ++
5 files changed, 40 insertions(+), 10 deletions(-)
diff --git a/src/main/java/org/springblade/modules/ownersCommittee/controller/OwnersCommitteeMemberController.java b/src/main/java/org/springblade/modules/ownersCommittee/controller/OwnersCommitteeMemberController.java
index 268c0cb..7fafe29 100644
--- a/src/main/java/org/springblade/modules/ownersCommittee/controller/OwnersCommitteeMemberController.java
+++ b/src/main/java/org/springblade/modules/ownersCommittee/controller/OwnersCommitteeMemberController.java
@@ -16,25 +16,25 @@
*/
package org.springblade.modules.ownersCommittee.controller;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
-import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import lombok.AllArgsConstructor;
-import javax.validation.Valid;
-
-import org.springblade.core.secure.BladeUser;
+import org.springblade.core.boot.ctrl.BladeController;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.Func;
-import org.springframework.web.bind.annotation.*;
-import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springblade.modules.ownersCommittee.entity.OwnersCommitteeMemberEntity;
+import org.springblade.modules.ownersCommittee.service.IOwnersCommitteeMemberService;
import org.springblade.modules.ownersCommittee.vo.OwnersCommitteeMemberVO;
import org.springblade.modules.ownersCommittee.wrapper.OwnersCommitteeMemberWrapper;
-import org.springblade.modules.ownersCommittee.service.IOwnersCommitteeMemberService;
-import org.springblade.core.boot.ctrl.BladeController;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
/**
* 业委会成员表 控制器
@@ -109,6 +109,12 @@
@ApiOperationSupport(order = 6)
@ApiOperation(value = "新增或修改", notes = "传入ownersCommittee")
public R submit(@Valid @RequestBody OwnersCommitteeMemberEntity ownersCommittee) {
+ long count = ownersCommitteeService.count(Wrappers.<OwnersCommitteeMemberEntity>lambdaQuery()
+ .eq(OwnersCommitteeMemberEntity::getAreaId, ownersCommittee.getAreaId())
+ .eq(OwnersCommitteeMemberEntity::getUserId, ownersCommittee.getUserId()));
+ if (count > 0) {
+ return R.fail("该业委会成员已存在");
+ }
return R.status(ownersCommitteeService.saveOrUpdate(ownersCommittee));
}
diff --git a/src/main/java/org/springblade/modules/property/service/impl/PropertyCapitalApplyServiceImpl.java b/src/main/java/org/springblade/modules/property/service/impl/PropertyCapitalApplyServiceImpl.java
index 794135a..eaa64fc 100644
--- a/src/main/java/org/springblade/modules/property/service/impl/PropertyCapitalApplyServiceImpl.java
+++ b/src/main/java/org/springblade/modules/property/service/impl/PropertyCapitalApplyServiceImpl.java
@@ -69,7 +69,7 @@
// 判断角色，物业角色只能查询当前小区的
String userRole = AuthUtil.getUserRole();
- if (userRole.equals("wygly")) {
+ if (userRole.contains("wygly")) {
IPropertyDistrictUserService bean = SpringUtils.getBean(IPropertyDistrictUserService.class);
List<String> strings = bean.selectPropertyDistrictByUserId(AuthUtil.getUserId());
propertyCapitalApply.setDistrictIdList(strings);
diff --git a/src/main/java/org/springblade/modules/task/mapper/TaskMapper.java b/src/main/java/org/springblade/modules/task/mapper/TaskMapper.java
index d67c35d..9115086 100644
--- a/src/main/java/org/springblade/modules/task/mapper/TaskMapper.java
+++ b/src/main/java/org/springblade/modules/task/mapper/TaskMapper.java
@@ -40,6 +40,8 @@
*/
List<TaskVO> selectTaskPage(IPage page,TaskVO task);
+ List<TaskVO> selectTaskPageBy(IPage page,TaskVO task);
+
Integer selectTaskCount(TaskVO task);
diff --git a/src/main/java/org/springblade/modules/task/mapper/TaskMapper.xml b/src/main/java/org/springblade/modules/task/mapper/TaskMapper.xml
index 04b8187..b80bdf8 100644
--- a/src/main/java/org/springblade/modules/task/mapper/TaskMapper.xml
+++ b/src/main/java/org/springblade/modules/task/mapper/TaskMapper.xml
@@ -116,4 +116,19 @@
</select>
+ <select id="selectTaskPageBy" resultType="org.springblade.modules.task.vo.TaskVO">
+
+ SELECT
+ jt.* ,
+ jda.address_name
+ FROM
+ jczz_task jt
+ LEFT JOIN jczz_doorplate_address jda ON jt.house_code = jda.address_code
+ LEFT JOIN jczz_community jc ON jc.CODE = jda.nei_code
+ WHERE
+ jc.res_police_user_id = #{task.userId}
+ AND jt.report_type = '1'
+ </select>
+
+
</mapper>
diff --git a/src/main/java/org/springblade/modules/task/service/impl/TaskServiceImpl.java b/src/main/java/org/springblade/modules/task/service/impl/TaskServiceImpl.java
index 77f183b..6d5fcff 100644
--- a/src/main/java/org/springblade/modules/task/service/impl/TaskServiceImpl.java
+++ b/src/main/java/org/springblade/modules/task/service/impl/TaskServiceImpl.java
@@ -55,7 +55,14 @@
@Override
public IPage<TaskVO> selectTaskPage(IPage<TaskVO> page, TaskVO task) {
task.setUserId(AuthUtil.getUserId());
- return page.setRecords(baseMapper.selectTaskPage(page, task));
+ // 民警角色
+ if (AuthUtil.getUserRole().contains("mj")) {
+ task.setUserId(AuthUtil.getUserId());
+ return page.setRecords(baseMapper.selectTaskPageBy(page, task));
+ } else {
+ // 非民警角色
+ return page.setRecords(baseMapper.selectTaskPage(page, task));
+ }
}
/**
--
Gitblit v1.9.3