代码优化

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

@@ -19,7 +19,6 @@ package com.yifu.cloud.plus.v1.yifu.salary.entity;
 
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute;

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

@@ -3,7 +3,6 @@ package com.yifu.cloud.plus.v1.yifu.salary.entity;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
 import com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute;
 import com.yifu.cloud.plus.v1.yifu.common.mybatis.base.BaseEntity;
 import io.swagger.v3.oas.annotations.media.Schema;

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

@@ -21,11 +21,10 @@ import com.alibaba.excel.annotation.ExcelProperty;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.yifu.cloud.plus.v1.yifu.common.mybatis.base.BaseEntity;
+import com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute;
 import org.hibernate.validator.constraints.Length;
 
 import javax.validation.constraints.NotBlank;

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

@@ -4,7 +4,6 @@ import com.alibaba.excel.annotation.ExcelProperty;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
 import com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute;
 import com.yifu.cloud.plus.v1.yifu.common.mybatis.base.BaseEntity;
 import io.swagger.v3.oas.annotations.media.Schema;

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

@@ -2,10 +2,8 @@ package com.yifu.cloud.plus.v1.yifu.salary.entity;
 
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
 import com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute;
 import com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttributeConstants;
 import com.yifu.cloud.plus.v1.yifu.common.mybatis.base.BaseEntity;
@@ -16,7 +14,6 @@ import lombok.EqualsAndHashCode;
 import org.hibernate.validator.constraints.Length;
 
 import javax.validation.constraints.NotBlank;
-import java.time.LocalDateTime;
 
 
 /**

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

@@ -2,7 +2,6 @@ package com.yifu.cloud.plus.v1.yifu.salary.entity;
 
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.baomidou.mybatisplus.annotation.*;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
 import com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute;
 import com.yifu.cloud.plus.v1.yifu.common.mybatis.base.BaseEntity;
 import io.swagger.v3.oas.annotations.tags.Tag;
@@ -13,7 +12,6 @@ import org.hibernate.validator.constraints.Length;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 import java.time.LocalDate;
-import java.time.LocalDateTime;
 
 
 /**

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

@@ -4,7 +4,6 @@ import com.alibaba.excel.annotation.ExcelProperty;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
 import com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute;
 import com.yifu.cloud.plus.v1.yifu.common.mybatis.base.BaseEntity;
 import io.swagger.v3.oas.annotations.tags.Tag;
@@ -13,8 +12,6 @@ import lombok.EqualsAndHashCode;
 import org.hibernate.validator.constraints.Length;
 
 import javax.validation.constraints.NotBlank;
-import java.io.Serializable;
-import java.time.LocalDateTime;
 
 /**
  * 薪资识别配置（标准模板）

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

@@ -19,8 +19,9 @@ package com.yifu.cloud.plus.v1.yifu.salary.entity;
 
 import com.alibaba.excel.annotation.ExcelIgnore;
 import com.alibaba.excel.annotation.ExcelProperty;
-import com.baomidou.mybatisplus.annotation.*;
-import com.fasterxml.jackson.annotation.JsonFormat;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
 import com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute;
 import com.yifu.cloud.plus.v1.yifu.common.mybatis.base.BaseEntity;
 import io.swagger.v3.oas.annotations.media.Schema;
@@ -29,7 +30,6 @@ import lombok.EqualsAndHashCode;
 import org.hibernate.validator.constraints.Length;
 
 import javax.validation.constraints.NotBlank;
-import java.time.LocalDateTime;
 
 /**
  * 薪酬人员表

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

@@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
 import com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute;
 import com.yifu.cloud.plus.v1.yifu.common.mybatis.base.BaseEntity;
 import io.swagger.v3.oas.annotations.tags.Tag;
@@ -14,7 +13,6 @@ import lombok.EqualsAndHashCode;
 import org.hibernate.validator.constraints.Length;
 
 import javax.validation.constraints.NotBlank;
-import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.List;
 

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

@@ -4,12 +4,9 @@ import com.alibaba.excel.annotation.ExcelProperty;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
 import com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute;
-import com.yifu.cloud.plus.v1.yifu.common.mybatis.base.BaseEntity;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
 import org.hibernate.validator.constraints.Length;
 
 import javax.validation.constraints.NotBlank;

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

@@ -22,11 +22,10 @@ import com.alibaba.excel.annotation.ExcelProperty;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.yifu.cloud.plus.v1.yifu.common.mybatis.base.BaseEntity;
+import com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute;
 import org.hibernate.validator.constraints.Length;
 
 import javax.validation.constraints.NotBlank;

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

@@ -22,11 +22,10 @@ import com.alibaba.excel.annotation.ExcelProperty;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.yifu.cloud.plus.v1.yifu.common.mybatis.base.BaseEntity;
+import com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute;
 import org.hibernate.validator.constraints.Length;
 
 import javax.validation.constraints.NotBlank;

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

 package com.yifu.cloud.plus.v1.yifu.salary.vo;
 
-import com.yifu.cloud.plus.v1.yifu.social.entity.TPaymentInfo;
 import lombok.Data;
 
 import java.util.List;

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

@@ -17,17 +17,12 @@
 package com.yifu.cloud.plus.v1.yifu.salary.vo;
 
 import com.alibaba.excel.annotation.ExcelProperty;
-import com.baomidou.mybatisplus.annotation.TableField;
 import com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute;
-import com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttributeConstants;
-import com.yifu.cloud.plus.v1.yifu.salary.entity.SysMessageSalary;
-import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import org.hibernate.validator.constraints.Length;
 
 import javax.validation.constraints.NotBlank;
 import java.math.BigDecimal;
-import java.time.LocalDateTime;
 
 /**
  * 最低工资提醒-每月更新一次

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

@@ -4,8 +4,6 @@ import com.alibaba.excel.annotation.ExcelProperty;
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute;
-import com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttributeConstants;
-import com.yifu.cloud.plus.v1.yifu.salary.entity.THaveSalaryNosocial;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import org.hibernate.validator.constraints.Length;

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

@@ -21,7 +21,6 @@ import com.yifu.cloud.plus.v1.yifu.salary.entity.TSalaryAccount;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
-import java.time.LocalDateTime;
 import java.util.List;
 import java.util.Set;
 

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

@@ -3,7 +3,6 @@ package com.yifu.cloud.plus.v1.yifu.salary.vo;
 import com.alibaba.excel.annotation.ExcelIgnore;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute;
-import com.yifu.cloud.plus.v1.yifu.salary.entity.TSalaryEmployee;
 import lombok.Data;
 import org.hibernate.validator.constraints.Length;
 

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

@@ -20,7 +20,6 @@ import com.yifu.cloud.plus.v1.yifu.salary.entity.TSalaryStandard;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
-import java.io.Serializable;
 import java.time.LocalDateTime;
 
 /**

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

@@ -18,7 +18,6 @@ package com.yifu.cloud.plus.v1.yifu.salary.vo;
 
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute;
-import com.yifu.cloud.plus.v1.yifu.common.core.vo.RowIndex;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import org.hibernate.validator.constraints.Length;

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

@@ -16,8 +16,8 @@
  */
 package com.yifu.cloud.plus.v1.yifu.salary.vo;
 
-import io.swagger.v3.oas.annotations.media.Schema;
 import com.yifu.cloud.plus.v1.yifu.salary.entity.TStatisticsBonus;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
 import java.time.LocalDateTime;

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

@@ -19,13 +19,10 @@ package com.yifu.cloud.plus.v1.yifu.salary.vo;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
+import com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute;
 import com.yifu.cloud.plus.v1.yifu.common.core.vo.RowIndex;
-import com.yifu.cloud.plus.v1.yifu.common.mybatis.base.BaseEntity;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
-import com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute;
 import org.hibernate.validator.constraints.Length;
 
 import javax.validation.constraints.NotBlank;

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

@@ -18,7 +18,6 @@ package com.yifu.cloud.plus.v1.yifu.salary.vo;
 
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute;
-import com.yifu.cloud.plus.v1.yifu.common.core.vo.RowIndex;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import org.hibernate.validator.constraints.Length;

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

@@ -16,8 +16,8 @@
  */
 package com.yifu.cloud.plus.v1.yifu.salary.vo;
 
-import io.swagger.v3.oas.annotations.media.Schema;
 import com.yifu.cloud.plus.v1.yifu.salary.entity.TStatisticsDeclarer;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
 import java.time.LocalDateTime;

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

@@ -17,10 +17,10 @@
 package com.yifu.cloud.plus.v1.yifu.salary.vo;
 
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute;
 import com.yifu.cloud.plus.v1.yifu.common.core.vo.RowIndex;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
-import com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute;
 
 import java.io.Serializable;
 

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

 package com.yifu.cloud.plus.v1.yifu.salary.controller;
 
-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.R;
-import com.yifu.cloud.plus.v1.yifu.common.dapr.util.HttpDaprUtil;
 import com.yifu.cloud.plus.v1.yifu.common.log.annotation.SysLog;
-import com.yifu.cloud.plus.v1.yifu.salary.constants.SalaryConstants;
 import com.yifu.cloud.plus.v1.yifu.salary.service.SalaryUploadService;
 import com.yifu.cloud.plus.v1.yifu.salary.vo.TPaymentBySalaryVo;
-import com.yifu.cloud.plus.v1.yifu.salary.vo.TPaymentVo;
 import com.yifu.cloud.plus.v1.yifu.salary.vo.TSalaryAccountVo;
 import com.yifu.cloud.plus.v1.yifu.salary.vo.TSalaryDetailVo;
 import io.swagger.v3.oas.annotations.Operation;

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

@@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 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.R;
 import com.yifu.cloud.plus.v1.yifu.common.log.annotation.SysLog;
 import com.yifu.cloud.plus.v1.yifu.salary.entity.TConfigSalary;

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

@@ -33,7 +33,6 @@ import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
-import java.util.WeakHashMap;
 
 
 /**

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

 package com.yifu.cloud.plus.v1.yifu.salary.controller;
 
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 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.R;
-import com.yifu.cloud.plus.v1.yifu.common.core.vo.YifuUser;
 import com.yifu.cloud.plus.v1.yifu.common.log.annotation.SysLog;
-import com.yifu.cloud.plus.v1.yifu.common.security.util.SecurityUtils;
 import com.yifu.cloud.plus.v1.yifu.salary.entity.TMinSalary;
 import com.yifu.cloud.plus.v1.yifu.salary.service.TMinSalaryService;
 import io.swagger.v3.oas.annotations.Operation;
@@ -20,7 +13,6 @@ import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
-import java.time.LocalDateTime;
 
 
 /**

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

@@ -164,7 +164,7 @@ public class TSalaryStandardController {
 	 */
 	@Operation(description = "薪酬审核")
 	@PostMapping("/salaryStandardAudit")
-	public R salaryStandardAudit(@RequestParam String auditFlag, @RequestParam(required = false) String AuditRemark,
+	public R<Boolean> salaryStandardAudit(@RequestParam String auditFlag, @RequestParam(required = false) String AuditRemark,
 								@RequestParam String id) {
 		return tSalaryStandardService.salaryStandardAudit(auditFlag, AuditRemark, id);
 	}
@@ -175,7 +175,7 @@ public class TSalaryStandardController {
 	 */
 	@Operation(description = "保存并提交")
 	@PostMapping("/doSubmit")
-	public R salaryStandardAudit(@RequestBody TSalaryStandard tSalaryStandard) {
+	public R<Boolean> salaryStandardAudit(@RequestBody TSalaryStandard tSalaryStandard) {
 		if (tSalaryStandard != null && Common.isNotNull(tSalaryStandard.getId())) {
 			TSalaryStandard s = tSalaryStandardService.getById(tSalaryStandard.getId());
 			if (s == null) {
@@ -197,7 +197,7 @@ public class TSalaryStandardController {
 					tSalaryStandard.setSubmitTime(new Date());
 					tSalaryStandard.setStatus(CommonConstants.ONE_INT);
 					tSalaryStandardService.updateById(tSalaryStandard);
-					return R.ok("提交成功！");
+					return R.ok(true,"提交成功！");
 				} else {
 					return R.failed("请登录！");
 				}

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

@@ -14,10 +14,8 @@ import com.yifu.cloud.plus.v1.yifu.salary.service.TSpecialDeducationSumService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.AllArgsConstructor;
-import lombok.SneakyThrows;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
 
 import javax.validation.Valid;
 import java.text.SimpleDateFormat;

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

@@ -33,7 +33,6 @@ import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
-import javax.servlet.http.HttpServletResponse;
 import java.util.List;
 
 

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

@@ -64,7 +64,7 @@ public interface TSalaryStandardService extends IService<TSalaryStandard> {
 	 * @param id
 	 * @return
 	 */
-	R salaryStandardAudit(String auditFlag, String AuditRemark,String id);
+	R<Boolean> salaryStandardAudit(String auditFlag, String AuditRemark,String id);
 
 	/**
 	 * @Description: 删除工资表

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

@@ -25,7 +25,6 @@ import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
 import com.yifu.cloud.plus.v1.yifu.salary.entity.TStatisticsCurrentReportMarket;
 import com.yifu.cloud.plus.v1.yifu.salary.vo.TStatisticsCurrentReportMarketSearchVo;
 
-import javax.servlet.http.HttpServletResponse;
 import java.io.InputStream;
 import java.util.List;
 

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

@@ -8,7 +8,6 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.google.common.collect.Maps;
-import com.yifu.cloud.plus.v1.yifu.admin.api.vo.AllUserNaVo;
 import com.yifu.cloud.plus.v1.yifu.archives.vo.TSettleDomainListVo;
 import com.yifu.cloud.plus.v1.yifu.archives.vo.TSettleDomainSelectVo;
 import com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants;
@@ -25,10 +24,10 @@ import com.yifu.cloud.plus.v1.yifu.salary.entity.THaveSalaryNosocial;
 import com.yifu.cloud.plus.v1.yifu.salary.mapper.THaveSalaryNosocialMapper;
 import com.yifu.cloud.plus.v1.yifu.salary.service.THaveSalaryNosocialService;
 import com.yifu.cloud.plus.v1.yifu.salary.service.TSalaryAccountService;
+import com.yifu.cloud.plus.v1.yifu.salary.vo.HaveSalaryNoSocialVo;
 import com.yifu.cloud.plus.v1.yifu.salary.vo.THaveSalaryNoSocialExportVo;
 import com.yifu.cloud.plus.v1.yifu.salary.vo.THaveSalaryNosocialSearchVo;
 import com.yifu.cloud.plus.v1.yifu.social.entity.TPaymentInfo;
-import com.yifu.cloud.plus.v1.yifu.salary.vo.HaveSalaryNoSocialVo;
 import lombok.AllArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

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

@@ -38,7 +38,6 @@ import com.yifu.cloud.plus.v1.yifu.common.core.constant.SecurityConstants;
 import com.yifu.cloud.plus.v1.yifu.common.core.util.*;
 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.common.mybatis.base.BaseEntity;
 import com.yifu.cloud.plus.v1.yifu.salary.entity.TSalaryEmployee;
 import com.yifu.cloud.plus.v1.yifu.salary.mapper.TSalaryEmployeeMapper;
 import com.yifu.cloud.plus.v1.yifu.salary.service.TSalaryEmployeeService;

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

@@ -273,7 +273,7 @@ public class TSalaryStandardServiceImpl extends ServiceImpl<TSalaryStandardMappe
 	}
 
 	@Override
-	public R salaryStandardAudit(String auditFlag, String auditRemark, String id) {
+	public R<Boolean> salaryStandardAudit(String auditFlag, String auditRemark, String id) {
 		YifuUser user = SecurityUtils.getUser();
 		TSalaryStandard tSalaryStandard = baseMapper.selectById(id);
 		if (Common.isNotNull(tSalaryStandard)) {

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

@@ -23,7 +23,6 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;

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

@@ -39,7 +39,6 @@ import com.yifu.cloud.plus.v1.yifu.salary.mapper.TStatisticsLaborMapper;
 import com.yifu.cloud.plus.v1.yifu.salary.service.TStatisticsLaborService;
 import com.yifu.cloud.plus.v1.yifu.salary.vo.TStatisticsLaborSearchVo;
 import com.yifu.cloud.plus.v1.yifu.salary.vo.TStatisticsLaborVo;
-import com.yifu.cloud.plus.v1.yifu.social.entity.TPreDispatchInfo;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.log4j.Log4j2;
 import org.springframework.stereotype.Service;

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

@@ -31,7 +31,6 @@ import com.yifu.cloud.plus.v1.yifu.common.core.util.DateUtil;
 import com.yifu.cloud.plus.v1.yifu.common.core.util.ExcelUtil;
 import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
 import com.yifu.cloud.plus.v1.yifu.salary.entity.TStatisticsDeclarer;
-import com.yifu.cloud.plus.v1.yifu.salary.entity.TStatisticsLabor;
 import com.yifu.cloud.plus.v1.yifu.salary.entity.TStatisticsRemuneration;
 import com.yifu.cloud.plus.v1.yifu.salary.mapper.TStatisticsDeclarerMapper;
 import com.yifu.cloud.plus.v1.yifu.salary.mapper.TStatisticsRemunerationMapper;

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

@@ -16,13 +16,8 @@
  */
 package com.yifu.cloud.plus.v1.yifu.salary.service.impl;
 
-import cn.hutool.core.bean.BeanUtil;
 import com.alibaba.excel.EasyExcel;
 import com.alibaba.excel.ExcelWriter;
-import com.alibaba.excel.context.AnalysisContext;
-import com.alibaba.excel.read.listener.ReadListener;
-import com.alibaba.excel.read.metadata.holder.ReadRowHolder;
-import com.alibaba.excel.util.ListUtils;
 import com.alibaba.excel.write.metadata.WriteSheet;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -30,26 +25,27 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants;
-import com.yifu.cloud.plus.v1.yifu.common.core.util.*;
+import com.yifu.cloud.plus.v1.yifu.common.core.util.Common;
+import com.yifu.cloud.plus.v1.yifu.common.core.util.DateUtil;
+import com.yifu.cloud.plus.v1.yifu.common.core.util.ExcelUtil;
+import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
 import com.yifu.cloud.plus.v1.yifu.common.core.vo.YifuUser;
 import com.yifu.cloud.plus.v1.yifu.common.security.util.SecurityUtils;
 import com.yifu.cloud.plus.v1.yifu.salary.entity.TStatisticsTaxSalary;
 import com.yifu.cloud.plus.v1.yifu.salary.entity.TStatisticsTaxSalaryRule;
 import com.yifu.cloud.plus.v1.yifu.salary.mapper.TStatisticsTaxSalaryMapper;
-import com.yifu.cloud.plus.v1.yifu.salary.service.*;
+import com.yifu.cloud.plus.v1.yifu.salary.service.TStatisticsTaxSalaryRuleService;
+import com.yifu.cloud.plus.v1.yifu.salary.service.TStatisticsTaxSalaryService;
 import com.yifu.cloud.plus.v1.yifu.salary.util.DoStatisticsTask;
 import com.yifu.cloud.plus.v1.yifu.salary.vo.TStatisticsTaxSalarySearchVo;
-import com.yifu.cloud.plus.v1.yifu.salary.vo.TStatisticsTaxSalaryVo;
 import lombok.AllArgsConstructor;
 import lombok.extern.log4j.Log4j2;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 
 import javax.servlet.ServletOutputStream;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
-import java.io.InputStream;
 import java.net.URLEncoder;
 import java.time.LocalDateTime;
 import java.util.ArrayList;

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

@@ -12,7 +12,6 @@ import com.yifu.cloud.plus.v1.yifu.salary.service.TStatisticsCurrentReportServic
 import com.yifu.cloud.plus.v1.yifu.salary.service.TStatisticsTaxSalaryTwoService;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 /**

yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/entity/SysHouseHoldInfo.java

@@ -26,8 +26,6 @@ import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.time.LocalDateTime;
-
 /**
  * 社保户公积金户数据
  *

yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/entity/TPaymentInfoImportLog.java

@@ -21,12 +21,12 @@ import com.alibaba.excel.annotation.ExcelProperty;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute;
 import com.yifu.cloud.plus.v1.yifu.common.mybatis.base.BaseEntity;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute;
 import lombok.NoArgsConstructor;
 import org.hibernate.validator.constraints.Length;
 

yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/vo/TDispatchImportVo.java

@@ -18,8 +18,6 @@ package com.yifu.cloud.plus.v1.yifu.social.vo;
 
 import com.alibaba.excel.annotation.ExcelIgnore;
 import com.alibaba.excel.annotation.ExcelProperty;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
 import com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute;
 import com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttributeConstants;
 import com.yifu.cloud.plus.v1.yifu.common.core.vo.RowIndex;

yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/vo/TDispatchInfoPageVo.java

@@ -17,16 +17,11 @@
 package com.yifu.cloud.plus.v1.yifu.social.vo;
 
 import com.alibaba.excel.annotation.ExcelProperty;
-import com.baomidou.mybatisplus.annotation.TableField;
 import com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute;
 import com.yifu.cloud.plus.v1.yifu.social.entity.TDispatchInfo;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
-import java.time.LocalDateTime;
-import java.util.List;
-import java.util.Set;
-
 /**
  * 派单信息记录表
  *

yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/vo/TDispatchReduceVo.java

@@ -16,7 +16,6 @@
  */
 package com.yifu.cloud.plus.v1.yifu.social.vo;
 
-import com.alibaba.excel.annotation.ExcelIgnore;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute;
 import com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttributeConstants;
@@ -25,10 +24,7 @@ import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import org.hibernate.validator.constraints.Length;
 
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
 import java.io.Serializable;
-import java.math.BigDecimal;
 import java.util.Date;
 
 /**

yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/vo/TPaymentInfoImportLogVo.java

@@ -19,10 +19,10 @@ package com.yifu.cloud.plus.v1.yifu.social.vo;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute;
 import com.yifu.cloud.plus.v1.yifu.common.core.vo.RowIndex;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
-import com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute;
 import org.hibernate.validator.constraints.Length;
 
 import javax.validation.constraints.NotBlank;

yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/vo/TPaymentInfoSearchVo.java

@@ -16,7 +16,6 @@
  */
 package com.yifu.cloud.plus.v1.yifu.social.vo;
 
-import com.baomidou.mybatisplus.annotation.TableField;
 import com.yifu.cloud.plus.v1.yifu.social.entity.TPaymentInfo;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;

yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/vo/TPaymentInfoVo.java

@@ -19,10 +19,10 @@ package com.yifu.cloud.plus.v1.yifu.social.vo;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute;
 import com.yifu.cloud.plus.v1.yifu.common.core.vo.RowIndex;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
-import com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute;
 import org.hibernate.validator.constraints.Length;
 
 import javax.validation.constraints.NotBlank;

yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/vo/TPreDispatchExportVo.java

@@ -11,7 +11,6 @@ import javax.validation.constraints.Size;
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
-import java.util.Date;
 
 @Data
 public class TPreDispatchExportVo implements Serializable {

yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/vo/TPreDispatchImportVo.java

@@ -2,17 +2,14 @@ package com.yifu.cloud.plus.v1.yifu.social.vo;
 
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute;
-import com.yifu.cloud.plus.v1.yifu.common.core.util.LocalDateTimeUtils;
 import com.yifu.cloud.plus.v1.yifu.common.core.vo.RowIndex;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
-import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.time.LocalDate;
-import java.time.LocalDateTime;
 
 @Data
 public class TPreDispatchImportVo extends RowIndex implements Serializable {

yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/vo/TPreDispatchReduceVo.java

@@ -16,9 +16,7 @@
  */
 package com.yifu.cloud.plus.v1.yifu.social.vo;
 
-import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
 import com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
@@ -28,7 +26,6 @@ import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
-import java.util.Date;
 import java.util.List;
 import java.util.Set;
 

yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/vo/TPreDispatchUpdateVo.java

@@ -3,15 +3,12 @@ package com.yifu.cloud.plus.v1.yifu.social.vo;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute;
 import com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttributeConstants;
-import com.yifu.cloud.plus.v1.yifu.common.core.util.DateUtil;
 import com.yifu.cloud.plus.v1.yifu.social.entity.TPreDispatchInfo;
 import lombok.Data;
 import org.hibernate.validator.constraints.Length;
 
-import javax.validation.constraints.DecimalMax;
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
-import java.util.Date;
 
 @Data
 public class TPreDispatchUpdateVo extends TPreDispatchInfo {

yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/vo/TSocialFundInfoExportVo.java

@@ -25,7 +25,6 @@ import com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttributeConstants;
 import com.yifu.cloud.plus.v1.yifu.common.core.vo.RowIndex;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
-import org.hibernate.validator.constraints.Length;
 
 import javax.validation.constraints.Size;
 import java.io.Serializable;

yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/controller/SysBaseSetInfoController.java

@@ -144,7 +144,7 @@ public class SysBaseSetInfoController {
 	@SysLog("禁用启用基数设置表")
 	@PostMapping("/disableOrEnableById")
 	@PreAuthorize("@pms.hasPermission('social_sysbasesetinfo_enable')")
-	public R disableOrEnableById(@RequestParam String id, @RequestParam Integer status) {
+	public R<Boolean> disableOrEnableById(@RequestParam String id, @RequestParam Integer status) {
 		SysBaseSetInfo baseSetInfo = sysBaseSetInfoService.getById(id);
 		if (null == baseSetInfo){
 			return R.failed("无对应ID的数据！");

yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/controller/SysHouseHoldInfoController.java

@@ -23,14 +23,12 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
 import com.yifu.cloud.plus.v1.yifu.common.log.annotation.SysLog;
 import com.yifu.cloud.plus.v1.yifu.social.entity.SysHouseHoldInfo;
+import com.yifu.cloud.plus.v1.yifu.social.service.SysHouseHoldInfoService;
 import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.security.SecurityRequirement;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
-import org.springframework.http.HttpHeaders;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
-import com.yifu.cloud.plus.v1.yifu.social.service.SysHouseHoldInfoService;
 
 import java.util.List;
 
@@ -92,7 +90,7 @@ public class SysHouseHoldInfoController {
     @SysLog("新增社保户公积金户数据" )
     @PostMapping
     @PreAuthorize("@pms.hasPermission('demo_syshouseholdinfo_add')" )
-    public R save(@RequestBody SysHouseHoldInfo sysHouseHoldInfo) {
+    public R<Boolean> save(@RequestBody SysHouseHoldInfo sysHouseHoldInfo) {
         return sysHouseHoldInfoService.saveInfo(sysHouseHoldInfo);
     }
 

yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/controller/TAgentConfigController.java

@@ -25,10 +25,8 @@ import com.yifu.cloud.plus.v1.yifu.common.log.annotation.SysLog;
 import com.yifu.cloud.plus.v1.yifu.social.entity.TAgentConfig;
 import com.yifu.cloud.plus.v1.yifu.social.service.TAgentConfigService;
 import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.security.SecurityRequirement;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
-import org.springframework.http.HttpHeaders;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
@@ -91,7 +89,7 @@ public class TAgentConfigController {
     @SysLog("新增预估临时政策配置表" )
     @PostMapping
     @PreAuthorize("@pms.hasPermission('social_tagentconfig_add')" )
-    public R save(@RequestBody TAgentConfig tAgentConfig) {
+    public R<Boolean> save(@RequestBody TAgentConfig tAgentConfig) {
         return tAgentConfigService.saveInfo(tAgentConfig);
     }
 
@@ -129,7 +127,7 @@ public class TAgentConfigController {
 	@Operation(summary = "通过id删除预估临时政策配置表", description = "通过id删除预估临时政策配置表：hasPermission('social_tagentconfig_del')")
 	@PostMapping("/updateOpenFlagById")
 	@PreAuthorize("@pms.hasPermission('social_tagentconfig_edit')")
-	public R updateOpenFlagById(@RequestParam String id) {
+	public R<Boolean> updateOpenFlagById(@RequestParam String id) {
 		return tAgentConfigService.updateFlagById(id);
 	}
 }

yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/controller/TAuditInfoController.java

@@ -26,11 +26,9 @@ import com.yifu.cloud.plus.v1.yifu.social.entity.TAuditInfo;
 import com.yifu.cloud.plus.v1.yifu.social.service.TAuditInfoService;
 import com.yifu.cloud.plus.v1.yifu.social.vo.TAuditInfoSearchVo;
 import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.security.SecurityRequirement;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
 import lombok.SneakyThrows;
-import org.springframework.http.HttpHeaders;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;

yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/controller/TDispatchInfoController.java

@@ -301,7 +301,6 @@ public class TDispatchInfoController {
 	 * @Description  导出 社保花名册
 	 * @Date 17:40 2022/7/27
 	 * @Param
-	 * @return
 	**/
 	@PostMapping("/doexportSocialRecordRoster")
 	@Operation(description = "导出社保花名册 hasPermission('wxhr:tdispatchinfo_doexportSocialRecordRoster')")

yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/controller/TForecastLibraryController.java

@@ -279,7 +279,6 @@ public class TForecastLibraryController {
 	 * @Description: 定时任务推送社保预估明细的数据
 	 * @Author: huyc
 	 * @Date: 2022/8/30
-	 * @return: void
 	 **/
 	@Operation(summary = "定时生成公积金预估明细的数据", description = "定时生成公积金预估明细的数据")
 	@SysLog("定时生成公积金预估明细的数据")

yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/controller/TPaymentInfoController.java

@@ -23,13 +23,14 @@ 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.log.annotation.SysLog;
 import com.yifu.cloud.plus.v1.yifu.common.security.annotation.Inner;
+import com.yifu.cloud.plus.v1.yifu.salary.vo.HaveSalaryNoSocialSearchVo;
 import com.yifu.cloud.plus.v1.yifu.salary.vo.TPaymentBySalaryVo;
 import com.yifu.cloud.plus.v1.yifu.salary.vo.TPaymentVo;
 import com.yifu.cloud.plus.v1.yifu.salary.vo.UpdateSocialFoundVo;
 import com.yifu.cloud.plus.v1.yifu.social.entity.TPaymentInfo;
 import com.yifu.cloud.plus.v1.yifu.social.service.TPaymentInfoService;
-import com.yifu.cloud.plus.v1.yifu.salary.vo.HaveSalaryNoSocialSearchVo;
 import com.yifu.cloud.plus.v1.yifu.social.vo.TPaymentInfoSearchVo;
+import com.yifu.cloud.plus.v1.yifu.social.vo.TPaymentInfoVo;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.security.SecurityRequirement;
 import io.swagger.v3.oas.annotations.tags.Tag;
@@ -107,7 +108,7 @@ public class TPaymentInfoController {
 	@SysLog("通过id删除缴费库")
 	@DeleteMapping("/{id}")
 	@PreAuthorize("@pms.hasPermission('social_tpaymentinfo_del')")
-	public R removeById(@PathVariable String id) {
+	public R<Boolean> removeById(@PathVariable String id) {
 		return tPaymentInfoService.removeInFoById(id);
 	}
 
@@ -132,7 +133,7 @@ public class TPaymentInfoController {
 	 */
 	@Operation(summary = "通过id查询单条记录")
 	@GetMapping("/allInfo/{id}")
-	public R getAllInfoById(@PathVariable("id") String id) {
+	public R<TPaymentInfoVo> getAllInfoById(@PathVariable("id") String id) {
 		return tPaymentInfoService.getAllInfoById(id);
 	}
 
@@ -207,7 +208,7 @@ public class TPaymentInfoController {
 	@Operation(description = "根据条件批量删除")
 	@SysLog("根据条件批量删除")
 	@PostMapping("/removeBatchByIdsAndType")
-	public R removeBatchByIdsAndType(@RequestParam(name = "empIdCard", required = false) String empIdCard,
+	public R<Boolean> removeBatchByIdsAndType(@RequestParam(name = "empIdCard", required = false) String empIdCard,
 									 @RequestParam(name = "socialHouseId", required = false) String socialHouseId,
 									 @RequestParam(name = "fundHouseId", required = false) String fundHouseId,
 									 @RequestParam(name = "socialCreateMonth", required = false) String socialCreateMonth,

yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/controller/TPaymentInfoImportLogController.java

@@ -25,15 +25,16 @@ import com.yifu.cloud.plus.v1.yifu.common.core.vo.YifuUser;
 import com.yifu.cloud.plus.v1.yifu.common.security.annotation.Inner;
 import com.yifu.cloud.plus.v1.yifu.common.security.util.SecurityUtils;
 import com.yifu.cloud.plus.v1.yifu.social.service.TPaymentInfoImportLogService;
-import org.apache.commons.lang.StringUtils;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.security.SecurityRequirement;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
+import org.apache.commons.lang.StringUtils;
 import org.springframework.http.HttpHeaders;
-import org.springframework.web.bind.annotation.*;
-
-import javax.servlet.http.HttpServletResponse;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 
 /**

yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/controller/TPreDispatchInfoController.java

@@ -33,13 +33,13 @@ import com.yifu.cloud.plus.v1.yifu.social.service.TPreDispatchInfoService;
 import com.yifu.cloud.plus.v1.yifu.social.vo.TPreDispatchExportVo;
 import com.yifu.cloud.plus.v1.yifu.social.vo.TPreDispatchReduceVo;
 import com.yifu.cloud.plus.v1.yifu.social.vo.TPreDispatchUpdateVo;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.security.access.prepost.PreAuthorize;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.security.SecurityRequirement;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.http.HttpHeaders;
+import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletResponse;
@@ -374,7 +374,6 @@ public class TPreDispatchInfoController {
 	 * @Author huyc
 	 * @Date 2022-07-18
 	 * @param preDispatchInfo
-	 * @return
 	 **/
 	@PostMapping("/doexportPreDispatch")
 	@Operation(summary = "导出预派单", description = "导出预派单")

yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/controller/TSocialFundHistoryController.java

@@ -26,11 +26,9 @@ import com.yifu.cloud.plus.v1.yifu.social.entity.TSocialFundHistory;
 import com.yifu.cloud.plus.v1.yifu.social.service.TSocialFundHistoryService;
 import com.yifu.cloud.plus.v1.yifu.social.vo.TSocialFundHistorySearchVo;
 import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.security.SecurityRequirement;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
 import lombok.SneakyThrows;
-import org.springframework.http.HttpHeaders;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;

yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/mapper/SysPayProportionMapper.java

@@ -20,9 +20,9 @@ package com.yifu.cloud.plus.v1.yifu.social.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yifu.cloud.plus.v1.yifu.social.entity.SysPayProportion;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
-import com.yifu.cloud.plus.v1.yifu.social.entity.SysPayProportion;
 
 import java.util.List;
 

yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/mapper/TDispatchInfoMapper.java

@@ -20,7 +20,6 @@ package com.yifu.cloud.plus.v1.yifu.social.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
 import com.yifu.cloud.plus.v1.yifu.social.entity.TDispatchInfo;
 import com.yifu.cloud.plus.v1.yifu.social.vo.*;
 import org.apache.ibatis.annotations.Mapper;

yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/mapper/TIncomeMapper.java

@@ -20,8 +20,6 @@ package com.yifu.cloud.plus.v1.yifu.social.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.yifu.cloud.plus.v1.yifu.salary.vo.SysMessageSalaryExportVo;
-import com.yifu.cloud.plus.v1.yifu.salary.vo.SysMessageSalarySearchVo;
 import com.yifu.cloud.plus.v1.yifu.social.entity.TIncome;
 import com.yifu.cloud.plus.v1.yifu.social.vo.IncomeExportVo;
 import com.yifu.cloud.plus.v1.yifu.social.vo.TIncomeSearchVo;

yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/SysHouseHoldInfoService.java

@@ -43,5 +43,5 @@ public interface SysHouseHoldInfoService extends IService<SysHouseHoldInfo> {
 	 * @param sysHouseHoldInfo 社保户公积金户数据
 	 * @return R
 	 */
-	R saveInfo (SysHouseHoldInfo sysHouseHoldInfo);
+	R<Boolean> saveInfo (SysHouseHoldInfo sysHouseHoldInfo);
 }

yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/TAgentConfigService.java

@@ -43,12 +43,12 @@ public interface TAgentConfigService extends IService<TAgentConfig> {
 	 * @param id 预估临时政策配置表id
 	 * @return
 	 */
-	R updateFlagById(String id);
+	R<Boolean> updateFlagById(String id);
 
 	/**
 	 * 修改开启关闭状态
 	 * @param tAgentConfig 预估临时政策配置表id
 	 * @return
 	 */
-	R saveInfo(TAgentConfig tAgentConfig);
+	R<Boolean> saveInfo(TAgentConfig tAgentConfig);
 }

yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/TDispatchDayConfService.java

@@ -20,10 +20,11 @@ package com.yifu.cloud.plus.v1.yifu.social.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.social.entity.TDispatchDayConf;
 import com.yifu.cloud.plus.v1.yifu.social.vo.TDispatchDayConfSearchVo;
-import com.yifu.cloud.plus.v1.yifu.common.core.util.ErrorMessage;
+
 import javax.servlet.http.HttpServletResponse;
 import java.io.InputStream;
 import java.util.List;

yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/TDispatchInfoService.java

@@ -20,11 +20,11 @@ package com.yifu.cloud.plus.v1.yifu.social.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.common.core.vo.YifuUser;
 import com.yifu.cloud.plus.v1.yifu.social.entity.TDispatchInfo;
 import com.yifu.cloud.plus.v1.yifu.social.vo.*;
-import com.yifu.cloud.plus.v1.yifu.common.core.util.ErrorMessage;
 import org.apache.shardingsphere.transaction.annotation.ShardingTransactionType;
 import org.apache.shardingsphere.transaction.core.TransactionType;
 import org.springframework.transaction.annotation.Transactional;

yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/TPaymentInfoImportLogService.java

@@ -20,8 +20,6 @@ package com.yifu.cloud.plus.v1.yifu.social.service;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.yifu.cloud.plus.v1.yifu.social.entity.TPaymentInfoImportLog;
 
-import javax.servlet.http.HttpServletResponse;
-
 /**
  * 
  *
@@ -30,13 +28,4 @@ import javax.servlet.http.HttpServletResponse;
  */
 public interface TPaymentInfoImportLogService extends IService<TPaymentInfoImportLog> {
 
-	/**
-	 * @description: 导出社保导入日志
-	 * @param response
-	 * @param random
-	 * @return: void
-	 * @author: huyc
-	 * @date: 2022/7/25
-	 */
-	String exportPaymentInfoLog(HttpServletResponse response, String random);
 }

yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/TPaymentInfoService.java

@@ -25,6 +25,7 @@ import com.yifu.cloud.plus.v1.yifu.salary.vo.TPaymentVo;
 import com.yifu.cloud.plus.v1.yifu.salary.vo.UpdateSocialFoundVo;
 import com.yifu.cloud.plus.v1.yifu.social.entity.TPaymentInfo;
 import com.yifu.cloud.plus.v1.yifu.social.vo.TPaymentInfoSearchVo;
+import com.yifu.cloud.plus.v1.yifu.social.vo.TPaymentInfoVo;
 
 import javax.servlet.http.HttpServletResponse;
 import java.io.InputStream;
@@ -82,7 +83,7 @@ public interface TPaymentInfoService extends IService<TPaymentInfo> {
 	 * @param id
 	 * @return
 	 **/
-	R removeInFoById(String id);
+	R<Boolean> removeInFoById(String id);
 
 	/**
 	 * 删除缴费库数据 包括明细
@@ -100,7 +101,7 @@ public interface TPaymentInfoService extends IService<TPaymentInfo> {
 	 * @param id
 	 * @return
 	 **/
-	R getAllInfoById(String id);
+	R<TPaymentInfoVo> getAllInfoById(String id);
 
 	/**
 	 * 根据条件批量删除
@@ -113,7 +114,7 @@ public interface TPaymentInfoService extends IService<TPaymentInfo> {
 	 * @param socialPayMonth    缴纳月份
 	 * @return
 	 **/
-	R removeBatchByInfo(String empIdCard, String socialHouseId, String fundHouseId,
+	R<Boolean> removeBatchByInfo(String empIdCard, String socialHouseId, String fundHouseId,
 						String socialCreateMonth, String socialPayMonth);
 
 	/**

yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/TPreDispatchInfoService.java

@@ -97,7 +97,7 @@ public interface TPreDispatchInfoService extends IService<TPreDispatchInfo> {
 	 * @Date 2022-07-18
 	 * @return
 	 **/
-	R update(TPreDispatchInfo tPreDispatchInfo);
+	R<Boolean> update(TPreDispatchInfo tPreDispatchInfo);
 
 	/**
 	 * 预派单批量新增派增

yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/TProvidentFundService.java

@@ -20,10 +20,11 @@ package com.yifu.cloud.plus.v1.yifu.social.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.social.entity.TProvidentFund;
 import com.yifu.cloud.plus.v1.yifu.social.vo.TProvidentFundSearchVo;
-import com.yifu.cloud.plus.v1.yifu.common.core.util.ErrorMessage;
+
 import javax.servlet.http.HttpServletResponse;
 import java.io.InputStream;
 import java.util.List;

yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/TSocialFundHistoryService.java

@@ -20,10 +20,11 @@ package com.yifu.cloud.plus.v1.yifu.social.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.social.entity.TSocialFundHistory;
 import com.yifu.cloud.plus.v1.yifu.social.vo.TSocialFundHistorySearchVo;
-import com.yifu.cloud.plus.v1.yifu.common.core.util.ErrorMessage;
+
 import javax.servlet.http.HttpServletResponse;
 import java.io.InputStream;
 import java.util.List;

yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/SysHouseHoldInfoServiceImpl.java

@@ -53,7 +53,7 @@ public class SysHouseHoldInfoServiceImpl extends ServiceImpl<SysHouseHoldInfoMap
 	 * @return
 	 */
 	@Override
-	public R saveInfo(SysHouseHoldInfo sysHouseHoldInfo) {
+	public R<Boolean> saveInfo(SysHouseHoldInfo sysHouseHoldInfo) {
 
 		SysHouseHoldInfo info = this.getOne(Wrappers.<SysHouseHoldInfo>query().lambda()
 					.eq(SysHouseHoldInfo::getType,sysHouseHoldInfo.getType())

yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TAgentConfigServiceImpl.java

@@ -16,7 +16,6 @@
  */
 package com.yifu.cloud.plus.v1.yifu.social.service.impl;
 
-import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -52,7 +51,7 @@ public class TAgentConfigServiceImpl extends ServiceImpl<TAgentConfigMapper, TAg
     }
 
 	@Override
-	public R updateFlagById(String id) {
+	public R<Boolean> updateFlagById(String id) {
 		if (!Common.isNotNull(id)){
 			return R.failed("id不可为空！");
 		}
@@ -74,7 +73,7 @@ public class TAgentConfigServiceImpl extends ServiceImpl<TAgentConfigMapper, TAg
 	}
 
 	@Override
-	public R saveInfo(TAgentConfig tAgentConfig) {
+	public R<Boolean> saveInfo(TAgentConfig tAgentConfig) {
 		LambdaQueryWrapper<TAgentConfig> wrapper = Wrappers.lambdaQuery();
 		wrapper.eq(TAgentConfig::getYear, tAgentConfig.getYear());
 		wrapper.eq(TAgentConfig::getTarget, tAgentConfig.getTarget());

yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TAuditInfoServiceImpl.java

@@ -169,7 +169,7 @@ public class TAuditInfoServiceImpl extends ServiceImpl<TAuditInfoMapper, TAuditI
     @Override
     public R<List<ErrorMessage>> importDiy(InputStream inputStream) {
         List<ErrorMessage> errorMessageList = new ArrayList<>();
-        ExcelUtil<TAuditInfoVo> util1 = new ExcelUtil<>(TAuditInfoVo.class);;
+        ExcelUtil<TAuditInfoVo> util1 = new ExcelUtil<>(TAuditInfoVo.class);
         // 写法2：
         // 匿名内部类 不用额外写一个DemoDataListener
         // 这里 需要指定读用哪个class去读，然后读取第一个sheet 文件流会自动关闭
@@ -223,7 +223,6 @@ public class TAuditInfoServiceImpl extends ServiceImpl<TAuditInfoMapper, TAuditI
     }
     private void importTAuditInfo(List<TAuditInfoVo> excelVOList, List<ErrorMessage> errorMessageList) {
         // 个性化校验逻辑
-        ErrorMessage errorMsg;
         // 执行数据插入操作 组装
         for (int i = 0; i < excelVOList.size(); i++) {
             TAuditInfoVo excel = excelVOList.get(i);

yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TDispatchDayConfServiceImpl.java

@@ -170,7 +170,7 @@ public class TDispatchDayConfServiceImpl extends ServiceImpl<TDispatchDayConfMap
     @Override
     public R<List<ErrorMessage>> importDiy(InputStream inputStream) {
         List<ErrorMessage> errorMessageList = new ArrayList<>();
-        ExcelUtil<TDispatchDayConfVo> util1 = new ExcelUtil<>(TDispatchDayConfVo.class);;
+        ExcelUtil<TDispatchDayConfVo> util1 = new ExcelUtil<>(TDispatchDayConfVo.class);
         // 写法2：
         // 匿名内部类 不用额外写一个DemoDataListener
         // 这里 需要指定读用哪个class去读，然后读取第一个sheet 文件流会自动关闭
@@ -224,7 +224,6 @@ public class TDispatchDayConfServiceImpl extends ServiceImpl<TDispatchDayConfMap
     }
     private void importTDispatchDayConf(List<TDispatchDayConfVo> excelVOList, List<ErrorMessage> errorMessageList) {
         // 个性化校验逻辑
-        ErrorMessage errorMsg;
         // 执行数据插入操作 组装
         for (int i = 0; i < excelVOList.size(); i++) {
             TDispatchDayConfVo excel = excelVOList.get(i);

yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TDispatchInfoServiceImpl.java

@@ -336,7 +336,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 		Map<String,TDispatchInfo> dispatchMap = new HashMap<>();
 		// 新增社保公积金查询
 		Map<String,TSocialFundInfo> socialFundAddMap = new HashMap<>();
-		DispatchEmpVo empVo = null;
+		DispatchEmpVo empVo;
 		SysBaseSetInfo socialSet;
 		SysBaseSetInfo fundSet;
 		ProjectSetInfoVo setInfoVo = null;
@@ -483,11 +483,11 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 		Map<String, EmpContractDispatchVo> contractsMap = null;
 		Map<String, EmpProjectDispatchVo> projectsMap = null;
 		TDispatchImportVo excel;
-		EmpContractDispatchVo contract = null;
-		EmpProjectDispatchVo project = null;
+		EmpContractDispatchVo contract;
+		EmpProjectDispatchVo project;
 		EmpAddDispatchVo emp = null;
-		TSocialInfo social = null;
-		TProvidentFund fund = null;
+		TSocialInfo social;
+		TProvidentFund fund;
 		TSocialFundInfo socialFund = null;
 		TDispatchInfo dispatch = null;
 		if (Common.isNotNull(res) && Common.isNotNull(res.getData())){
@@ -578,7 +578,6 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 				errorMessageList.add(new ErrorMessage(excel.getRowIndex(), "派单新增异常："+e.getMessage()));
 				continue;
 			}
-			//errorMessageList.add(new ErrorMessage(excel.getRowIndex(), CommonConstants.SAVE_SUCCESS,CommonConstants.GREEN));
 		}
 		// 清理map list 等数据
 		Common.clear(empAddsMap);
@@ -966,22 +965,27 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 	private synchronized String getApplyCode() {
 		String nowDay = DateUtil.getThisDay();
 		Cache cache = cacheManager.getCache(CacheConstants.EVERYDAY_DISPATCH_CODE);
-		Object nowNumObj = cache.get(nowDay);
+		Object nowNumObj = null;
 		int nowNums = 1;
-		if (Common.isNotNull(nowNumObj)) {
-			SimpleValueWrapper value = (SimpleValueWrapper) nowNumObj;
-			nowNums = (Integer) value.get() + 1;
-		} else {
-			String code = null;
-			try {
-				code = baseMapper.getMaxDispatchCode();
-				nowNums = Integer.parseInt(code) + 1;
-			} catch (NumberFormatException e) {
-				log.error("获取申请编码当日最大编码时出错：" + code);
-				nowNums = 1;
+		if (Common.isNotNull(cache)){
+			nowNumObj = null==nowDay?null:cache.get(nowDay);
+			if (Common.isNotNull(nowNumObj)) {
+				SimpleValueWrapper value = (SimpleValueWrapper) nowNumObj;
+				if (Common.isNotNull(value)){
+					nowNums = (Integer) value.get() + 1;
+				}
+			} else {
+				String code = null;
+				try {
+					code = baseMapper.getMaxDispatchCode();
+					nowNums = Integer.parseInt(code) + 1;
+				} catch (NumberFormatException e) {
+					log.error("获取申请编码当日最大编码时出错：" + code);
+					nowNums = 1;
+				}
 			}
+			cache.put(nowDay, nowNums);
 		}
-		cache.put(nowDay, nowNums);
 		return "PD" + nowDay + this.getFourNum(String.valueOf(nowNums));
 	}
 

yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TForecastLibraryServiceImpl.java

@@ -28,7 +28,6 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants;
 import com.yifu.cloud.plus.v1.yifu.common.core.util.*;
 import com.yifu.cloud.plus.v1.yifu.common.core.vo.YifuUser;
-import com.yifu.cloud.plus.v1.yifu.common.dapr.util.UpmsDaprUtils;
 import com.yifu.cloud.plus.v1.yifu.common.security.util.SecurityUtils;
 import com.yifu.cloud.plus.v1.yifu.ekp.util.EkpFundUtil;
 import com.yifu.cloud.plus.v1.yifu.ekp.util.EkpSocialUtil;

yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TIncomeServiceImpl.java

@@ -17,7 +17,6 @@
 package com.yifu.cloud.plus.v1.yifu.social.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
-import cn.hutool.core.util.ArrayUtil;
 import com.alibaba.excel.EasyExcel;
 import com.alibaba.excel.ExcelWriter;
 import com.alibaba.excel.context.AnalysisContext;
@@ -25,16 +24,11 @@ import com.alibaba.excel.read.listener.ReadListener;
 import com.alibaba.excel.read.metadata.holder.ReadRowHolder;
 import com.alibaba.excel.util.ListUtils;
 import com.alibaba.excel.write.metadata.WriteSheet;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants;
 import com.yifu.cloud.plus.v1.yifu.common.core.util.*;
-import com.yifu.cloud.plus.v1.yifu.common.dapr.util.UpmsDaprUtils;
-import com.yifu.cloud.plus.v1.yifu.salary.vo.SysMessageSalaryExportVo;
-import com.yifu.cloud.plus.v1.yifu.salary.vo.SysMessageSalarySearchVo;
 import com.yifu.cloud.plus.v1.yifu.social.entity.TIncome;
 import com.yifu.cloud.plus.v1.yifu.social.entity.TIncomeDetail;
 import com.yifu.cloud.plus.v1.yifu.social.mapper.TIncomeMapper;
@@ -44,7 +38,6 @@ import com.yifu.cloud.plus.v1.yifu.social.vo.IncomeExportVo;
 import com.yifu.cloud.plus.v1.yifu.social.vo.TIncomeSearchVo;
 import com.yifu.cloud.plus.v1.yifu.social.vo.TIncomeVo;
 import lombok.extern.log4j.Log4j2;
-import org.apache.poi.ss.formula.functions.T;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -216,7 +209,6 @@ public class TIncomeServiceImpl extends ServiceImpl<TIncomeMapper, TIncome> impl
 
 	private void importTIncome(List<TIncomeVo> excelVOList, List<ErrorMessage> errorMessageList) {
 		// 个性化校验逻辑
-		ErrorMessage errorMsg;
 		// 执行数据插入操作 组装
 		for (int i = 0; i < excelVOList.size(); i++) {
 			TIncomeVo excel = excelVOList.get(i);
@@ -290,7 +282,6 @@ public class TIncomeServiceImpl extends ServiceImpl<TIncomeMapper, TIncome> impl
 			// 商险Map
 			Map<String, Integer> insureMap = new HashMap<>();
 			Integer nums;
-			Integer maxNum;
 			for (TIncomeDetail detail : detailList) {
 				nums = numMap.get(detail.getPayMonth() + CommonConstants.DOWN_LINE_STRING + detail.getSourceType()
 						+ CommonConstants.DOWN_LINE_STRING + detail.getFeeType()

yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TPaymentInfoImportLogServiceImpl.java

@@ -19,7 +19,6 @@ package com.yifu.cloud.plus.v1.yifu.social.service.impl;
 import com.alibaba.excel.EasyExcel;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.yifu.cloud.plus.v1.yifu.archives.vo.EmployeeProjectExportVO;
 import com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants;
 import com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute;
 import com.yifu.cloud.plus.v1.yifu.common.core.util.Common;
@@ -59,7 +58,6 @@ public class TPaymentInfoImportLogServiceImpl extends ServiceImpl<TPaymentInfoIm
 	 * @author: huyc
 	 * @date: 2022/7/25
 	 */
-	@Override
 	public String exportPaymentInfoLog(HttpServletResponse response, String random) {
 
 		String fileName = "社保导入日志" + DateUtil.getThisTime() + ".xlsx";

yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TPaymentInfoServiceImpl.java

@@ -16,15 +16,25 @@ package com.yifu.cloud.plus.v1.yifu.social.service.impl;/*
  */
 
 import cn.hutool.core.collection.CollUtil;
+import com.alibaba.excel.EasyExcel;
+import com.alibaba.excel.ExcelWriter;
+import com.alibaba.excel.context.AnalysisContext;
 import com.alibaba.excel.read.listener.ReadListener;
+import com.alibaba.excel.read.metadata.holder.ReadRowHolder;
+import com.alibaba.excel.util.ListUtils;
+import com.alibaba.excel.write.metadata.WriteSheet;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.yifu.cloud.plus.v1.yifu.admin.api.entity.SysArea;
 import com.yifu.cloud.plus.v1.yifu.admin.api.vo.AreaVo;
+import com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants;
 import com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttributeConstants;
 import com.yifu.cloud.plus.v1.yifu.common.core.exception.ErrorCodes;
+import com.yifu.cloud.plus.v1.yifu.common.core.util.*;
 import com.yifu.cloud.plus.v1.yifu.common.core.vo.YifuUser;
-import com.yifu.cloud.plus.v1.yifu.common.dapr.util.ArchivesDaprUtil;
 import com.yifu.cloud.plus.v1.yifu.common.dapr.util.UpmsDaprUtils;
 import com.yifu.cloud.plus.v1.yifu.common.security.util.SecurityUtils;
 import com.yifu.cloud.plus.v1.yifu.ekp.util.EkpFundUtil;
@@ -39,7 +49,6 @@ import com.yifu.cloud.plus.v1.yifu.social.constants.PaymentConstants;
 import com.yifu.cloud.plus.v1.yifu.social.constants.SocialConstants;
 import com.yifu.cloud.plus.v1.yifu.social.entity.*;
 import com.yifu.cloud.plus.v1.yifu.social.mapper.*;
-import com.yifu.cloud.plus.v1.yifu.social.service.TPaymentInfoImportLogService;
 import com.yifu.cloud.plus.v1.yifu.social.service.TPaymentInfoService;
 import com.yifu.cloud.plus.v1.yifu.social.vo.TPaymentHeFeiVo;
 import com.yifu.cloud.plus.v1.yifu.social.vo.TPaymentInfoSearchVo;
@@ -47,30 +56,18 @@ import com.yifu.cloud.plus.v1.yifu.social.vo.TPaymentInfoVo;
 import lombok.extern.log4j.Log4j2;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import com.yifu.cloud.plus.v1.yifu.common.core.util.ErrorMessage;
-import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
 
+import javax.servlet.ServletOutputStream;
 import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
 import java.io.InputStream;
 import java.math.BigDecimal;
-import java.text.NumberFormat;
-import java.util.*;
-
-import com.alibaba.excel.EasyExcel;
-import com.alibaba.excel.ExcelWriter;
-import com.alibaba.excel.context.AnalysisContext;
-import com.alibaba.excel.read.metadata.holder.ReadRowHolder;
-import com.alibaba.excel.util.ListUtils;
-import com.alibaba.excel.write.metadata.WriteSheet;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-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.*;
-
-import javax.servlet.ServletOutputStream;
-import java.io.IOException;
 import java.net.URLEncoder;
+import java.text.NumberFormat;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.UUID;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.atomic.AtomicInteger;
@@ -95,9 +92,6 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
 	@Autowired
 	private UpmsDaprUtils upmsDaprUtils;
 
-	@Autowired
-	private TPaymentInfoImportLogService tPaymentInfoImportLogService;
-
 	@Autowired
 	private TSocialFundInfoMapper socialFundInfoMapper;
 
@@ -109,9 +103,6 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
 
 	private final int partSize = 30;
 
-	@Autowired
-	private ArchivesDaprUtil archivesDaprUtil;
-
 	@Autowired
 	private SysHouseHoldInfoMapper sysHouseHoldInfoMapper;
 
@@ -198,7 +189,7 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
 	}
 
 	@Override
-	public R removeInFoById(String id) {
+	public R<Boolean> removeInFoById(String id) {
 		YifuUser user = SecurityUtils.getUser();
 
 		TPaymentInfo paymentInfo = baseMapper.selectById(id);
@@ -225,7 +216,7 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
 			return R.failed(CommonConstants.NO_DATA_TO_HANDLE);
 		}
 		List<String> idList = Common.initStrToList(ids, CommonConstants.COMMA_STRING);
-		TPaymentInfo paymentInfo = null;
+		TPaymentInfo paymentInfo;
 
 		for (String id : idList) {
 			paymentInfo = baseMapper.selectById(id);
@@ -252,13 +243,13 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
 	 * @Date 2022-07-24
 	 **/
 	@Override
-	public R getAllInfoById(String id) {
+	public R<TPaymentInfoVo> getAllInfoById(String id) {
 		TPaymentInfoVo vo = baseMapper.getAllInfoById(id);
 		return R.ok(vo, "查询成功！");
 	}
 
 	@Override
-	public R removeBatchByInfo(String empIdCard, String socialHouseId, String fundHouseId,
+	public R<Boolean> removeBatchByInfo(String empIdCard, String socialHouseId, String fundHouseId,
 							   String socialCreateMonth, String socialPayMonth) {
 		YifuUser user = SecurityUtils.getUser();
 
@@ -316,7 +307,7 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
 		}
 		if (Common.isNotNull(socialPayMonth)) {
 			wrapper.eq(TPaymentInfo::getSocialPayMonth, socialPayMonth).or()
-					.eq(TPaymentInfo::getProvidentPayMonth, socialPayMonth);;
+					.eq(TPaymentInfo::getProvidentPayMonth, socialPayMonth);
 		}
 		return wrapper;
 	}
@@ -326,7 +317,6 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
 		YifuUser user = SecurityUtils.getUser();
 		List<ErrorMessage> errorMessageList = new ArrayList<>();
 		ExcelUtil<TPaymentInfoVo> util1 = new ExcelUtil<>(TPaymentInfoVo.class);
-		;
 		// 写法2：
 		// 匿名内部类 不用额外写一个DemoDataListener
 		// 这里 需要指定读用哪个class去读，然后读取第一个sheet 文件流会自动关闭
@@ -388,8 +378,8 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
 										  String random, YifuUser user, Integer rowNumber) {
 		long start = System.currentTimeMillis();
 
-		HashMap<String, String> areaMap = new HashMap<String, String>();
-		HashMap<String, String> areaMap2 = new HashMap<String, String>();
+		HashMap<String, String> areaMap = new HashMap<>();
+		HashMap<String, String> areaMap2 = new HashMap<>();
 		R<AreaVo> areaListR = upmsDaprUtils.getAreaListR();
 		if (Common.isNotNull(areaListR)) {
 			AreaVo areaList = areaListR.getData();
@@ -657,7 +647,7 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
 		if (null == areaArray || null == areaMap2 || null == s) {
 			return s;
 		}
-		String temp = null;
+		String temp;
 		if (areaArray.length >= CommonConstants.TWO_INT) {
 			temp = areaMap2.get(areaArray[0] + CommonConstants.DOWN_LINE_STRING + "null");
 			if (Common.isNotNull(temp)) {

yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TPreDispatchInfoServiceImpl.java

@@ -50,7 +50,10 @@ import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.net.URLEncoder;
 import java.time.LocalDateTime;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 /**
  * 预派单记录

yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TProvidentFundServiceImpl.java

@@ -170,7 +170,7 @@ public class TProvidentFundServiceImpl extends ServiceImpl<TProvidentFundMapper,
     @Override
     public R<List<ErrorMessage>> importDiy(InputStream inputStream) {
         List<ErrorMessage> errorMessageList = new ArrayList<>();
-        ExcelUtil<TProvidentFundVo> util1 = new ExcelUtil<>(TProvidentFundVo.class);;
+        ExcelUtil<TProvidentFundVo> util1 = new ExcelUtil<>(TProvidentFundVo.class);
         // 写法2：
         // 匿名内部类 不用额外写一个DemoDataListener
         // 这里 需要指定读用哪个class去读，然后读取第一个sheet 文件流会自动关闭
@@ -224,7 +224,6 @@ public class TProvidentFundServiceImpl extends ServiceImpl<TProvidentFundMapper,
     }
     private void importTProvidentFund(List<TProvidentFundVo> excelVOList, List<ErrorMessage> errorMessageList) {
         // 个性化校验逻辑
-        ErrorMessage errorMsg;
         // 执行数据插入操作 组装
         for (int i = 0; i < excelVOList.size(); i++) {
             TProvidentFundVo excel = excelVOList.get(i);

yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TSocialFundInfoServiceImpl.java

@@ -41,7 +41,10 @@ import com.yifu.cloud.plus.v1.yifu.social.constants.SocialConstants;
 import com.yifu.cloud.plus.v1.yifu.social.entity.*;
 import com.yifu.cloud.plus.v1.yifu.social.mapper.TSocialFundInfoMapper;
 import com.yifu.cloud.plus.v1.yifu.social.service.*;
-import com.yifu.cloud.plus.v1.yifu.social.vo.*;
+import com.yifu.cloud.plus.v1.yifu.social.vo.TSocialFundHistoryVo;
+import com.yifu.cloud.plus.v1.yifu.social.vo.TSocialFundInfoDetailVo;
+import com.yifu.cloud.plus.v1.yifu.social.vo.TSocialFundInfoExportVo;
+import com.yifu.cloud.plus.v1.yifu.social.vo.TSocialFundInfoSearchVo;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.log4j.Log4j2;
 import org.springframework.stereotype.Service;
@@ -279,8 +282,8 @@ public class TSocialFundInfoServiceImpl extends ServiceImpl<TSocialFundInfoMappe
 		Map<String, SysBaseSetInfo> socialSetInfoMap = sysBaseSetInfoService.getSysBaseSetInfoMap(CommonConstants.ZERO_STRING);
 		Map<String, SysBaseSetInfo> fundSetInfoMap = sysBaseSetInfoService.getSysBaseSetInfoMap(CommonConstants.ONE_STRING);
 		// 社保基数配置
-		SysBaseSetInfo socialSetInfo = null;
-		SysBaseSetInfo fundSetInfo = null;
+		SysBaseSetInfo socialSetInfo;
+		SysBaseSetInfo fundSetInfo;
 		for (int i = 0; i < excelVOList.size(); i++) {
 			isSocial = false;
 			isFund = false;

yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TSocialInfoServiceImpl.java

@@ -169,7 +169,7 @@ public class TSocialInfoServiceImpl extends ServiceImpl<TSocialInfoMapper, TSoci
     @Override
     public R<List<ErrorMessage>> importDiy(InputStream inputStream) {
         List<ErrorMessage> errorMessageList = new ArrayList<>();
-        ExcelUtil<TSocialInfoVo> util1 = new ExcelUtil<>(TSocialInfoVo.class);;
+        ExcelUtil<TSocialInfoVo> util1 = new ExcelUtil<>(TSocialInfoVo.class);
         // 写法2：
         // 匿名内部类 不用额外写一个DemoDataListener
         // 这里 需要指定读用哪个class去读，然后读取第一个sheet 文件流会自动关闭
@@ -223,7 +223,6 @@ public class TSocialInfoServiceImpl extends ServiceImpl<TSocialInfoMapper, TSoci
     }
     private void importTSocialInfo(List<TSocialInfoVo> excelVOList, List<ErrorMessage> errorMessageList) {
         // 个性化校验逻辑
-        ErrorMessage errorMsg;
         // 执行数据插入操作 组装
         for (int i = 0; i < excelVOList.size(); i++) {
             TSocialInfoVo excel = excelVOList.get(i);