大屏相关接口

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

@@ -29,10 +29,7 @@ import org.springframework.web.multipart.MultipartFile;
 
 import javax.annotation.Resource;
 import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.List;
+import java.util.*;
 import java.util.stream.Collectors;
 
 
@@ -876,16 +873,15 @@ public class RiskPlanAppController extends BaseController {
     }
 
 
-
     /**
-     * 现有风险根据得分返回对应的风险等级
-     *
-     * @param score 得分
-     * @real_return {@link R<RiskAssessmentMatrixLevel>}
+     * 根据分数获取风险等级，并计算楼栋风险值
+     * @param buildingId
+     * @param score
+     * @return
      */
-    @GetMapping("/existing/matrix/score/{score}")
-    public R<RiskAssessmentMatrixLevel> getRiskAssessmentExistingMatrixLevelByScore(@PathVariable BigDecimal score) {
-        return R.ok(riskAssessmentMatrixLevelService.getRiskAssessmentExistingMatrixLevelByScore(score));
+    @GetMapping("/existing/matrix/score")
+    public R<Map<String, String>> getRiskLevelByScore(Long buildingId, BigDecimal score) {
+        return R.ok(riskPlanExistingListService.getRiskLevelByScore(buildingId,score));
     }
 
     /**

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

@@ -62,6 +62,9 @@ public class RiskPlanController extends BaseController
     @Resource
     private IRiskPlanInherentListService riskPlanInherentListService;
 
+    @Autowired
+    private IRiskPlanExistingListService riskPlanExistingListService;
+
     @Resource
     private ILedgerBuildingService ledgerBuildingService;
 
@@ -222,6 +225,26 @@ public class RiskPlanController extends BaseController
         return getDataTable(dtos);
     }
 
+    /**
+     * 查询固有风险信息列表
+     */
+    @GetMapping("/existingList")
+    public TableDataInfo getPlanExistingList(RiskInherentListExportDto riskInherentListExportDto)
+    {
+        startPage();
+        List<RiskInherentListExportDto> dtos = riskPlanExistingListService.getPlanExistingList(riskInherentListExportDto);
+        for (RiskInherentListExportDto dto : dtos) {
+            if ("1".equals(dto.getMajorHazardSource())){
+                dto.setMajorHazardSource("是");
+            }else {
+                dto.setMajorHazardSource("否");
+                dto.setHazardSourceName("/");
+                dto.setMajorHazardDescription("/");
+            }
+        }
+        return getDataTable(dtos);
+    }
+
     /**
      * 根据楼宇id获取楼层列表
      *

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

@@ -102,5 +102,6 @@ public class RiskPlanExistingListController extends BaseController
     {
         return toAjax(riskPlanExistingListService.deleteRiskPlanExistingListByIds(ids));
     }
+
 }
 

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

@@ -89,7 +89,10 @@ public class LedgerBuilding extends BaseEntityClean
     @TableField(exist = false)
     private String num;
 
-
+    /**
+     * 楼栋风险指数
+     */
+    private BigDecimal riskIndex;
 
 
 

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

@@ -202,5 +202,9 @@ public class RiskPlanExistingList extends BaseEntity {
     @TableField(exist = false)
     private String roomName;
 
+    /**
+     * 风险等级颜色
+     */
+    private  String riskColor;
 
 }

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

 package com.censoft.censoftrongtong.domain.dto;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import lombok.Data;
@@ -126,4 +127,14 @@ public class RiskExistingListSaveDto {
      * 参考依据
      */
     private String referenceBasis;
+
+    /**
+     * 评估选项ids
+     */
+    private String evaluationItemIds;
+
+    /**
+     * 影响因素
+     */
+    private String factorItems;
 }

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

 package com.censoft.censoftrongtong.mapper;
 
 import com.censoft.censoftrongtong.domain.RiskPlanExistingList;
+import com.censoft.censoftrongtong.domain.dto.RiskInherentListExportDto;
 import com.censoft.censoftrongtong.domain.dto.RiskPlanAppExistingListDetailsDto;
 import com.censoft.censoftrongtong.domain.dto.statistics.*;
 import com.github.yulichang.base.MPJBaseMapper;
@@ -100,6 +101,9 @@ public interface RiskPlanExistingListMapper extends MPJBaseMapper<RiskPlanExisti
      */
     public int deleteRiskPlanExistingListByIds(Long[] ids);
 
+
+    List<RiskInherentListExportDto> getPlanExistingList(RiskInherentListExportDto riskInherentListExportDto);
+
     RiskPlanAppExistingListDetailsDto getRiskPlanAppExistingListDetailsDtoByExistingId(@Param("existingId") Long existingId);
 
 }

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

@@ -15,5 +15,4 @@ public interface IRiskAssessmentMatrixLevelService extends IService<RiskAssessme
 
     RiskAssessmentMatrixLevel getRiskAssessmentMatrixLevelByScore(BigDecimal score);
 
-    RiskAssessmentMatrixLevel getRiskAssessmentExistingMatrixLevelByScore(BigDecimal score);
 }

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

 package com.censoft.censoftrongtong.service;
 
+import com.censoft.censoftrongtong.domain.RiskAssessmentMatrixLevel;
 import com.censoft.censoftrongtong.domain.RiskPlanExistingList;
 import com.censoft.censoftrongtong.domain.dto.RiskExistingListSaveDto;
+import com.censoft.censoftrongtong.domain.dto.RiskInherentListExportDto;
 import com.censoft.censoftrongtong.domain.dto.RiskPlanAppExistingListDetailsDto;
 import com.censoft.censoftrongtong.domain.dto.statistics.*;
 import com.github.yulichang.base.MPJBaseService;
 
+import java.math.BigDecimal;
 import java.util.*;
 
 /**
@@ -99,4 +102,21 @@ public interface IRiskPlanExistingListService extends MPJBaseService<RiskPlanExi
     Boolean saveRiskExistingListSaveDto(RiskExistingListSaveDto saveDto);
 
     RiskPlanAppExistingListDetailsDto getRiskPlanAppExistingListDetailsDtoByExistingId(Long existingId);
+
+    /**
+     * 计算现状风险等级
+     * @param buildingId
+     * @param score
+     * @return
+     */
+    Map<String, String>  getRiskLevelByScore(Long buildingId, BigDecimal score);
+
+
+    /**
+     * 获取现状风险台账
+     * @param riskInherentListExportDto
+     * @return
+     */
+    List<RiskInherentListExportDto> getPlanExistingList(RiskInherentListExportDto riskInherentListExportDto);
+
 }

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

 package com.censoft.censoftrongtong.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.censoft.censoftrongtong.domain.RiskAssessmentMatrixLevel;
+import com.censoft.censoftrongtong.domain.RiskPlanExistingList;
 import com.censoft.censoftrongtong.mapper.RiskAssessmentMatrixLevelMapper;
 import com.censoft.censoftrongtong.service.IRiskAssessmentMatrixLevelService;
 import org.springframework.stereotype.Service;
@@ -44,19 +46,6 @@ public class RiskAssessmentMatrixLevelServiceImpl
 
         return first.get();
     }
-
-    @Override
-    public RiskAssessmentMatrixLevel getRiskAssessmentExistingMatrixLevelByScore(BigDecimal score) {
-        RiskAssessmentMatrixLevel riskAssessmentMatrixLevel = new RiskAssessmentMatrixLevel();
-        if (score.compareTo(new BigDecimal(1))<=0){
-            riskAssessmentMatrixLevel.setLevel("低风险");
-        }else if (score.compareTo(new BigDecimal(2))>0 && score.compareTo(new BigDecimal(3))<=0){
-            riskAssessmentMatrixLevel.setLevel("一般风险");
-        }else if (score.compareTo(new BigDecimal(3))>0 && score.compareTo(new BigDecimal(3.5))<=0){
-            riskAssessmentMatrixLevel.setLevel("较大风险");
-        }else {
-            riskAssessmentMatrixLevel.setLevel("重大风险");
-        }
-        return riskAssessmentMatrixLevel;
-    }
 }
+
+

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

 package com.censoft.censoftrongtong.service.impl;
 
 import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.censoft.censoftrongtong.domain.LedgerBuilding;
+import com.censoft.censoftrongtong.domain.RiskAssessmentMatrixLevel;
 import com.censoft.censoftrongtong.domain.RiskPlanExistingList;
 import com.censoft.censoftrongtong.domain.dto.RiskExistingListSaveDto;
+import com.censoft.censoftrongtong.domain.dto.RiskInherentListExportDto;
 import com.censoft.censoftrongtong.domain.dto.RiskPlanAppExistingListDetailsDto;
 import com.censoft.censoftrongtong.domain.dto.statistics.*;
 import com.censoft.censoftrongtong.mapper.RiskPlanExistingListMapper;
+import com.censoft.censoftrongtong.service.ILedgerBuildingService;
 import com.censoft.censoftrongtong.service.IRiskPlanExistingListService;
 import com.github.yulichang.base.MPJBaseServiceImpl;
 import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.system.domain.RiskLevelProportion;
+import com.ruoyi.system.domain.RiskNumIndex;
+import com.ruoyi.system.mapper.RiskLevelProportionMapper;
+import com.ruoyi.system.service.IRiskLevelProportionService;
+import com.ruoyi.system.service.IRiskNumIndexService;
 import com.ruoyi.system.service.ISysUploadFileService;
+import org.apache.poi.hpsf.Decimal;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.math.BigDecimal;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -30,15 +42,20 @@ public class RiskPlanExistingListServiceImpl
         implements IRiskPlanExistingListService {
     @Autowired
     private RiskPlanExistingListMapper riskPlanExistingListMapper;
-
+    @Autowired
+    private ILedgerBuildingService ledgerBuildingService;
+    @Autowired
+    private IRiskLevelProportionService riskLevelProportionService;
+    @Autowired
+    private IRiskNumIndexService riskNumIndexService;
     @Resource
     private ISysUploadFileService uploadFileService;
 
 
     @Override
-    public Long getNationalRiskNum(String areaName, Date beginTime,Long peojectId) {
+    public Long getNationalRiskNum(String areaName, Date beginTime, Long peojectId) {
 
-        return riskPlanExistingListMapper.getNationalRiskNum(areaName, beginTime,peojectId);
+        return riskPlanExistingListMapper.getNationalRiskNum(areaName, beginTime, peojectId);
     }
 
     @Override
@@ -54,22 +71,23 @@ public class RiskPlanExistingListServiceImpl
     }
 
     @Override
-    public List<RiskLevelStatisticsDto> getRiskLevelStatistics(String areaName,Long projectId) {
-        return riskPlanExistingListMapper.getRiskLevelStatistics(areaName,projectId);
+    public List<RiskLevelStatisticsDto> getRiskLevelStatistics(String areaName, Long projectId) {
+        return riskPlanExistingListMapper.getRiskLevelStatistics(areaName, projectId);
     }
 
     @Override
     public List<AccidentTypeStatisticsDto> getAccidentTypeStatistics(String areaName) {
         return riskPlanExistingListMapper.getAccidentTypeStatistics(areaName);
     }
+
     @Override
     public List<RiskProjectRankingDto> getRiskProjectRanking(String areaName, String level) {
-        return riskPlanExistingListMapper.getRiskProjectRanking(areaName,level);
+        return riskPlanExistingListMapper.getRiskProjectRanking(areaName, level);
     }
 
     @Override
     public List<ProjectRiskInfoDto> getProjectRiskInfo(Long projectId, Long buildingId, Long floorId, String level) {
-        return riskPlanExistingListMapper.getProjectRiskInfo(projectId,buildingId,floorId,level);
+        return riskPlanExistingListMapper.getProjectRiskInfo(projectId, buildingId, floorId, level);
     }
 
     @Override
@@ -78,8 +96,6 @@ public class RiskPlanExistingListServiceImpl
     }
 
 
-
-
     /**
      * 查询现有风险清单库
      *
@@ -191,4 +207,79 @@ public class RiskPlanExistingListServiceImpl
         existingList.setCreateTime(new Date());
         return saveOrUpdate(existingList);
     }
+
+
+    /**
+     * 计算房间风险等级
+     * 计算规则 ：
+     * 当前楼的所有现状风险
+     * 0%-4%    重大
+     * 4%-20%   较大
+     * 20%-50%  一般
+     * 50%-100% 低
+     *
+     * @param score
+     * @return
+     */
+    @Override
+    public Map<String, String> getRiskLevelByScore(Long buildingId, BigDecimal score) {
+        Map<String, String> result = new HashMap<>();
+        //查询当前楼栋现状风险列表
+        List<RiskPlanExistingList> existingList = this.list(Wrappers.<RiskPlanExistingList>query().lambda().eq(RiskPlanExistingList::getBuildingId, buildingId.toString()).orderByDesc(RiskPlanExistingList::getLevelScore));
+        if (existingList == null) {
+            existingList = new ArrayList<>();
+            RiskPlanExistingList riskPlan = new RiskPlanExistingList();
+            riskPlan.setLevelScore(score);
+            riskPlan.setId(null);
+            existingList.add(riskPlan);
+        }
+        //查询风险等级占比
+        List<RiskLevelProportion> levelProportions = riskLevelProportionService.list();
+
+        BigDecimal riskIndex = BigDecimal.ZERO;
+        Map<String, List<RiskPlanExistingList>> map = new HashMap<>();
+        for (RiskLevelProportion item : levelProportions) {
+            BigDecimal s = new BigDecimal(existingList.size());
+            long min = s.multiply(item.getLevelScaleMin()).longValue();
+            long max = s.multiply(item.getLevelScaleMax()).longValue();
+            //风险列表排序后按照顺序设置风险等级
+            List<RiskPlanExistingList> riskList = existingList.stream().skip(min).limit((max - min)).collect(Collectors.toList());
+            for (RiskPlanExistingList risk : riskList) {
+                if (risk.getId() != null) {
+                    risk.setLevel(item.getRiskName());
+                    risk.setRiskColor(item.getRiskColor());
+                    //更新风险等级
+                    this.updateRiskPlanExistingList(risk);
+                } else {
+                    result.put("level", item.getRiskName());
+                    result.put("levelScore", score.toString());
+                    result.put("riskColor", item.getRiskColor());
+                }
+            }
+            //计算每个类型的平均值及对应的风险指数
+            BigDecimal riskAvg = riskList.stream().map(f -> f == null ? BigDecimal.ZERO : f.getLevelScore()).reduce(BigDecimal.ZERO, BigDecimal::add)
+                    .divide(BigDecimal.valueOf(riskList.size()), 2, BigDecimal.ROUND_HALF_UP);
+            //计算各等级风险指数
+            BigDecimal thisRiskIndex = riskAvg.multiply(item.getLevelScaleMax()).multiply(item.getRiskGradeIndex());
+            //求和计算总体风险指数
+            riskIndex = riskIndex.add(thisRiskIndex);
+        }
+        //查询风险数量系数inherentList
+        List<RiskNumIndex> riskNumIndexList = riskNumIndexService.list();
+        for (RiskNumIndex numIndex : riskNumIndexList) {
+            if (existingList.size() >= numIndex.getRiskNumIndexMin() && existingList.size() < numIndex.getRiskNumIndexMax()) {
+                BigDecimal buildingIndex = numIndex.getRiskVal().multiply(riskIndex);
+                LedgerBuilding building = ledgerBuildingService.getById(buildingId);
+                building.setRiskIndex(buildingIndex);
+                ledgerBuildingService.updateById(building);
+            }
+        }
+        return result;
+    }
+
+    @Override
+    public List<RiskInherentListExportDto> getPlanExistingList(RiskInherentListExportDto riskInherentListExportDto) {
+        return riskPlanExistingListMapper.getPlanExistingList(riskInherentListExportDto);
+    }
+
 }

censoft-rongtong/src/main/java/com/ruoyi/system/controller/RiskLevelProportionController.java

+package com.ruoyi.system.controller;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.system.domain.RiskLevelProportion;
+import com.ruoyi.system.service.IRiskLevelProportionService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 风险等级占比和系数Controller
+ * 
+ * @author ruoyi
+ * @date 2023-11-30
+ */
+@RestController
+@RequestMapping("/system/riskLevelProportion")
+public class RiskLevelProportionController extends BaseController
+{
+    @Autowired
+    private IRiskLevelProportionService riskLevelProportionService;
+
+    /**
+     * 查询风险等级占比和系数列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:riskLevelProportion:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(RiskLevelProportion riskLevelProportion)
+    {
+        startPage();
+        List<RiskLevelProportion> list = riskLevelProportionService.selectRiskLevelProportionList(riskLevelProportion);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出风险等级占比和系数列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:riskLevelProportion:export')")
+    @Log(title = "风险等级占比和系数", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, RiskLevelProportion riskLevelProportion)
+    {
+        List<RiskLevelProportion> list = riskLevelProportionService.selectRiskLevelProportionList(riskLevelProportion);
+        ExcelUtil<RiskLevelProportion> util = new ExcelUtil<RiskLevelProportion>(RiskLevelProportion.class);
+        util.exportExcel(response, list, "风险等级占比和系数数据");
+    }
+
+    /**
+     * 获取风险等级占比和系数详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('system:riskLevelProportion:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return success(riskLevelProportionService.selectRiskLevelProportionById(id));
+    }
+
+    /**
+     * 新增风险等级占比和系数
+     */
+    @PreAuthorize("@ss.hasPermi('system:riskLevelProportion:add')")
+    @Log(title = "风险等级占比和系数", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody RiskLevelProportion riskLevelProportion)
+    {
+        return toAjax(riskLevelProportionService.insertRiskLevelProportion(riskLevelProportion));
+    }
+
+    /**
+     * 修改风险等级占比和系数
+     */
+    @PreAuthorize("@ss.hasPermi('system:riskLevelProportion:edit')")
+    @Log(title = "风险等级占比和系数", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody RiskLevelProportion riskLevelProportion)
+    {
+        return toAjax(riskLevelProportionService.updateRiskLevelProportion(riskLevelProportion));
+    }
+
+    /**
+     * 删除风险等级占比和系数
+     */
+    @PreAuthorize("@ss.hasPermi('system:riskLevelProportion:remove')")
+    @Log(title = "风险等级占比和系数", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(riskLevelProportionService.deleteRiskLevelProportionByIds(ids));
+    }
+}

censoft-rongtong/src/main/java/com/ruoyi/system/controller/RiskNumIndexController.java

+package com.ruoyi.system.controller;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.system.domain.RiskNumIndex;
+import com.ruoyi.system.service.IRiskNumIndexService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 风险数量系数Controller
+ * 
+ * @author ruoyi
+ * @date 2023-11-30
+ */
+@RestController
+@RequestMapping("/system/riskNumIndex")
+public class RiskNumIndexController extends BaseController
+{
+    @Autowired
+    private IRiskNumIndexService riskNumIndexService;
+
+    /**
+     * 查询风险数量系数列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:riskNumIndex:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(RiskNumIndex riskNumIndex)
+    {
+        startPage();
+        List<RiskNumIndex> list = riskNumIndexService.selectRiskNumIndexList(riskNumIndex);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出风险数量系数列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:riskNumIndex:export')")
+    @Log(title = "风险数量系数", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, RiskNumIndex riskNumIndex)
+    {
+        List<RiskNumIndex> list = riskNumIndexService.selectRiskNumIndexList(riskNumIndex);
+        ExcelUtil<RiskNumIndex> util = new ExcelUtil<RiskNumIndex>(RiskNumIndex.class);
+        util.exportExcel(response, list, "风险数量系数数据");
+    }
+
+    /**
+     * 获取风险数量系数详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('system:riskNumIndex:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return success(riskNumIndexService.selectRiskNumIndexById(id));
+    }
+
+    /**
+     * 新增风险数量系数
+     */
+    @PreAuthorize("@ss.hasPermi('system:riskNumIndex:add')")
+    @Log(title = "风险数量系数", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody RiskNumIndex riskNumIndex)
+    {
+        return toAjax(riskNumIndexService.insertRiskNumIndex(riskNumIndex));
+    }
+
+    /**
+     * 修改风险数量系数
+     */
+    @PreAuthorize("@ss.hasPermi('system:riskNumIndex:edit')")
+    @Log(title = "风险数量系数", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody RiskNumIndex riskNumIndex)
+    {
+        return toAjax(riskNumIndexService.updateRiskNumIndex(riskNumIndex));
+    }
+
+    /**
+     * 删除风险数量系数
+     */
+    @PreAuthorize("@ss.hasPermi('system:riskNumIndex:remove')")
+    @Log(title = "风险数量系数", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(riskNumIndexService.deleteRiskNumIndexByIds(ids));
+    }
+}

censoft-rongtong/src/main/java/com/ruoyi/system/domain/RiskLevelProportion.java

+package com.ruoyi.system.domain;
+
+import java.math.BigDecimal;
+
+import lombok.Data;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 风险等级占比和系数对象 risk_level_proportion
+ *
+ * @author ruoyi
+ * @date 2023-11-30
+ */
+@Data
+public class RiskLevelProportion extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** $column.columnComment */
+    private Long id;
+
+    /** 风险名称
+ */
+    @Excel(name = "风险名称")
+    private String riskName;
+
+    /** 风险等级占比（小） */
+    @Excel(name = "风险等级占比", readConverterExp = "小=")
+    private BigDecimal levelScaleMin;
+
+    /** 风险等级占比（大） */
+    @Excel(name = "风险等级占比", readConverterExp = "大=")
+    private BigDecimal levelScaleMax;
+
+    /** 风险等级系数 */
+    @Excel(name = "风险等级系数")
+    private BigDecimal riskGradeIndex;
+
+    /** 删除标志（0代表存在 1代表删除） */
+    private String delFlag;
+    /**
+     * 风险颜色
+     */
+    private String riskColor;
+
+
+}

censoft-rongtong/src/main/java/com/ruoyi/system/domain/RiskNumIndex.java

+package com.ruoyi.system.domain;
+
+import java.math.BigDecimal;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 风险数量系数对象 risk_num_index
+ * 
+ * @author ruoyi
+ * @date 2023-11-30
+ */
+public class RiskNumIndex extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** $column.columnComment */
+    private Long id;
+
+    /** 数量系数 */
+    @Excel(name = "数量系数")
+    private BigDecimal riskVal;
+
+    /** 风险等级占比（小） */
+    @Excel(name = "风险等级占比", readConverterExp = "小=")
+    private Long riskNumIndexMin;
+
+    /** 风险等级占比（大） */
+    @Excel(name = "风险等级占比", readConverterExp = "大=")
+    private Long riskNumIndexMax;
+
+    /** 删除标志（0代表存在 1代表删除） */
+    private String delFlag;
+
+    public void setId(Long id) 
+    {
+        this.id = id;
+    }
+
+    public Long getId() 
+    {
+        return id;
+    }
+    public void setRiskVal(BigDecimal riskVal) 
+    {
+        this.riskVal = riskVal;
+    }
+
+    public BigDecimal getRiskVal() 
+    {
+        return riskVal;
+    }
+    public void setRiskNumIndexMin(Long riskNumIndexMin) 
+    {
+        this.riskNumIndexMin = riskNumIndexMin;
+    }
+
+    public Long getRiskNumIndexMin() 
+    {
+        return riskNumIndexMin;
+    }
+    public void setRiskNumIndexMax(Long riskNumIndexMax) 
+    {
+        this.riskNumIndexMax = riskNumIndexMax;
+    }
+
+    public Long getRiskNumIndexMax() 
+    {
+        return riskNumIndexMax;
+    }
+    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("riskVal", getRiskVal())
+            .append("riskNumIndexMin", getRiskNumIndexMin())
+            .append("riskNumIndexMax", getRiskNumIndexMax())
+            .append("delFlag", getDelFlag())
+            .append("createBy", getCreateBy())
+            .append("createTime", getCreateTime())
+            .append("updateBy", getUpdateBy())
+            .append("updateTime", getUpdateTime())
+            .append("remark", getRemark())
+            .toString();
+    }
+}

censoft-rongtong/src/main/java/com/ruoyi/system/mapper/RiskLevelProportionMapper.java

+package com.ruoyi.system.mapper;
+
+import java.util.List;
+import com.ruoyi.system.domain.RiskLevelProportion;
+import com.github.yulichang.base.MPJBaseMapper;
+
+/**
+ * 风险等级占比和系数Mapper接口
+ * 
+ * @author ruoyi
+ * @date 2023-11-30
+ */
+public interface RiskLevelProportionMapper  extends MPJBaseMapper<RiskLevelProportion>
+{
+    /**
+     * 查询风险等级占比和系数
+     * 
+     * @param id 风险等级占比和系数主键
+     * @return 风险等级占比和系数
+     */
+    public RiskLevelProportion selectRiskLevelProportionById(Long id);
+
+    /**
+     * 查询风险等级占比和系数列表
+     * 
+     * @param riskLevelProportion 风险等级占比和系数
+     * @return 风险等级占比和系数集合
+     */
+    public List<RiskLevelProportion> selectRiskLevelProportionList(RiskLevelProportion riskLevelProportion);
+
+    /**
+     * 新增风险等级占比和系数
+     * 
+     * @param riskLevelProportion 风险等级占比和系数
+     * @return 结果
+     */
+    public int insertRiskLevelProportion(RiskLevelProportion riskLevelProportion);
+
+    /**
+     * 修改风险等级占比和系数
+     * 
+     * @param riskLevelProportion 风险等级占比和系数
+     * @return 结果
+     */
+    public int updateRiskLevelProportion(RiskLevelProportion riskLevelProportion);
+
+    /**
+     * 删除风险等级占比和系数
+     * 
+     * @param id 风险等级占比和系数主键
+     * @return 结果
+     */
+    public int deleteRiskLevelProportionById(Long id);
+
+    /**
+     * 批量删除风险等级占比和系数
+     * 
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteRiskLevelProportionByIds(Long[] ids);
+}

censoft-rongtong/src/main/java/com/ruoyi/system/mapper/RiskNumIndexMapper.java

+package com.ruoyi.system.mapper;
+
+import java.util.List;
+import com.ruoyi.system.domain.RiskNumIndex;
+import com.github.yulichang.base.MPJBaseMapper;
+
+/**
+ * 风险数量系数Mapper接口
+ * 
+ * @author ruoyi
+ * @date 2023-11-30
+ */
+public interface RiskNumIndexMapper  extends MPJBaseMapper<RiskNumIndex>
+{
+    /**
+     * 查询风险数量系数
+     * 
+     * @param id 风险数量系数主键
+     * @return 风险数量系数
+     */
+    public RiskNumIndex selectRiskNumIndexById(Long id);
+
+    /**
+     * 查询风险数量系数列表
+     * 
+     * @param riskNumIndex 风险数量系数
+     * @return 风险数量系数集合
+     */
+    public List<RiskNumIndex> selectRiskNumIndexList(RiskNumIndex riskNumIndex);
+
+    /**
+     * 新增风险数量系数
+     * 
+     * @param riskNumIndex 风险数量系数
+     * @return 结果
+     */
+    public int insertRiskNumIndex(RiskNumIndex riskNumIndex);
+
+    /**
+     * 修改风险数量系数
+     * 
+     * @param riskNumIndex 风险数量系数
+     * @return 结果
+     */
+    public int updateRiskNumIndex(RiskNumIndex riskNumIndex);
+
+    /**
+     * 删除风险数量系数
+     * 
+     * @param id 风险数量系数主键
+     * @return 结果
+     */
+    public int deleteRiskNumIndexById(Long id);
+
+    /**
+     * 批量删除风险数量系数
+     * 
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteRiskNumIndexByIds(Long[] ids);
+}

censoft-rongtong/src/main/java/com/ruoyi/system/service/IRiskLevelProportionService.java

+package com.ruoyi.system.service;
+
+import java.util.List;
+import com.ruoyi.system.domain.RiskLevelProportion;
+import com.github.yulichang.base.MPJBaseService;
+/**
+ * 风险等级占比和系数Service接口
+ * 
+ * @author ruoyi
+ * @date 2023-11-30
+ */
+public interface IRiskLevelProportionService  extends MPJBaseService<RiskLevelProportion>
+{
+    /**
+     * 查询风险等级占比和系数
+     * 
+     * @param id 风险等级占比和系数主键
+     * @return 风险等级占比和系数
+     */
+    public RiskLevelProportion selectRiskLevelProportionById(Long id);
+
+    /**
+     * 查询风险等级占比和系数列表
+     * 
+     * @param riskLevelProportion 风险等级占比和系数
+     * @return 风险等级占比和系数集合
+     */
+    public List<RiskLevelProportion> selectRiskLevelProportionList(RiskLevelProportion riskLevelProportion);
+
+    /**
+     * 新增风险等级占比和系数
+     * 
+     * @param riskLevelProportion 风险等级占比和系数
+     * @return 结果
+     */
+    public int insertRiskLevelProportion(RiskLevelProportion riskLevelProportion);
+
+    /**
+     * 修改风险等级占比和系数
+     * 
+     * @param riskLevelProportion 风险等级占比和系数
+     * @return 结果
+     */
+    public int updateRiskLevelProportion(RiskLevelProportion riskLevelProportion);
+
+    /**
+     * 批量删除风险等级占比和系数
+     * 
+     * @param ids 需要删除的风险等级占比和系数主键集合
+     * @return 结果
+     */
+    public int deleteRiskLevelProportionByIds(Long[] ids);
+
+    /**
+     * 删除风险等级占比和系数信息
+     * 
+     * @param id 风险等级占比和系数主键
+     * @return 结果
+     */
+    public int deleteRiskLevelProportionById(Long id);
+}

censoft-rongtong/src/main/java/com/ruoyi/system/service/IRiskNumIndexService.java

+package com.ruoyi.system.service;
+
+import java.util.List;
+import com.ruoyi.system.domain.RiskNumIndex;
+import com.github.yulichang.base.MPJBaseService;
+/**
+ * 风险数量系数Service接口
+ * 
+ * @author ruoyi
+ * @date 2023-11-30
+ */
+public interface IRiskNumIndexService  extends MPJBaseService<RiskNumIndex>
+{
+    /**
+     * 查询风险数量系数
+     * 
+     * @param id 风险数量系数主键
+     * @return 风险数量系数
+     */
+    public RiskNumIndex selectRiskNumIndexById(Long id);
+
+    /**
+     * 查询风险数量系数列表
+     * 
+     * @param riskNumIndex 风险数量系数
+     * @return 风险数量系数集合
+     */
+    public List<RiskNumIndex> selectRiskNumIndexList(RiskNumIndex riskNumIndex);
+
+    /**
+     * 新增风险数量系数
+     * 
+     * @param riskNumIndex 风险数量系数
+     * @return 结果
+     */
+    public int insertRiskNumIndex(RiskNumIndex riskNumIndex);
+
+    /**
+     * 修改风险数量系数
+     * 
+     * @param riskNumIndex 风险数量系数
+     * @return 结果
+     */
+    public int updateRiskNumIndex(RiskNumIndex riskNumIndex);
+
+    /**
+     * 批量删除风险数量系数
+     * 
+     * @param ids 需要删除的风险数量系数主键集合
+     * @return 结果
+     */
+    public int deleteRiskNumIndexByIds(Long[] ids);
+
+    /**
+     * 删除风险数量系数信息
+     * 
+     * @param id 风险数量系数主键
+     * @return 结果
+     */
+    public int deleteRiskNumIndexById(Long id);
+}

censoft-rongtong/src/main/java/com/ruoyi/system/service/impl/RiskLevelProportionServiceImpl.java

+package com.ruoyi.system.service.impl;
+
+import java.util.List;
+import com.ruoyi.common.utils.DateUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.system.mapper.RiskLevelProportionMapper;
+import com.ruoyi.system.domain.RiskLevelProportion;
+import com.ruoyi.system.service.IRiskLevelProportionService;
+import com.github.yulichang.base.MPJBaseServiceImpl;
+/**
+ * 风险等级占比和系数Service业务层处理
+ * 
+ * @author ruoyi
+ * @date 2023-11-30
+ */
+@Service
+public class RiskLevelProportionServiceImpl extends MPJBaseServiceImpl<RiskLevelProportionMapper, RiskLevelProportion> implements IRiskLevelProportionService
+{
+    @Autowired
+    private RiskLevelProportionMapper riskLevelProportionMapper;
+
+    /**
+     * 查询风险等级占比和系数
+     * 
+     * @param id 风险等级占比和系数主键
+     * @return 风险等级占比和系数
+     */
+    @Override
+    public RiskLevelProportion selectRiskLevelProportionById(Long id)
+    {
+        return riskLevelProportionMapper.selectRiskLevelProportionById(id);
+    }
+
+    /**
+     * 查询风险等级占比和系数列表
+     * 
+     * @param riskLevelProportion 风险等级占比和系数
+     * @return 风险等级占比和系数
+     */
+    @Override
+    public List<RiskLevelProportion> selectRiskLevelProportionList(RiskLevelProportion riskLevelProportion)
+    {
+        return riskLevelProportionMapper.selectRiskLevelProportionList(riskLevelProportion);
+    }
+
+    /**
+     * 新增风险等级占比和系数
+     * 
+     * @param riskLevelProportion 风险等级占比和系数
+     * @return 结果
+     */
+    @Override
+    public int insertRiskLevelProportion(RiskLevelProportion riskLevelProportion)
+    {
+        riskLevelProportion.setCreateTime(DateUtils.getNowDate());
+        return riskLevelProportionMapper.insertRiskLevelProportion(riskLevelProportion);
+    }
+
+    /**
+     * 修改风险等级占比和系数
+     * 
+     * @param riskLevelProportion 风险等级占比和系数
+     * @return 结果
+     */
+    @Override
+    public int updateRiskLevelProportion(RiskLevelProportion riskLevelProportion)
+    {
+        riskLevelProportion.setUpdateTime(DateUtils.getNowDate());
+        return riskLevelProportionMapper.updateRiskLevelProportion(riskLevelProportion);
+    }
+
+    /**
+     * 批量删除风险等级占比和系数
+     * 
+     * @param ids 需要删除的风险等级占比和系数主键
+     * @return 结果
+     */
+    @Override
+    public int deleteRiskLevelProportionByIds(Long[] ids)
+    {
+        return riskLevelProportionMapper.deleteRiskLevelProportionByIds(ids);
+    }
+
+    /**
+     * 删除风险等级占比和系数信息
+     * 
+     * @param id 风险等级占比和系数主键
+     * @return 结果
+     */
+    @Override
+    public int deleteRiskLevelProportionById(Long id)
+    {
+        return riskLevelProportionMapper.deleteRiskLevelProportionById(id);
+    }
+}

censoft-rongtong/src/main/java/com/ruoyi/system/service/impl/RiskNumIndexServiceImpl.java

+package com.ruoyi.system.service.impl;
+
+import java.util.List;
+import com.ruoyi.common.utils.DateUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.system.mapper.RiskNumIndexMapper;
+import com.ruoyi.system.domain.RiskNumIndex;
+import com.ruoyi.system.service.IRiskNumIndexService;
+import com.github.yulichang.base.MPJBaseServiceImpl;
+/**
+ * 风险数量系数Service业务层处理
+ * 
+ * @author ruoyi
+ * @date 2023-11-30
+ */
+@Service
+public class RiskNumIndexServiceImpl extends MPJBaseServiceImpl<RiskNumIndexMapper, RiskNumIndex> implements IRiskNumIndexService
+{
+    @Autowired
+    private RiskNumIndexMapper riskNumIndexMapper;
+
+    /**
+     * 查询风险数量系数
+     * 
+     * @param id 风险数量系数主键
+     * @return 风险数量系数
+     */
+    @Override
+    public RiskNumIndex selectRiskNumIndexById(Long id)
+    {
+        return riskNumIndexMapper.selectRiskNumIndexById(id);
+    }
+
+    /**
+     * 查询风险数量系数列表
+     * 
+     * @param riskNumIndex 风险数量系数
+     * @return 风险数量系数
+     */
+    @Override
+    public List<RiskNumIndex> selectRiskNumIndexList(RiskNumIndex riskNumIndex)
+    {
+        return riskNumIndexMapper.selectRiskNumIndexList(riskNumIndex);
+    }
+
+    /**
+     * 新增风险数量系数
+     * 
+     * @param riskNumIndex 风险数量系数
+     * @return 结果
+     */
+    @Override
+    public int insertRiskNumIndex(RiskNumIndex riskNumIndex)
+    {
+        riskNumIndex.setCreateTime(DateUtils.getNowDate());
+        return riskNumIndexMapper.insertRiskNumIndex(riskNumIndex);
+    }
+
+    /**
+     * 修改风险数量系数
+     * 
+     * @param riskNumIndex 风险数量系数
+     * @return 结果
+     */
+    @Override
+    public int updateRiskNumIndex(RiskNumIndex riskNumIndex)
+    {
+        riskNumIndex.setUpdateTime(DateUtils.getNowDate());
+        return riskNumIndexMapper.updateRiskNumIndex(riskNumIndex);
+    }
+
+    /**
+     * 批量删除风险数量系数
+     * 
+     * @param ids 需要删除的风险数量系数主键
+     * @return 结果
+     */
+    @Override
+    public int deleteRiskNumIndexByIds(Long[] ids)
+    {
+        return riskNumIndexMapper.deleteRiskNumIndexByIds(ids);
+    }
+
+    /**
+     * 删除风险数量系数信息
+     * 
+     * @param id 风险数量系数主键
+     * @return 结果
+     */
+    @Override
+    public int deleteRiskNumIndexById(Long id)
+    {
+        return riskNumIndexMapper.deleteRiskNumIndexById(id);
+    }
+}

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

 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.censoft.censoftrongtong.mapper.LedgerBuildingMapper">
 
     <resultMap type="com.censoft.censoftrongtong.domain.LedgerBuilding" id="LedgerBuildingResult">
-        <result property="id"    column="id"    />
-        <result property="projectId"    column="project_id"    />
-        <result property="name"    column="name"    />
-        <result property="type"    column="type"    />
-        <result property="deptId"    column="dept_id"    />
-        <result property="floor"    column="floor"    />
-        <result property="groundFloor"    column="ground_floor"    />
-        <result property="undergroundFloor"    column="underground_floor"    />
-        <result property="useto"    column="useto"    />
-        <result property="city"    column="city"    />
-        <result property="area"    column="area"    />
-        <result property="address"    column="address"    />
-        <result property="infoAssetsId"    column="info_assets_id"    />
-        <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"    />
+        <result property="id" column="id"/>
+        <result property="projectId" column="project_id"/>
+        <result property="name" column="name"/>
+        <result property="type" column="type"/>
+        <result property="deptId" column="dept_id"/>
+        <result property="floor" column="floor"/>
+        <result property="groundFloor" column="ground_floor"/>
+        <result property="undergroundFloor" column="underground_floor"/>
+        <result property="useto" column="useto"/>
+        <result property="city" column="city"/>
+        <result property="area" column="area"/>
+        <result property="address" column="address"/>
+        <result property="infoAssetsId" column="info_assets_id"/>
+        <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"/>
+        <result property="riskIndex" column="risk_index"/>
     </resultMap>
 
     <sql id="selectLedgerBuildingVo">
-        select id, project_id, name, type, dept_id, floor, useto, city, area, address,info_assets_id, status, del_flag, create_by, create_time, update_by, update_time from ledger_building
+        select id,
+               project_id,
+               name,
+               risk_index,
+               type,
+               dept_id,
+               floor,
+               useto,
+               city,
+               area,
+               address,
+               info_assets_id,
+               status,
+               del_flag,
+               create_by,
+               create_time,
+               update_by,
+               update_time
+        from ledger_building
     </sql>
 
-    <select id="selectLedgerBuildingList" parameterType="com.censoft.censoftrongtong.domain.LedgerBuilding" resultMap="LedgerBuildingResult">
+    <select id="selectLedgerBuildingList" parameterType="com.censoft.censoftrongtong.domain.LedgerBuilding"
+            resultMap="LedgerBuildingResult">
         SELECT
         b.id,
+        b.risk_index,
         b.project_id,
         p.NAME 'project_name',
         b.NAME,
@@ -58,14 +79,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         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 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>
+            <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>
@@ -84,7 +105,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         AND `status` = '0'
     </select>
 
-    <insert id="insertLedgerBuilding" parameterType="com.censoft.censoftrongtong.domain.LedgerBuilding" useGeneratedKeys="true" keyProperty="id">
+    <insert id="insertLedgerBuilding" parameterType="com.censoft.censoftrongtong.domain.LedgerBuilding"
+            useGeneratedKeys="true" keyProperty="id">
         insert into ledger_building
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="projectId != null">project_id,</if>
@@ -105,6 +127,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createTime != null">create_time,</if>
             <if test="updateBy != null">update_by,</if>
             <if test="updateTime != null">update_time,</if>
+            <if test="riskIndex != null">risk_index,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="projectId != null">#{projectId},</if>
@@ -125,6 +148,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createTime != null">#{createTime},</if>
             <if test="updateBy != null">#{updateBy},</if>
             <if test="updateTime != null">#{updateTime},</if>
+            <if test="riskIndex != null">#{riskIndex},</if>
         </trim>
     </insert>
 
@@ -147,12 +171,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createTime != null">create_time = #{createTime},</if>
             <if test="updateBy != null">update_by = #{updateBy},</if>
             <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="riskIndex != null">risk_index = #{riskIndex},</if>
         </trim>
         where id = #{id}
     </update>
 
     <delete id="deleteLedgerBuildingById" parameterType="Long">
-        update ledger_building set del_flag = '1' where id = #{id}
+        update ledger_building
+        set del_flag = '1'
+        where id = #{id}
     </delete>
 
     <delete id="deleteLedgerBuildingByIds" parameterType="String">

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

+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.system.mapper.RiskLevelProportionMapper">
+    
+    <resultMap type="RiskLevelProportion" id="RiskLevelProportionResult">
+        <result property="id"    column="id"    />
+        <result property="riskName"    column="risk_name"    />
+        <result property="levelScaleMin"    column="level_scale_min"    />
+        <result property="levelScaleMax"    column="level_scale_max"    />
+        <result property="riskGradeIndex"    column="risk_grade_index"    />
+        <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"    />
+        <result property="remark"    column="remark"    />
+    </resultMap>
+
+    <sql id="selectRiskLevelProportionVo">
+        select id, risk_name, level_scale_min, level_scale_max, risk_grade_index, del_flag, create_by, create_time, update_by, update_time, remark from risk_level_proportion
+    </sql>
+
+    <select id="selectRiskLevelProportionList" parameterType="RiskLevelProportion" resultMap="RiskLevelProportionResult">
+        <include refid="selectRiskLevelProportionVo"/>
+        <where>  
+            <if test="riskName != null  and riskName != ''"> and risk_name like concat('%', #{riskName}, '%')</if>
+            <if test="levelScaleMin != null "> and level_scale_min = #{levelScaleMin}</if>
+            <if test="levelScaleMax != null "> and level_scale_max = #{levelScaleMax}</if>
+            <if test="riskGradeIndex != null "> and risk_grade_index = #{riskGradeIndex}</if>
+        </where>
+    </select>
+    
+    <select id="selectRiskLevelProportionById" parameterType="Long" resultMap="RiskLevelProportionResult">
+        <include refid="selectRiskLevelProportionVo"/>
+        where id = #{id}
+    </select>
+        
+    <insert id="insertRiskLevelProportion" parameterType="RiskLevelProportion" useGeneratedKeys="true" keyProperty="id">
+        insert into risk_level_proportion
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="riskName != null">risk_name,</if>
+            <if test="levelScaleMin != null">level_scale_min,</if>
+            <if test="levelScaleMax != null">level_scale_max,</if>
+            <if test="riskGradeIndex != null">risk_grade_index,</if>
+            <if test="delFlag != null">del_flag,</if>
+            <if test="createBy != null">create_by,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="updateBy != null">update_by,</if>
+            <if test="updateTime != null">update_time,</if>
+            <if test="remark != null">remark,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="riskName != null">#{riskName},</if>
+            <if test="levelScaleMin != null">#{levelScaleMin},</if>
+            <if test="levelScaleMax != null">#{levelScaleMax},</if>
+            <if test="riskGradeIndex != null">#{riskGradeIndex},</if>
+            <if test="delFlag != null">#{delFlag},</if>
+            <if test="createBy != null">#{createBy},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateBy != null">#{updateBy},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+            <if test="remark != null">#{remark},</if>
+         </trim>
+    </insert>
+
+    <update id="updateRiskLevelProportion" parameterType="RiskLevelProportion">
+        update risk_level_proportion
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="riskName != null">risk_name = #{riskName},</if>
+            <if test="levelScaleMin != null">level_scale_min = #{levelScaleMin},</if>
+            <if test="levelScaleMax != null">level_scale_max = #{levelScaleMax},</if>
+            <if test="riskGradeIndex != null">risk_grade_index = #{riskGradeIndex},</if>
+            <if test="delFlag != null">del_flag = #{delFlag},</if>
+            <if test="createBy != null">create_by = #{createBy},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="remark != null">remark = #{remark},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteRiskLevelProportionById" parameterType="Long">
+        delete from risk_level_proportion where id = #{id}
+    </delete>
+
+    <delete id="deleteRiskLevelProportionByIds" parameterType="String">
+        delete from risk_level_proportion 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/RiskNumIndexMapper.xml

+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.system.mapper.RiskNumIndexMapper">
+    
+    <resultMap type="RiskNumIndex" id="RiskNumIndexResult">
+        <result property="id"    column="id"    />
+        <result property="riskVal"    column="risk_val"    />
+        <result property="riskNumIndexMin"    column="risk_num_index_min"    />
+        <result property="riskNumIndexMax"    column="risk_num_index_max"    />
+        <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"    />
+        <result property="remark"    column="remark"    />
+    </resultMap>
+
+    <sql id="selectRiskNumIndexVo">
+        select id, risk_val, risk_num_index_min, risk_num_index_max, del_flag, create_by, create_time, update_by, update_time, remark from risk_num_index
+    </sql>
+
+    <select id="selectRiskNumIndexList" parameterType="RiskNumIndex" resultMap="RiskNumIndexResult">
+        <include refid="selectRiskNumIndexVo"/>
+        <where>  
+            <if test="riskVal != null "> and risk_val = #{riskVal}</if>
+            <if test="riskNumIndexMin != null "> and risk_num_index_min = #{riskNumIndexMin}</if>
+            <if test="riskNumIndexMax != null "> and risk_num_index_max = #{riskNumIndexMax}</if>
+        </where>
+    </select>
+    
+    <select id="selectRiskNumIndexById" parameterType="Long" resultMap="RiskNumIndexResult">
+        <include refid="selectRiskNumIndexVo"/>
+        where id = #{id}
+    </select>
+        
+    <insert id="insertRiskNumIndex" parameterType="RiskNumIndex" useGeneratedKeys="true" keyProperty="id">
+        insert into risk_num_index
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="riskVal != null">risk_val,</if>
+            <if test="riskNumIndexMin != null">risk_num_index_min,</if>
+            <if test="riskNumIndexMax != null">risk_num_index_max,</if>
+            <if test="delFlag != null">del_flag,</if>
+            <if test="createBy != null">create_by,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="updateBy != null">update_by,</if>
+            <if test="updateTime != null">update_time,</if>
+            <if test="remark != null">remark,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="riskVal != null">#{riskVal},</if>
+            <if test="riskNumIndexMin != null">#{riskNumIndexMin},</if>
+            <if test="riskNumIndexMax != null">#{riskNumIndexMax},</if>
+            <if test="delFlag != null">#{delFlag},</if>
+            <if test="createBy != null">#{createBy},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateBy != null">#{updateBy},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+            <if test="remark != null">#{remark},</if>
+         </trim>
+    </insert>
+
+    <update id="updateRiskNumIndex" parameterType="RiskNumIndex">
+        update risk_num_index
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="riskVal != null">risk_val = #{riskVal},</if>
+            <if test="riskNumIndexMin != null">risk_num_index_min = #{riskNumIndexMin},</if>
+            <if test="riskNumIndexMax != null">risk_num_index_max = #{riskNumIndexMax},</if>
+            <if test="delFlag != null">del_flag = #{delFlag},</if>
+            <if test="createBy != null">create_by = #{createBy},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="remark != null">remark = #{remark},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteRiskNumIndexById" parameterType="Long">
+        delete from risk_num_index where id = #{id}
+    </delete>
+
+    <delete id="deleteRiskNumIndexByIds" parameterType="String">
+        delete from risk_num_index 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

@@ -523,5 +523,64 @@
         WHERE rpil.id = #{existingId}
     </select>
 
+    <select id="getPlanExistingList"
+            resultType="com.censoft.censoftrongtong.domain.dto.RiskInherentListExportDto">
+        SELECT
+        rpil.id AS id,
+        sd.dept_name AS deptName,
+        lp.`name` AS projectName,
+        lp.city AS city,
+        lp.type AS type,
+        lp.business AS businessFormat,
+        rpil.`name` AS inherentName,
+        rpil.`level` AS inherentLevel,
+        rpel.`name` AS existingName,
+        rpel.`level` AS existingLevel,
+        rpil.`level` AS inherentProjectLevel,
+        rpel.`level` AS existingProjectLevel,
+        rpil.presence_location AS presenceLocation,
+        rpil.type AS listType,
+        rpil.measures_administration AS inherentMeasuresAdministration,
+        rpel.measures_administration AS existingMeasuresAdministration,
+        rpil.measures_dept_name AS measuresDeptName,
+        rpil.measures_user_name AS measuresUserName,
+        rpil.measures_user_phone AS measuresUserPhone,
+        rpil.hazard_source_name AS hazardSourceName,
+        rpil.major_hazard_source AS majorHazardSource,
+        rpil.major_hazard_source_description AS majorHazardDescription,
+        rpil.reference_basis AS referenceBasis
+        FROM
+        risk_plan rp
+        LEFT JOIN ledger_project lp ON lp.id = rp.project_id
+        LEFT JOIN sys_dept sd ON sd.dept_id = lp.dept_id
+        LEFT JOIN ledger_building lb ON FIND_IN_SET( lb.id, rp.building_ids )
+        LEFT JOIN ledger_floor lf ON lf.building_id = lb.id
+        LEFT JOIN ledger_room lr ON lr.floor_id = lf.id
+        LEFT JOIN risk_plan_inherent_list rpil ON rpil.room_id = lr.id
+        LEFT JOIN risk_plan_existing_list rpel ON rpel.inherent_id = rpil.id
+        WHERE
+        rpil.id IS NOT NULL
+        <if test="deptName != null and deptName != ''">and sd.dept_name like concat('%',#{deptName},'%')</if>
+        <if test="projectName != null and projectName != ''">and lp.name like concat('%',#{projectName},'%')</if>
+        <if test="city != null and city != ''">and lp.city like concat('%',#{city},'%')</if>
+        <if test="businessFormat != null and businessFormat != ''">and lp.business like
+            concat('%',#{businessFordoneListmat},'%')
+        </if>
+        <if test="inherentName != null and inherentName != ''">and rpil.`name` like concat('%',#{inherentName},'%')</if>
+        <if test="inherentLevel != null and inherentLevel != ''">and rpil.`level` like
+            concat('%',#{inherentLevel},'%')
+        </if>
+        <if test="existingName != null and existingName != ''">and rpel.`name` like concat('%',#{existingName},'%')</if>
+        <if test="existingLevel != null and existingLevel != ''">and rpel.`level` like
+            concat('%',#{existingLevel},'%')
+        </if>
+        <if test="presenceLocation != null and presenceLocation != ''">and rpil.presence_location like
+            concat('%',#{presenceLocation},'%')
+        </if>
+        <if test="listType != null and listType != ''">and rpil.type like concat('%',#{listType},'%')</if>
+        <if test="planId != null">and rp.id = #{name}</if>
+        GROUP BY rpil.id
+    </select>
+
 
 </mapper>
\ No newline at end of file

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

@@ -644,7 +644,7 @@
                lf.`name`              AS floorName,
                lr.id                  AS roomId,
                lr.`name`              AS roomName
-        FROM risk_plan_inherent_list reil
+        FROM risk_plan_existing_list reil
                  LEFT JOIN sys_user su ON su.user_id = reil.user_id
                  LEFT JOIN risk_plan_inherent_list rpil ON rpil.id = reil.inherent_id
                  LEFT JOIN ledger_room lr ON lr.id = rpil.room_id
@@ -711,14 +711,14 @@
         LEFT JOIN ledger_floor lf ON lf.building_id = lb.id
         LEFT JOIN ledger_room lr ON lr.floor_id = lf.id
         LEFT JOIN risk_plan_inherent_list rpil ON rpil.room_id = lr.id
-        LEFT JOIN risk_plan_inherent_list rpel ON rpel.inherent_id = rpil.id
+        LEFT JOIN risk_plan_existing_list rpel ON rpel.inherent_id = rpil.id
         WHERE
         rpil.id IS NOT NULL
         <if test="deptName != null and deptName != ''">and sd.dept_name like concat('%',#{deptName},'%')</if>
         <if test="projectName != null and projectName != ''">and lp.name like concat('%',#{projectName},'%')</if>
         <if test="city != null and city != ''">and lp.city like concat('%',#{city},'%')</if>
         <if test="businessFormat != null and businessFormat != ''">and lp.business like
-            concat('%',#{businessFormat},'%')
+            concat('%',#{businessFordoneListmat},'%')
         </if>
         <if test="inherentName != null and inherentName != ''">and rpil.`name` like concat('%',#{inherentName},'%')</if>
         <if test="inherentLevel != null and inherentLevel != ''">and rpil.`level` like