优化导入，精简字段

yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/controller/TSettleDomainController.java

@@ -216,7 +216,7 @@ public class TSettleDomainController {
 	 **/
 	@Inner
 	@PostMapping("/inner/getSettleDomainVoById")
-	public TSettleDomainSelectVo getSettleDomainVoById(@RequestParam String id) {
+	public TSettleDomainSelectVo getSettleDomainVoById(@RequestBody String id) {
 		return tSettleDomainService.getSettleDomainVoById(id);
 	}
 

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

-package com.yifu.cloud.plus.v1.yifu.salary.vo;
-
-import com.yifu.cloud.plus.v1.yifu.common.core.util.ErrorMessage;
-import lombok.Getter;
-import lombok.Setter;
-import lombok.ToString;
-
-import java.io.Serializable;
-import java.util.List;
-
-/**
- * @Description: 工资导入的返回vo
- * @Author: hgw
- * @Date: 2021/11/2 15:22
- * @return:
- **/
-@Getter
-@Setter
-@ToString
-public class SalaryUploadReturnVo implements Serializable {
-	/**
-	 * 用于返回错误信息
-	 */
-	private List<ErrorMessage> errorInfo;
-
-	// 重复数据
-	private List<ErrorMessage> repeatInfo;
-
-}

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

@@ -42,8 +42,8 @@ public class SalaryUploadController {
 	@SysLog("上传薪资表")
 	@PostMapping("/upload")
 	public R upload(@RequestBody String jsonString, @RequestParam String settleDepart, @RequestParam String configId
-			, @RequestParam String salaryType, @RequestParam int repeatFlag) {
-		return salaryUploadService.salaryUpload(jsonString, settleDepart, configId, salaryType, repeatFlag);
+			, @RequestParam String salaryType) {
+		return salaryUploadService.salaryUpload(jsonString, settleDepart, configId, salaryType);
 	}
 
 	/**

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

@@ -18,13 +18,13 @@ public interface SalaryUploadService extends IService<TSalaryStandard> {
 
 	/**
 	 * @param jsonString
-	 * @param repeatFlag 默认 0：不允许重复导入已存在系统内的数据；1：允许重复导入
+	 *repeatFlag 默认 0：不允许重复导入已存在系统内的数据；1：允许重复导入
 	 * @Description: 普通工资上传
 	 * @Author: hgw
 	 * @Date: 2019/9/4 15:58
 	 * @return: com.yifu.cloud.v1.common.core.util.R
 	 **/
-	R salaryUpload(String jsonString, String settleDepart, String configId, String formType, int repeatFlag);
+	R salaryUpload(String jsonString, String settleDepart, String configId, String formType);
 
 	/**
 	 * @param savList

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

@@ -93,12 +93,10 @@ public class SalaryUploadServiceImpl extends ServiceImpl<TSalaryStandardMapper,
 	 * @return: com.yifu.cloud.v1.common.core.util.R
 	 **/
 	@Override
-	public R salaryUpload(String jsonString, String settleDepart, String configId, String salaryType, int repeatFlag) {
+	public R salaryUpload(String jsonString, String settleDepart, String configId, String salaryType) {
 		if (Common.isNotNull(jsonString) && Common.isNotNull(settleDepart) && Common.isNotNull(configId) && Common.isNotNull(salaryType)) {
-			TSettleDomainSelectVo deptVo = new TSettleDomainSelectVo();
-			deptVo.setId(settleDepart);
 			R<TSettleDomainSelectVo> sdr = HttpDaprUtil.invokeMethodPost(archivesProperties.getAppUrl(), archivesProperties.getAppId()
-					, "/tsettledomain/inner/getSettleDomainVoById", deptVo, TSettleDomainSelectVo.class, SecurityConstants.FROM_IN);
+					, "/tsettledomain/inner/getSettleDomainVoById", settleDepart, TSettleDomainSelectVo.class, SecurityConstants.FROM_IN);
 			// 结算主体
 			TSettleDomainSelectVo dept = null;
 			if (sdr != null && sdr.getData() != null) {
@@ -164,15 +162,11 @@ public class SalaryUploadServiceImpl extends ServiceImpl<TSalaryStandardMapper,
 				Map<String, Integer> checkMap = tSalaryAccountService.getAccountCheckMap(dept.getId(), DateUtil.addMonth(configSalary.getSalaryMonth()));
 				util1.getJsonStringToList(user, jsonString,
 						dept, configSalary, salaryConfigMap, isMustMap, empIdCardMap, empNameMap, isDuplicateName
-						, salaryType, invoiceTitle, employeeService, checkMap, repeatFlag, ownEmployeeMap, ownDeptMap, tSalaryAccountService);
+						, salaryType, invoiceTitle, employeeService, checkMap, ownEmployeeMap, ownDeptMap, tSalaryAccountService);
 				List<TSalaryAccountVo> saList = util1.getEntityList();
 
-				SalaryUploadReturnVo returnVo = new SalaryUploadReturnVo();
-				if ((null != util1.getErrorInfo() && !util1.getErrorInfo().isEmpty())
-						|| (null != util1.getRepeatInfo() && !util1.getRepeatInfo().isEmpty())) {
-					returnVo.setErrorInfo(util1.getErrorInfo());
-					returnVo.setRepeatInfo(util1.getRepeatInfo());
-					return R.failed(returnVo);
+				if ((null != util1.getErrorInfo() && !util1.getErrorInfo().isEmpty())) {
+					return R.failed(util1.getErrorInfo());
 				} else {
 					if (null != saList && !saList.isEmpty()) {
 						// return R.ok(saList)

yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/util/SalaryAccountUtil.java

@@ -49,9 +49,6 @@ public class SalaryAccountUtil implements Serializable {
 	 */
 	private List<ErrorMessage> errorInfo;
 
-	// 重复数据
-	private List<ErrorMessage> repeatInfo;
-
 	/**
 	 * @param jsonStr         客户原表json内容
 	 * @param dept            项目
@@ -71,12 +68,11 @@ public class SalaryAccountUtil implements Serializable {
 			, TConfigSalary configSalary, Map<String, TSalaryConfigStandard> salaryConfigMap, Map<String, Boolean> isMustMap
 			, Map<String, TSalaryEmployee> empIdCardMap, Map<String, TSalaryEmployee> empNameMap, boolean isDuplicateName
 			, String salaryType, String invoiceTitle, TSalaryEmployeeService tSalaryEmployeeService
-			, Map<String, Integer> checkMap, int repeatFlag, Map<String, Integer> ownEmployeeMap
+			, Map<String, Integer> checkMap, Map<String, Integer> ownEmployeeMap
 			, Map<String, Integer> ownDeptMap, TSalaryAccountService tSalaryAccountService) {
 		List<TSalaryAccountVo> tList = new ArrayList<>();
 		List<HashMap> list = JSONObject.parseArray(jsonStr, HashMap.class);
 		List<ErrorMessage> errorList = new ArrayList<>();
-		List<ErrorMessage> repeatList = new ArrayList<>();
 		try {
 			// 得到数据的条数
 			int rows = list.size();
@@ -590,7 +586,6 @@ public class SalaryAccountUtil implements Serializable {
 		}
 		this.setEntityList(tList);
 		this.setErrorInfo(errorList);
-		this.setRepeatInfo(repeatList);
 	}
 
 	/**

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

@@ -258,7 +258,7 @@
 		from t_salary_account a
 				 left join t_salary_account_item relaySalary on relaySalary.SALARY_ACCOUNT_ID = a.id and relaySalary.JAVA_FIED_NAME='relaySalary'
 				 left join t_salary_account_item actSalary on actSalary.SALARY_ACCOUNT_ID = a.id and actSalary.JAVA_FIED_NAME='actualSalarySum'
-		where a.DELETE_FLAG = 0 and a.SETTLE_DEPART_ID = #{settleId} and a.SALARY_MONTH = #{settleMonth}
+		where a.DELETE_FLAG = 0 and a.DEPT_ID = #{settleId} and a.SALARY_MONTH = #{settleMonth}
 	</select>
 
 	<!-- 获取当前年最小计税月 -->