MVP1.6.2-工资原表识别-优化

yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/controller/TSalaryStandardOriginalController.java

@@ -21,7 +21,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants;
 import com.yifu.cloud.plus.v1.yifu.common.core.util.Common;
-import com.yifu.cloud.plus.v1.yifu.common.core.util.ErrorMessage;
 import com.yifu.cloud.plus.v1.yifu.common.core.util.OSSUtil;
 import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
 import com.yifu.cloud.plus.v1.yifu.common.core.vo.YifuUser;

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

@@ -20,7 +20,6 @@ package com.yifu.cloud.plus.v1.yifu.salary.service;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.yifu.cloud.plus.v1.yifu.common.core.util.ErrorMessage;
 import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
 import com.yifu.cloud.plus.v1.yifu.salary.entity.TSalaryStandardOriginal;
 import com.yifu.cloud.plus.v1.yifu.salary.vo.ExcelSheetVo;

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

@@ -21,14 +21,9 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.yifu.cloud.plus.v1.check.entity.TCheckIdCard;
-import com.yifu.cloud.plus.v1.check.vo.CheckIdCardListVo;
 import com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants;
-import com.yifu.cloud.plus.v1.yifu.common.core.constant.SecurityConstants;
 import com.yifu.cloud.plus.v1.yifu.common.core.util.Common;
-import com.yifu.cloud.plus.v1.yifu.common.core.util.ErrorMessage;
 import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
-import com.yifu.cloud.plus.v1.yifu.common.dapr.config.DaprCheckProperties;
-import com.yifu.cloud.plus.v1.yifu.common.dapr.util.HttpDaprUtil;
 import com.yifu.cloud.plus.v1.yifu.salary.entity.TSalaryStandardOriginal;
 import com.yifu.cloud.plus.v1.yifu.salary.entity.TSalaryStandardOriginalDetail;
 import com.yifu.cloud.plus.v1.yifu.salary.mapper.TSalaryStandardOriginalMapper;
@@ -48,8 +43,6 @@ import org.apache.poi.xssf.usermodel.XSSFCell;
 import org.apache.poi.xssf.usermodel.XSSFRow;
 import org.apache.poi.xssf.usermodel.XSSFSheet;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -73,11 +66,9 @@ import java.util.regex.Pattern;
 @Log4j2
 @Service
 @AllArgsConstructor
-@EnableConfigurationProperties({DaprCheckProperties.class})
 public class TSalaryStandardOriginalServiceImpl extends ServiceImpl<TSalaryStandardOriginalMapper, TSalaryStandardOriginal>
 		implements TSalaryStandardOriginalService {
 
-	private DaprCheckProperties checkProperties;
 	private final SalaryUploadService salaryUploadService;
 	private final TSalaryStandardOriginalDetailService tSalaryStandardOriginalDetailService;
 
@@ -313,7 +304,7 @@ public class TSalaryStandardOriginalServiceImpl extends ServiceImpl<TSalaryStand
 									}
 								}
 								if (nullColumnNum >= maxNullColumNum) {
-									for (int num = maxNullColumNum-1; num >= 0; num--) {
+									for (int num = maxNullColumNum - 1; num >= 0; num--) {
 										if (dataRowFlag) {
 											columnList.remove(nullColumn + num);
 										}
@@ -523,7 +514,7 @@ public class TSalaryStandardOriginalServiceImpl extends ServiceImpl<TSalaryStand
 									}
 								}
 								if (nullColumnNum >= maxNullColumNum) {
-									for (int num = maxNullColumNum-1; num >= 0; num--) {
+									for (int num = maxNullColumNum - 1; num >= 0; num--) {
 										if (dataRowFlag) {
 											columnList.remove(nullColumn + num);
 										}