qt
/
weaver-hrm-salary
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

冲突解决

This commit is contained in:
Harryxzy 2024-10-18 17:47:26 +08:00
parent 558304043c
commit d13a072e15
7 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/engine/salary/entity/salaryacct/bo/SalaryAcctResultBO.java
View File

@ -357,7 +357,7 @@ public class SalaryAcctResultBO {
// 薪资项目的值
Map<String, Object> map = SalaryEntityUtil.convert2Map(salaryItems, o -> "" + o.getId(), o -> resultValueMap.getOrDefault(o.getId(), StringUtils.EMPTY));
// 人员信息字段的值
Map<String, String> fieldValueMap = SalaryAcctFormulaBO.convert2FormulaEmployee(employeeMap.get(e.getEmployeeId()));
Map<String, String> fieldValueMap = SalaryAcctFormulaBO.convert2FormulaEmployee(employeeMap.get(e.getEmployeeId()), e, false );
for (SalarySobEmpFieldPO salarySobEmpField : salarySobEmpFields) {
// 员工信息字段的字段类型
if (dynamicEmpInfo) {

2
src/com/engine/salary/mapper/salaryacct/SalaryAcctEmployeeMapper.java
View File

@ -126,5 +126,5 @@ public interface SalaryAcctEmployeeMapper {
void updateIgnoreNull(@Param("salaryAcctEmployeePO")SalaryAcctEmployeePO salaryAcctEmployeePO);
void lock(SalaryAcctEmployeePO salaryAcctEmployeePO);
void lock(@Param("salaryAcctEmployeePO")SalaryAcctEmployeePO salaryAcctEmployeePO, @Param("now") Date now);
}

5
src/com/engine/salary/mapper/salaryacct/SalaryAcctEmployeeMapper.xml
View File

@ -1176,9 +1176,10 @@
UPDATE hrsa_salary_acct_emp
<set>
lock_items =
#{lockItems, jdbcType=ARRAY, typeHandler=com.engine.salary.handle.SalaryListTypeHandler},
#{salaryAcctEmployeePO.lockItems, jdbcType=ARRAY, typeHandler=com.engine.salary.handle.SalaryListTypeHandler},
lock_time=#{now},
</set>
WHERE id = #{id} AND delete_type = 0
WHERE id = #{salaryAcctEmployeePO.id} AND delete_type = 0
</update>
</mapper>

2
src/com/engine/salary/service/SalaryAcctEmployeeService.java
View File

@ -279,5 +279,5 @@ public interface SalaryAcctEmployeeService {
*/
void updateIgnoreNull(SalaryAcctEmployeePO salaryAcctEmployeePO);
void lock(SalaryAcctEmployeePO salaryAcctEmployeePO);
void lock(SalaryAcctEmployeePO salaryAcctEmployeePO, Date lockDate);
}

9
src/com/engine/salary/service/impl/SalaryAcctEmployeeServiceImpl.java
View File

@ -8,7 +8,6 @@ import com.engine.common.util.ServiceUtil;
import com.engine.core.impl.Service;
import com.engine.hrmelog.entity.dto.LoggerContext;
import com.engine.salary.common.LocalDateRange;
import com.engine.hrmelog.entity.dto.LoggerContext;
import com.engine.salary.config.SalaryElogConfig;
import com.engine.salary.constant.SalaryDefaultTenantConstant;
import com.engine.salary.entity.datacollection.DataCollectionEmployee;
@ -811,7 +810,7 @@ public class SalaryAcctEmployeeServiceImpl extends Service implements SalaryAcct
salaryAcctEmployees.forEach(salaryAcctEmployeePO -> {
salaryAcctEmployeePO.setLockItems(itemIds);
lock(salaryAcctEmployeePO);
lock(salaryAcctEmployeePO, now);
});
// 宁波精华，需要更新支付方式的值
List<SalaryAcctEmployeePO> salaryAcctEmployeePOList = listByIds(acctEmpIds);
@ -819,7 +818,7 @@ public class SalaryAcctEmployeeServiceImpl extends Service implements SalaryAcct
}else {
salaryAcctEmployees.forEach(salaryAcctEmployeePO -> {
salaryAcctEmployeePO.setLockItems(new ArrayList<>());
lock(salaryAcctEmployeePO);
lock(salaryAcctEmployeePO, now);
});
// 宁波精华，需要更新支付方式的值
nbjhUpdateZffs(salaryAcctRecord, salaryAcctEmployees, now, lockStatus.getValue());
@ -1096,7 +1095,7 @@ public class SalaryAcctEmployeeServiceImpl extends Service implements SalaryAcct
}
@Override
public void lock(SalaryAcctEmployeePO salaryAcctEmployeePO) {
getSalaryAcctEmployeeMapper().lock(salaryAcctEmployeePO);
public void lock(SalaryAcctEmployeePO salaryAcctEmployeePO, Date lockDate) {
getSalaryAcctEmployeeMapper().lock(salaryAcctEmployeePO, lockDate);
}
}

4
src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java
View File

@ -1029,7 +1029,7 @@ public class SalaryAcctResultServiceImpl extends Service implements SalaryAcctRe
salaryAcctEmployeePO.setLockItems(Lists.newArrayList(new HashSet(lockItemIds)));
getSalaryAcctEmployeeService(user).lock(salaryAcctEmployeePO);
getSalaryAcctEmployeeService(user).lock(salaryAcctEmployeePO, null);
}
@Override
@ -1055,7 +1055,7 @@ public class SalaryAcctResultServiceImpl extends Service implements SalaryAcctRe
lockItemIds.removeAll(salaryItemIds);
}
salaryAcctEmployeePO.setLockItems(Lists.newArrayList(new HashSet(lockItemIds)));
getSalaryAcctEmployeeService(user).lock(salaryAcctEmployeePO);
getSalaryAcctEmployeeService(user).lock(salaryAcctEmployeePO, null);
});
}

2
src/com/engine/salary/service/impl/SalaryArchiveServiceImpl.java
View File

@ -1633,6 +1633,6 @@ public class SalaryArchiveServiceImpl extends Service implements SalaryArchiveSe
rows.add(row);
});
// 3.表数据
return ExcelUtilPlus.genWorkbookV2WithPattern(rows, sheetName);
return ExcelUtilPlus.genWorkbookV2WithPattern(rows, sheetName, false);
}
}