Commit 7c3071e4 authored by hongguangwu's avatar hongguangwu

MVP1.6.10工资相关

parent 6cb8bc44
package com.yifu.cloud.plus.v1.yifu.salary.vo; package com.yifu.cloud.plus.v1.yifu.salary.vo;
import com.alibaba.excel.annotation.ExcelProperty;
import com.yifu.cloud.plus.v1.yifu.salary.entity.TSalaryStandardIssueRes; import com.yifu.cloud.plus.v1.yifu.salary.entity.TSalaryStandardIssueRes;
import lombok.Getter; import lombok.Getter;
import lombok.Setter; import lombok.Setter;
...@@ -47,4 +48,7 @@ public class SalaryUploadOriginalParamVo { ...@@ -47,4 +48,7 @@ public class SalaryUploadOriginalParamVo {
// 新员工是否更新:0否;1是 // 新员工是否更新:0否;1是
String newEmpUpdateFlag; String newEmpUpdateFlag;
// @ExcelProperty("是否固定列")
Integer isFixedColumn;
} }
...@@ -53,4 +53,7 @@ public class SalaryUploadParamVo { ...@@ -53,4 +53,7 @@ public class SalaryUploadParamVo {
// 新员工是否更新:0否;1是 // 新员工是否更新:0否;1是
String newEmpUpdateFlag; String newEmpUpdateFlag;
// @ExcelProperty("是否固定列")
Integer isFixedColumn;
} }
...@@ -360,6 +360,9 @@ public class SalaryUploadServiceImpl extends ServiceImpl<TSalaryStandardMapper, ...@@ -360,6 +360,9 @@ public class SalaryUploadServiceImpl extends ServiceImpl<TSalaryStandardMapper,
if (Common.isNotNull(vo.getOriginalSetName())){ if (Common.isNotNull(vo.getOriginalSetName())){
salary.setOriginalSetName(vo.getOriginalSetName()); salary.setOriginalSetName(vo.getOriginalSetName());
} }
if (Common.isNotNull(vo.getIsFixedColumn())){
salary.setIsFixedColumn(vo.getIsFixedColumn());
}
// 薪资导入、删除前加锁: // 薪资导入、删除前加锁:
TSalaryLock lock = salaryLockService.lambdaQuery() TSalaryLock lock = salaryLockService.lambdaQuery()
.eq(TSalaryLock::getDeptId, dept.getId()) .eq(TSalaryLock::getDeptId, dept.getId())
......
...@@ -1078,6 +1078,7 @@ public class TSalaryStandardOriginalServiceImpl extends ServiceImpl<TSalaryStand ...@@ -1078,6 +1078,7 @@ public class TSalaryStandardOriginalServiceImpl extends ServiceImpl<TSalaryStand
returnVo.setSetName(excelVo.getSetName()); returnVo.setSetName(excelVo.getSetName());
returnVo.setOriginalSetName(excelVo.getOriginalSetName()); returnVo.setOriginalSetName(excelVo.getOriginalSetName());
returnVo.setNewEmpUpdateFlag(excelVo.getNewEmpUpdateFlag()); returnVo.setNewEmpUpdateFlag(excelVo.getNewEmpUpdateFlag());
returnVo.setIsFixedColumn(excelVo.getIsFixedColumn());
//数据保存 //数据保存
return R.ok(returnVo); return R.ok(returnVo);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment