Commit 6a6341da authored by hongguangwu's avatar hongguangwu

Merge remote-tracking branch 'origin/MVP1.7.10' into MVP1.7.10

parents e4e46564 b7842243
...@@ -22,4 +22,6 @@ public class TAuditExportStandardVo { ...@@ -22,4 +22,6 @@ public class TAuditExportStandardVo {
private String businessPrimaryTyp; private String businessPrimaryTyp;
private String businessSecondType; private String businessSecondType;
private String businessThirdType; private String businessThirdType;
//新增薪酬申请编号 fxj v1.7.10
private String applyNo;
} }
...@@ -132,6 +132,9 @@ public class TSalaryAccountExportVo { ...@@ -132,6 +132,9 @@ public class TSalaryAccountExportVo {
@ExcelProperty("薪酬状态") @ExcelProperty("薪酬状态")
private String status; private String status;
//新增薪酬申请编号 fxj v1.7.10 2025-04-25
@ExcelProperty("薪酬申请单号")
private String applyNo;
} }
...@@ -343,6 +343,7 @@ public class TSalaryAccountServiceImpl extends ServiceImpl<TSalaryAccountMapper, ...@@ -343,6 +343,7 @@ public class TSalaryAccountServiceImpl extends ServiceImpl<TSalaryAccountMapper,
standardItems.clear(); standardItems.clear();
} }
} }
//封装信息 //封装信息
initResult(list, itemExportVoMap,itemStandardMap,itemAnnualBonusMap,itemPersionTaxMap,itemAnnuityMap,itemSubsidyMap,itemCarNoTaxMap); initResult(list, itemExportVoMap,itemStandardMap,itemAnnualBonusMap,itemPersionTaxMap,itemAnnuityMap,itemSubsidyMap,itemCarNoTaxMap);
if (i%CommonConstants.EXCEL_EXPORT_LIMIT==0){ if (i%CommonConstants.EXCEL_EXPORT_LIMIT==0){
...@@ -588,6 +589,8 @@ public class TSalaryAccountServiceImpl extends ServiceImpl<TSalaryAccountMapper, ...@@ -588,6 +589,8 @@ public class TSalaryAccountServiceImpl extends ServiceImpl<TSalaryAccountMapper,
vo.setBusinessPrimaryType(standardVo.getBusinessPrimaryTyp()); vo.setBusinessPrimaryType(standardVo.getBusinessPrimaryTyp());
vo.setBusinessSecondType(standardVo.getBusinessSecondType()); vo.setBusinessSecondType(standardVo.getBusinessSecondType());
vo.setBusinessThirdType(standardVo.getBusinessThirdType()); vo.setBusinessThirdType(standardVo.getBusinessThirdType());
//新增薪酬申请编号 fxj v1.7.10 2025-04-25
vo.setApplyNo(standardVo.getApplyNo());
} }
itemVo = itemAnnualBonusMap.get(vo.getId()); itemVo = itemAnnualBonusMap.get(vo.getId());
if (Common.isNotNull(itemVo)){ if (Common.isNotNull(itemVo)){
......
...@@ -2032,6 +2032,7 @@ ...@@ -2032,6 +2032,7 @@
,s.BUSINESS_PRIMARY_TYPE as businessPrimaryType ,s.BUSINESS_PRIMARY_TYPE as businessPrimaryType
,s.BUSINESS_SECOND_TYPE as businessSecondType ,s.BUSINESS_SECOND_TYPE as businessSecondType
,s.BUSINESS_THIRD_TYPE as businessThirdType ,s.BUSINESS_THIRD_TYPE as businessThirdType
,s.APPLY_NO applyNo
FROM FROM
t_salary_standard s t_salary_standard s
where where
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment