diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/count/SysNetworknumController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/count/SysNetworknumController.java index e7f1009..dde1bc5 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/count/SysNetworknumController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/count/SysNetworknumController.java @@ -118,9 +118,7 @@ public class SysNetworknumController extends BaseController { @PostMapping("/countInfo") @ResponseBody public AjaxResult countInfo() { - SysDictData sysDictData = new SysDictData(); - sysDictData.setDictType("sys_file_miji"); - List<SysDictData> smType = dictDataService.selectDictDataList(sysDictData); + List<SysDictData> smType = dictDataService.selectDictDataByType("sys_file_miji"); List<String> list = smType.stream().map(SysDictData::getDictLabel).collect(Collectors.toList()); List<Long> yAxisData = new ArrayList<>(); smType.forEach(xAxis -> { diff --git a/ruoyi-system/src/main/resources/mapper/system/TdPropertyInfoMapper.xml b/ruoyi-system/src/main/resources/mapper/system/TdPropertyInfoMapper.xml index b4a254e..e29003c 100644 --- a/ruoyi-system/src/main/resources/mapper/system/TdPropertyInfoMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/TdPropertyInfoMapper.xml @@ -203,14 +203,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" <select id="selectCountBF" resultType="com.ruoyi.system.domain.count.PropertyStateCountDTO"> SELECT - SUM (CASE WHEN destory_type = 1 THEN 1 ELSE 0 END) AS ybf, - SUM (CASE WHEN destory_type = 0 THEN 1 ELSE 0 END) AS wbf + SUM (CASE WHEN destory_type = '1' THEN 1 ELSE 0 END) AS ybf, + SUM (CASE WHEN destory_type = '0' THEN 1 ELSE 0 END) AS wbf FROM td_property_info </select> <select id="selectCountXH" resultType="com.ruoyi.system.domain.count.PropertyDesCountDTO"> SELECT - SUM (CASE WHEN destory_state = 1 THEN 1 ELSE 0 END) AS yxh, + SUM (CASE WHEN destory_state = '1' THEN 1 ELSE 0 END) AS yxh, SUM (CASE WHEN destory_state='' THEN 1 ELSE 0 END) AS wxh FROM td_property_info </select>