Merge remote-tracking branch 'origin/master' into master

@@ -120,6 +120,7 @@ public class SafetyEnvironmentFeeController {
             Map<String, String> sysDepartDictMap = businessService.dictMap("sys_depart", null);
             Map<String, String> sysDepartDictMap = businessService.dictMap("sys_depart", null);
             Map<String, String> safetyEnvironmentProtectionFeeDictMap = businessService.dictMap("safety_environment_protection_fee", null);
             Map<String, String> safetyEnvironmentProtectionFeeDictMap = businessService.dictMap("safety_environment_protection_fee", null);
             Map<String, String> energyEnvironmentProtectionFeeDictMap = businessService.dictMap("energy_environment_protection_fee", null);
             Map<String, String> energyEnvironmentProtectionFeeDictMap = businessService.dictMap("energy_environment_protection_fee", null);
+            Map<String, String> ynDictMap = businessService.dictMap("yn", null);
             // 封装结果
             // 封装结果
             IPage<Map<String, Object>> mapIPage = new Page<>(pageNo, pageSize);
             IPage<Map<String, Object>> mapIPage = new Page<>(pageNo, pageSize);
             mapIPage.setTotal(safetyEnvironmentFeeIPage.getTotal());
             mapIPage.setTotal(safetyEnvironmentFeeIPage.getTotal());
@@ -127,12 +128,13 @@ public class SafetyEnvironmentFeeController {
                 Map<String, Object> entityMap = BeanUtil.beanToMap(item);
                 Map<String, Object> entityMap = BeanUtil.beanToMap(item);
                 entityMap.put("departName", sysDepartDictMap.get(item.getDepartId()));
                 entityMap.put("departName", sysDepartDictMap.get(item.getDepartId()));
                 // 安全环保费
                 // 安全环保费
-                if ("1".equals(feeDict)) {
+                if ("safety_environment_protection_fee".equals(feeDict)) {
                     entityMap.put("feeType_dictText", safetyEnvironmentProtectionFeeDictMap.get(item.getFeeType()));
                     entityMap.put("feeType_dictText", safetyEnvironmentProtectionFeeDictMap.get(item.getFeeType()));
-                } else if ("2".equals(feeDict)) {
+                } else if ("energy_environment_protection_fee".equals(feeDict)) {
                     // 节能环保费
                     // 节能环保费
                     entityMap.put("feeType_dictText", energyEnvironmentProtectionFeeDictMap.get(item.getFeeType()));
                     entityMap.put("feeType_dictText", energyEnvironmentProtectionFeeDictMap.get(item.getFeeType()));
                 }
                 }
+                entityMap.put("budgetFlag_dictText", ynDictMap.get(item.getBudgetFlag()));
                 return entityMap;
                 return entityMap;
             }).collect(Collectors.toList()));
             }).collect(Collectors.toList()));
             result.setResult(mapIPage);
             result.setResult(mapIPage);