From 3f48c86f23b4d1c8bd32e40f270a2cb2e4788b23 Mon Sep 17 00:00:00 2001 From: chenshaoxin <1981897232@qq.com> Date: Tue, 8 Apr 2025 11:53:52 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BA=BA=EF=BC=9A=E9=99=88?= =?UTF-8?q?=E7=BB=8D=E9=91=AB=20=E6=97=A5=E6=9C=9F=EF=BC=9A2025/4/8=2011?= =?UTF-8?q?=EF=BC=9A30=20=E5=86=85=E5=AE=B9=EF=BC=9A=E9=87=91=E8=9E=8D?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E6=8A=A5=E8=A1=A8=E9=87=91=E9=A2=9D=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../shkd/sys/sys/plugin/report/FinanceReportFormPlugin.java | 1 - .../java/shkd/sys/sys/plugin/report/FinanceReportPlugin.java | 1 - .../shkd/sys/sys/plugin/report/domain/FinanceVarietyEnum.java | 3 +-- 3 files changed, 1 insertion(+), 4 deletions(-) diff --git a/sys/shkd-sys-sys/src/main/java/shkd/sys/sys/plugin/report/FinanceReportFormPlugin.java b/sys/shkd-sys-sys/src/main/java/shkd/sys/sys/plugin/report/FinanceReportFormPlugin.java index 5b5cd07..a221699 100644 --- a/sys/shkd-sys-sys/src/main/java/shkd/sys/sys/plugin/report/FinanceReportFormPlugin.java +++ b/sys/shkd-sys-sys/src/main/java/shkd/sys/sys/plugin/report/FinanceReportFormPlugin.java @@ -309,7 +309,6 @@ public class FinanceReportFormPlugin extends AbstractReportFormPlugin implement @Override public int compare(DynamicObject dynamicObject1, DynamicObject dynamicObject2) { - return (map.get(dynamicObject1.getString("shkd_orgnumber"))==null?100:map.get(dynamicObject1.getString("shkd_orgnumber")))-(map.get(dynamicObject2.getString("shkd_orgnumber"))==null?100:map.get(dynamicObject2.getString("shkd_orgnumber"))); // return dynamicObject1.getInt("menuindex")-dynamicObject2.getInt("menuindex"); diff --git a/sys/shkd-sys-sys/src/main/java/shkd/sys/sys/plugin/report/FinanceReportPlugin.java b/sys/shkd-sys-sys/src/main/java/shkd/sys/sys/plugin/report/FinanceReportPlugin.java index bdb0fdf..b61dd23 100644 --- a/sys/shkd-sys-sys/src/main/java/shkd/sys/sys/plugin/report/FinanceReportPlugin.java +++ b/sys/shkd-sys-sys/src/main/java/shkd/sys/sys/plugin/report/FinanceReportPlugin.java @@ -155,7 +155,6 @@ public class FinanceReportPlugin extends AbstractReportListDataPlugin { } /* - * * 拼接sql方法 * */ public StringBuilder getSQlBuilder(List dateList,List orgIds,String orgnumber,StringBuilder sqlBuilder){ diff --git a/sys/shkd-sys-sys/src/main/java/shkd/sys/sys/plugin/report/domain/FinanceVarietyEnum.java b/sys/shkd-sys-sys/src/main/java/shkd/sys/sys/plugin/report/domain/FinanceVarietyEnum.java index d0d8323..6bf875f 100644 --- a/sys/shkd-sys-sys/src/main/java/shkd/sys/sys/plugin/report/domain/FinanceVarietyEnum.java +++ b/sys/shkd-sys-sys/src/main/java/shkd/sys/sys/plugin/report/domain/FinanceVarietyEnum.java @@ -61,8 +61,7 @@ public class FinanceVarietyEnum { return "千万元"; }else if ("100000000".equals("shkd_selmoney")) { return "亿元"; - } - else { + } else { return "元"; } }