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-04-09 14:25:43 +08:00
parent 47ba860cc6 c04dad0c4d
commit be8ede54df
11 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
resource/sqlupgrade/DM/sql202411190103.sql
View File

@ -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),

2
resource/sqlupgrade/GS/sql202411190103.sql
View File

@ -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),

2
resource/sqlupgrade/JC/sql202411190103.sql
View File

@ -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),

2
resource/sqlupgrade/Mysql/sql202411190103.sql
View File

@ -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),

2
resource/sqlupgrade/Oracle/sql202411190103.sql
View File

@ -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),

2
resource/sqlupgrade/PG/sql202411190103.sql
View File

@ -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,

2
resource/sqlupgrade/SQLServer/sql202411190103.sql
View File

@ -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,

2
resource/sqlupgrade/ST/sql202411190103.sql
View File

@ -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),

2
src/com/engine/salary/entity/push/po/PushRecordDetailPO.java
View File

@ -56,7 +56,7 @@ public class PushRecordDetailPO {
* 执行sql
*/
@ElogTransform(name = "执行sql")
private String execute;
private String formula;
/**
* 创建时间

24
src/com/engine/salary/mapper/push/PushRecordDetailMapper.xml
View File

@ -6,7 +6,7 @@
<result column="create_time" property="createTime"/>
<result column="creator" property="creator"/>
<result column="delete_type" property="deleteType"/>
<result column="execute" property="execute"/>
<result column="formula" property="formula"/>
<result column="id" property="id"/>
<result column="record_id" property="recordId"/>
<result column="status" property="status"/>
@ -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 @@
<if test="deleteType != null">
AND delete_type = #{deleteType}
</if>
<if test="execute != null">
AND execute = #{execute}
<if test="formula != null">
AND formula = #{formula}
</if>
<if test="id != null">
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 @@
<if test="deleteType != null">
delete_type,
</if>
<if test="execute != null">
execute,
<if test="formula != null">
formula,
</if>
<if test="id != null">
id,
@ -199,8 +199,8 @@
<if test="deleteType != null">
#{deleteType},
</if>
<if test="execute != null">
#{execute},
<if test="formula != null">
#{formula},
</if>
<if test="id != null">
#{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 @@
<if test="deleteType != null">
delete_type=#{deleteType},
</if>
<if test="execute != null">
execute=#{execute},
<if test="formula != null">
formula=#{formula},
</if>
<if test="recordId != null">
record_id=#{recordId},

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

@ -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();