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 custom/五院杭州中心

This commit is contained in:
Harryxzy 2025-05-15 14:00:40 +08:00
parent 2ae00ca581 bb84021758
commit 6cc1d84657
9 changed files with 39 additions and 34 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
defaultCloseNonStandard149=true
AESEncryptScrect=990EB004A1C862721C1513AE90038C9E
version=3.0.2.2504.01
version=3.0.2.2504.03
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)
/

6
src/com/engine/salary/service/impl/SalarySendServiceImpl.java
View File

@ -497,6 +497,11 @@ public class SalarySendServiceImpl extends Service implements SalarySendService
if (salarySendInfo == null) {
throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(100511, "工资单信息不存在"));
}
if (!Objects.equals(salarySendInfo.getSendStatus(), 1)) {
throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(100511, "工资单信息不存在"));
}
Long employeeId = salarySendInfo.getEmployeeId();
if (currentEmployeeId.compareTo(employeeId) != 0) {
@ -1386,7 +1391,6 @@ public class SalarySendServiceImpl extends Service implements SalarySendService
}
@Override
public Map<String, Object> withdraw(SalarySendWithdrawParam param) {
if (param.getSalarySendId() == null) {

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

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

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

@ -6,6 +6,7 @@ import org.apache.commons.collections4.CollectionUtils;
import org.apache.poi.ss.usermodel.*;
import org.apache.poi.ss.util.CellRangeAddress;
import org.apache.poi.xssf.usermodel.*;
import weaver.wechat.util.Utils;
import java.awt.Color;
import java.math.BigDecimal;
@ -131,10 +132,10 @@ public class ExcelUtilPlus {
for (int i = 0; i < header.size(); i++) {
WeaTableColumnGroup columnGroupItem = (WeaTableColumnGroup) header.get(i);
XSSFCell rowZeroCell = row0.createCell(i, CellType.STRING);
rowZeroCell.setCellValue(columnGroupItem.getText().toString());
rowZeroCell.setCellValue(columnGroupItem.getText());
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, Utils.null2String(columnGroupItem.getText()).length() * 4)) * 256);
patternList.add(columnGroupItem.getPattern());
}

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

@ -250,7 +250,9 @@ public class ValidUtil {
.replace("ｂｅｔｗｅｅｎ", "between")
.replace("ＢＥＴＷＥＥＮ", "BETWEEN")
.replace("ｕｎｉｏｎ", "union")
.replace("ＵＮＩＯＮ", "UNION");
.replace("ＵＮＩＯＮ", "UNION")
.replace("ｓｕｂｓｔｒ", "substr")
.replace("ＳＵＢＳＴＲ", "SUBSTR");
}
setValue(t, field.getName(), result);
} 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("ｕｎｉｏｎ", "union")
.replace("ＵＮＩＯＮ", "UNION"));
.replace("ＵＮＩＯＮ", "UNION")
.replace("ｓｕｂｓｔｒ", "substr")
.replace("ＳＵＢＳＴＲ", "SUBSTR")
);
}
});
@ -127,7 +130,10 @@ public class SalarySobRangeWrapper extends Service {
.replace("ｂｅｔｗｅｅｎ", "between")
.replace("ＢＥＴＷＥＥＮ", "BETWEEN")
.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("ｕｎｉｏｎ", "union")
.replace("ＵＮＩＯＮ", "UNION"));
.replace("ＵＮＩＯＮ", "UNION")
.replace("ｓｕｂｓｔｒ", "substr")
.replace("ＳＵＢＳＴＲ", "SUBSTR")
);
}
});
@ -386,7 +389,10 @@ public class TaxAgentWrapper extends Service {
.replace("ｂｅｔｗｅｅｎ", "between")
.replace("ＢＥＴＷＥＥＮ", "BETWEEN")
.replace("ｕｎｉｏｎ", "union")
.replace("ＵＮＩＯＮ", "UNION"));
.replace("ＵＮＩＯＮ", "UNION")
.replace("ｓｕｂｓｔｒ", "substr")
.replace("ＳＵＢＳＴＲ", "SUBSTR")
);
}
});