sy
|
be68f01145
|
薪酬系统-福利档案，mysql环境中sql脚本优化
|
2024-01-15 09:45:19 +08:00 |
Harryxzy
|
5f7c1c641b
|
Merge remote-tracking branch 'origin/release/2.9.10.2312.02' into release/2.9.10.2312.02
|
2024-01-08 15:33:11 +08:00 |
|
Harryxzy
|
c0c93490fe
|
sql
|
2024-01-08 15:32:49 +08:00 |
|
sy
|
a16ed64ac0
|
Merge remote-tracking branch 'remotes/origin/feature/231201-福利档案拆分个人和公司福利基数' into release/2.9.10.2312.02
|
2024-01-08 13:54:25 +08:00 |
 钱涛
|
2befcfd1f2
|
pg脚本问题
|
2023-12-28 11:08:53 +08:00 |
|
sy
|
e97dab27fc
|
薪酬系统-福利档案，拆分个人和公司福利基数逻辑相关sql脚本
|
2023-12-13 10:51:24 +08:00 |
|
钱涛
|
bbe4b315cf
|
pg脚本异常
|
2023-12-08 11:43:19 +08:00 |
|
钱涛
|
addd937b7b
|
Merge branch 'feature/支持工资单短信' into release/2.9.8.2311.02
|
2023-11-22 10:40:30 +08:00 |
|
sy
|
30e6bed471
|
Merge remote-tracking branch 'remotes/origin/feature/231001-福利档案基数调整记录' into release/2.9.8.2311.02
|
2023-11-22 09:38:16 +08:00 |
|
钱涛
|
118e95465d
|
短信模板脚本
|
2023-11-21 16:17:47 +08:00 |
|
钱涛
|
e677207eac
|
新增统计维度展示
|
2023-11-08 15:59:54 +08:00 |
|
钱涛
|
27255932de
|
数据库表
|
2023-11-07 15:12:10 +08:00 |
|
sy
|
5b2609d93f
|
薪酬系统-福利档案，福利档案基数调整记录表新建sql脚本
|
2023-10-25 09:49:16 +08:00 |
|
钱涛
|
b4a1aa8039
|
修改系统公式异常
|
2023-10-16 10:52:28 +08:00 |
|
钱涛
|
855effccc5
|
修改系统公式异常
|
2023-10-13 16:54:33 +08:00 |
|
钱涛
|
4a59859fa8
|
调薪记录
|
2023-10-12 17:34:09 +08:00 |
|
Harryxzy
|
8e8a502738
|
prop
|
2023-10-12 14:26:28 +08:00 |
|
钱涛
|
e570c1879e
|
账套保存异常
|
2023-10-09 15:35:20 +08:00 |
|
钱涛
|
d98933832a
|
Merge branch 'feature/生成签名pdf' into release/2.9.6.2310.01
# Conflicts:
# src/com/engine/salary/web/SalaryBillController.java
|
2023-10-07 15:19:38 +08:00 |
|
Harryxzy
|
cdefb1d310
|
Merge branch 'feature/230902_报表共享' into release/2.9.5.2309.01
|
2023-09-21 11:45:34 +08:00 |
|
Harryxzy
|
97b451e203
|
sql
|
2023-09-21 10:05:32 +08:00 |
|
钱涛
|
b0a25f6cf0
|
删除与组织冲突sql
|
2023-09-19 11:37:37 +08:00 |
|
钱涛
|
12480f8306
|
生成工资单pdf签名
|
2023-09-18 18:45:59 +08:00 |
|
钱涛
|
5ef4c8c909
|
解决sql202307100103.sql与组织冲突
|
2023-09-01 11:33:20 +08:00 |
|
钱涛
|
0ac2fd248e
|
慢sql提醒
|
2023-08-31 16:22:02 +08:00 |
|
钱涛
|
2fad3c6c7c
|
Merge branch 'feature/慢sql检测' into release/2.9.4.2308.02
|
2023-08-31 15:46:29 +08:00 |
|
钱涛
|
283485929f
|
超时提醒
|
2023-08-31 15:31:34 +08:00 |
|
sy
|
cd5e5d2284
|
薪酬系统-ST数据库适配，神通数据库-薪酬非标初始化脚本
|
2023-08-31 14:04:41 +08:00 |
|
Harryxzy
|
ea1a46839d
|
Merge branch 'feature/230703-薪资账套项目页面改造' into release/2.9.3.2308.01
|
2023-08-17 16:07:24 +08:00 |
|
Harryxzy
|
343edd2df7
|
sql
|
2023-08-17 16:06:55 +08:00 |
|
Harryxzy
|
19cb2d9622
|
Merge branch 'feature/230703-薪资账套项目页面改造' into release/2.9.3.2308.01
|
2023-08-14 09:19:20 +08:00 |
|
Harryxzy
|
7ebb8d6618
|
Merge branch 'feature/230702-自定义工资项目展示名' into release/2.9.3.2308.01
|
2023-08-14 09:19:04 +08:00 |
|
sy
|
6f9deed908
|
薪酬系统-福利档案，修改社保、公积金、其他福利表结构
|
2023-08-09 18:19:42 +08:00 |
|
Harryxzy
|
6a01f0d785
|
Merge branch 'release/2.9.2.2307.02' into feature/230702-自定义工资项目展示名
|
2023-08-08 11:42:41 +08:00 |
|
Harryxzy
|
a85e887356
|
sql
|
2023-08-08 11:42:24 +08:00 |
|
Harryxzy
|
c977109cb7
|
sql
|
2023-08-08 11:05:52 +08:00 |
|
钱涛
|
5b5d3ff447
|
非系统人员浏览按钮
|
2023-07-20 15:34:10 +08:00 |
|
钱涛
|
dbe01ca25e
|
非系统人员初始化语句
|
2023-07-20 14:43:50 +08:00 |
|
钱涛
|
01b02531ce
|
Merge branch 'feature/外部人员' into release/2.9.2.2307.02
# Conflicts:
# src/com/engine/salary/mapper/salarybill/SalarySendInfoMapper.xml
# src/com/engine/salary/service/impl/SalarySendServiceImpl.java
# src/com/engine/salary/sys/service/SalarySysConfService.java
# src/com/engine/salary/sys/service/impl/SalarySysConfServiceImpl.java
# src/com/engine/salary/wrapper/SalarySystemConfigWrapper.java
|
2023-07-20 10:08:05 +08:00 |
|
Harryxzy
|
0a4c19fb36
|
Merge branch 'feature/230702-薪资项目-核算时隐藏' into release/2.9.2.2307.02
|
2023-07-19 11:11:46 +08:00 |
|
Harryxzy
|
cb3b55f8b4
|
薪资项目-核算时隐藏sql
|
2023-07-19 09:35:30 +08:00 |
|
钱涛
|
5d6a471fb8
|
删除未适配数据库
|
2023-07-17 14:37:15 +08:00 |
|
钱涛
|
1b289319a4
|
工资单反馈sql
|
2023-07-17 11:52:10 +08:00 |
|
钱涛
|
873b90474f
|
Merge branch 'feature/230701qt' into feature/外部人员
|
2023-07-13 16:55:36 +08:00 |
|
钱涛
|
d5977c053b
|
添加删除脚本
|
2023-07-13 09:19:16 +08:00 |
|
钱涛
|
aec6918c12
|
Merge branch 'release/2.9.1.2307.01' into feature/外部人员
# Conflicts:
# src/com/engine/salary/biz/EmployBiz.java
# src/com/engine/salary/biz/SIAccountBiz.java
# src/com/engine/salary/entity/salaryBill/dto/SalarySendDetailListDTO.java
# src/com/engine/salary/entity/salaryarchive/param/SalaryArchiveQueryParam.java
# src/com/engine/salary/mapper/archive/SalaryArchiveMapper.java
# src/com/engine/salary/service/SalaryEmployeeService.java
# src/com/engine/salary/service/impl/AddUpDeductionServiceImpl.java
# src/com/engine/salary/service/impl/AddUpSituationServiceImpl.java
# src/com/engine/salary/service/impl/OtherDeductionServiceImpl.java
# src/com/engine/salary/service/impl/SIAccountServiceImpl.java
# src/com/engine/salary/service/impl/SalaryAcctCalculateServiceImpl.java
# src/com/engine/salary/service/impl/SalaryArchiveExcelServiceImpl.java
# src/com/engine/salary/service/impl/SalaryEmployeeServiceImpl.java
# src/com/engine/salary/service/impl/SalarySendRangeServiceImpl.java
# src/com/engine/salary/service/impl/TaxAgentManageRangeServiceImpl.java
# src/com/engine/salary/web/SalarySobController.java
# src/com/engine/salary/wrapper/SalaryAcctRecordWrapper.java
# src/com/engine/salary/wrapper/SalaryArchiveWrapper.java
# src/com/engine/salary/wrapper/SalarySendWrapper.java
# src/com/engine/salary/wrapper/TaxAgentSubAdminWrapper.java
# src/com/engine/salary/wrapper/TaxDeclarationWrapper.java
|
2023-07-11 16:08:15 +08:00 |
|
Harryxzy
|
287fcae68e
|
工资单定时发送sql
|
2023-07-11 10:22:14 +08:00 |
|
sy
|
a429c271f4
|
Merge branch 'feature/230602-数据库适配-PG' into release/2.8.4.2306.02
|
2023-06-29 15:12:48 +08:00 |
|
钱涛
|
b130fb0121
|
海康包冲突jar
|
2023-06-28 18:11:53 +08:00 |
|
sy
|
cdf4421ac2
|
薪酬系统-pg数据库适配，初始化sql脚本
|
2023-06-28 15:56:30 +08:00 |