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

工资单确认反馈sql

This commit is contained in:
Harryxzy 2024-02-19 14:01:30 +08:00
parent 7fe03ac7a1
commit c64e9b4b76
9 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
resource/sqlupgrade/DM/sql202402190103.sql Normal file
View File

@ -0,0 +1,3 @@
alter table hrsa_salary_template add feedback_status int;
/

3
resource/sqlupgrade/GS/sql202402190103.sql Normal file
View File

@ -0,0 +1,3 @@
alter table hrsa_salary_template add feedback_status int;
/

3
resource/sqlupgrade/JC/sql202402190103.sql Normal file
View File

@ -0,0 +1,3 @@
alter table hrsa_salary_template add feedback_status int;
/

1
resource/sqlupgrade/Mysql/sql202402190103.sql Normal file
View File

@ -0,0 +1 @@
alter table hrsa_salary_template add feedback_status int;

2
resource/sqlupgrade/Oracle/sql202402190103.sql Normal file
View File

@ -0,0 +1,2 @@
alter table hrsa_salary_template add feedback_status int
/

1
resource/sqlupgrade/PG/sql202402190103.sql Normal file
View File

@ -0,0 +1 @@
alter table hrsa_salary_template add feedback_status int;

2
resource/sqlupgrade/SQLServer/sql202402190103.sql Normal file
View File

@ -0,0 +1,2 @@
alter table hrsa_salary_template add feedback_status int
go

3
resource/sqlupgrade/ST/sql202402190103.sql Normal file
View File

@ -0,0 +1,3 @@
alter table hrsa_salary_template add feedback_status int;
/

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

@ -725,7 +725,9 @@ public class SalarySendServiceImpl extends Service implements SalarySendService
throw new SalaryRunTimeException("请先设置工资单模板");
}
Integer ackFeedbackStatus = salaryTemplates.get(0).getAckFeedbackStatus();
if (ackFeedbackStatus != null && NumberUtils.compare(ackFeedbackStatus, 1) == 0) {
Integer feedbackStatus = salaryTemplates.get(0).getFeedbackStatus();
if ( (ackFeedbackStatus != null && NumberUtils.compare(ackFeedbackStatus, 1) == 0)
|| (feedbackStatus != null && NumberUtils.compare(feedbackStatus, 1) == 0)) {
// 默认为空时，未读未确认
pageInfo.getList().stream().forEach(obj -> {
SalarySendInfoListDTO dto = (SalarySendInfoListDTO) obj;