Commit ea1a47b7 authored by fangxinjiang's avatar fangxinjiang

车改补贴(不计税)导出-fxj

......@@ -24,4 +24,6 @@ public class TAuditExportItemVo {
private BigDecimal exemptionPersionTax;
@ExcelProperty("企业(职业)年金")
private BigDecimal enterpriseAnnuity;
@ExcelProperty("车改补贴(不计税)")
private BigDecimal carNoTax;
}
......@@ -114,6 +114,9 @@ public class TSalaryAccountExportVo {
private BigDecimal costReduction;
@ExcelProperty("通讯补贴(不计税)")
private BigDecimal phoneSubsidy;
@ExcelProperty("车改补贴(不计税)")
private BigDecimal carNotTax;
@ExcelProperty("表单上传人")
private String createName;
......
......@@ -153,6 +153,8 @@ public interface TSalaryAccountMapper extends BaseMapper<TSalaryAccount> {
List<TAuditExportItemVo> auditExportPhoneSubsidy(@Param("idList") List<String> idList);
List<TAuditExportItemVo> auditExportCarNoTax(@Param("idList") List<String> idList);
List<TSalaryAccount> getAccountListBySalaryId(@Param("searchVo") TSalaryAccountSearchVo searchVo);
// 导出报账专用hgw
......
......@@ -253,11 +253,13 @@ public class TSalaryAccountServiceImpl extends ServiceImpl<TSalaryAccountMapper,
Map<String,TAuditExportItemVo> itemPersionTaxMap = new HashMap<>();
Map<String,TAuditExportItemVo> itemAnnuityMap = new HashMap<>();
Map<String,TAuditExportItemVo> itemSubsidyMap = new HashMap<>();
Map<String,TAuditExportItemVo> itemCarNoTaxMap = new HashMap<>();
List<TSalaryAccountItemExportVo> items = null;
List<TAuditExportItemVo> annualBonusItems;
List<TAuditExportItemVo> exemptionPersionTaxItems;
List<TAuditExportItemVo> enterpriseAnnuityItems;
List<TAuditExportItemVo> phoneSubsidyItems;
List<TAuditExportItemVo> carNoTaxItems;
List<String> ids = null;
for (int i = 0; i <= count; i += CommonConstants.EXCEL_EXPORT_LIMIT_1) {
// 获取实际记录
......@@ -313,6 +315,11 @@ public class TSalaryAccountServiceImpl extends ServiceImpl<TSalaryAccountMapper,
itemSubsidyMap = phoneSubsidyItems.stream().collect(Collectors.toMap(TAuditExportItemVo::getSalaryAccountId,vo -> vo,(k1,k2) -> k1));
}
phoneSubsidyItems.clear();
carNoTaxItems = baseMapper.auditExportCarNoTax(idList);
if (Common.isNotNull(carNoTaxItems)){
itemCarNoTaxMap = carNoTaxItems.stream().collect(Collectors.toMap(TAuditExportItemVo::getSalaryAccountId,vo -> vo,(k1,k2) -> k1));
}
carNoTaxItems.clear();
}
if (Common.isNotNull(idStandardList)){
standardItems = baseMapper.auditExportStandard(idStandardList);
......@@ -322,7 +329,7 @@ public class TSalaryAccountServiceImpl extends ServiceImpl<TSalaryAccountMapper,
}
}
//封装信息
initResult(list, itemExportVoMap,itemStandardMap,itemAnnualBonusMap,itemPersionTaxMap,itemAnnuityMap,itemSubsidyMap);
initResult(list, itemExportVoMap,itemStandardMap,itemAnnualBonusMap,itemPersionTaxMap,itemAnnuityMap,itemSubsidyMap,itemCarNoTaxMap);
if (i%CommonConstants.EXCEL_EXPORT_LIMIT==0){
writeSheet = EasyExcelFactory.writerSheet("工资报账" + index).build();
index++;
......@@ -388,7 +395,8 @@ public class TSalaryAccountServiceImpl extends ServiceImpl<TSalaryAccountMapper,
Map<String,TAuditExportItemVo> itemAnnualBonusMap,
Map<String,TAuditExportItemVo> itemPersionTaxMap,
Map<String,TAuditExportItemVo> itemAnnuityMap,
Map<String,TAuditExportItemVo> itemSubsidyMap) {
Map<String,TAuditExportItemVo> itemSubsidyMap,
Map<String,TAuditExportItemVo> itemCarNoTaxMap) {
TSalaryAccountItemExportVo voTemp;
TAuditExportStandardVo standardVo;
TAuditExportItemVo itemVo;
......@@ -421,6 +429,12 @@ public class TSalaryAccountServiceImpl extends ServiceImpl<TSalaryAccountMapper,
if (Common.isNotNull(itemVo)){
vo.setPhoneSubsidy(itemVo.getPhoneSubsidy());
}
// fxj 2025-02-28 车改补贴(不计税) MVP1.7.7
itemVo = itemCarNoTaxMap.get(vo.getId());
if (Common.isNotNull(itemVo)){
vo.setCarNotTax(itemVo.getCarNoTax());
}
}
}
......
......@@ -1861,6 +1861,22 @@
</if>
</select>
<select id="auditExportCarNoTax" resultType="com.yifu.cloud.plus.v1.yifu.salary.vo.TAuditExportItemVo">
select
carNoTax.SALARY_ACCOUNT_ID as salaryAccountId,
carNoTax.SALARY_MONEY as carNoTax
FROM
t_salary_account_item carNoTax
where
carNoTax.JAVA_FIED_NAME='carNotTax'
<if test="idList != null and idList.size>0">
AND carNoTax.SALARY_ACCOUNT_ID in
<foreach item="idStr" index="index" collection="idList" open="(" separator="," close=")">
#{idStr}
</foreach>
</if>
</select>
<select id="auditExportEnterpriseAnnuity" resultType="com.yifu.cloud.plus.v1.yifu.salary.vo.TAuditExportItemVo">
select
enterpriseAnnuity.SALARY_ACCOUNT_ID as salaryAccountId,
......
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