Commit 47c0e2c5 authored by hongguangwu's avatar hongguangwu

invoiceTitle

parent d0022ad9
...@@ -249,14 +249,15 @@ public class SalaryUploadServiceImpl extends ServiceImpl<TSalaryStandardMapper, ...@@ -249,14 +249,15 @@ public class SalaryUploadServiceImpl extends ServiceImpl<TSalaryStandardMapper,
* @Date: 2019/9/26 9:44 * @Date: 2019/9/26 9:44
* @return: com.yifu.cloud.v1.hrms.api.entity.TSalaryStandard * @return: com.yifu.cloud.v1.hrms.api.entity.TSalaryStandard
**/ **/
public R<TSalaryStandard> saveNewTSalary(TSalaryAccountVo sav, TSettleDomainSelectVo dept, YifuUser user, public R<TSalaryStandard> saveNewTSalary(TSalaryAccountVo sav, TSettleDomainSelectVo dept, YifuUser user
LocalDateTime nowTime) { , LocalDateTime nowTime, String invoiceTitle) {
TSalaryStandard s = null; TSalaryStandard s = null;
if (sav != null) { if (sav != null) {
if (null == user || null == user.getId()) { if (null == user || null == user.getId()) {
return null; return null;
} }
s = new TSalaryStandard(); s = new TSalaryStandard();
s.setInvoiceTitle(invoiceTitle);
s.setType(CommonConstants.ZERO_INT); s.setType(CommonConstants.ZERO_INT);
s.setBelongDeptId(String.valueOf(user.getDeptId())); s.setBelongDeptId(String.valueOf(user.getDeptId()));
if (Common.isNotNull(user.getDeptName())) { if (Common.isNotNull(user.getDeptName())) {
...@@ -1457,9 +1458,9 @@ public class SalaryUploadServiceImpl extends ServiceImpl<TSalaryStandardMapper, ...@@ -1457,9 +1458,9 @@ public class SalaryUploadServiceImpl extends ServiceImpl<TSalaryStandardMapper,
TSalaryStandard salary; TSalaryStandard salary;
LocalDateTime nowTime = LocalDateTime.now(); LocalDateTime nowTime = LocalDateTime.now();
//工资主表 //工资主表
R<TSalaryStandard> sr = this.saveNewTSalary(salaryAccountVo, dept, user, nowTime);
String invoiceTitle = dept.getBusinessSubjectName(); String invoiceTitle = dept.getBusinessSubjectName();
R<TSalaryStandard> sr = this.saveNewTSalary(salaryAccountVo, dept, user, nowTime, invoiceTitle);
if (sr == null || sr.getCode() == CommonConstants.FAIL) { if (sr == null || sr.getCode() == CommonConstants.FAIL) {
return sr; return sr;
} else { } else {
......
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