diff --git a/src/main/java/com/spring/ifs/api/BaseSearchApi.java b/src/main/java/com/spring/ifs/api/BaseSearchApi.java index 8dd1fb33..16a4717c 100644 --- a/src/main/java/com/spring/ifs/api/BaseSearchApi.java +++ b/src/main/java/com/spring/ifs/api/BaseSearchApi.java @@ -477,7 +477,7 @@ public class BaseSearchApi { StringBuilder searchSql = new StringBuilder(); searchSql.append("SELECT OBJID ifsRowId, OBJVERSION ifsRowVersion, CONTRACT, WORK_CENTER_NO,"); searchSql.append(" ifsapp.WORK_CENTER_API.Get_Description(CONTRACT, WORK_CENTER_NO) workCenterDesc,"); - searchSql.append(" COST_SET, ifsapp.COST_SET_API.Get_Description(CONTRACT,COST_SET) costSetDesc, WC_RATE, WC_COST_CODE,"); + searchSql.append(" COST_SET, '' costSetDesc, WC_RATE, WC_COST_CODE,"); searchSql.append(" OVERHEAD1_FAC, OVERHEAD1_APPL, OVERHEAD2_FAC, OVERHEAD2_APPL,"); searchSql.append(" to_char(START_DATE, 'yyyy-MM-dd') START_DATE, to_char(END_DATE, 'yyyy-MM-dd') END_DATE"); searchSql.append(" FROM ifsapp.WORK_CENTER_COST"); @@ -631,8 +631,8 @@ public class BaseSearchApi { public static List getLaborClassCosts(Server srv, String siteCon, int startIndex, int pageSize) throws APException { StringBuilder searchSql = new StringBuilder(); searchSql.append("SELECT lcc.OBJID ifsRowId, lcc.OBJVERSION ifsRowVersion, lcc.CONTRACT, lcc.LABOR_CLASS_NO,"); - searchSql.append(" ifsapp.LABOR_CLASS_API.Get_labor_class_Description(lcc.CONTRACT, lcc.LABOR_CLASS_NO) laborClassDesc,"); - searchSql.append(" lcc.COST_SET, ifsapp.COST_SET_API.Get_Description(lcc.CONTRACT,lcc.COST_SET) costSetDesc,"); + searchSql.append(" lc.labor_class_description laborClassDesc,"); + searchSql.append(" lcc.COST_SET, '' costSetDesc,"); searchSql.append(" lcc.labor_class_RATE, lcc.labor_class_COST_CODE,"); searchSql.append(" to_char(lcc.START_DATE, 'yyyy-MM-dd') START_DATE, to_char(lcc.END_DATE, 'yyyy-MM-dd') END_DATE,"); searchSql.append(" (CASE WHEN lc.objstate = 'Active' THEN 'Y' ELSE 'N' END) active"); diff --git a/src/main/java/com/spring/ifs/utils/IfsConverterToMap.java b/src/main/java/com/spring/ifs/utils/IfsConverterToMap.java index 2785e54d..236d6a49 100644 --- a/src/main/java/com/spring/ifs/utils/IfsConverterToMap.java +++ b/src/main/java/com/spring/ifs/utils/IfsConverterToMap.java @@ -51,11 +51,7 @@ public class IfsConverterToMap { String formatterValue = bigDecimal.toPlainString(); tempMap.put(key, formatterValue); } else if (objValue instanceof Double) { - BigDecimal bigDecimal = new BigDecimal((Double) objValue); - // 去除尾部的零 - bigDecimal = bigDecimal.stripTrailingZeros(); - String formatterValue = bigDecimal.toPlainString(); - tempMap.put(key, formatterValue); + tempMap.put(key, objValue.toString()); } else if (objValue instanceof Integer) { BigDecimal bigDecimal = new BigDecimal((Integer) objValue); // 设置小数位数,最多保留 16 位有效数字 @@ -127,13 +123,7 @@ public class IfsConverterToMap { String formatterValue = bigDecimal.toPlainString(); resultMap.put(key, formatterValue); } else if (objValue instanceof Double) { - BigDecimal bigDecimal = new BigDecimal((Double) objValue); - // 设置小数位数,最多保留 16 位有效数字 - bigDecimal = bigDecimal.setScale(16, BigDecimal.ROUND_HALF_UP); - // 去除尾部的零 - bigDecimal = bigDecimal.stripTrailingZeros(); - String formatterValue = bigDecimal.toPlainString(); - resultMap.put(key, formatterValue); + resultMap.put(key, objValue.toString()); } else if (objValue instanceof Integer) { BigDecimal bigDecimal = new BigDecimal((Integer) objValue); // 设置小数位数,最多保留 16 位有效数字