Commit Graph

265 Commits

Author SHA1 Message Date
Harryxzy 558304043c Merge branch 'release/2.16.1.2410.01' into custom/宁波精华
# Conflicts:
#	src/com/engine/salary/entity/salaryacct/bo/SalaryAcctResultBO.java
#	src/com/engine/salary/entity/salaryacct/po/SalaryAcctEmployeePO.java
#	src/com/engine/salary/mapper/datacollection/EmployMapper.java
#	src/com/engine/salary/mapper/datacollection/EmployMapper.xml
#	src/com/engine/salary/mapper/salaryacct/SalaryAcctEmployeeMapper.java
#	src/com/engine/salary/mapper/salaryacct/SalaryAcctEmployeeMapper.xml
#	src/com/engine/salary/mapper/taxagent/TaxAgentMapper.java
#	src/com/engine/salary/mapper/taxagent/TaxAgentMapper.xml
#	src/com/engine/salary/service/SalaryAcctEmployeeService.java
#	src/com/engine/salary/service/SalaryEmployeeService.java
#	src/com/engine/salary/service/TaxAgentService.java
#	src/com/engine/salary/service/impl/SalaryAcctEmployeeServiceImpl.java
#	src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java
#	src/com/engine/salary/service/impl/SalaryEmployeeServiceImpl.java
#	src/com/engine/salary/service/impl/TaxAgentServiceImpl.java
2024-10-18 17:11:03 +08:00
钱涛 641b085a28 单元格锁定sql 2024-10-17 18:53:37 +08:00
钱涛 cede931b0d 版本 2024-10-17 14:21:46 +08:00
钱涛 64ac30c05f 自定义列全局设置 2024-10-11 15:34:17 +08:00
钱涛 da4e908a7d 模板sql 2024-10-10 14:16:57 +08:00
钱涛 7d0ebd1cdc 精简版常用查询 2024-09-26 17:00:59 +08:00
钱涛 6f10ac4ab2 取消非系统人员菜单 2024-09-24 19:04:57 +08:00
钱涛 17ef5a3c2b 浮动数据菜单 2024-09-24 13:19:20 +08:00
钱涛 db064863b2 版本号 2024-09-19 14:19:26 +08:00
Harryxzy 9e5810f173 Merge branch 'feature/240801-浮动薪资' into release/2.15.2.2409.01 2024-09-13 11:11:24 +08:00
钱涛 8aa34b806c 日志权限 2024-09-12 14:50:10 +08:00
钱涛 b7f9a1653c 线程数量 2024-09-02 17:41:07 +08:00
钱涛 659560550a Merge branch 'release/2.15.1.2407.01' into feature/240801-浮动薪资 2024-08-16 13:18:08 +08:00
钱涛 5071c08d8c Merge branch 'release/2.15.1.2407.01' into feature/导入工具
# Conflicts:
#	src/com/engine/salary/service/impl/SalarySobServiceImpl.java
2024-08-15 13:41:52 +08:00
钱涛 f74ec99644 账套支持sql范围 2024-08-15 10:37:41 +08:00
Harryxzy 1ebc56bb70 浮动薪酬增加义务人sql 2024-08-12 16:49:29 +08:00
钱涛 b83d45efa0 下载系统配置 2024-08-12 10:02:46 +08:00
Harryxzy 75fb15928a 浮动薪酬 2024-08-09 10:21:40 +08:00
Harryxzy 94a829e2c9 宁波精华社保管理员 2024-07-22 10:08:04 +08:00
Harryxzy ecadd01fa0 社保管理员sql 2024-07-18 13:43:12 +08:00
Harryxzy def55c9996 Merge branch 'feature/240701-社保管理员' into custom/宁波精华 2024-07-18 13:42:06 +08:00
Harryxzy 6b8b7fee62 社保管理员sql 2024-07-18 13:41:25 +08:00
Harryxzy 8c1caebdaf Merge branch 'feature/240701-社保管理员' into custom/宁波精华
# Conflicts:
#	src/com/engine/salary/entity/taxagent/po/TaxAgentAdminPO.java
#	src/com/engine/salary/mapper/archive/SalaryArchiveMapper.java
#	src/com/engine/salary/mapper/salarysob/SalarySobMapper.xml
#	src/com/engine/salary/mapper/taxagent/TaxAgentAdminMapper.xml
#	src/com/engine/salary/service/TaxAgentAdminService.java
#	src/com/engine/salary/service/impl/TaxAgentAdminServiceImpl.java
#	src/com/engine/salary/service/impl/TaxAgentServiceImpl.java
#	src/com/engine/salary/wrapper/TaxAgentWrapper.java
2024-07-17 18:18:39 +08:00
Harryxzy 6d5ff52329 社保管理员temp 2024-07-17 18:05:37 +08:00
Harryxzy 844266ac9a 社保管理员temp 2024-07-17 17:59:52 +08:00
Harryxzy f7a68cd27e 社保管理员temp 2024-07-17 14:55:44 +08:00
钱涛 b91818f2dc 版本 2024-07-15 09:36:40 +08:00
钱涛 993f21b448 Merge branch 'feature/人员信息快照' into release/2.14.5.2406.03
# Conflicts:
#	src/com/engine/salary/service/impl/SalarySendServiceImpl.java
2024-06-21 14:17:36 +08:00
钱涛 6d3af9d4ed wiki 2024-06-21 14:14:57 +08:00
钱涛 28536476d3 版本 2024-06-21 09:16:44 +08:00
钱涛 8d65e5d501 版本记录 2024-06-20 14:48:35 +08:00
钱涛 fa26d3041a 默认算税sql 2024-06-20 11:08:52 +08:00
钱涛 0c0c754a9d 人员信息快照 2024-06-18 11:01:58 +08:00
钱涛 7e988193c6 公式扩展获取月有多少天 2024-06-12 14:31:50 +08:00
钱涛 7a67253407 版本 2024-06-06 15:35:12 +08:00
钱涛 c86b53fd27 Merge branch 'feature/锁定人员' into release/2.14.3.2406.01 2024-05-30 17:06:57 +08:00
钱涛 238438897b 处理工资单证件号码不显示 2024-05-29 14:04:16 +08:00
钱涛 1ca5b15a68 处理档案sql 2024-05-29 10:31:29 +08:00
钱涛 6bd0d1b8a8 锁定人员sql 2024-05-28 17:51:26 +08:00
钱涛 f298450e7c 根据身份证导入 2024-05-28 15:26:59 +08:00
钱涛 2cd255136d 版本 2024-05-23 16:13:47 +08:00
钱涛 43db025d98 Merge branch 'feature/账套副本' into release/2.14.2.2405.02 2024-05-23 11:36:38 +08:00
钱涛 4c3b34e376 sql 2024-05-17 15:41:15 +08:00
钱涛 6de3b1454d 获取档案信息sql 2024-05-16 14:06:38 +08:00
钱涛 af819896e4 版本 2024-05-14 13:45:03 +08:00
钱涛 e7dee966d6 二开说明 2024-05-09 17:27:28 +08:00
钱涛 bcc1e35117 拦截核算记录样例 2024-05-08 17:28:43 +08:00
钱涛 def5bae707 账套快照-隐藏字段脚本 2024-05-07 16:41:12 +08:00
钱涛 3428de9e33 账套快照 2024-05-06 16:03:29 +08:00
钱涛 4682866674 档案sql 2024-04-25 14:25:40 +08:00