MVP1.6.4-薪资导入的表格类型

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

@@ -466,6 +466,14 @@ public class TSalaryStandard extends BaseEntity {
 	@Schema(description = "业务类型三级分类")
 	private String businessThirdType;
 
+	/**
+	 * 表格类型 0 薪资原表 1 系统模板
+	 */
+	@ExcelAttribute(name = "表格类型 0 薪资原表 1 系统模板")
+	@HeadFontStyle(fontHeightInPoints = 11)
+	@ExcelProperty("表格类型 0 薪资原表 1 系统模板")
+	private String excelType;
+
 	/**
 	 * 工资月份-起
 	 */

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

@@ -42,4 +42,6 @@ public class SalaryUploadParamVo {
 	// 数据行，从0开始计数的
 	Integer dataNum;
 
+	// 表格类型 0 薪资原表 1 系统模板
+	String excelType;
 }

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

@@ -349,7 +349,9 @@ public class SalaryUploadServiceImpl extends ServiceImpl<TSalaryStandardMapper,
 				}
 			}
 			if (salary != null) {
-
+				if (Common.isNotNull(vo.getExcelType())) {
+					salary.setExcelType(vo.getExcelType());
+				}
 				// 薪资导入、删除前加锁：
 				TSalaryLock lock = salaryLockService.lambdaQuery()
 						.eq(TSalaryLock::getDeptId, dept.getId())

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

@@ -1012,6 +1012,7 @@ public class TSalaryStandardOriginalServiceImpl extends ServiceImpl<TSalaryStand
 				// 最后转化为jsonString
 				jsonString = JSON.toJSON(contentList).toString();
 				SalaryUploadParamVo returnVo = new SalaryUploadParamVo();
+				returnVo.setExcelType(CommonConstants.ZERO_STRING);
 				returnVo.setDataNum(vo.getDataNum());
 				returnVo.setCheckList(checkList);
 				returnVo.setJsonString(jsonString);

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

@@ -84,6 +84,7 @@
 	<result property="setId" column="SET_ID"/>
 	<result property="deleteUser" column="DELETE_USER"/>
 	<result property="deleteDate" column="DELETE_DATE"/>
+	<result property="excelType" column="EXCEL_TYPE"/>
   </resultMap>
     <sql id="Base_Column_List">
                 a.ID,
@@ -145,7 +146,8 @@
 				a.INCOME_MONTH,
 				a.SET_ID,
 				a.DELETE_USER,
-				a.DELETE_DATE
+				a.DELETE_DATE,
+				a.EXCEL_TYPE
     </sql>
     <sql id="tSalaryStandard_where">
         <if test="tSalaryStandard != null">
@@ -293,6 +295,9 @@
 			<if test="tSalaryStandard.isDiff != null and tSalaryStandard.isDiff.trim() != ''">
 				AND a.IS_DIFF = #{tSalaryStandard.isDiff}
 			</if>
+			<if test="tSalaryStandard.excelType != null and tSalaryStandard.excelType.trim() != ''">
+				AND a.EXCEL_TYPE = #{tSalaryStandard.excelType}
+			</if>
         </if>
     </sql>
     <!--tSalaryStandard简单分页查询-->