1.5.7-审核人导出加字段

yifu-salary/yifu-salary-api/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/entity/TSalaryStandard.java

@@ -459,6 +459,13 @@ public class TSalaryStandard extends BaseEntity {
 	@Schema(description = "删除时间")
 	private Date deleteDate;
 
+	@Schema(description = "业务类型分类")
+	private String businessPrimaryType;
+	@Schema(description = "业务类型二级分类")
+	private String businessSecondType;
+	@Schema(description = "业务类型三级分类")
+	private String businessThirdType;
+
 	/**
 	 * 工资月份-起
 	 */

yifu-salary/yifu-salary-api/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/vo/TSalaryAccountExportVo.java

@@ -53,6 +53,12 @@ public class TSalaryAccountExportVo {
 	private String salaryMonth;
 	@ExcelProperty("出账单位")
 	private String invoiceTitle;
+	@ExcelProperty("业务类型分类")
+	private String businessPrimaryType;
+	@ExcelProperty("业务类型二级分类")
+	private String businessSecondType;
+	@ExcelProperty("业务类型三级分类")
+	private String businessThirdType;
 	@ExcelProperty("结算单位")
 	private String unitName;
 	@ExcelProperty("结算单位编码")
@@ -98,12 +104,14 @@ public class TSalaryAccountExportVo {
 	private BigDecimal sumContinuingEducationMoney;
 	@ExcelProperty(value = "赡养老人专项扣除")
 	private BigDecimal sumSupportElderlyMoney;
-	@ExcelProperty(value = "婴幼儿照护费")
-	private BigDecimal sumBabyMoney;
 	@ExcelProperty(value = "累计个人养老金")
 	private BigDecimal sumPrivatePension;
+	@ExcelProperty(value = "婴幼儿照护费")
+	private BigDecimal sumBabyMoney;
 	@ExcelProperty("减除费用")
 	private BigDecimal costReduction;
+	@ExcelProperty("通讯补贴（不计税）")
+	private BigDecimal phoneSubsidy;
 	@ExcelProperty("表单上传人")
 	private String createName;
 
@@ -120,4 +128,5 @@ public class TSalaryAccountExportVo {
 	@ExcelProperty("薪酬状态")
 	private String status;
 
+
 }

yifu-salary/yifu-salary-biz/src/main/resources/mapper/TSalaryAccountMapper.xml

@@ -844,6 +844,10 @@
 			sum(ifnull(pdeduction.SALARY_MONEY,0)) pdeductionMoney,
 			if(a.PAY_SETTLE_FLAG = '0','已结算',if(a.PAY_SETTLE_FLAG = '1','结算中',if(a.PAY_SETTLE_FLAG = '2','未结算','-'))) paySettleFlag,
 			case s.STATUS when 0 then '待提交' when 1 then '待审核' when 2 then '待推送明细' when 3 then '已推送待发放' when 4 then '已发放' when 5 then '审核不通过' when 6 then '确认不通过' when 7 then '财务退回' when 10 then '推送失败' when 11 then '已审核生成收入中' when 12 then '已审核生成收入失败' else '-' end as status
+			,phoneSubsidy.SALARY_MONEY as phoneSubsidy
+			,s.BUSINESS_PRIMARY_TYPE as businessPrimaryType
+			,s.BUSINESS_SECOND_TYPE as businessSecondType
+			,s.BUSINESS_THIRD_TYPE as businessThirdType
 		from
 		t_salary_account a
 		left join t_salary_standard s on a.SALARY_FORM_ID = s.id
@@ -851,6 +855,7 @@
 		left join t_salary_account_item exemptionPersionTax on exemptionPersionTax.SALARY_ACCOUNT_ID = a.id and exemptionPersionTax.JAVA_FIED_NAME='exemptionPersionTax'
 		left join t_salary_account_item enterpriseAnnuity on enterpriseAnnuity.SALARY_ACCOUNT_ID = a.id and enterpriseAnnuity.JAVA_FIED_NAME='enterpriseAnnuity'
 		left join t_salary_account_item pdeduction on pdeduction.SALARY_ACCOUNT_ID = a.id and pdeduction.JAVA_FIED_NAME='pdeduction'
+		left join t_salary_account_item phoneSubsidy on phoneSubsidy.SALARY_ACCOUNT_ID = a.id and phoneSubsidy.JAVA_FIED_NAME='phoneSubsidy'
 		<where>
 			a.DELETE_FLAG = 0
 			<include refid="where_export"/>