From c04dad0c4dcc77d3a2e7965599cdc5bb94fb4177 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com>
Date: Wed, 9 Apr 2025 14:23:38 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AD=97=E6=AE=B5=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
resource/sqlupgrade/DM/sql202411190103.sql | 2 +-
resource/sqlupgrade/GS/sql202411190103.sql | 2 +-
resource/sqlupgrade/JC/sql202411190103.sql | 2 +-
resource/sqlupgrade/Mysql/sql202411190103.sql | 2 +-
.../sqlupgrade/Oracle/sql202411190103.sql | 2 +-
resource/sqlupgrade/PG/sql202411190103.sql | 2 +-
.../sqlupgrade/SQLServer/sql202411190103.sql | 2 +-
resource/sqlupgrade/ST/sql202411190103.sql | 2 +-
.../entity/push/po/PushRecordDetailPO.java | 2 +-
.../mapper/push/PushRecordDetailMapper.xml | 24 +++++++++----------
.../salary/service/impl/PushServiceImpl.java | 6 ++---
11 files changed, 24 insertions(+), 24 deletions(-)
diff --git a/resource/sqlupgrade/DM/sql202411190103.sql b/resource/sqlupgrade/DM/sql202411190103.sql
index 1ed27c6fd..1d13e52dd 100644
--- a/resource/sqlupgrade/DM/sql202411190103.sql
+++ b/resource/sqlupgrade/DM/sql202411190103.sql
@@ -57,7 +57,7 @@ CREATE TABLE hrsa_push_record_detail
id NUMBER(38,0) NOT NULL,
record_id NUMBER(38,0),
acct_emp_id NUMBER(38,0),
- execute CLOB,
+ formula CLOB,
execute_time date,
status number,
creator NUMBER(38,0),
diff --git a/resource/sqlupgrade/GS/sql202411190103.sql b/resource/sqlupgrade/GS/sql202411190103.sql
index 1ed27c6fd..1d13e52dd 100644
--- a/resource/sqlupgrade/GS/sql202411190103.sql
+++ b/resource/sqlupgrade/GS/sql202411190103.sql
@@ -57,7 +57,7 @@ CREATE TABLE hrsa_push_record_detail
id NUMBER(38,0) NOT NULL,
record_id NUMBER(38,0),
acct_emp_id NUMBER(38,0),
- execute CLOB,
+ formula CLOB,
execute_time date,
status number,
creator NUMBER(38,0),
diff --git a/resource/sqlupgrade/JC/sql202411190103.sql b/resource/sqlupgrade/JC/sql202411190103.sql
index 1ed27c6fd..1d13e52dd 100644
--- a/resource/sqlupgrade/JC/sql202411190103.sql
+++ b/resource/sqlupgrade/JC/sql202411190103.sql
@@ -57,7 +57,7 @@ CREATE TABLE hrsa_push_record_detail
id NUMBER(38,0) NOT NULL,
record_id NUMBER(38,0),
acct_emp_id NUMBER(38,0),
- execute CLOB,
+ formula CLOB,
execute_time date,
status number,
creator NUMBER(38,0),
diff --git a/resource/sqlupgrade/Mysql/sql202411190103.sql b/resource/sqlupgrade/Mysql/sql202411190103.sql
index 98b55261c..fdfc32280 100644
--- a/resource/sqlupgrade/Mysql/sql202411190103.sql
+++ b/resource/sqlupgrade/Mysql/sql202411190103.sql
@@ -59,7 +59,7 @@ CREATE TABLE hrsa_push_record_detail
id bigint(0) NOT NULL,
record_id bigint(0),
acct_emp_id bigint(0),
- execute text,
+ formula text,
execute_time datetime(0),
status int(0),
creator bigint(0),
diff --git a/resource/sqlupgrade/Oracle/sql202411190103.sql b/resource/sqlupgrade/Oracle/sql202411190103.sql
index 27e5d3cc9..09f3ee1bd 100644
--- a/resource/sqlupgrade/Oracle/sql202411190103.sql
+++ b/resource/sqlupgrade/Oracle/sql202411190103.sql
@@ -59,7 +59,7 @@ CREATE TABLE hrsa_push_record_detail
id NUMBER(38,0) NOT NULL,
record_id NUMBER(38,0),
acct_emp_id NUMBER(38,0),
- execute CLOB,
+ formula CLOB,
execute_time date,
status number,
creator NUMBER(38,0),
diff --git a/resource/sqlupgrade/PG/sql202411190103.sql b/resource/sqlupgrade/PG/sql202411190103.sql
index 0e2ba412e..5f4272388 100644
--- a/resource/sqlupgrade/PG/sql202411190103.sql
+++ b/resource/sqlupgrade/PG/sql202411190103.sql
@@ -59,7 +59,7 @@ CREATE TABLE hrsa_push_record_detail
id bigint NOT NULL,
record_id bigint,
acct_emp_id bigint,
- execute text,
+ formula text,
execute_time timestamp,
status int,
creator bigint,
diff --git a/resource/sqlupgrade/SQLServer/sql202411190103.sql b/resource/sqlupgrade/SQLServer/sql202411190103.sql
index fd993c777..dd06040a8 100644
--- a/resource/sqlupgrade/SQLServer/sql202411190103.sql
+++ b/resource/sqlupgrade/SQLServer/sql202411190103.sql
@@ -62,7 +62,7 @@ CREATE TABLE hrsa_push_record_detail
id bigint NOT NULL,
record_id bigint,
acct_emp_id bigint,
- execute text,
+ formula text,
execute_time datetime,
status int,
creator bigint,
diff --git a/resource/sqlupgrade/ST/sql202411190103.sql b/resource/sqlupgrade/ST/sql202411190103.sql
index 1ed27c6fd..1d13e52dd 100644
--- a/resource/sqlupgrade/ST/sql202411190103.sql
+++ b/resource/sqlupgrade/ST/sql202411190103.sql
@@ -57,7 +57,7 @@ CREATE TABLE hrsa_push_record_detail
id NUMBER(38,0) NOT NULL,
record_id NUMBER(38,0),
acct_emp_id NUMBER(38,0),
- execute CLOB,
+ formula CLOB,
execute_time date,
status number,
creator NUMBER(38,0),
diff --git a/src/com/engine/salary/entity/push/po/PushRecordDetailPO.java b/src/com/engine/salary/entity/push/po/PushRecordDetailPO.java
index f971532e6..88308a8b6 100644
--- a/src/com/engine/salary/entity/push/po/PushRecordDetailPO.java
+++ b/src/com/engine/salary/entity/push/po/PushRecordDetailPO.java
@@ -56,7 +56,7 @@ public class PushRecordDetailPO {
* 执行sql
*/
@ElogTransform(name = "执行sql")
- private String execute;
+ private String formula;
/**
* 创建时间
diff --git a/src/com/engine/salary/mapper/push/PushRecordDetailMapper.xml b/src/com/engine/salary/mapper/push/PushRecordDetailMapper.xml
index bdbee38fc..73220be28 100644
--- a/src/com/engine/salary/mapper/push/PushRecordDetailMapper.xml
+++ b/src/com/engine/salary/mapper/push/PushRecordDetailMapper.xml
@@ -6,7 +6,7 @@
-
+
@@ -24,7 +24,7 @@
, t.create_time
, t.creator
, t.delete_type
- , t.execute
+ , t.formula
, t.id
, t.record_id
, t.status
@@ -68,8 +68,8 @@
AND delete_type = #{deleteType}
-
- AND execute = #{execute}
+
+ AND formula = #{formula}
AND id = #{id}
@@ -101,7 +101,7 @@
, t.create_time
, t.creator
, t.delete_type
- , t.execute
+ , t.formula
, t.id
, t.record_id
, t.status
@@ -161,8 +161,8 @@
delete_type,
-
- execute,
+
+ formula,
id,
@@ -199,8 +199,8 @@
#{deleteType},
-
- #{execute},
+
+ #{formula},
#{id},
@@ -234,7 +234,7 @@
create_time=#{createTime},
creator=#{creator},
delete_type=#{deleteType},
- execute=#{execute},
+ formula=#{formula},
record_id=#{recordId},
status=#{status},
tenant_key=#{tenantKey},
@@ -262,8 +262,8 @@
delete_type=#{deleteType},
-
- execute=#{execute},
+
+ formula=#{formula},
record_id=#{recordId},
diff --git a/src/com/engine/salary/service/impl/PushServiceImpl.java b/src/com/engine/salary/service/impl/PushServiceImpl.java
index ac7a8902e..cf01efde8 100644
--- a/src/com/engine/salary/service/impl/PushServiceImpl.java
+++ b/src/com/engine/salary/service/impl/PushServiceImpl.java
@@ -378,7 +378,7 @@ public class PushServiceImpl extends Service implements PushService {
.acctEmpId(emp.getId())
.recordId(record.getId())
.status(PushRecordDetailStatusEnum.PREPARE.getValue())
- .execute(sql)
+ .formula(sql)
.createTime(now)
.updateTime(now)
.creator((long) user.getUID())
@@ -428,9 +428,9 @@ public class PushServiceImpl extends Service implements PushService {
pushRecordDetailPOS.forEach(pushRecordDetailPO -> {
try {
- String execute = pushRecordDetailPO.getExecute();
+ String formula = pushRecordDetailPO.getFormula();
RecordSet rs = new RecordSet();
- boolean success = rs.execute(execute);
+ boolean success = rs.execute(formula);
if (success) {
//建模需要权限重构
Integer modeId = pushRecordPO.getModeId();