Merge remote-tracking branch 'origin/develop' into develop

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

@@ -97,210 +97,210 @@ public class TStatisticsCurrentReportMarketVo extends RowIndex implements Serial
 	/**
 	 * 本期收入
 	 */
-	@ExcelAttribute(name = "本期收入")
+	@ExcelAttribute(name = "本期收入", maxLength = 12)
 	@Schema(description = "本期收入")
 	@ExcelProperty("本期收入")
 	private BigDecimal realSalary;
 	/**
 	 * 本期费用
 	 */
-	@ExcelAttribute(name = "本期费用")
+	@ExcelAttribute(name = "本期费用", maxLength = 12)
 	@Schema(description = "本期费用")
 	@ExcelProperty("本期费用")
 	private BigDecimal currentExpenses;
 	/**
 	 * 本期免税收入
 	 */
-	@ExcelAttribute(name = "本期免税收入")
+	@ExcelAttribute(name = "本期免税收入", maxLength = 12)
 	@Schema(description = "本期免税收入")
 	@ExcelProperty("本期免税收入")
 	private BigDecimal currentTaxFreeIncome;
 	/**
 	 * 本期基本养老保险费
 	 */
-	@ExcelAttribute(name = "本期基本养老保险费")
+	@ExcelAttribute(name = "本期基本养老保险费", maxLength = 12)
 	@Schema(description = "本期基本养老保险费")
 	@ExcelProperty("本期基本养老保险费")
 	private BigDecimal personalPensionMoney;
 	/**
 	 * 本期基本医疗
 	 */
-	@ExcelAttribute(name = "本期基本医疗保险费")
+	@ExcelAttribute(name = "本期基本医疗保险费", maxLength = 12)
 	@Schema(description = "本期基本医疗保险费")
 	@ExcelProperty("本期基本医疗保险费")
 	private BigDecimal personalMedicalMoney;
 	/**
 	 * 本期失业
 	 */
-	@ExcelAttribute(name = "本期失业保险费")
+	@ExcelAttribute(name = "本期失业保险费", maxLength = 12)
 	@Schema(description = "本期失业保险费")
 	@ExcelProperty("本期失业保险费")
 	private BigDecimal personalUnemploymentMoney;
 	/**
 	 * 本期住房公积金
 	 */
-	@ExcelAttribute(name = "本期住房公积金")
+	@ExcelAttribute(name = "本期住房公积金", maxLength = 12)
 	@Schema(description = "本期住房公积金")
 	@ExcelProperty("本期住房公积金")
 	private BigDecimal personalProvidentFee;
 	/**
 	 * 本期企业(职业)年金
 	 */
-	@ExcelAttribute(name = "本期企业(职业)年金")
+	@ExcelAttribute(name = "本期企业(职业)年金", maxLength = 12)
 	@Schema(description = "本期企业(职业)年金")
 	@ExcelProperty("本期企业(职业)年金")
 	private BigDecimal enterpriseAnnuity;
 	/**
 	 * 本期商业健康保险费
 	 */
-	@ExcelAttribute(name = "本期商业健康保险费")
+	@ExcelAttribute(name = "本期商业健康保险费", maxLength = 12)
 	@Schema(description = "本期商业健康保险费")
 	@ExcelProperty("本期商业健康保险费")
 	private BigDecimal nowTakingRisks;
 	/**
 	 * 本期税延养老保险费
 	 */
-	@ExcelAttribute(name = "本期税延养老保险费")
+	@ExcelAttribute(name = "本期税延养老保险费", maxLength = 12)
 	@Schema(description = "本期税延养老保险费")
 	@ExcelProperty("本期税延养老保险费")
 	private BigDecimal nowTaxDeferred;
 	/**
 	 * 本期其他扣除(其他)
 	 */
-	@ExcelAttribute(name = "本期其他扣除(其他)")
+	@ExcelAttribute(name = "本期其他扣除(其他)", maxLength = 12)
 	@Schema(description = "本期其他扣除(其他)")
 	@ExcelProperty("本期其他扣除(其他)")
 	private BigDecimal nowOther;
 	/**
 	 * 累计收入额
 	 */
-	@ExcelAttribute(name = "累计收入额")
+	@ExcelAttribute(name = "累计收入额", maxLength = 12)
 	@Schema(description = "累计收入额")
 	@ExcelProperty("累计收入额")
 	private BigDecimal allIncome;
 	/**
 	 * 累计减除费用
 	 */
-	@ExcelAttribute(name = "累计减除费用")
+	@ExcelAttribute(name = "累计减除费用", maxLength = 12)
 	@Schema(description = "累计减除费用")
 	@ExcelProperty("累计减除费用")
 	private BigDecimal costReduction;
 	/**
 	 * 累计专项扣除
 	 */
-	@ExcelAttribute(name = "累计专项扣除")
+	@ExcelAttribute(name = "累计专项扣除", maxLength = 12)
 	@Schema(description = "累计专项扣除")
 	@ExcelProperty("累计专项扣除")
 	private BigDecimal specialDeduction;
 	/**
 	 * 累计子女教育支出扣除
 	 */
-	@ExcelAttribute(name = "累计子女教育支出扣除")
+	@ExcelAttribute(name = "累计子女教育支出扣除", maxLength = 12)
 	@Schema(description = "累计子女教育支出扣除")
 	@ExcelProperty("累计子女教育支出扣除")
 	private BigDecimal childEduinfoMoney;
 	/**
 	 * 累计继续教育支出扣除
 	 */
-	@ExcelAttribute(name = "累计继续教育支出扣除")
+	@ExcelAttribute(name = "累计继续教育支出扣除", maxLength = 12)
 	@Schema(description = "累计继续教育支出扣除")
 	@ExcelProperty("累计继续教育支出扣除")
 	private BigDecimal continuingEducationExpenseMoney;
 	/**
 	 * 累计住房贷款利息支出扣除
 	 */
-	@ExcelAttribute(name = "累计住房贷款利息支出扣除")
+	@ExcelAttribute(name = "累计住房贷款利息支出扣除", maxLength = 12)
 	@Schema(description = "累计住房贷款利息支出扣除")
 	@ExcelProperty("累计住房贷款利息支出扣除")
 	private BigDecimal housingLoanInterestExpenseMoney;
 	/**
 	 * 累计住房租金支出扣除
 	 */
-	@ExcelAttribute(name = "累计住房租金支出扣除")
+	@ExcelAttribute(name = "累计住房租金支出扣除", maxLength = 12)
 	@Schema(description = "累计住房租金支出扣除")
 	@ExcelProperty("累计住房租金支出扣除")
 	private BigDecimal housingRentalinfoMoney;
 	/**
 	 * 累计赡养老人支出扣除
 	 */
-	@ExcelAttribute(name = "累计赡养老人支出扣除")
+	@ExcelAttribute(name = "累计赡养老人支出扣除", maxLength = 12)
 	@Schema(description = "累计赡养老人支出扣除")
 	@ExcelProperty("累计赡养老人支出扣除")
 	private BigDecimal supportElderlyExpenseMoney;
 	/**
 	 * 累计3岁以下婴幼儿照护
 	 */
-	@ExcelAttribute(name = "累计3岁以下婴幼儿照护")
+	@ExcelAttribute(name = "累计3岁以下婴幼儿照护", maxLength = 12)
 	@Schema(description = "累计3岁以下婴幼儿照护")
 	@ExcelProperty("累计3岁以下婴幼儿照护")
 	private BigDecimal sumBabyMoney;
 	/**
 	 * 累计其他扣除
 	 */
-	@ExcelAttribute(name = "累计其他扣除")
+	@ExcelAttribute(name = "累计其他扣除", maxLength = 12)
 	@Schema(description = "累计其他扣除")
 	@ExcelProperty("累计其他扣除")
 	private BigDecimal allOther;
 	/**
 	 * 累计准予扣除的捐赠
 	 */
-	@ExcelAttribute(name = "累计准予扣除的捐赠")
+	@ExcelAttribute(name = "累计准予扣除的捐赠", maxLength = 12)
 	@Schema(description = "累计准予扣除的捐赠")
 	@ExcelProperty("累计准予扣除的捐赠")
 	private BigDecimal allDonate;
 	/**
 	 * 累计应纳税所得额
 	 */
-	@ExcelAttribute(name = "累计应纳税所得额")
+	@ExcelAttribute(name = "累计应纳税所得额", maxLength = 12)
 	@Schema(description = "累计应纳税所得额")
 	@ExcelProperty("累计应纳税所得额")
 	private BigDecimal taxable;
 	/**
 	 * 税率
 	 */
-	@ExcelAttribute(name = "税率")
+	@ExcelAttribute(name = "税率", maxLength = 12)
 	@Schema(description = "税率")
 	@ExcelProperty("税率")
 	private BigDecimal taxFee;
 	/**
 	 * 速算扣除数
 	 */
-	@ExcelAttribute(name = "速算扣除数")
+	@ExcelAttribute(name = "速算扣除数", maxLength = 12)
 	@Schema(description = "速算扣除数")
 	@ExcelProperty("速算扣除数")
 	private BigDecimal quickDeducation;
 	/**
 	 * 累计应纳税额
 	 */
-	@ExcelAttribute(name = "累计应纳税额")
+	@ExcelAttribute(name = "累计应纳税额", maxLength = 12)
 	@Schema(description = "累计应纳税额")
 	@ExcelProperty("累计应纳税额")
 	private BigDecimal salaryTax;
 	/**
 	 * 累计减免税额
 	 */
-	@ExcelAttribute(name = "累计减免税额")
+	@ExcelAttribute(name = "累计减免税额", maxLength = 12)
 	@Schema(description = "累计减免税额")
 	@ExcelProperty("累计减免税额")
 	private BigDecimal allTaxDeduction;
 	/**
 	 * 累计应扣缴税额
 	 */
-	@ExcelAttribute(name = "累计应扣缴税额")
+	@ExcelAttribute(name = "累计应扣缴税额", maxLength = 12)
 	@Schema(description = "累计应扣缴税额")
 	@ExcelProperty("累计应扣缴税额")
 	private BigDecimal allWithholdingTax;
 	/**
 	 * 累计已预缴税额
 	 */
-	@ExcelAttribute(name = "累计已预缴税额")
+	@ExcelAttribute(name = "累计已预缴税额", maxLength = 12)
 	@Schema(description = "累计已预缴税额")
 	@ExcelProperty("累计已预缴税额")
 	private BigDecimal allTaxPrepaid;
 	/**
 	 * 累计应补(退)税额
 	 */
-	@ExcelAttribute(name = "累计应补(退)税额")
+	@ExcelAttribute(name = "累计应补(退)税额", maxLength = 12)
 	@Schema(description = "累计应补(退)税额")
 	@ExcelProperty("累计应补(退)税额")
 	private BigDecimal allTaxPayable;

yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/impl/TStatisticsCurrentReportMarketServiceImpl.java

@@ -136,8 +136,13 @@ public class TStatisticsCurrentReportMarketServiceImpl extends ServiceImpl<TStat
 							}
 							if (Common.isEmpty(declareMonth)) {
 								errorMessageList.add(new ErrorMessage(CommonConstants.ZERO_INT
-										, "请检查‘税款所属期起’单元格格式是文本格式，且满足日期格式yyyy-MM-dd或yyyyMMdd:CreateStart="
-										+ cachedDataList.get(0).getCreateStart() + "|| yearMonth=" + declareMonth));
+										, "请检查‘税款所属期起’单元格格式是文本格式，且满足日期格式yyyy-MM-dd或yyyyMMdd"));
+							}
+							try {
+								Integer.parseInt(declareMonth);
+							} catch (Exception e) {
+								errorMessageList.add(new ErrorMessage(CommonConstants.ZERO_INT
+										, "请检查‘税款所属期起’单元格格式是文本格式，且满足日期格式yyyy-MM-dd或yyyyMMdd"));
 							}
 							declareTitle = cachedDataList.get(0).getInvoiceTitle();
 							if (Common.isEmpty(declareTitle)) {