|
|
|
@ -653,7 +653,8 @@ public class BaseSearchApi { |
|
|
|
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"); |
|
|
|
searchSql.append(" (CASE WHEN lc.objstate = 'Active' THEN 'Y' ELSE 'N' END) active, "); |
|
|
|
searchSql.append(" (CASE WHEN lc.objstate = 'Active' THEN 'Y' ELSE 'N' END) showInQueryFlag "); |
|
|
|
searchSql.append(" FROM ifsapp.LABOR_CLASS_COST lcc"); |
|
|
|
searchSql.append(" LEFT JOIN ifsapp.labor_class lc ON lc.CONTRACT = lcc.CONTRACT AND lc.LABOR_CLASS_NO = lcc.LABOR_CLASS_NO"); |
|
|
|
searchSql.append(" WHERE lcc.COST_SET = '1' AND lcc.END_DATE IS NULL"); |
|
|
|
@ -694,6 +695,7 @@ public class BaseSearchApi { |
|
|
|
tempItem.setUpdateDate(null); // 从tempMap获取值 |
|
|
|
tempItem.setUpdateBy(tempMap.get("UPDATE_BY")); // 从tempMap获取值 |
|
|
|
tempItem.setLevelCost(new BigDecimal(tempMap.get("LABOR_CLASS_RATE")).setScale(6, BigDecimal.ROUND_HALF_UP)); |
|
|
|
tempItem.setShowInQueryFlag(tempMap.get("SHOWINQUERYFLAG")); |
|
|
|
//添加对象 |
|
|
|
returnlList.add(tempItem); |
|
|
|
} |
|
|
|
|