薪资原表导入：1.详情加字段 表单类型、方案名称、表格类型、原表类型2.表单类型和表格类型带入到EKP

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

@@ -451,9 +451,17 @@ public class TSalaryStandard extends BaseEntity {
 	 */
 	@Schema(description = "收入月份")
 	private String incomeMonth;
-
+	//方案名称ID
 	@Schema(description = "配置ID")
 	private String setId;
+	//方案名称
+	@Schema(description = "方案名称")
+	private String setName;
+
+	//原表类型
+	@Schema(description = "原表类型")
+	private String originalSetName;
+
 	@Schema(description = "删除人（汉字名）")
 	private String deleteUser;
 	@Schema(description = "删除时间")

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

@@ -44,4 +44,10 @@ public class SalaryUploadParamVo {
 
 	// 表格类型 0 薪资原表 1 系统模板
 	String excelType;
+
+	// 方案名称
+	String setName;
+
+	// 原表类型
+	String originalSetName;
 }

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

@@ -299,6 +299,7 @@ public class SalaryUploadServiceImpl extends ServiceImpl<TSalaryStandardMapper,
 			s.setBusinessThirdType(dept.getBusinessThirdType());
 			if (configSalary != null) {
 				s.setSetId(configSalary.getId());
+				s.setSetName(configSalary.getName());
 				if (Common.isNotNull(configSalary.getIncomeMonth())) {
 					s.setIncomeMonth(DateUtil.addMonth(configSalary.getIncomeMonth()));
 				}
@@ -352,6 +353,9 @@ public class SalaryUploadServiceImpl extends ServiceImpl<TSalaryStandardMapper,
 				if (Common.isNotNull(vo.getExcelType())) {
 					salary.setExcelType(vo.getExcelType());
 				}
+				if (Common.isNotNull(vo.getOriginalSetName())){
+					salary.setOriginalSetName(vo.getOriginalSetName());
+				}
 				// 薪资导入、删除前加锁：
 				TSalaryLock lock = salaryLockService.lambdaQuery()
 						.eq(TSalaryLock::getDeptId, dept.getId())

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

@@ -85,6 +85,8 @@
 	<result property="deleteUser" column="DELETE_USER"/>
 	<result property="deleteDate" column="DELETE_DATE"/>
 	<result property="excelType" column="EXCEL_TYPE"/>
+	<result property="setName" column="SET_NAME"/>
+	<result property="originalSetName" column="ORIGINAL_SET_NAME"/>
   </resultMap>
     <sql id="Base_Column_List">
                 a.ID,
@@ -147,7 +149,9 @@
 				a.SET_ID,
 				a.DELETE_USER,
 				a.DELETE_DATE,
-				a.EXCEL_TYPE
+				a.EXCEL_TYPE,
+				a.SET_NAME,
+				a.ORIGINAL_SET_NAME
     </sql>
     <sql id="tSalaryStandard_where">
         <if test="tSalaryStandard != null">
@@ -298,6 +302,12 @@
 			<if test="tSalaryStandard.excelType != null and tSalaryStandard.excelType.trim() != ''">
 				AND a.EXCEL_TYPE = #{tSalaryStandard.excelType}
 			</if>
+			<if test="tSalaryStandard.setName != null and tSalaryStandard.setName.trim() != ''">
+				AND a.SET_NAME = #{tSalaryStandard.setName}
+			</if>
+			<if test="tSalaryStandard.originalSetName != null and tSalaryStandard.originalSetName.trim() != ''">
+				AND a.ORIGINAL_SET_NAME = #{tSalaryStandard.originalSetName}
+			</if>
         </if>
     </sql>
     <!--tSalaryStandard简单分页查询-->