From c83403c4cdf831c39dfd2df253ba3a27acf05b2d Mon Sep 17 00:00:00 2001 From: 25604 Date: Tue, 1 Jul 2025 17:25:18 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E4=BC=98=E5=8C=96=E7=AD=96=E7=95=A5?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E6=8E=92=E5=BA=8F=E9=97=AE=E9=A2=98=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/mh/system/mapper/policy/PolicyManageMapper.java | 4 ++-- .../system/service/policy/impl/PolicyManageServiceImpl.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/mh-system/src/main/java/com/mh/system/mapper/policy/PolicyManageMapper.java b/mh-system/src/main/java/com/mh/system/mapper/policy/PolicyManageMapper.java index f975aa1..d0d93f4 100644 --- a/mh-system/src/main/java/com/mh/system/mapper/policy/PolicyManageMapper.java +++ b/mh-system/src/main/java/com/mh/system/mapper/policy/PolicyManageMapper.java @@ -20,7 +20,7 @@ public interface PolicyManageMapper extends BaseMapper { @Select("select pm.*,cpm.cur_value from policy_manage pm " + " left join collection_params_manage cpm on pm.cpm_id = cpm.id " + - " where pm.system_type = #{systemType} and pm.fun_policy_type = #{funPolicyType} order by pm.policy_type, pm.order_num ") + " where pm.system_type = #{systemType} and pm.fun_policy_type = #{funPolicyType} order by pm.policy_type::int, pm.order_num ") List selectPolicyList(@Param("systemType") String systemType, @Param("funPolicyType") String funPolicyType); @@ -32,7 +32,7 @@ public interface PolicyManageMapper extends BaseMapper { " where pm.system_type = #{systemType} " + " and pm.fun_policy_type = #{funPolicyType} " + " and house_id = #{houseId} " + - " order by pm.policy_type, pm.order_num ") + " order by pm.policy_type:int, pm.order_num ") List selectPolicyListByParams(@Param("systemType") String systemType, @Param("funPolicyType") String funPolicyType, @Param("houseId") String houseId); diff --git a/mh-system/src/main/java/com/mh/system/service/policy/impl/PolicyManageServiceImpl.java b/mh-system/src/main/java/com/mh/system/service/policy/impl/PolicyManageServiceImpl.java index 74bec20..f18eec2 100644 --- a/mh-system/src/main/java/com/mh/system/service/policy/impl/PolicyManageServiceImpl.java +++ b/mh-system/src/main/java/com/mh/system/service/policy/impl/PolicyManageServiceImpl.java @@ -46,7 +46,7 @@ public class PolicyManageServiceImpl implements IPolicyManageService { List policyManages = policyManageMapper.selectPolicyListByParams(systemType, funPolicyType, houseId); Map> listMap = policyManages.stream() // 先排序（例如按 policyType） - .sorted(Comparator.comparing(PolicyManage::getPolicyType)) +// .sorted(Comparator.comparing(PolicyManage::getPolicyType)) // 处理每个PolicyManage对象的curValue字段 .peek(policy -> { policy.setCurValue(BigDecimal.valueOf(policy.getCurValue().intValue())); // 除以1000并保留整数 @@ -80,7 +80,7 @@ public class PolicyManageServiceImpl implements IPolicyManageService { // policyManages使用stream流，根据policyType进行数据分组， Map> listMap = policyManages.stream() // 先按PolicyType排序 - .sorted(Comparator.comparing(PolicyManage::getPolicyType)) +// .sorted(Comparator.comparing(PolicyManage::getPolicyType)) // 处理每个PolicyManage对象的curValue字段 .peek(policy -> { // 自动开关机时间，反馈是ms，页面是s，所以除以1000