wenlukang1
/
CTSK_DEV
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

提交人：陈绍鑫 

日期：2025/4/8 11：30
内容：金融统计报表金额字段优化
This commit is contained in:
陈绍鑫 2025-04-08 11:53:52 +08:00
parent b31fb15f1a
commit 3f48c86f23
3 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
sys/shkd-sys-sys/src/main/java/shkd/sys/sys/plugin/report/FinanceReportFormPlugin.java
View File

@ -309,7 +309,6 @@ public class FinanceReportFormPlugin extends AbstractReportFormPlugin implement
@Override @Override
public int compare(DynamicObject dynamicObject1, DynamicObject dynamicObject2) { 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 (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"); // return dynamicObject1.getInt("menuindex")-dynamicObject2.getInt("menuindex");

1
sys/shkd-sys-sys/src/main/java/shkd/sys/sys/plugin/report/FinanceReportPlugin.java
View File

@ -155,7 +155,6 @@ public class FinanceReportPlugin extends AbstractReportListDataPlugin {
} }
/* /*
*
* 拼接sql方法 * 拼接sql方法
* */ * */
public StringBuilder getSQlBuilder(List<String> dateList,List<Long> orgIds,String orgnumber,StringBuilder sqlBuilder){ public StringBuilder getSQlBuilder(List<String> dateList,List<Long> orgIds,String orgnumber,StringBuilder sqlBuilder){

3
sys/shkd-sys-sys/src/main/java/shkd/sys/sys/plugin/report/domain/FinanceVarietyEnum.java
View File

@ -61,8 +61,7 @@ public class FinanceVarietyEnum {
return "千万元"; return "千万元";
}else if ("100000000".equals("shkd_selmoney")) { }else if ("100000000".equals("shkd_selmoney")) {
return "亿元"; return "亿元";
} } else {
else {
return "元"; return "元";
} }
} }