Merge branch 'develop' of http://git.censoft.com.cn/rongtong/ruoyi-vue-master into dev-yf

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/controller/RiskPlanAppController.java

@@ -282,7 +282,7 @@ public class RiskPlanAppController extends BaseController {
      * @real_return {@link R<List<LedgerFloor>>}
      */
     @GetMapping("/floor/list/{buildingId}")
-    public R<List<LedgerFloor>> getFloorListByBuildingId(@PathVariable("buildingId") Long buildingId) {
+    public R<List<LedgerFloorDto>> getFloorListByBuildingId(@PathVariable("buildingId") Long buildingId) {
         return R.ok(ledgerFloorService.getFloorListByBuildingId(buildingId));
     }
 

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

@@ -48,7 +48,12 @@ public class LedgerRoom extends BaseEntity
     /** 房屋类型 */
     @Excel(name = "房屋类型")
     @TableField("room_type")
-    private  String  roomType;
+    private String roomType;
+
+    /** 得分，积分 */
+    @Excel(name = "得分，积分")
+    @TableField("score")
+    private String score;
 
     /** 楼层id */
     @Excel(name = "颜色")
@@ -57,7 +62,7 @@ public class LedgerRoom extends BaseEntity
 
     /** 房屋平面图位置 */
     @Excel(name = "房屋平面图位置")
-    @TableField(" position")
+    @TableField("position")
     private String position;
 
     /** 状态（0正常 1停用） */
@@ -69,4 +74,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/RiskPlanInherentList.java

@@ -87,14 +87,38 @@ public class RiskPlanInherentList extends BaseEntity
     @Excel(name = "工程技术措施附件")
     private String measuresProjectFileIds;
 
-    /** 管理措施 */
-    @Excel(name = "管理措施")
+    /** 应采取的管理措施 */
+    @Excel(name = "应采取的管理措施")
     private String measuresAdministration;
 
-    /** 管理措施附件 */
-    @Excel(name = "管理措施附件")
+    /** 已采取的管理措施1 */
+    @Excel(name = "已采取的管理措施")
+    private String takenMeasuresAdministration;
+
+    /** 管控责任单位id1 */
+    @Excel(name = "管控责任单位id")
+    private Long measuresDeptId;
+
+    /** 管控责任人id1 */
+    @Excel(name = "管控责任人id")
+    private String measuresUserId;
+
+    /** 已采取的管理措施 */
+    @Excel(name = "已采取的管理措施附件")
     private String measuresAdministrationFileIds;
 
+    /** 危险源名称1 */
+    @Excel(name = "危险源名称")
+    private String hazardSourceName;
+
+    /** 是否存在重大危险源 1*/
+    @Excel(name = "是否存在重大危险源")
+    private Boolean majorHazardSource;
+
+    /** 重大危险源描述1 */
+    @Excel(name = "重大危险源描述")
+    private Boolean majorHazardSourceDescription;
+
     /** 应急处置措施 */
     @Excel(name = "应急处置措施")
     private String measuresEmergency;
@@ -325,6 +349,54 @@ public class RiskPlanInherentList extends BaseEntity
         this.riskSeverity = riskSeverity;
     }
 
+    public String getTakenMeasuresAdministration() {
+        return takenMeasuresAdministration;
+    }
+
+    public void setTakenMeasuresAdministration(String takenMeasuresAdministration) {
+        this.takenMeasuresAdministration = takenMeasuresAdministration;
+    }
+
+    public Long getMeasuresDeptId() {
+        return measuresDeptId;
+    }
+
+    public void setMeasuresDeptId(Long measuresDeptId) {
+        this.measuresDeptId = measuresDeptId;
+    }
+
+    public String getMeasuresUserId() {
+        return measuresUserId;
+    }
+
+    public void setMeasuresUserId(String measuresUserId) {
+        this.measuresUserId = measuresUserId;
+    }
+
+    public String getHazardSourceName() {
+        return hazardSourceName;
+    }
+
+    public void setHazardSourceName(String hazardSourceName) {
+        this.hazardSourceName = hazardSourceName;
+    }
+
+    public Boolean getMajorHazardSource() {
+        return majorHazardSource;
+    }
+
+    public void setMajorHazardSource(Boolean majorHazardSource) {
+        this.majorHazardSource = majorHazardSource;
+    }
+
+    public Boolean getMajorHazardSourceDescription() {
+        return majorHazardSourceDescription;
+    }
+
+    public void setMajorHazardSourceDescription(Boolean majorHazardSourceDescription) {
+        this.majorHazardSourceDescription = majorHazardSourceDescription;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

censoft-rongtong/src/main/java/com/censoft/censoftrongtong/domain/dto/LedgerFloorDto.java

+package com.censoft.censoftrongtong.domain.dto;
+
+import com.censoft.censoftrongtong.domain.LedgerFloor;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * 基础数据-楼层对象 ledger_floor
+ *
+ * @author ruoyi
+ * @date 2023-06-26
+ */
+@Data
+public class LedgerFloorDto {
+    /**
+     * 名称 地上地下
+     */
+    private String name;
+    /**
+     * 楼层
+     */
+    private List<LedgerFloor> children;
+}

censoft-rongtong/src/main/java/com/censoft/censoftrongtong/domain/dto/RiskInherentListSaveDto.java

 package com.censoft.censoftrongtong.domain.dto;
 
-import com.ruoyi.common.annotation.Excel;
-import com.ruoyi.common.core.domain.BaseEntity;
 import lombok.Data;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
 
 /**
  * 固有风险清单库对象 risk_inherent_list
- * 
+ *
  * @author ruoyi
  * @date 2023-06-26
  */
@@ -51,12 +47,30 @@ public class RiskInherentListSaveDto{
     /** 工程技术措施附件 */
     private String measuresProjectFileIds;
 
-    /** 管理措施 */
+    /** 应采取的管理措施 */
     private String measuresAdministration;
 
+    /** 已采取的管理措施 */
+    private String takenMeasuresAdministration;
+
+    /** 管控责任单位id */
+    private Long measuresDeptId;
+
+    /** 管控责任人id */
+    private String measuresUserId;
+
     /** 管理措施附件 */
     private String measuresAdministrationFileIds;
 
+    /** 危险源名称 */
+    private String hazardSourceName;
+
+    /** 是否存在重大危险源 */
+    private Boolean majorHazardSource;
+
+    /** 重大危险源描述 */
+    private Boolean majorHazardSourceDescription;
+
     /** 应急处置措施 */
     private String measuresEmergency;
 

censoft-rongtong/src/main/java/com/censoft/censoftrongtong/domain/dto/RiskPlanAppApproveListDto.java

@@ -11,21 +11,38 @@ import java.util.Date;
  */
 @Data
 public class RiskPlanAppApproveListDto {
-    /** 流程步骤id */
+    /**
+     * 流程步骤id
+     */
     private Long taskId;
 
-    /** 开始时间 */
+    /**
+     * 开始时间
+     */
     private Date startTime;
 
-    /** 审批人id */
+    /**
+     * 审批人id
+     */
     private Long approvalUserId;
 
-    /** 审批人名称 */
+    /**
+     * 审批人名称
+     */
     private String approvalUserName;
 
-    /** 流程名称 */
+    /**
+     * 流程名称
+     */
     private String taskName;
 
-    /** 审批结果 */
+    /**
+     * 审批结果
+     */
     private String taskResult;
+
+    /**
+     * 经办意见
+     */
+    private String taskOpinion;
 }

censoft-rongtong/src/main/java/com/censoft/censoftrongtong/domain/dto/RiskPlanAppExistingListDto.java

@@ -35,4 +35,10 @@ public class RiskPlanAppExistingListDto {
 
     /** 评估人头像 */
     private String avatar;
+
+    /** 风险等级 */
+    private String level;
+
+    /** 风险因素 */
+    private String factor;
 }

censoft-rongtong/src/main/java/com/censoft/censoftrongtong/domain/dto/RiskPlanAppInherentListDto.java

@@ -42,4 +42,6 @@ public class RiskPlanAppInherentListDto {
 
     /** 生成时间 */
     private Date createTime;
+    /** 风险级别*/
+    private String level;
 }

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/ILedgerFloorService.java

 package com.censoft.censoftrongtong.service;
 
 import com.censoft.censoftrongtong.domain.LedgerFloor;
+import com.censoft.censoftrongtong.domain.dto.LedgerFloorDto;
 
 import java.util.List;
 
@@ -60,5 +61,5 @@ public interface ILedgerFloorService
      */
     public int deleteLedgerFloorById(Long id);
 
-    List<LedgerFloor> getFloorListByBuildingId(Long buildingId);
+    List<LedgerFloorDto> getFloorListByBuildingId(Long buildingId);
 }

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/LedgerFloorServiceImpl.java

 package com.censoft.censoftrongtong.service.impl;
 
 import java.util.List;
+import java.util.stream.Collectors;
 
 import com.censoft.censoftrongtong.domain.LedgerFloor;
+import com.censoft.censoftrongtong.domain.dto.LedgerFloorDto;
 import com.censoft.censoftrongtong.mapper.LedgerFloorMapper;
 import com.censoft.censoftrongtong.service.ILedgerFloorService;
 import com.ruoyi.common.utils.DateUtils;
@@ -96,10 +98,27 @@ public class LedgerFloorServiceImpl implements ILedgerFloorService
     }
 
     @Override
-    public List<LedgerFloor> getFloorListByBuildingId(Long buildingId) {
+    public List<LedgerFloorDto> getFloorListByBuildingId(Long buildingId) {
         LedgerFloor query = new LedgerFloor();
         query.setBuildingId(buildingId);
         query.setStatus("0");
-        return selectLedgerFloorList(query);
+        List<LedgerFloor> ledgerFloors = selectLedgerFloorList(query);
+        return getLedgerFloorDtoListByLedgerFloor(ledgerFloors);
+    }
+
+    private List<LedgerFloorDto> getLedgerFloorDtoListByLedgerFloor(List<LedgerFloor> ledgerFloors) {
+        return ledgerFloors.stream()
+                .map(LedgerFloor::getType)
+                .distinct()
+                .map(type->{
+                    List<LedgerFloor> children = ledgerFloors
+                            .stream()
+                            .filter(ledgerFloor -> type.equals(ledgerFloor.getType()))
+                            .collect(Collectors.toList());
+                    LedgerFloorDto ledgerFloorDto = new LedgerFloorDto();
+                    ledgerFloorDto.setName(type);
+                    ledgerFloorDto.setChildren(children);
+                    return ledgerFloorDto;
+                }).collect(Collectors.toList());
     }
 }

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/java/com/censoft/censoftrongtong/service/impl/RiskPlanServiceImpl.java

@@ -239,6 +239,7 @@ public class RiskPlanServiceImpl implements IRiskPlanService {
                 riskPlanTask1.setTaskName(RiskPlanStatusType.WAIT_RETURN.getTitle());
                 riskPlanTask1.setStatus("running");
                 riskPlanTask1.setStartTime(new Date());
+                riskPlanTask1.setApprovalUserId(appApproveDto.getUserId());
                 riskPlanTaskService.insertRiskPlanTask(riskPlanTask1);
 
                 //修改计划状态
@@ -290,6 +291,7 @@ public class RiskPlanServiceImpl implements IRiskPlanService {
                 riskPlanTask1.setStatus("completed");
                 riskPlanTask1.setStartTime(new Date());
                 riskPlanTask1.setCompletedTime(new Date());
+                riskPlanTask1.setApprovalUserId(appApproveDto.getUserId());
                 riskPlanTaskService.insertRiskPlanTask(riskPlanTask1);
 
                 //插入任务表 已完成
@@ -300,6 +302,7 @@ public class RiskPlanServiceImpl implements IRiskPlanService {
                 riskPlanTask2.setStatus("completed");
                 riskPlanTask2.setStartTime(new Date());
                 riskPlanTask2.setCompletedTime(new Date());
+                riskPlanTask2.setApprovalUserId(appApproveDto.getUserId());
                 riskPlanTaskService.insertRiskPlanTask(riskPlanTask2);
 
             }
@@ -326,6 +329,7 @@ public class RiskPlanServiceImpl implements IRiskPlanService {
         riskPlanTask1.setTaskName(RiskPlanStatusType.REVOKE.getTitle());
         riskPlanTask1.setStatus("completed");
         riskPlanTask1.setStartTime(new Date());
+        riskPlanTask1.setApprovalUserId(userId);
         riskPlanTaskService.insertRiskPlanTask(riskPlanTask1);
 
         //修改计划状态

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

@@ -28,19 +28,20 @@ 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 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'
         </where>
     </select>
     

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

@@ -23,13 +23,14 @@ 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="buildingId != null "> and tt.building_id = #{buildingId}</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,56 @@ 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="roomType"    column="room_type"    />
+        <result property="score"    column="score"    />
+        <result property="position"    column="position"    />
+        <result property="color"    column="color"    />
+        <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, room_type,score,color,position,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.room_type,r.score,r.color,r.position, 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>

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

@@ -81,6 +81,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             su.user_id AS userId,
             su.nick_name AS userName,
             su.avatar,
+            rpil.level,
             rpil.create_time AS createTime
         FROM
             risk_plan_inherent_list rpil
@@ -144,7 +145,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             reil.`describe`,
             su.user_id AS userId,
             su.nick_name AS userName,
-            su.avatar
+            su.avatar,
+            reil.level,
+            reil.factor
         FROM
             risk_plan_existing_list reil
                 LEFT JOIN sys_user su ON su.user_id = reil.user_id

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

@@ -170,7 +170,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             rpt.approval_user_id AS approvalUserId,
             su.nick_name AS approvalUserName,
             rpt.task_name AS taskName,
-            rpt.task_result AS taskResult
+            rpt.task_result AS taskResult,
+            rpt.task_opinion AS taskOpinion
         FROM
             risk_plan_task rpt
                 LEFT JOIN sys_user su ON su.user_id = rpt.approval_user_id

ruoyi-admin/src/main/resources/application.yml

@@ -15,7 +15,7 @@ ruoyi:
   # 验证码类型 math 数字计算 char 字符验证
   captchaType: math
   # 服务器地址
-  serverAddress: http://192.168.4.232/dev-api
+  serverAddress: http://rongtongpc.censoft.com.cn/dev-api
 
 # 开发环境配置
 server: