Skip to content

R
RuoYi-Vue-master
Commit 8d797c53 authored by 周昊's avatar 周昊
Browse files
Options

1、修改项目、楼宇列表数据权限隔离

parent eca0c53d
Hide whitespace changes
Inline Side-by-side
Showing with 74 additions and 26 deletions
censoft-rongtong/src/main/java/com/censoft/censoftrongtong/controller/LedgerBuildingController.java
View file @ 8d797c53
......@@ -46,6 +46,9 @@ public class LedgerBuildingController extends BaseController
public TableDataInfo list(LedgerBuilding ledgerBuilding)
{
startPage();
if (ledgerBuilding.getDeptId() == null){
ledgerBuilding.setDeptId(getDeptId());
}
List<LedgerBuilding> list = ledgerBuildingService.selectLedgerBuildingList(ledgerBuilding);
return getDataTable(list);
}
......@@ -58,6 +61,9 @@ public class LedgerBuildingController extends BaseController
@PostMapping("/export")
public void export(HttpServletResponse response, LedgerBuilding ledgerBuilding)
{
if (ledgerBuilding.getDeptId() == null){
ledgerBuilding.setDeptId(getDeptId());
}
List<LedgerBuilding> list = ledgerBuildingService.selectLedgerBuildingList(ledgerBuilding);
ExcelUtil<LedgerBuilding> util = new ExcelUtil<LedgerBuilding>(LedgerBuilding.class);
util.exportExcel(response, list, "基础数据-楼宇数据");
......@@ -81,6 +87,7 @@ public class LedgerBuildingController extends BaseController
@PostMapping
public AjaxResult add(@RequestBody LedgerBuilding ledgerBuilding)
{
ledgerBuilding.setCreateBy(getUsername());
return toAjax(ledgerBuildingService.insertLedgerBuilding(ledgerBuilding));
}
......@@ -92,6 +99,7 @@ public class LedgerBuildingController extends BaseController
@PutMapping
public AjaxResult edit(@RequestBody LedgerBuilding ledgerBuilding)
{
ledgerBuilding.setUpdateBy(getUsername());
return toAjax(ledgerBuildingService.updateLedgerBuilding(ledgerBuilding));
}
......
censoft-rongtong/src/main/java/com/censoft/censoftrongtong/controller/LedgerProjectController.java
View file @ 8d797c53
......@@ -45,6 +45,9 @@ public class LedgerProjectController extends BaseController
public TableDataInfo list(LedgerProject ledgerProject)
{
startPage();
if (ledgerProject.getDeptId() == null) {
ledgerProject.setDeptId(getDeptId());
}
List<LedgerProject> list = ledgerProjectService.selectLedgerProjectList(ledgerProject);
return getDataTable(list);
}
......@@ -57,6 +60,9 @@ public class LedgerProjectController extends BaseController
@PostMapping("/export")
public void export(HttpServletResponse response, LedgerProject ledgerProject)
{
if (ledgerProject.getDeptId() == null) {
ledgerProject.setDeptId(getDeptId());
}
List<LedgerProject> list = ledgerProjectService.selectLedgerProjectList(ledgerProject);
ExcelUtil<LedgerProject> util = new ExcelUtil<LedgerProject>(LedgerProject.class);
util.exportExcel(response, list, "基础数据-项目数据");
......@@ -80,6 +86,7 @@ public class LedgerProjectController extends BaseController
@PostMapping
public AjaxResult add(@RequestBody LedgerProject ledgerProject)
{
ledgerProject.setCreateBy(getUsername());
return toAjax(ledgerProjectService.insertLedgerProject(ledgerProject));
}
......@@ -91,6 +98,7 @@ public class LedgerProjectController extends BaseController
@PutMapping
public AjaxResult edit(@RequestBody LedgerProject ledgerProject)
{
ledgerProject.setUpdateBy(getUsername());
return toAjax(ledgerProjectService.updateLedgerProject(ledgerProject));
}
......
censoft-rongtong/src/main/java/com/censoft/censoftrongtong/domain/LedgerBuilding.java
View file @ 8d797c53
......@@ -22,47 +22,42 @@ public class LedgerBuilding extends BaseEntityClean
private Long id;
/** 项目id */
@Excel(name = "项目id")
private Long projectId;
/** 楼宇名称 */
@Excel(name = "楼宇名称")
@Excel(name = "楼宇名称",sort = 2)
private String name;
/** 资产类型 */
@Excel(name = "资产类型")
@Excel(name = "资产类型",sort = 3)
private String type;
/** 组织机构id */
@Excel(name = "组织机构id")
private Long deptId;
/** 楼层 */
@Excel(name = "楼层")
@Excel(name = "楼层数（层）",sort = 5)
private String floor;
/** 地上楼层 */
@Excel(name = "地上楼层")
private Integer groundFloor;
/** 地下楼层 */
@Excel(name = "地下楼层")
private Integer undergroundFloor;
/** 用途 */
@Excel(name = "用途")
@Excel(name = "用途",sort = 6)
private String useto;
/** 所在城市 */
@Excel(name = "所在城市")
@Excel(name = "所在城市",sort = 7)
private String city;
/** 资产面积 */
@Excel(name = "资产面积")
private BigDecimal area;
/** 详细地址 */
@Excel(name = "详细地址")
@Excel(name = "详细地址",sort = 8)
private String address;
/** 状态（0正常 1停用） */
......@@ -75,12 +70,14 @@ public class LedgerBuilding extends BaseEntityClean
* 项目名称
*/
@TableField(exist = false)
@Excel(name = "项目名称",sort = 1)
private String projectName;
/**
* 组织名称
*/
@TableField(exist = false)
@Excel(name = "所属区域",sort = 4)
private String deptName;
/**
......
censoft-rongtong/src/main/java/com/censoft/censoftrongtong/service/impl/LedgerBuildingServiceImpl.java
View file @ 8d797c53
package com.censoft.censoftrongtong.service.impl;
import com.censoft.censoftrongtong.domain.LedgerBuilding;
import com.censoft.censoftrongtong.domain.LedgerProject;
import com.censoft.censoftrongtong.mapper.LedgerBuildingMapper;
import com.censoft.censoftrongtong.service.ILedgerBuildingService;
import com.censoft.censoftrongtong.service.ILedgerProjectService;
import com.github.yulichang.base.MPJBaseServiceImpl;
import com.ruoyi.common.utils.DateUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.util.List;
/**
......@@ -22,6 +25,9 @@ public class LedgerBuildingServiceImpl extends MPJBaseServiceImpl<LedgerBuilding
@Autowired
private LedgerBuildingMapper ledgerBuildingMapper;
@Resource
private ILedgerProjectService ledgerProjectService;
/**
* 查询基础数据-楼宇
*
......@@ -55,6 +61,10 @@ public class LedgerBuildingServiceImpl extends MPJBaseServiceImpl<LedgerBuilding
@Override
public int insertLedgerBuilding(LedgerBuilding ledgerBuilding)
{
LedgerProject ledgerProject = ledgerProjectService.selectLedgerProjectById(ledgerBuilding.getProjectId());
ledgerBuilding.setDeptId(ledgerProject.getDeptId());
ledgerBuilding.setCity(ledgerProject.getCity());
ledgerBuilding.setFloor(ledgerBuilding.getGroundFloor() + ledgerBuilding.getUndergroundFloor() +"");
ledgerBuilding.setCreateTime(DateUtils.getNowDate());
return ledgerBuildingMapper.insertLedgerBuilding(ledgerBuilding);
}
......@@ -68,6 +78,10 @@ public class LedgerBuildingServiceImpl extends MPJBaseServiceImpl<LedgerBuilding
@Override
public int updateLedgerBuilding(LedgerBuilding ledgerBuilding)
{
LedgerProject ledgerProject = ledgerProjectService.getById(ledgerBuilding.getProjectId());
ledgerBuilding.setDeptId(ledgerProject.getDeptId());
ledgerBuilding.setCity(ledgerProject.getCity());
ledgerBuilding.setFloor(ledgerBuilding.getGroundFloor() + ledgerBuilding.getUndergroundFloor() +"");
ledgerBuilding.setUpdateTime(DateUtils.getNowDate());
return ledgerBuildingMapper.updateLedgerBuilding(ledgerBuilding);
}
......
censoft-rongtong/src/main/resources/mapper/system/LedgerBuildingMapper.xml
View file @ 8d797c53
......@@ -30,20 +30,41 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</sql>
<select id="selectLedgerBuildingList" parameterType="com.censoft.censoftrongtong.domain.LedgerBuilding" resultMap="LedgerBuildingResult">
select * from (SELECT b.id, b.project_id, p.NAME 'project_name', b.NAME, b.type, b.dept_id, d.dept_name, b.floor,b.ground_floor,b.underground_floor, b.useto, b.city, b.area, b.address, b.STATUS, b.del_flag, b.create_by, b.create_time, b.update_by, b.update_time FROM ledger_building b LEFT JOIN sys_dept d ON b.dept_id = d.dept_id LEFT JOIN ledger_project p ON b.project_id = p.id) tt
SELECT
b.id,
b.project_id,
p.NAME 'project_name',
b.NAME,
b.type,
b.dept_id,
d.dept_name,
b.floor,
b.ground_floor,
b.underground_floor,
b.useto,
b.city,
b.area,
b.address,
b.STATUS,
b.del_flag,
b.create_by,
b.create_time,
b.update_by,
b.update_time
FROM
ledger_building b
LEFT JOIN sys_dept d ON b.dept_id = d.dept_id
LEFT JOIN ledger_project p ON b.project_id = p.id
<where>
<if test="projectName != null "> and tt.project_name like concat('%', #{projectName}, '%') </if>
<if test="projectId != null "> and tt.project_id = #{projectId} </if>
<if test="name != null and name != ''"> and tt.name like concat('%', #{name}, '%')</if>
<if test="type != null and type != ''"> and tt.type = #{type}</if>
<if test="deptId != null "> and tt.dept_name like concat('%', #{deptName}, '%')</if>
<if test="floor != null and floor != ''"> and tt.floor = #{floor}</if>
<if test="useto != null and useto != ''"> and tt.useto = #{useto}</if>
<if test="city != null and city != ''"> and tt.city = #{city}</if>
<if test="area != null "> and tt.area = #{area}</if>
<if test="address != null and address != ''"> and tt.address = #{address}</if>
<if test="status != null and status != ''"> and tt.status = #{status}</if>
and tt.del_flag = '0'
<if test="projectName != null "> and p.name like concat('%', #{projectName}, '%') </if>
<if test="projectId != null "> and b.project_id = #{projectId} </if>
<if test="name != null and name != ''"> and b.name like concat('%', #{name}, '%')</if>
<if test="type != null and type != ''"> and b.type = #{type}</if>
<if test="deptId != null "> and ( d.dept_id = #{deptId} or find_in_set(#{deptId},d.ancestors) )</if>
<if test="useto != null and useto != ''"> and b.useto like concat('%', #{useto}, '%')</if>
<if test="city != null and city != ''"> and b.city like concat('%', #{city}, '%')</if>
<if test="status != null and status != ''"> and b.status = #{status}</if>
and b.del_flag = '0'
</where>
</select>
......@@ -126,11 +147,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</update>
<delete id="deleteLedgerBuildingById" parameterType="Long">
delete from ledger_building where id = #{id}
update ledger_building set del_flag = '1' where id = #{id}
</delete>
<delete id="deleteLedgerBuildingByIds" parameterType="String">
delete from ledger_building where id in
update ledger_building set del_flag = '1' where id in
<foreach item="id" collection="array" open="(" separator="," close=")">
#{id}
</foreach>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment