From e3241a8a2b867fb60cd63edd64744a1fbfae0d1d Mon Sep 17 00:00:00 2001
From: heheng <heheng@123456>
Date: 星期三, 11 十二月 2024 17:14:30 +0800
Subject: [PATCH] 更改查询方式
---
assess-system/src/main/resources/mapper/SysUserMapper.xml | 6 ++++++
assess-admin/src/main/java/com/gkhy/assess/admin/controller/web/SysAgencyController.java | 7 +++++++
assess-system/src/main/java/com/gkhy/assess/system/service/impl/SysAgencyServiceImpl.java | 5 +++++
assess-system/src/main/java/com/gkhy/assess/system/domain/SysUser.java | 4 ++++
assess-system/src/main/java/com/gkhy/assess/system/service/SysAgencyService.java | 9 +++++++++
5 files changed, 31 insertions(+), 0 deletions(-)
diff --git a/assess-admin/src/main/java/com/gkhy/assess/admin/controller/web/SysAgencyController.java b/assess-admin/src/main/java/com/gkhy/assess/admin/controller/web/SysAgencyController.java
index b1482e3..dcfaa9a 100644
--- a/assess-admin/src/main/java/com/gkhy/assess/admin/controller/web/SysAgencyController.java
+++ b/assess-admin/src/main/java/com/gkhy/assess/admin/controller/web/SysAgencyController.java
@@ -32,6 +32,13 @@
return CommonResult.success(agencyService.agencyList(agency));
}
+ @ApiOperation(value = "机构列表")
+ @GetMapping("/agencyLists")
+ public CommonResult agencyLists(SysAgency agency){
+ return CommonResult.success(agencyService.agencyLists(agency));
+ }
+
+
@RequiresPermissions(value={"system:assess:monitor","system:assess:agency"},logical = Logical.OR)
@ApiOperation(value = "根据id获取机构详情")
@ApiImplicitParams({
diff --git a/assess-system/src/main/java/com/gkhy/assess/system/domain/SysUser.java b/assess-system/src/main/java/com/gkhy/assess/system/domain/SysUser.java
index 128ec62..f9a838f 100644
--- a/assess-system/src/main/java/com/gkhy/assess/system/domain/SysUser.java
+++ b/assess-system/src/main/java/com/gkhy/assess/system/domain/SysUser.java
@@ -203,4 +203,8 @@
@TableField(exist = false)
private String agencyName;
+ @ApiModelProperty(value = "机构属性(0疆内，1疆外,默认0)",required = false)
+ @TableField(exist = false)
+ private Integer attribute;
+
}
diff --git a/assess-system/src/main/java/com/gkhy/assess/system/service/SysAgencyService.java b/assess-system/src/main/java/com/gkhy/assess/system/service/SysAgencyService.java
index e7e9ce6..49101f2 100644
--- a/assess-system/src/main/java/com/gkhy/assess/system/service/SysAgencyService.java
+++ b/assess-system/src/main/java/com/gkhy/assess/system/service/SysAgencyService.java
@@ -5,6 +5,8 @@
import com.baomidou.mybatisplus.extension.service.IService;
import com.gkhy.assess.system.domain.SysUser;
+import java.util.List;
+
/**
* <p>
* 机构表 服务类
@@ -23,6 +25,13 @@
CommonPage agencyList(SysAgency agency);
/**
+ * 根据条件分页查询机构列表
+ * @param agency
+ * @return
+ */
+ List<SysAgency> agencyLists(SysAgency agency);
+
+ /**
* 校验机构名称是否唯一
* @param agency
* @return
diff --git a/assess-system/src/main/java/com/gkhy/assess/system/service/impl/SysAgencyServiceImpl.java b/assess-system/src/main/java/com/gkhy/assess/system/service/impl/SysAgencyServiceImpl.java
index 6ce89ad..a7c38ce 100644
--- a/assess-system/src/main/java/com/gkhy/assess/system/service/impl/SysAgencyServiceImpl.java
+++ b/assess-system/src/main/java/com/gkhy/assess/system/service/impl/SysAgencyServiceImpl.java
@@ -36,6 +36,11 @@
}
@Override
+ public List<SysAgency> agencyLists(SysAgency agency) {
+ return baseMapper.agencyList(agency);
+ }
+
+ @Override
public boolean checkAgencyNameUnique(SysAgency agency) {
Long agencyId = agency.getId()==null? -1L : agency.getId();
SysAgency info = baseMapper.checkAgencyNameUnique(agency.getName());
diff --git a/assess-system/src/main/resources/mapper/SysUserMapper.xml b/assess-system/src/main/resources/mapper/SysUserMapper.xml
index 9811df4..89759fb 100644
--- a/assess-system/src/main/resources/mapper/SysUserMapper.xml
+++ b/assess-system/src/main/resources/mapper/SysUserMapper.xml
@@ -94,6 +94,9 @@
<if test="state != null">
AND u.state = #{state}
</if>
+ <if test="attribute != null">
+ AND a.attribute = #{attribute}
+ </if>
<if test="phone != null and phone != ''">
AND u.phone like concat('%', #{phone}, '%')
</if>
@@ -135,6 +138,9 @@
<if test="post != null and post != ''">
AND u.post =#{post}
</if>
+ <if test="agencyName != null and agencyName != ''">
+ AND a.name like concat('%', #{agencyName}, '%')
+ </if>
</where>
order by u.create_time desc
--
Gitblit v1.9.2