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

领悦显示调整

This commit is contained in:
Harryxzy 2025-03-06 11:39:14 +08:00
parent ea51212bff
commit ebec70ddeb
6 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/com/engine/salary/entity/salaryacct/bo/SalaryAcctEmployeeBO.java
View File

@ -66,6 +66,7 @@ public class SalaryAcctEmployeeBO {
.taxAgentName(taxAgentNameMap.getOrDefault(e.getTaxAgentId(), StringUtils.EMPTY))
.departmentId(e.getDepartmentId())
.departmentName(e.getDepartmentName())
.idNo(simpleEmployee.getIdNo())
.status(UserStatusEnum.getDefaultLabelByValue(NumberUtils.toInt(e.getStatus())))
.accountType(AccountTypeEnum.getDefaultLabelByValue(e.getAccountType()))
.mobile(simpleEmployee.getMobile())

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

@ -176,7 +176,11 @@ public class SalaryAcctResultBO {
List<WeaTableColumnGroup> columns = Lists.newArrayList();
// 员工信息字段
for (SalarySobEmpFieldDTO salarySobEmpFieldDTO : salarySobItemAggregateDTO.getEmpFields()) {
columns.add(new WeaTableColumnGroup(SalaryPageUtil.selfAdaption(salarySobEmpFieldDTO.getFieldName(), 0), salarySobEmpFieldDTO.getFieldName(), salarySobEmpFieldDTO.getFieldId()));
if (salarySobEmpFieldDTO.getFieldId().equals("idNo")) {
columns.add(new WeaTableColumnGroup(SalaryPageUtil.selfAdaption(salarySobEmpFieldDTO.getFieldName(), 160), salarySobEmpFieldDTO.getFieldName(), salarySobEmpFieldDTO.getFieldId()));
} else {
columns.add(new WeaTableColumnGroup(SalaryPageUtil.selfAdaption(salarySobEmpFieldDTO.getFieldName(), 0), salarySobEmpFieldDTO.getFieldName(), salarySobEmpFieldDTO.getFieldId()));
}
}
// 薪资项目分组下的薪资项目
for (SalarySobItemGroupDTO salarySobItemGroupDTO : salarySobItemAggregateDTO.getItemGroups()) {

3
src/com/engine/salary/entity/salaryacct/dto/SalaryAccEmployeeListDTO.java
View File

@ -45,6 +45,9 @@ public class SalaryAccEmployeeListDTO {
@TableTitle(title = "部门", dataIndex = "departmentName", key = "departmentName")
private String departmentName;
@TableTitle(title = "身份证号", dataIndex = "idNo", key = "idNo")
private String idNo;
@TableTitle(title = "手机号", dataIndex = "mobile", key = "mobile")
private String mobile;

2
src/com/engine/salary/mapper/salarybill/SalarySendMapper.xml
View File

@ -84,7 +84,7 @@
t1.delete_type = 0
AND t2.delete_type = 0
<include refid="paramSql"/>
ORDER BY t1.id DESC
ORDER BY t1.salary_month desc, t1.id DESC
</select>
<select id="getById" resultType="com.engine.salary.entity.salaryBill.po.SalarySendPO">

2
src/com/engine/salary/mapper/taxdeclaration/TaxDeclarationMapper.xml
View File

@ -73,7 +73,7 @@
<if test="taxCycle != null">
AND tax_cycle = #{taxCycle}
</if>
ORDER BY id DESC
ORDER BY t.salary_month DESC, id DESC
</select>
<insert id="batchInsert">
INSERT INTO hrsa_tax_declaration(id, salary_month, tax_cycle, tax_agent_id, description,

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

@ -185,6 +185,7 @@ public class SalaryAcctExcelServiceImpl extends Service implements SalaryAcctExc
SalaryI18nUtil.getI18nLabel(85429, "姓名"),
SalaryI18nUtil.getI18nLabel(86184, "个税扣缴义务人"),
SalaryI18nUtil.getI18nLabel(86185, "部门"),
SalaryI18nUtil.getI18nLabel(0, "身份证号"),
SalaryI18nUtil.getI18nLabel(86186, "手机号"),
SalaryI18nUtil.getI18nLabel(86186, "工号"),
SalaryI18nUtil.getI18nLabel(91075, "员工状态"),
@ -234,6 +235,7 @@ public class SalaryAcctExcelServiceImpl extends Service implements SalaryAcctExc
SalaryI18nUtil.getI18nLabel(85429, "姓名"),
SalaryI18nUtil.getI18nLabel(86184, "个税扣缴义务人"),
SalaryI18nUtil.getI18nLabel(86185, "部门"),
SalaryI18nUtil.getI18nLabel(0, "身份证号"),
SalaryI18nUtil.getI18nLabel(86186, "手机号"),
SalaryI18nUtil.getI18nLabel(86186, "工号"),
SalaryI18nUtil.getI18nLabel(91075, "员工状态"),
@ -278,6 +280,7 @@ public class SalaryAcctExcelServiceImpl extends Service implements SalaryAcctExc
SalaryI18nUtil.getI18nLabel(85429, "姓名"),
SalaryI18nUtil.getI18nLabel(86184, "个税扣缴义务人"),
SalaryI18nUtil.getI18nLabel(86185, "部门"),
SalaryI18nUtil.getI18nLabel(0, "身份证号"),
SalaryI18nUtil.getI18nLabel(86186, "手机号"),
SalaryI18nUtil.getI18nLabel(86186, "工号"),
SalaryI18nUtil.getI18nLabel(91075, "员工状态"),
@ -334,6 +337,7 @@ public class SalaryAcctExcelServiceImpl extends Service implements SalaryAcctExc
row.add(dto.getEmployeeName());
row.add(dto.getTaxAgentName());
row.add(dto.getDepartmentName());
row.add(dto.getIdNo());
row.add(dto.getMobile());
row.add(dto.getJobNum());
row.add(dto.getStatus());