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

Merge branch 'release/3.0.2.2504.01' into release/个税&业务线

This commit is contained in:
钱涛 2025-05-09 16:28:56 +08:00
parent c7cadd2b98 ac1a767a29
commit 603d31b095
8 changed files with 32 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
resource/WEB-INF/prop/hrmSalary.properties
View File

@ -1,5 +1,5 @@
log=false log=false
defaultCloseNonStandard149=true defaultCloseNonStandard149=true
AESEncryptScrect=990EB004A1C862721C1513AE90038C9E AESEncryptScrect=990EB004A1C862721C1513AE90038C9E
version=3.0.2.2504.01 version=3.0.2.2504.03
openFormulaForcedEditing=false openFormulaForcedEditing=false

4
resource/sqlupgrade/Oracle/sql202504020203.sql
View File

@ -34,8 +34,8 @@ CREATE TABLE hrsa_push_record_detail
) )
/ /
ALTER TABLE hrsa_push_record ADD fail_reason varchar2(4000); ALTER TABLE hrsa_push_record ADD fail_reason varchar2(4000)
/ /
ALTER TABLE hrsa_push_record_detail ADD fail_reason varchar2(4000); ALTER TABLE hrsa_push_record_detail ADD fail_reason varchar2(4000)
/ /

4
resource/sqlupgrade/Oracle/sql202504030103.sql
View File

@ -1,5 +1,5 @@
ALTER TABLE hrsa_push_setting_item ADD sorted_index NUMBER; ALTER TABLE hrsa_push_setting_item ADD sorted_index NUMBER
/ /
ALTER TABLE hrsa_push_record_detail ADD data_id NUMBER(38,0); ALTER TABLE hrsa_push_record_detail ADD data_id NUMBER(38,0)
/ /

28
src/com/engine/salary/service/impl/TaxAgentServiceImpl.java
View File

@ -687,29 +687,15 @@ public class TaxAgentServiceImpl extends Service implements TaxAgentService {
return taxAgentManageRangeEmployeeList; return taxAgentManageRangeEmployeeList;
} }
List<Long> taxAgentIds = allTaxAgents.stream().map(TaxAgentPO::getId).collect(Collectors.toList()); TaxAgentQueryParam param = TaxAgentQueryParam.builder().build();
if (employeeStatus != null) { param.setFilterType(AuthFilterTypeEnum.QUERY_DATA);
List<String> personnelStatusList; List<TaxAgentPO> taxAgentList = listAuth(param);
// 查询人员状态 List<Long> taxAgentIds = SalaryEntityUtil.properties(taxAgentList, TaxAgentPO::getId, Collectors.toList());
// if (employeeStatus.equals(SalaryEmployeeStatusEnum.NORMAL)) {
// allEmployees = allEmployees.stream().filter(f -> UserStatusEnum.getNormalStatus().contains(f.getStatus())).collect(Collectors.toList());
// } else if (employeeStatus.equals(SalaryEmployeeStatusEnum.UNAVAILABLE)) {
// allEmployees = allEmployees.stream().filter(f -> UserStatusEnum.getUnavailableStatus().contains(f.getStatus())).collect(Collectors.toList());
// }
}
// 是否开启分权
if (!isOpenDevolution() || isChief(employeeId)) {
return getTaxAgentEmp(allTaxAgents, taxAgentIds);
}
// 1.判断自己是否是管理员， 如果是管理员，就是能够操作所属个税扣缴义务人下的所有人的数据 if (CollectionUtils.isNotEmpty(taxAgentIds)) {
List<TaxAgentAdminPO> taxAgentAdminList = getTaxAgentAdminService(user).listByTaxAgentIdsAndEmployeeId(taxAgentIds, (long) user.getUID()); List<TaxAgentManageRangeEmployeeDTO> taxAgentEmp = getTaxAgentEmp(allTaxAgents, taxAgentIds);
// 是管理员的列表 taxAgentManageRangeEmployeeList.addAll(taxAgentEmp);
List<Long> adminTaxAgentIds = taxAgentAdminList.stream().map(TaxAgentAdminPO::getTaxAgentId).collect(Collectors.toList());
if (CollectionUtils.isNotEmpty(adminTaxAgentIds)) {
taxAgentManageRangeEmployeeList.addAll(getTaxAgentEmp(allTaxAgents, adminTaxAgentIds));
} }
return taxAgentManageRangeEmployeeList; return taxAgentManageRangeEmployeeList;

2
src/com/engine/salary/util/excel/ExcelUtilPlus.java
View File

@ -136,7 +136,7 @@ public class ExcelUtilPlus {
for (int i = 0; i < header.size(); i++) { for (int i = 0; i < header.size(); i++) {
WeaTableColumnGroup columnGroupItem = (WeaTableColumnGroup) header.get(i); WeaTableColumnGroup columnGroupItem = (WeaTableColumnGroup) header.get(i);
XSSFCell rowZeroCell = row0.createCell(i, CellType.STRING); XSSFCell rowZeroCell = row0.createCell(i, CellType.STRING);
rowZeroCell.setCellValue(columnGroupItem.getText().toString()); rowZeroCell.setCellValue(columnGroupItem.getText());
rowZeroCell.setCellStyle(titleCellStyle); rowZeroCell.setCellStyle(titleCellStyle);
//设置列宽 //设置列宽
sheet.setColumnWidth(i, Math.min(255, Math.max(12, columnGroupItem.getText().length() * 4)) * 256); sheet.setColumnWidth(i, Math.min(255, Math.max(12, columnGroupItem.getText().length() * 4)) * 256);

4
src/com/engine/salary/util/valid/ValidUtil.java
View File

@ -250,7 +250,9 @@ public class ValidUtil {
.replace("ｂｅｔｗｅｅｎ", "between") .replace("ｂｅｔｗｅｅｎ", "between")
.replace("ＢＥＴＷＥＥＮ", "BETWEEN") .replace("ＢＥＴＷＥＥＮ", "BETWEEN")
.replace("ｕｎｉｏｎ", "union") .replace("ｕｎｉｏｎ", "union")
.replace("ＵＮＩＯＮ", "UNION"); .replace("ＵＮＩＯＮ", "UNION")
.replace("ｓｕｂｓｔｒ", "substr")
.replace("ＳＵＢＳＴＲ", "SUBSTR");
} }
setValue(t, field.getName(), result); setValue(t, field.getName(), result);
} else if (valueTypeEnum == ValueTypeEnum.OBJECT) { } else if (valueTypeEnum == ValueTypeEnum.OBJECT) {

10
src/com/engine/salary/wrapper/SalarySobRangeWrapper.java
View File

@ -97,7 +97,10 @@ public class SalarySobRangeWrapper extends Service {
.replace("ｂｅｔｗｅｅｎ", "between") .replace("ｂｅｔｗｅｅｎ", "between")
.replace("ＢＥＴＷＥＥＮ", "BETWEEN") .replace("ＢＥＴＷＥＥＮ", "BETWEEN")
.replace("ｕｎｉｏｎ", "union") .replace("ｕｎｉｏｎ", "union")
.replace("ＵＮＩＯＮ", "UNION")); .replace("ＵＮＩＯＮ", "UNION")
.replace("ｓｕｂｓｔｒ", "substr")
.replace("ＳＵＢＳＴＲ", "SUBSTR")
);
} }
}); });
@ -127,7 +130,10 @@ public class SalarySobRangeWrapper extends Service {
.replace("ｂｅｔｗｅｅｎ", "between") .replace("ｂｅｔｗｅｅｎ", "between")
.replace("ＢＥＴＷＥＥＮ", "BETWEEN") .replace("ＢＥＴＷＥＥＮ", "BETWEEN")
.replace("ｕｎｉｏｎ", "union") .replace("ｕｎｉｏｎ", "union")
.replace("ＵＮＩＯＮ", "UNION")); .replace("ＵＮＩＯＮ", "UNION")
.replace("ｓｕｂｓｔｒ", "substr")
.replace("ＳＵＢＳＴＲ", "SUBSTR")
);
} }
}); });

10
src/com/engine/salary/wrapper/TaxAgentWrapper.java
View File

@ -352,7 +352,10 @@ public class TaxAgentWrapper extends Service {
.replace("ｂｅｔｗｅｅｎ", "between") .replace("ｂｅｔｗｅｅｎ", "between")
.replace("ＢＥＴＷＥＥＮ", "BETWEEN") .replace("ＢＥＴＷＥＥＮ", "BETWEEN")
.replace("ｕｎｉｏｎ", "union") .replace("ｕｎｉｏｎ", "union")
.replace("ＵＮＩＯＮ", "UNION")); .replace("ＵＮＩＯＮ", "UNION")
.replace("ｓｕｂｓｔｒ", "substr")
.replace("ＳＵＢＳＴＲ", "SUBSTR")
);
} }
}); });
@ -386,7 +389,10 @@ public class TaxAgentWrapper extends Service {
.replace("ｂｅｔｗｅｅｎ", "between") .replace("ｂｅｔｗｅｅｎ", "between")
.replace("ＢＥＴＷＥＥＮ", "BETWEEN") .replace("ＢＥＴＷＥＥＮ", "BETWEEN")
.replace("ｕｎｉｏｎ", "union") .replace("ｕｎｉｏｎ", "union")
.replace("ＵＮＩＯＮ", "UNION")); .replace("ＵＮＩＯＮ", "UNION")
.replace("ｓｕｂｓｔｒ", "substr")
.replace("ＳＵＢＳＴＲ", "SUBSTR")
);
} }
}); });