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

Merge remote-tracking branch 'origin/custom/领悦业务线' into custom/领悦业务线

This commit is contained in:
Harryxzy 2024-11-26 17:00:19 +08:00
parent a7ebc20688 ef33f16f3f
commit fe6997117c
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/com/engine/salary/enums/UserStatusEnum.java
View File

@ -16,10 +16,10 @@ import java.util.stream.Collectors;
public enum UserStatusEnum implements BaseEnum {
TRIAL(0, "试用", 1),
FORMAL(1, "正式", 1),
FORMAL(1, "转正", 1),
TEMPORARY(2, "临时", 1),
DELAY(3, "试用延期", 1),
FIRE(4, "解雇", 1),
DELAY(3, "见习", 1),
FIRE(4, "解聘", 1),
DEPARTURE(5, "离职", 1),
RETIRED(6, "退休", 1),
INVALID(7, "无效", 1);

6
src/com/engine/salary/enums/salarysob/SalaryEmployeeStatusEnum.java
View File

@ -21,13 +21,13 @@ public enum SalaryEmployeeStatusEnum implements BaseEnum<Integer> {
TRIAL(0, "试用", 100121),
FORMAL(1, "正式", 100122),
FORMAL(1, "转正", 100122),
TEMPORARY(2, "临时", 100123),
DELAY(3, "试用延期", 100124),
DELAY(3, "见习", 100124),
FIRE(4, "解雇", 100125),
FIRE(4, "解聘", 100125),
DEPARTURE(5, "离职", 100126),

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

@ -498,6 +498,7 @@ public class SalaryArchiveServiceImpl extends Service implements SalaryArchiveSe
Object[] header = {
new WeaTableColumnGroup("150px", SalaryI18nUtil.getI18nLabel(85429, "姓名"), "", "", 0),
new WeaTableColumnGroup("150px", SalaryI18nUtil.getI18nLabel(86184, "个税扣缴义务人"), "", "", 0),
new WeaTableColumnGroup("150px", SalaryI18nUtil.getI18nLabel(86185, "分部"), "", "", 0),
new WeaTableColumnGroup("150px", SalaryI18nUtil.getI18nLabel(86185, "部门"), "", "", 0),
new WeaTableColumnGroup("150px", SalaryI18nUtil.getI18nLabel(86176, "工号"), "", "", 0),
new WeaTableColumnGroup("150px", SalaryI18nUtil.getI18nLabel(86186, "手机号"), "", "", 0),
@ -537,6 +538,7 @@ public class SalaryArchiveServiceImpl extends Service implements SalaryArchiveSe
List<Object> row = new ArrayList<>();
row.add(Util.null2String(e.get("username")));
row.add(Util.null2String(e.get("taxAgentName")));
row.add(Util.null2String(e.get("subcompanyName")));
row.add(Util.null2String(e.get("departmentName")));
row.add(Util.null2String(e.get("workcode")));
row.add(Util.null2String(e.get("mobile")));