Merge branch 'develop' into feature-zhaji

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

@@ -34,7 +34,10 @@ import java.math.BigDecimal;
  * @date 2022-08-05 11:40:14
  */
 @Data
-public class TStatisticsCurrentReportMarketVo extends RowIndex implements Serializable {
+public class TStatisticsCurrentReportMarketVo implements Serializable {
+
+	@ExcelAttribute(name = "行号")
+	private Integer rowIndex;
 
 	/**
 	 * 税务主体(封面抬头)

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

@@ -135,18 +135,18 @@ public class TStatisticsCurrentReportMarketServiceImpl extends ServiceImpl<TStat
 								declareMonth = DateUtil.getYearMonth(cachedDataList.get(0).getCreateStart());
 							}
 							if (Common.isEmpty(declareMonth)) {
-								errorMessageList.add(new ErrorMessage(CommonConstants.ZERO_INT
+								errorMessageList.add(new ErrorMessage(CommonConstants.TWO_INT
 										, "请检查‘税款所属期起’单元格格式是文本格式，且满足日期格式yyyy-MM-dd或yyyyMMdd"));
 							}
 							try {
 								Integer.parseInt(declareMonth);
 							} catch (Exception e) {
-								errorMessageList.add(new ErrorMessage(CommonConstants.ZERO_INT
+								errorMessageList.add(new ErrorMessage(CommonConstants.TWO_INT
 										, "请检查‘税款所属期起’单元格格式是文本格式，且满足日期格式yyyy-MM-dd或yyyyMMdd"));
 							}
 							declareTitle = cachedDataList.get(0).getInvoiceTitle();
 							if (Common.isEmpty(declareTitle)) {
-								errorMessageList.add(new ErrorMessage(CommonConstants.ZERO_INT
+								errorMessageList.add(new ErrorMessage(CommonConstants.TWO_INT
 										, "封面抬头全称-不能为空"));
 							}
 							if (Common.isNotNull(declareMonth) && Common.isNotNull(declareTitle)) {
@@ -157,7 +157,7 @@ public class TStatisticsCurrentReportMarketServiceImpl extends ServiceImpl<TStat
 								queryWrapperSc.setEntity(sdsCheck);
 								int count = baseMapper.getCountByMonthAndTitle(declareMonth, declareTitle);
 								if (count > CommonConstants.ZERO_INT) {
-									errorMessageList.add(new ErrorMessage(CommonConstants.ZERO_INT
+									errorMessageList.add(new ErrorMessage(CommonConstants.TWO_INT
 											, "当前月同一-封面抬头全称-已存在数据。"));
 								}
 							}