parent
b31fb15f1a
commit
3f48c86f23
|
@ -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");
|
||||
|
|
|
@ -155,7 +155,6 @@ public class FinanceReportPlugin extends AbstractReportListDataPlugin {
|
|||
}
|
||||
|
||||
/*
|
||||
*
|
||||
* 拼接sql方法
|
||||
* */
|
||||
public StringBuilder getSQlBuilder(List<String> dateList,List<Long> orgIds,String orgnumber,StringBuilder sqlBuilder){
|
||||
|
|
|
@ -61,8 +61,7 @@ public class FinanceVarietyEnum {
|
|||
return "千万元";
|
||||
}else if ("100000000".equals("shkd_selmoney")) {
|
||||
return "亿元";
|
||||
}
|
||||
else {
|
||||
} else {
|
||||
return "元";
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue