Merge branch 'xjchen' into 'develop' (9f8409c6) · Commits · 融通安全管理系统 / RuoYi-Vue-master · GitLab

censoft-rongtong/src/main/java/com/censoft/censoftrongtong/controller/LedgerRoomController.java

+6 −2

Original line number	Diff line number	Diff line
		@@ -44,9 +44,13 @@ public class LedgerRoomController extends BaseController
		public TableDataInfo list(LedgerRoom ledgerRoom)
		{
		QueryWrapper<LedgerRoom> queryWrapper = new QueryWrapper<>();
		queryWrapper.eq("floor_id",ledgerRoom.getFloorId()).eq("del_flag","0");
		if (ledgerRoom.getFloorId()!=null) {
		queryWrapper.eq("floor_id",ledgerRoom.getFloorId());
		}
		queryWrapper.eq("del_flag","0");
		startPage();
		List<LedgerRoom> list = ledgerRoomService.list(queryWrapper);
		//List<LedgerRoom> list = ledgerRoomService.list(queryWrapper);
		List<LedgerRoom> list =ledgerRoomService.selectLedgerRoomList(ledgerRoom);
		return getDataTable(list);
		}

censoft-rongtong/src/main/java/com/censoft/censoftrongtong/domain/LedgerBuilding.java

+21 −131

Original line number	Diff line number	Diff line
		package com.censoft.censoftrongtong.domain;

		import java.math.BigDecimal;

		import com.baomidou.mybatisplus.annotation.TableField;
		import com.ruoyi.common.core.domain.BaseEntityClean;
		import lombok.Data;
		import org.apache.commons.lang3.builder.ToStringBuilder;
		import org.apache.commons.lang3.builder.ToStringStyle;
		import com.ruoyi.common.annotation.Excel;
		@@ -12,7 +16,8 @@ import com.ruoyi.common.core.domain.BaseEntity;
		* @author ruoyi
		* @date 2023-06-26
		*/
		public class LedgerBuilding extends BaseEntity
		@Data
		public class LedgerBuilding extends BaseEntityClean
		{
		private static final long serialVersionUID = 1L;

		@@ -61,135 +66,20 @@ public class LedgerBuilding extends BaseEntity

		/** 删除标志（0代表存在 1代表删除） */
		private String delFlag;
		/**
		* 项目名称
		*/
		@TableField(exist = false)
		private String projectName;

		public void setId(Long id)
		{
		this.id = id;
		}

		public Long getId()
		{
		return id;
		}
		public void setProjectId(Long projectId)
		{
		this.projectId = projectId;
		}

		public Long getProjectId()
		{
		return projectId;
		}
		public void setName(String name)
		{
		this.name = name;
		}

		public String getName()
		{
		return name;
		}
		public void setType(String type)
		{
		this.type = type;
		}

		public String getType()
		{
		return type;
		}
		public void setDeptId(Long deptId)
		{
		this.deptId = deptId;
		}

		public Long getDeptId()
		{
		return deptId;
		}
		public void setFloor(String floor)
		{
		this.floor = floor;
		}

		public String getFloor()
		{
		return floor;
		}

		public String getUseto() {
		return useto;
		}
		/**
		* 组织名称
		*/
		@TableField(exist = false)
		private String deptName;

		public void setUseto(String useto) {
		this.useto = useto;
		}

		public void setCity(String city)
		{
		this.city = city;
		}

		public String getCity()
		{
		return city;
		}
		public void setArea(BigDecimal area)
		{
		this.area = area;
		}

		public BigDecimal getArea()
		{
		return area;
		}
		public void setAddress(String address)
		{
		this.address = address;
		}

		public String getAddress()
		{
		return address;
		}
		public void setStatus(String status)
		{
		this.status = status;
		}

		public String getStatus()
		{
		return status;
		}
		public void setDelFlag(String delFlag)
		{
		this.delFlag = delFlag;
		}

		public String getDelFlag()
		{
		return delFlag;
		}

		@Override
		public String toString() {
		return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
		.append("id", getId())
		.append("projectId", getProjectId())
		.append("name", getName())
		.append("type", getType())
		.append("deptId", getDeptId())
		.append("floor", getFloor())
		.append("useto", getUseto())
		.append("city", getCity())
		.append("area", getArea())
		.append("address", getAddress())
		.append("status", getStatus())
		.append("delFlag", getDelFlag())
		.append("createBy", getCreateBy())
		.append("createTime", getCreateTime())
		.append("updateBy", getUpdateBy())
		.append("updateTime", getUpdateTime())
		.toString();
		}
		}

censoft-rongtong/src/main/java/com/censoft/censoftrongtong/domain/LedgerFloor.java

+10 −79

Original line number	Diff line number	Diff line
		package com.censoft.censoftrongtong.domain;

		import com.baomidou.mybatisplus.annotation.TableField;
		import com.ruoyi.common.core.domain.BaseEntityClean;
		import lombok.Data;
		import org.apache.commons.lang3.builder.ToStringBuilder;
		import org.apache.commons.lang3.builder.ToStringStyle;
		import com.ruoyi.common.annotation.Excel;
		@@ -11,7 +14,8 @@ import com.ruoyi.common.core.domain.BaseEntity;
		* @author ruoyi
		* @date 2023-06-26
		*/
		public class LedgerFloor extends BaseEntity
		@Data
		public class LedgerFloor extends BaseEntityClean
		{
		private static final long serialVersionUID = 1L;

		@@ -41,84 +45,11 @@ public class LedgerFloor extends BaseEntity
		/** 删除标志（0代表存在 1代表删除） */
		private String delFlag;

		public void setId(Long id)
		{
		this.id = id;
		}

		public Long getId()
		{
		return id;
		}
		public void setBuildingId(Long buildingId)
		{
		this.buildingId = buildingId;
		}

		public Long getBuildingId()
		{
		return buildingId;
		}
		public void setName(String name)
		{
		this.name = name;
		}

		public String getName()
		{
		return name;
		}
		public void setType(String type)
		{
		this.type = type;
		}

		public String getType()
		{
		return type;
		}
		public void setRoomNumber(Long roomNumber)
		{
		this.roomNumber = roomNumber;
		}

		public Long getRoomNumber()
		{
		return roomNumber;
		}
		public void setStatus(String status)
		{
		this.status = status;
		}

		public String getStatus()
		{
		return status;
		}
		public void setDelFlag(String delFlag)
		{
		this.delFlag = delFlag;
		}
		/**
		* 楼栋名称
		*/
		@TableField(exist = false)
		private String buildingName;

		public String getDelFlag()
		{
		return delFlag;
		}

		@Override
		public String toString() {
		return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
		.append("id", getId())
		.append("buildingId", getBuildingId())
		.append("name", getName())
		.append("type", getType())
		.append("roomNumber", getRoomNumber())
		.append("status", getStatus())
		.append("delFlag", getDelFlag())
		.append("createBy", getCreateBy())
		.append("createTime", getCreateTime())
		.append("updateBy", getUpdateBy())
		.append("updateTime", getUpdateTime())
		.toString();
		}
		}

censoft-rongtong/src/main/java/com/censoft/censoftrongtong/domain/LedgerProject.java

+10 −98

Original line number	Diff line number	Diff line
		package com.censoft.censoftrongtong.domain;

		import com.baomidou.mybatisplus.annotation.TableField;
		import com.ruoyi.common.core.domain.BaseEntityClean;
		import lombok.Data;
		import org.apache.commons.lang3.builder.ToStringBuilder;
		import org.apache.commons.lang3.builder.ToStringStyle;
		import com.ruoyi.common.annotation.Excel;
		@@ -11,7 +14,8 @@ import com.ruoyi.common.core.domain.BaseEntity;
		* @author ruoyi
		* @date 2023-06-26
		*/
		public class LedgerProject extends BaseEntity
		@Data
		public class LedgerProject extends BaseEntityClean
		{
		private static final long serialVersionUID = 1L;

		@@ -48,105 +52,13 @@ public class LedgerProject extends BaseEntity

		/** 删除标志（0代表存在 1代表删除） */
		private String delFlag;
		/**
		* 部门名称名称
		*/
		@TableField(exist = false)
		private String deptName;

		public void setId(Long id)
		{
		this.id = id;
		}

		public Long getId()
		{
		return id;
		}
		public void setName(String name)
		{
		this.name = name;
		}

		public String getName()
		{
		return name;
		}
		public void setType(String type)
		{
		this.type = type;
		}

		public String getType()
		{
		return type;
		}
		public void setDeptId(Long deptId)
		{
		this.deptId = deptId;
		}

		public Long getDeptId()
		{
		return deptId;
		}
		public void setCity(String city)
		{
		this.city = city;
		}

		public String getCity()
		{
		return city;
		}
		public void setAddress(String address)
		{
		this.address = address;
		}

		public String getAddress()
		{
		return address;
		}
		public void setSource(String source)
		{
		this.source = source;
		}

		public String getSource()
		{
		return source;
		}
		public void setStatus(String status)
		{
		this.status = status;
		}

		public String getStatus()
		{
		return status;
		}
		public void setDelFlag(String delFlag)
		{
		this.delFlag = delFlag;
		}

		public String getDelFlag()
		{
		return delFlag;
		}

		@Override
		public String toString() {
		return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
		.append("id", getId())
		.append("name", getName())
		.append("type", getType())
		.append("deptId", getDeptId())
		.append("city", getCity())
		.append("address", getAddress())
		.append("source", getSource())
		.append("status", getStatus())
		.append("delFlag", getDelFlag())
		.append("createBy", getCreateBy())
		.append("createTime", getCreateTime())
		.append("updateBy", getUpdateBy())
		.append("updateTime", getUpdateTime())
		.toString();
		}
		}

censoft-rongtong/src/main/java/com/censoft/censoftrongtong/domain/LedgerRoom.java

+6 −0

Original line number	Diff line number	Diff line
		@@ -69,4 +69,10 @@ public class LedgerRoom extends BaseEntity
		@TableField("del_flag")
		@TableLogic
		private String delFlag;
		/**
		* 楼层名称
		*/
		@TableField(exist = false)
		private String floorName;

		}