diff --git a/src/com/engine/salary/service/impl/RemoteExcelServiceImpl.java b/src/com/engine/salary/service/impl/RemoteExcelServiceImpl.java index 59582f3f5..f59889717 100644 --- a/src/com/engine/salary/service/impl/RemoteExcelServiceImpl.java +++ b/src/com/engine/salary/service/impl/RemoteExcelServiceImpl.java @@ -214,43 +214,72 @@ public class RemoteExcelServiceImpl extends Service implements RemoteExcelServic public Map> allFieldList(ReferenceTypeEnum referenceTypeEnum) { Map> result = new HashMap<>(); - //sql if (ReferenceTypeEnum.SQL.equals(referenceTypeEnum)) { - result.put(SalarySQLReferenceEnum.EMPLOYEE_INFO.getDefaultLabel(), +// result.put(SalarySQLReferenceEnum.EMPLOYEE_INFO.getDefaultLabel(), +// convert2FormulaVar(DataCollectionEmployee.class, SalarySQLReferenceEnum.EMPLOYEE_INFO.getValue() + "")); +// result.put(SalarySQLReferenceEnum.SALARY_ACCT_EMPLOYEE.getDefaultLabel(), +// convert2FormulaVar(SalaryAcctEmployeePO.class, SalarySQLReferenceEnum.SALARY_ACCT_EMPLOYEE.getValue() + "")); +// result.put(SalarySQLReferenceEnum.SALARY_CYCLE.getDefaultLabel(), +// convert2FormulaVar(SalarySobCycleDTO.class, SalarySQLReferenceEnum.SALARY_CYCLE.getValue() + "")); +// result.put(SalarySQLReferenceEnum.SALARY_ITEM.getDefaultLabel(), +// salaryItem2FormulaVar(SalaryFormulaReferenceEnum.SALARY_ITEM, null)); + result.put(SalaryI18nUtil.getI18nLabel(user.getLanguage(), SalarySQLReferenceEnum.EMPLOYEE_INFO.getLabelId(), SalarySQLReferenceEnum.EMPLOYEE_INFO.getDefaultLabel()), convert2FormulaVar(DataCollectionEmployee.class, SalarySQLReferenceEnum.EMPLOYEE_INFO.getValue() + "")); - result.put(SalarySQLReferenceEnum.SALARY_ACCT_EMPLOYEE.getDefaultLabel(), + result.put(SalaryI18nUtil.getI18nLabel(user.getLanguage(), SalarySQLReferenceEnum.SALARY_ACCT_EMPLOYEE.getLabelId(), SalarySQLReferenceEnum.SALARY_ACCT_EMPLOYEE.getDefaultLabel()), convert2FormulaVar(SalaryAcctEmployeePO.class, SalarySQLReferenceEnum.SALARY_ACCT_EMPLOYEE.getValue() + "")); - result.put(SalarySQLReferenceEnum.SALARY_CYCLE.getDefaultLabel(), + result.put(SalaryI18nUtil.getI18nLabel(user.getLanguage(), SalarySQLReferenceEnum.SALARY_CYCLE.getLabelId(), SalarySQLReferenceEnum.SALARY_CYCLE.getDefaultLabel()), convert2FormulaVar(SalarySobCycleDTO.class, SalarySQLReferenceEnum.SALARY_CYCLE.getValue() + "")); - result.put(SalarySQLReferenceEnum.SALARY_ITEM.getDefaultLabel(), + result.put(SalaryI18nUtil.getI18nLabel(user.getLanguage(), SalarySQLReferenceEnum.SALARY_ITEM.getLabelId(), SalarySQLReferenceEnum.SALARY_ITEM.getDefaultLabel()), salaryItem2FormulaVar(SalaryFormulaReferenceEnum.SALARY_ITEM, null)); return result; } // 如果是其他数据源 if (ReferenceTypeEnum.FORMULA.equals(referenceTypeEnum)) { - result.put(SalaryFormulaReferenceEnum.SALARY_ITEM.getDefaultLabel(), +// result.put(SalaryFormulaReferenceEnum.SALARY_ITEM.getDefaultLabel(), +// salaryItem2FormulaVar(SalaryFormulaReferenceEnum.SALARY_ITEM, null)); +// result.put(SalaryFormulaReferenceEnum.ISSUED.getDefaultLabel(), +// salaryItem2FormulaVar(SalaryFormulaReferenceEnum.ISSUED, null)); +// result.put(SalaryFormulaReferenceEnum.SALARY_ARCHIVES.getDefaultLabel(), +// salaryArchives2FormulaVar(SalaryFormulaReferenceEnum.SALARY_ARCHIVES, null)); +// result.put(SalaryFormulaReferenceEnum.ADD_UP_SITUATION.getDefaultLabel(), +// convert2FormulaVar(AddUpSituation.class, SalaryFormulaReferenceEnum.ADD_UP_SITUATION.getValue() + "")); +// result.put(SalaryFormulaReferenceEnum.ADD_UP_DEDUCTIONS.getDefaultLabel(), +// convert2FormulaVar(AddUpDeduction.class, SalaryFormulaReferenceEnum.ADD_UP_DEDUCTIONS.getValue() + "")); +// result.put(SalaryFormulaReferenceEnum.EMPLOYEE_INFO.getDefaultLabel(), +// convert2FormulaVar(DataCollectionEmployee.class, SalaryFormulaReferenceEnum.EMPLOYEE_INFO.getValue() + "")); +// result.put(SalaryFormulaReferenceEnum.OTHER_DEDUCTION.getDefaultLabel(), +// convert2FormulaVar(OtherDeductionPO.class, SalaryFormulaReferenceEnum.OTHER_DEDUCTION.getValue() + "")); +// result.put(SalaryFormulaReferenceEnum.WELFARE.getDefaultLabel(), +// welfare2FormulaVar(SalaryFormulaReferenceEnum.WELFARE)); +// result.put(SalaryFormulaReferenceEnum.ATTEND.getDefaultLabel(), +// attendData2FormulaVar(SalaryFormulaReferenceEnum.ATTEND)); +// result.put(SalarySQLReferenceEnum.SALARY_ACCT_EMPLOYEE.getDefaultLabel(), +// convert2FormulaVar(SalaryAcctEmployeePO.class, SalarySQLReferenceEnum.SALARY_ACCT_EMPLOYEE.getValue() + "")); +// result.put(SalarySQLReferenceEnum.SALARY_CYCLE.getDefaultLabel(), +// convert2FormulaVar(SalarySobCycleDTO.class, SalarySQLReferenceEnum.SALARY_CYCLE.getValue() + "")); + result.put(SalaryI18nUtil.getI18nLabel(user.getLanguage(), SalaryFormulaReferenceEnum.SALARY_ITEM.getLabelId(), SalaryFormulaReferenceEnum.SALARY_ITEM.getDefaultLabel()), salaryItem2FormulaVar(SalaryFormulaReferenceEnum.SALARY_ITEM, null)); - result.put(SalaryFormulaReferenceEnum.ISSUED.getDefaultLabel(), + result.put(SalaryI18nUtil.getI18nLabel(user.getLanguage(), SalaryFormulaReferenceEnum.ISSUED.getLabelId(), SalaryFormulaReferenceEnum.ISSUED.getDefaultLabel()), salaryItem2FormulaVar(SalaryFormulaReferenceEnum.ISSUED, null)); - result.put(SalaryFormulaReferenceEnum.SALARY_ARCHIVES.getDefaultLabel(), + result.put(SalaryI18nUtil.getI18nLabel(user.getLanguage(), SalaryFormulaReferenceEnum.SALARY_ARCHIVES.getLabelId(), SalaryFormulaReferenceEnum.SALARY_ARCHIVES.getDefaultLabel()), salaryArchives2FormulaVar(SalaryFormulaReferenceEnum.SALARY_ARCHIVES, null)); - result.put(SalaryFormulaReferenceEnum.ADD_UP_SITUATION.getDefaultLabel(), + result.put(SalaryI18nUtil.getI18nLabel(user.getLanguage(), SalaryFormulaReferenceEnum.ADD_UP_SITUATION.getLabelId(), SalaryFormulaReferenceEnum.ADD_UP_SITUATION.getDefaultLabel()), convert2FormulaVar(AddUpSituation.class, SalaryFormulaReferenceEnum.ADD_UP_SITUATION.getValue() + "")); - result.put(SalaryFormulaReferenceEnum.ADD_UP_DEDUCTIONS.getDefaultLabel(), + result.put(SalaryI18nUtil.getI18nLabel(user.getLanguage(), SalaryFormulaReferenceEnum.ADD_UP_DEDUCTIONS.getLabelId(), SalaryFormulaReferenceEnum.ADD_UP_DEDUCTIONS.getDefaultLabel()), convert2FormulaVar(AddUpDeduction.class, SalaryFormulaReferenceEnum.ADD_UP_DEDUCTIONS.getValue() + "")); - result.put(SalaryFormulaReferenceEnum.EMPLOYEE_INFO.getDefaultLabel(), + result.put(SalaryI18nUtil.getI18nLabel(user.getLanguage(), SalaryFormulaReferenceEnum.EMPLOYEE_INFO.getLabelId(), SalaryFormulaReferenceEnum.EMPLOYEE_INFO.getDefaultLabel()), convert2FormulaVar(DataCollectionEmployee.class, SalaryFormulaReferenceEnum.EMPLOYEE_INFO.getValue() + "")); - result.put(SalaryFormulaReferenceEnum.OTHER_DEDUCTION.getDefaultLabel(), + result.put(SalaryI18nUtil.getI18nLabel(user.getLanguage(), SalaryFormulaReferenceEnum.OTHER_DEDUCTION.getLabelId(), SalaryFormulaReferenceEnum.OTHER_DEDUCTION.getDefaultLabel()), convert2FormulaVar(OtherDeductionPO.class, SalaryFormulaReferenceEnum.OTHER_DEDUCTION.getValue() + "")); - result.put(SalaryFormulaReferenceEnum.WELFARE.getDefaultLabel(), + result.put(SalaryI18nUtil.getI18nLabel(user.getLanguage(), SalaryFormulaReferenceEnum.WELFARE.getLabelId(), SalaryFormulaReferenceEnum.WELFARE.getDefaultLabel()), welfare2FormulaVar(SalaryFormulaReferenceEnum.WELFARE)); - result.put(SalaryFormulaReferenceEnum.ATTEND.getDefaultLabel(), + result.put(SalaryI18nUtil.getI18nLabel(user.getLanguage(), SalaryFormulaReferenceEnum.ATTEND.getLabelId(), SalaryFormulaReferenceEnum.ATTEND.getDefaultLabel()), attendData2FormulaVar(SalaryFormulaReferenceEnum.ATTEND)); - result.put(SalarySQLReferenceEnum.SALARY_ACCT_EMPLOYEE.getDefaultLabel(), + result.put(SalaryI18nUtil.getI18nLabel(user.getLanguage(), SalarySQLReferenceEnum.SALARY_ACCT_EMPLOYEE.getLabelId(), SalarySQLReferenceEnum.SALARY_ACCT_EMPLOYEE.getDefaultLabel()), convert2FormulaVar(SalaryAcctEmployeePO.class, SalarySQLReferenceEnum.SALARY_ACCT_EMPLOYEE.getValue() + "")); - result.put(SalarySQLReferenceEnum.SALARY_CYCLE.getDefaultLabel(), + result.put(SalaryI18nUtil.getI18nLabel(user.getLanguage(), SalarySQLReferenceEnum.SALARY_CYCLE.getLabelId(), SalarySQLReferenceEnum.SALARY_CYCLE.getDefaultLabel()), convert2FormulaVar(SalarySobCycleDTO.class, SalarySQLReferenceEnum.SALARY_CYCLE.getValue() + "")); return result; }