Merge branch 'xjchen' into 'develop'

PC端项目到房间列表修改20230713

See merge request !7

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

@@ -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

 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;
+
+    /**
+     * 组织名称
+     */
+    @TableField(exist = false)
+    private String deptName;
+
+
+
+
 
-    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;
-    }
-
-    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

 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

 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

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

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

@@ -11,311 +11,361 @@ import com.ruoyi.common.core.domain.BaseEntity;
  * @author ruoyi
  * @date 2023-06-26
  */
-public class RiskPlanExistingList extends BaseEntity
-{
+public class RiskPlanExistingList extends BaseEntity {
     private static final long serialVersionUID = 1L;
 
-    /** id */
+    /**
+     * id
+     */
     private Long id;
 
-    /** 评估人id */
+    /**
+     * 评估人id
+     */
     @Excel(name = "评估人id")
     private Long userId;
 
-    /** 固有风险id */
+    /**
+     * 固有风险id
+     */
     @Excel(name = "固有风险id")
     private Long inherentId;
 
-    /** 计划id */
+    /**
+     * 计划id
+     */
     @Excel(name = "计划id")
     private Long planId;
 
-    /** 房间id */
+    /**
+     * 房间id
+     */
     @Excel(name = "房间id")
     private Long roomId;
 
-    /** 风险code */
+    /**
+     * 风险code
+     */
     @Excel(name = "风险code")
     private String code;
 
-    /** 风险源名称 */
+    /**
+     * 风险源名称
+     */
     @Excel(name = "风险源名称")
     private String name;
 
-    /** 风险类型 */
+    /**
+     * 风险类型
+     */
     @Excel(name = "风险类型")
     private String type;
 
-    /** 风险描述 */
+    /**
+     * 风险描述
+     */
     @Excel(name = "风险描述")
     private String describe;
 
-    /** 评估模型 */
+    /**
+     * 评估模型
+     */
     @Excel(name = "评估模型")
     private String evaluationModel;
 
-    /** 评估范围 */
+    /**
+     * 评估范围
+     */
     @Excel(name = "评估范围")
     private String evaluationRange;
 
-    /** 风险等级 */
+    /**
+     * 风险等级
+     */
     @Excel(name = "风险等级")
     private String level;
 
-    /** 存在部位 */
+    /**
+     * 存在部位
+     */
     @Excel(name = "存在部位")
     private String presenceLocation;
 
-    /** 风险源照片id */
+    /**
+     * 风险源照片id
+     */
     @Excel(name = "风险源照片id")
     private String pictureFileIds;
 
-    /** 风险因素 */
+    /**
+     * 风险因素
+     */
     @Excel(name = "风险因素")
     private String factor;
 
-    /** 工程技术措施 */
+    /**
+     * 发生可能性
+     */
+    @Excel(name = "发生可能性")
+    private String riskLikelihood;
+
+    /**
+     * 后果严重程度
+     */
+    @Excel(name = "后果严重程度")
+    private String riskSeverity;
+
+
+    /**
+     * 工程技术措施
+     */
     @Excel(name = "工程技术措施")
     private String measuresProject;
 
-    /** 工程技术措施附件 */
+    /**
+     * 工程技术措施附件
+     */
     @Excel(name = "工程技术措施附件")
     private String measuresProjectFileIds;
 
-    /** 管理措施 */
+    /**
+     * 管理措施
+     */
     @Excel(name = "管理措施")
     private String measuresAdministration;
 
-    /** 管理措施附件 */
+    /**
+     * 管理措施附件
+     */
     @Excel(name = "管理措施附件")
     private String measuresAdministrationFileIds;
 
-    /** 应急处置措施 */
+    /**
+     * 应急处置措施
+     */
     @Excel(name = "应急处置措施")
     private String measuresEmergency;
 
-    /** 应急处置措施附件 */
+    /**
+     * 应急处置措施附件
+     */
     @Excel(name = "应急处置措施附件")
     private String measuresEmergencyFileIds;
 
-    /** 参考依据 */
+    /**
+     * 参考依据
+     */
     @Excel(name = "参考依据")
     private String referenceBasis;
 
-    /** 删除标志（0代表存在 1代表删除） */
+    /**
+     * 删除标志（0代表存在 1代表删除）
+     */
     private String delFlag;
 
-    public void setId(Long id) 
-    {
+    public void setId(Long id) {
         this.id = id;
     }
 
-    public Long getId() 
-    {
+    public Long getId() {
         return id;
     }
-    public void setUserId(Long userId) 
-    {
+
+    public void setUserId(Long userId) {
         this.userId = userId;
     }
 
-    public Long getUserId() 
-    {
+    public Long getUserId() {
         return userId;
     }
-    public void setInherentId(Long inherentId) 
-    {
+
+    public void setInherentId(Long inherentId) {
         this.inherentId = inherentId;
     }
 
-    public Long getInherentId() 
-    {
+    public Long getInherentId() {
         return inherentId;
     }
-    public void setPlanId(Long planId) 
-    {
+
+    public void setPlanId(Long planId) {
         this.planId = planId;
     }
 
-    public Long getPlanId() 
-    {
+    public Long getPlanId() {
         return planId;
     }
-    public void setRoomId(Long roomId) 
-    {
+
+    public void setRoomId(Long roomId) {
         this.roomId = roomId;
     }
 
-    public Long getRoomId() 
-    {
+    public Long getRoomId() {
         return roomId;
     }
-    public void setCode(String code) 
-    {
+
+    public void setCode(String code) {
         this.code = code;
     }
 
-    public String getCode() 
-    {
+    public String getCode() {
         return code;
     }
-    public void setName(String name) 
-    {
+
+    public void setName(String name) {
         this.name = name;
     }
 
-    public String getName() 
-    {
+    public String getName() {
         return name;
     }
-    public void setType(String type) 
-    {
+
+    public void setType(String type) {
         this.type = type;
     }
 
-    public String getType() 
-    {
+    public String getType() {
         return type;
     }
-    public void setDescribe(String describe) 
-    {
+
+    public void setDescribe(String describe) {
         this.describe = describe;
     }
 
-    public String getDescribe() 
-    {
+    public String getDescribe() {
         return describe;
     }
-    public void setEvaluationModel(String evaluationModel) 
-    {
+
+    public void setEvaluationModel(String evaluationModel) {
         this.evaluationModel = evaluationModel;
     }
 
-    public String getEvaluationModel() 
-    {
+    public String getEvaluationModel() {
         return evaluationModel;
     }
-    public void setEvaluationRange(String evaluationRange) 
-    {
+
+    public void setEvaluationRange(String evaluationRange) {
         this.evaluationRange = evaluationRange;
     }
 
-    public String getEvaluationRange() 
-    {
+    public String getEvaluationRange() {
         return evaluationRange;
     }
-    public void setLevel(String level) 
-    {
+
+    public void setLevel(String level) {
         this.level = level;
     }
 
-    public String getLevel() 
-    {
+    public String getLevel() {
         return level;
     }
-    public void setPresenceLocation(String presenceLocation) 
-    {
+
+    public void setPresenceLocation(String presenceLocation) {
         this.presenceLocation = presenceLocation;
     }
 
-    public String getPresenceLocation() 
-    {
+    public String getRiskLikelihood() {
+        return riskLikelihood;
+    }
+
+    public void setRiskLikelihood(String riskLikelihood) {
+        this.riskLikelihood = riskLikelihood;
+    }
+
+    public String getRiskSeverity() {
+        return riskSeverity;
+    }
+
+    public void setRiskSeverity(String riskSeverity) {
+        this.riskSeverity = riskSeverity;
+    }
+
+    public String getPresenceLocation() {
         return presenceLocation;
     }
-    public void setPictureFileIds(String pictureFileIds) 
-    {
+
+    public void setPictureFileIds(String pictureFileIds) {
         this.pictureFileIds = pictureFileIds;
     }
 
-    public String getPictureFileIds() 
-    {
+    public String getPictureFileIds() {
         return pictureFileIds;
     }
-    public void setFactor(String factor) 
-    {
+
+    public void setFactor(String factor) {
         this.factor = factor;
     }
 
-    public String getFactor() 
-    {
+    public String getFactor() {
         return factor;
     }
-    public void setMeasuresProject(String measuresProject) 
-    {
+
+    public void setMeasuresProject(String measuresProject) {
         this.measuresProject = measuresProject;
     }
 
-    public String getMeasuresProject() 
-    {
+    public String getMeasuresProject() {
         return measuresProject;
     }
-    public void setMeasuresProjectFileIds(String measuresProjectFileIds) 
-    {
+
+    public void setMeasuresProjectFileIds(String measuresProjectFileIds) {
         this.measuresProjectFileIds = measuresProjectFileIds;
     }
 
-    public String getMeasuresProjectFileIds() 
-    {
+    public String getMeasuresProjectFileIds() {
         return measuresProjectFileIds;
     }
-    public void setMeasuresAdministration(String measuresAdministration) 
-    {
+
+    public void setMeasuresAdministration(String measuresAdministration) {
         this.measuresAdministration = measuresAdministration;
     }
 
-    public String getMeasuresAdministration() 
-    {
+    public String getMeasuresAdministration() {
         return measuresAdministration;
     }
-    public void setMeasuresAdministrationFileIds(String measuresAdministrationFileIds) 
-    {
+
+    public void setMeasuresAdministrationFileIds(String measuresAdministrationFileIds) {
         this.measuresAdministrationFileIds = measuresAdministrationFileIds;
     }
 
-    public String getMeasuresAdministrationFileIds() 
-    {
+    public String getMeasuresAdministrationFileIds() {
         return measuresAdministrationFileIds;
     }
-    public void setMeasuresEmergency(String measuresEmergency) 
-    {
+
+    public void setMeasuresEmergency(String measuresEmergency) {
         this.measuresEmergency = measuresEmergency;
     }
 
-    public String getMeasuresEmergency() 
-    {
+    public String getMeasuresEmergency() {
         return measuresEmergency;
     }
-    public void setMeasuresEmergencyFileIds(String measuresEmergencyFileIds) 
-    {
+
+    public void setMeasuresEmergencyFileIds(String measuresEmergencyFileIds) {
         this.measuresEmergencyFileIds = measuresEmergencyFileIds;
     }
 
-    public String getMeasuresEmergencyFileIds() 
-    {
+    public String getMeasuresEmergencyFileIds() {
         return measuresEmergencyFileIds;
     }
-    public void setReferenceBasis(String referenceBasis) 
-    {
+
+    public void setReferenceBasis(String referenceBasis) {
         this.referenceBasis = referenceBasis;
     }
 
-    public String getReferenceBasis() 
-    {
+    public String getReferenceBasis() {
         return referenceBasis;
     }
-    public void setDelFlag(String delFlag) 
-    {
+
+    public void setDelFlag(String delFlag) {
         this.delFlag = delFlag;
     }
 
-    public String getDelFlag() 
-    {
+    public String getDelFlag() {
         return delFlag;
     }
 
     @Override
     public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
                 .append("id", getId())
                 .append("userId", getUserId())
                 .append("inherentId", getInherentId())
@@ -328,6 +378,8 @@ public class RiskPlanExistingList extends BaseEntity
                 .append("evaluationModel", getEvaluationModel())
                 .append("evaluationRange", getEvaluationRange())
                 .append("level", getLevel())
+                .append("riskLikelihood", getRiskLikelihood())
+                .append("riskSeverity", getRiskSeverity())
                 .append("presenceLocation", getPresenceLocation())
                 .append("pictureFileIds", getPictureFileIds())
                 .append("factor", getFactor())

censoft-rongtong/src/main/java/com/censoft/censoftrongtong/mapper/LedgerRoomMapper.java

 package com.censoft.censoftrongtong.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.censoft.censoftrongtong.domain.LedgerFloor;
 import com.censoft.censoftrongtong.domain.LedgerRoom;
 
 import java.util.List;
@@ -13,5 +14,18 @@ import java.util.List;
  */
 public interface LedgerRoomMapper extends BaseMapper<LedgerRoom>
 {
+    /**
+     * 查询基础数据-房间列表
+     *
+     * @param ledgerRoom 基础数据-房间
+     * @return 基础数据-房间集合
+     */
+    /**
+     * 查询基础数据-楼层列表
+     *
+     * @param ledgerRoom 基础数据-楼层
+     * @return 基础数据-楼层集合
+     */
+    public List<LedgerRoom> selectLedgerRoomList(LedgerRoom ledgerRoom);
 
 }

censoft-rongtong/src/main/java/com/censoft/censoftrongtong/service/ILedgerRoomService.java

@@ -13,6 +13,19 @@ import java.util.List;
  */
 public interface ILedgerRoomService extends IService<LedgerRoom>
 {
+    /**
+     * 根据楼层查询该楼层房间列表
+     * @param floorId
+     * @return
+     */
 
     List<LedgerRoom> getRoomListByBuildingId(Long floorId);
+
+
+    /**
+     * 查询房间列表
+     * @param ledgerRoom
+     * @return
+     */
+    List<LedgerRoom> selectLedgerRoomList(LedgerRoom ledgerRoom);
 }

censoft-rongtong/src/main/java/com/censoft/censoftrongtong/service/impl/LedgerRoomServiceImpl.java

@@ -33,4 +33,10 @@ public class LedgerRoomServiceImpl extends ServiceImpl<LedgerRoomMapper, LedgerR
                 .eq(LedgerRoom::getStatus, "0");
         return list(wrapper);
     }
+
+    @Override
+    public List<LedgerRoom> selectLedgerRoomList(LedgerRoom ledgerRoom) {
+
+        return ledgerRoomMapper.selectLedgerRoomList(ledgerRoom);
+    }
 }

censoft-rongtong/src/main/resources/mapper/system/LedgerBuildingMapper.xml

@@ -28,19 +28,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </sql>
 
     <select id="selectLedgerBuildingList" parameterType="com.censoft.censoftrongtong.domain.LedgerBuilding" resultMap="LedgerBuildingResult">
-        <include refid="selectLedgerBuildingVo"/>
+        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.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
         <where>  
-            <if test="projectId != null "> and project_id = #{projectId}</if>
-            <if test="name != null  and name != ''"> and name like concat('%', #{name}, '%')</if>
-            <if test="type != null  and type != ''"> and type = #{type}</if>
-            <if test="deptId != null "> and dept_id = #{deptId}</if>
-            <if test="floor != null  and floor != ''"> and floor = #{floor}</if>
-            <if test="useto != null  and useto != ''"> and useto = #{useto}</if>
-            <if test="city != null  and city != ''"> and city = #{city}</if>
-            <if test="area != null "> and area = #{area}</if>
-            <if test="address != null  and address != ''"> and address = #{address}</if>
-            <if test="status != null  and status != ''"> and status = #{status}</if>
-             and del_flag = '0'
+            <if test="projectName != null "> and project_name like concat('%', #{projectName}, '%') </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'
         </where>
     </select>
     

censoft-rongtong/src/main/resources/mapper/system/LedgerFloorMapper.xml

@@ -23,13 +23,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </sql>
 
     <select id="selectLedgerFloorList" parameterType="com.censoft.censoftrongtong.domain.LedgerFloor" resultMap="LedgerFloorResult">
-        <include refid="selectLedgerFloorVo"/>
+        select * from(SELECT f.id, f.building_id, b.name 'building_name', f.NAME, f.type, f.room_number, f.STATUS, f.del_flag, f.create_by, f.create_time, f.update_by, f.update_time FROM ledger_floor f LEFT JOIN ledger_building b on f.building_id=b.id) tt
         <where>  
-            <if test="buildingId != null "> and building_id = #{buildingId}</if>
-            <if test="name != null  and name != ''"> and name like concat('%', #{name}, '%')</if>
-            <if test="type != null  and type != ''"> and type = #{type}</if>
-            <if test="roomNumber != null "> and room_number = #{roomNumber}</if>
-            <if test="status != null  and status != ''"> and status = #{status}</if>
+            <if test="buildingName != null "> and tt.building_name  like concat('%', #{buildingName}, '%')</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="roomNumber != null "> and tt.room_number = #{roomNumber}</if>
+            <if test="status != null  and status != ''"> and tt.status = #{status}</if>
         </where>
     </select>
     

censoft-rongtong/src/main/resources/mapper/system/LedgerProjectMapper.xml

@@ -25,15 +25,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </sql>
 
     <select id="selectLedgerProjectList" parameterType="com.censoft.censoftrongtong.domain.LedgerProject" resultMap="LedgerProjectResult">
-        <include refid="selectLedgerProjectVo"/>
+        SELECT p.id, p.NAME, p.type, p.dept_id, d.dept_name, p.city, p.address, p.source, p.STATUS, p.del_flag, p.create_by, p.create_time, p.update_by, p.update_time FROM ledger_project p LEFT JOIN sys_dept d ON p.dept_id = d.dept_id
         <where>  
-            <if test="name != null  and name != ''"> and name like concat('%', #{name}, '%')</if>
-            <if test="type != null  and type != ''"> and type = #{type}</if>
-            <if test="deptId != null "> and dept_id = #{deptId}</if>
-            <if test="city != null  and city != ''"> and city = #{city}</if>
-            <if test="address != null  and address != ''"> and address = #{address}</if>
-            <if test="source != null  and source != ''"> and source = #{source}</if>
-            <if test="status != null  and status != ''"> and status = #{status}</if>
+            <if test="name != null  and name != ''"> and p.name like concat('%', #{name}, '%')</if>
+            <if test="type != null  and type != ''"> and p.type = #{type}</if>
+            <if test="deptId != null "> and p.dept_id = #{deptId}</if>
+            <if test="city != null  and city != ''"> and p.city = #{city}</if>
+            <if test="address != null  and address != ''"> and p.address = #{address}</if>
+            <if test="source != null  and source != ''"> and p.source = #{source}</if>
+            <if test="status != null  and status != ''"> and p.status = #{status}</if>
         </where>
     </select>
     

censoft-rongtong/src/main/resources/mapper/system/LedgerRoomMapper.xml

@@ -4,4 +4,52 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.censoft.censoftrongtong.mapper.LedgerRoomMapper">
 
+    <resultMap type="com.censoft.censoftrongtong.domain.LedgerRoom" id="LedgerRoomResult">
+        <result property="id"    column="id"    />
+        <result property="floorId"    column="floor_id"    />
+        <result property="name"    column="name"    />
+        <result property="number"    column="number"    />
+        <result property="area"    column="area"    />
+        <result property="status"    column="status"    />
+        <result property="delFlag"    column="del_flag"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateBy"    column="update_by"    />
+        <result property="updateTime"    column="update_time"    />
+    </resultMap>
+
+    <sql id="selectLedgerRoomVo">
+        select id, floor_id, name, number, area, status, del_flag, create_by, create_time, update_by, update_time from ledger_room
+    </sql>
+
+    <select id="selectLedgerRoomList" parameterType="com.censoft.censoftrongtong.domain.LedgerRoom" resultMap="LedgerRoomResult">
+        select  * from (SELECT r.id, r.floor_id, f.name 'floor_name', r.NAME, r.number, r.area, r.STATUS, r.del_flag, r.create_by, r.create_time, r.update_by, r.update_time FROM ledger_room r LEFT JOIN ledger_floor f on r.floor_id=f.id) tt
+        <where>
+            <if test="floorId != null "> and tt.floor_id =  #{floorId}</if>
+            <if test="floorName != null "> and tt.floor_name like concat('%', #{floorName}, '%')</if>
+            <if test="name != null  and name != ''"> and tt.name like concat('%', #{name}, '%')</if>
+            <if test="number != null  and number != ''"> and tt.number = #{number}</if>
+            <if test="area != null "> and tt.area = #{area}</if>
+            <if test="status != null  and status != ''"> and tt.status = #{status}</if>
+        </where>
+    </select>
+
+    <select id="selectLedgerRoomById" parameterType="Long" resultMap="LedgerRoomResult">
+        <include refid="selectLedgerRoomVo"/>
+        where id = #{id}
+    </select>
+
+
+    <delete id="deleteLedgerRoomById" parameterType="Long">
+        delete from ledger_room where id = #{id}
+    </delete>
+
+    <delete id="deleteLedgerRoomByIds" parameterType="String">
+        delete from ledger_room where id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+
+
 </mapper>
\ No newline at end of file

censoft-rongtong/src/main/resources/mapper/system/RiskPlanExistingListMapper.xml

@@ -17,6 +17,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="evaluationModel"    column="evaluation_model"    />
         <result property="evaluationRange"    column="evaluation_range"    />
         <result property="level"    column="level"    />
+        <result property="riskLikelihood"    column="risk_likelihood"    />
+        <result property="riskSeverity"    column="risk_severity"    />
         <result property="presenceLocation"    column="presence_location"    />
         <result property="pictureFileIds"    column="picture_file_ids"    />
         <result property="factor"    column="factor"    />
@@ -35,7 +37,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectRiskPlanExistingListVo">
-        select id, user_id, inherent_id, plan_id, room_id, code, name, type, describe, evaluation_model, evaluation_range, level, presence_location, picture_file_ids, factor, measures_project, measures_project_file_ids, measures_administration, measures_administration_file_ids, measures_emergency, measures_emergency_file_ids, reference_basis, del_flag, create_by, create_time, update_by, update_time from risk_plan_existing_list
+        select id, user_id, inherent_id, plan_id, room_id, code, name, type, describe, evaluation_model, evaluation_range, level,risk_likelihood,risk_severity, presence_location, picture_file_ids, factor, measures_project, measures_project_file_ids, measures_administration, measures_administration_file_ids, measures_emergency, measures_emergency_file_ids, reference_basis, del_flag, create_by, create_time, update_by, update_time from risk_plan_existing_list
     </sql>
 
     <select id="selectRiskPlanExistingListList" parameterType="com.censoft.censoftrongtong.domain.RiskPlanExistingList" resultMap="RiskPlanExistingListResult">
@@ -84,6 +86,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="evaluationModel != null">evaluation_model,</if>
             <if test="evaluationRange != null">evaluation_range,</if>
             <if test="level != null">level,</if>
+            <if test="riskLikelihood != null">risk_likelihood,</if>
+            <if test="riskSeverity != null">risk_severity,</if>
             <if test="presenceLocation != null">presence_location,</if>
             <if test="pictureFileIds != null">picture_file_ids,</if>
             <if test="factor != null">factor,</if>
@@ -112,6 +116,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="evaluationModel != null">#{evaluationModel},</if>
             <if test="evaluationRange != null">#{evaluationRange},</if>
             <if test="level != null">#{level},</if>
+            <if test="riskLikelihood != null">#{riskLikelihood},</if>
+            <if test="riskSeverity != null">#{riskSeverity},</if>
             <if test="presenceLocation != null">#{presenceLocation},</if>
             <if test="pictureFileIds != null">#{pictureFileIds},</if>
             <if test="factor != null">#{factor},</if>
@@ -144,6 +150,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="evaluationModel != null">evaluation_model = #{evaluationModel},</if>
             <if test="evaluationRange != null">evaluation_range = #{evaluationRange},</if>
             <if test="level != null">level = #{level},</if>
+            <if test="riskLikelihood != null">risk_likelihood = #{riskLikelihood},</if>
+            <if test="riskSeverity != null">risk_severity = #{riskSeverity},</if>
             <if test="presenceLocation != null">presence_location = #{presenceLocation},</if>
             <if test="pictureFileIds != null">picture_file_ids = #{pictureFileIds},</if>
             <if test="factor != null">factor = #{factor},</if>