qt
/
weaver-hrm-salary
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
2,732 Commits 293 Branches 39 Tags 49 MiB
Commit Graph

142 Commits

Author SHA1 Message Date
Harryxzy f73cab0ca1 Merge branch 'release/个税版本' into custom/昂立 
# Conflicts:
#	src/com/engine/salary/entity/salaryacct/bo/SalaryAcctRecordBO.java
#	src/com/engine/salary/wrapper/SalaryAcctRecordWrapper.java
 2023-12-08 13:34:34 +08:00
钱涛 791bc2ffca Merge branch 'release/2.9.9.2312.01' into release/个税版本 
# Conflicts:
#	src/com/engine/salary/service/SalaryArchiveService.java
#	src/com/engine/salary/service/impl/SalaryArchiveServiceImpl.java
 2023-12-05 15:09:40 +08:00
Harryxzy b093717e46 Merge branch 'fix/231102_账套增加义务人筛选' into release/2.9.9.2312.01 2023-12-05 11:28:47 +08:00
Harryxzy 805fb9ff3c 1、薪资账套页面增加义务人筛选条件 
2、薪资核算页面增加义务人列表
 2023-11-20 16:14:51 +08:00
Harryxzy c710f78470 Merge branch 'release/个税版本' into custom/昂立 2023-11-17 16:03:07 +08:00
钱涛 753eaa5b22 检查闭环 2023-11-17 16:00:59 +08:00
Harryxzy 97a5d4ab91 线下对比表头改造成分组的样式 2023-11-15 17:12:52 +08:00
Harryxzy 14b5c65253 昂立修复工资单审批不展示未分类 2023-11-01 14:30:03 +08:00
Harryxzy f2a096b6f6 Merge branch 'release/个税版本' into custom/昂立 2023-10-31 17:21:25 +08:00
钱涛 b050888b7b Merge branch 'release/3.0.0.2311.01' into release/个税版本 2023-10-31 17:19:09 +08:00
钱涛 3d8919da25 账套增加证件号码字段 2023-10-31 15:08:43 +08:00
钱涛 2b4ded9dd0 修复合计没有根据自定义字段过滤 2023-10-30 19:19:07 +08:00
Harryxzy a897c827d4 Merge branch 'release/个税版本' into custom/昂立 2023-10-13 16:59:20 +08:00
Harryxzy bac9b92ae4 Merge branch 'custom/昂立-个税版本' into custom/昂立 
# Conflicts:
#	src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java
 2023-10-13 16:58:45 +08:00
钱涛 5d3e2928c9 Merge branch 'release/2.9.6.2310.01' into release/个税版本 2023-10-13 16:54:46 +08:00
Harryxzy c7796930a7 Merge branch 'fix/231002_变量返回双引号或0' into custom/昂立 2023-10-12 13:47:31 +08:00
Harryxzy fbc49bff98 公式变量为文本时返回””number返回0 2023-10-12 13:47:18 +08:00
钱涛 d5f5cb07ba Merge branch 'release/2.9.6.2310.01' into release/个税版本 2023-10-08 16:21:12 +08:00
钱涛 182e90676c Merge branch 'feature/自定义筛选条件' into release/2.9.6.2310.01 
# Conflicts:
#	src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java
 2023-10-08 14:24:33 +08:00
钱涛 26bbc9c0ee Merge branch 'release/2.9.6.2310.01' into release/个税版本 
# Conflicts:
#	src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java
 2023-10-08 14:21:25 +08:00
钱涛 8166e76081 账套增加状态字段 2023-10-08 13:38:37 +08:00
钱涛 5d203b0783 自定义搜索 2023-09-25 16:53:01 +08:00
钱涛 faeafbe5ad 暂存 2023-09-25 15:38:14 +08:00
钱涛 5602d65ed8 Merge branch 'release/2.9.5.2309.01' into release/个税版本 
# Conflicts:
#	resource/WEB-INF/prop/hrmSalaryCustom.properties
 2023-09-22 17:59:06 +08:00
钱涛 7c5af2166e 日期格式自定义配置 2023-09-22 17:57:47 +08:00
Harryxzy d86bb2f84b Merge branch 'release/个税版本' into custom/昂立-个税版本 
# Conflicts:
#	src/com/engine/salary/service/SalaryAcctRecordService.java
#	src/com/engine/salary/service/impl/SalaryAcctRecordServiceImpl.java
#	src/com/engine/salary/service/impl/SalarySobServiceImpl.java
 2023-09-22 16:20:51 +08:00
钱涛 0545c6eb8c Merge branch 'release/2.9.5.2309.01' into release/个税版本 2023-09-21 16:58:15 +08:00
Harryxzy bf8ae9fd09 Merge branch 'fix/230902-导出报表为数值类型' into release/2.9.5.2309.01 2023-09-21 16:03:38 +08:00
Harryxzy efa818f8b9 核算结果导出数值项excel格式为数值 2023-09-21 13:36:23 +08:00
Harryxzy c40c31845c 账套中修改公式为输入，核算的公式页面展示为空字符串不是”输入“ 2023-09-20 15:26:18 +08:00
钱涛 88a59d3d01 处理空指针 2023-09-18 13:49:25 +08:00
钱涛 02100c2ee3 有向无环拓扑排序 2023-09-07 15:15:59 +08:00
钱涛 464bb9d623 Merge branch 'release/个税二期' into release/个税版本 2023-09-06 17:06:07 +08:00
钱涛 43cdf98411 核算优先级 2023-09-06 15:48:43 +08:00
钱涛 d03aed1d1b 核算优先级 2023-09-06 14:01:56 +08:00
钱涛 d49b33c66f Merge branch 'release/个税一期' into release/个税版本 2023-09-06 11:40:34 +08:00
钱涛 f9611212d4 个税解析 2023-09-06 11:40:22 +08:00
钱涛 6059174e7c 往期累计的在线获取 2023-09-06 09:40:50 +08:00
钱涛 6871316f98 Merge branch 'release/2.9.4.2308.02' into release/个税一期 
# Conflicts:
#	resource/WEB-INF/prop/hrmSalaryCustom.properties
#	src/com/engine/salary/service/SalaryEmployeeService.java
#	src/com/engine/salary/service/impl/SalaryEmployeeServiceImpl.java
 2023-09-04 09:30:24 +08:00
Harryxzy 1187ee5e96 Merge branch 'release/2.9.4.2308.02' into custom/昂立 2023-09-01 11:20:13 +08:00
Harryxzy 89734ae022 昂立，工资单审批 2023-09-01 11:19:56 +08:00
Harryxzy c749e61e9c 昂立 2023-08-31 13:31:32 +08:00
Harryxzy 20337c2883 昂立-工资单审批 2023-08-29 17:48:15 +08:00
Harryxzy e6b4b4c4da 昂立 2023-08-29 10:08:18 +08:00
Harryxzy 7f17c68c9c 昂立 2023-08-28 10:38:53 +08:00
Harryxzy e83db15bc7 薪资档案、薪资核算编辑前端控制保留位数 2023-08-25 15:09:12 +08:00
钱涛 9e416123dd 账套薪资项目添加code 2023-08-23 16:49:45 +08:00
钱涛 988139610b Merge branch 'release/2.9.4.2308.02' into release/230803对接个税 
# Conflicts:
#	src/com/engine/salary/mapper/salarysob/SalarySobItemMapper.xml
#	src/com/engine/salary/web/SalarySobController.java
 2023-08-18 09:36:26 +08:00
钱涛 b1817142b0 个税对接，个税申报接口 2023-08-14 20:07:29 +08:00
Harryxzy 19cb2d9622 Merge branch 'feature/230703-薪资账套项目页面改造' into release/2.9.3.2308.01 2023-08-14 09:19:20 +08:00