 钱涛
|
3a17e8c833
|
Merge branch 'release/个税版本' into feature/在线算税
|
2024-06-21 13:59:00 +08:00 |
|
钱涛
|
d5dd3093cb
|
处理冲突
|
2024-06-21 13:38:44 +08:00 |
|
钱涛
|
02be1b9da4
|
Merge branch 'release/2.14.4.2406.02' into release/个税版本
# Conflicts:
# src/com/engine/salary/mapper/salarysob/SalarySobItemMapper.xml
# src/com/engine/salary/service/impl/AddUpDeductionServiceImpl.java
# src/com/engine/salary/service/impl/AddUpSituationServiceImpl.java
# src/com/engine/salary/service/impl/SalaryAcctCalculateServiceImpl.java
# src/com/engine/salary/service/impl/SalarySobItemServiceImpl.java
# src/com/engine/salary/service/impl/TaxDeclarationExcelServiceImpl.java
# src/com/engine/salary/util/excel/ExcelUtil.java
|
2024-06-21 10:53:59 +08:00 |
|
钱涛
|
a90e32fbf4
|
map映射
|
2024-06-20 17:08:01 +08:00 |
Harryxzy
|
071130adb3
|
Merge remote-tracking branch 'origin/release/2.14.4.2406.02' into release/2.14.4.2406.02
|
2024-06-20 16:40:42 +08:00 |
|
Harryxzy
|
b5f8e88a58
|
Merge branch 'feature/240502_薪资项目增加默认值设置' into release/2.14.4.2406.02
|
2024-06-20 16:40:07 +08:00 |
|
Harryxzy
|
537992187e
|
update 设置了多个default_value
|
2024-06-20 16:39:48 +08:00 |
|
钱涛
|
2be7ec31de
|
修改工资单预览
|
2024-06-20 16:39:35 +08:00 |
|
Harryxzy
|
560fabe075
|
账套人员范围导入增加了一列，导致导入校验没通过
|
2024-06-20 16:28:48 +08:00 |
|
钱涛
|
8d65e5d501
|
版本记录
|
2024-06-20 14:48:35 +08:00 |
|
钱涛
|
e5d66373e6
|
默认值需要导致异动
|
2024-06-20 14:47:19 +08:00 |
|
Harryxzy
|
3f9bb23e80
|
Merge branch 'feature/240502_薪资项目增加默认值设置' into release/2.14.4.2406.02
|
2024-06-20 11:44:15 +08:00 |
|
Harryxzy
|
e13c2b0cd0
|
薪资项目同步默认值
|
2024-06-20 11:43:57 +08:00 |
|
钱涛
|
fa26d3041a
|
默认算税sql
|
2024-06-20 11:08:52 +08:00 |
|
Harryxzy
|
4fbd7d7418
|
Merge branch 'feature/240502_薪资项目增加默认值设置' into release/2.14.4.2406.02
|
2024-06-20 10:44:41 +08:00 |
|
Harryxzy
|
5459729da2
|
Merge branch 'feature/240301-导出excel单元格格式' into release/2.14.4.2406.02
# Conflicts:
# src/com/engine/salary/service/impl/SalaryArchiveServiceImpl.java
|
2024-06-20 10:44:12 +08:00 |
|
钱涛
|
ba49d66b46
|
在线算税日志
|
2024-06-20 10:39:40 +08:00 |
|
钱涛
|
0df6169152
|
在线获取累计专项附加扣除
|
2024-06-19 17:05:46 +08:00 |
|
钱涛
|
24a979507a
|
未报送人员列表
|
2024-06-19 11:37:31 +08:00 |
|
钱涛
|
0961071980
|
Merge remote-tracking branch 'origin/feature/240502_薪资项目增加默认值设置' into feature/240502_薪资项目增加默认值设置
# Conflicts:
# src/com/engine/salary/mapper/salarysob/SalarySobItemMapper.xml
|
2024-06-19 11:23:43 +08:00 |
|
钱涛
|
fe8dcd0ccd
|
核算默认值
|
2024-06-19 11:21:00 +08:00 |
|
钱涛
|
f0fce26e8a
|
Merge branch 'release/2.14.4.2406.02' into feature/240502_薪资项目增加默认值设置
# Conflicts:
# src/com/engine/salary/mapper/salarysob/SalarySobItemMapper.xml
# src/com/engine/salary/service/impl/SalarySobItemServiceImpl.java
|
2024-06-19 11:14:31 +08:00 |
|
钱涛
|
d52e146001
|
在线算税时校验人员是否已报送
|
2024-06-19 09:53:46 +08:00 |
|
Harryxzy
|
216c4cee84
|
默认值temp
|
2024-06-17 17:58:01 +08:00 |
|
钱涛
|
af8cce8525
|
在线算税，个税对应规则
|
2024-06-17 17:03:48 +08:00 |
|
钱涛
|
6648e4140e
|
在线算税sql
|
2024-06-17 10:26:17 +08:00 |
|
钱涛
|
5b7533e908
|
同步假期余额字段
|
2024-06-14 13:46:59 +08:00 |
|
钱涛
|
0633225648
|
同步假期余额字段
|
2024-06-14 13:34:21 +08:00 |
|
钱涛
|
5c13f80034
|
Merge remote-tracking branch 'origin/release/2.14.4.2406.02' into release/2.14.4.2406.02
|
2024-06-13 17:46:55 +08:00 |
|
钱涛
|
64e34d6d08
|
工资单预览
|
2024-06-13 17:46:37 +08:00 |
|
Harryxzy
|
a27716ae72
|
Merge remote-tracking branch 'origin/release/2.14.4.2406.02' into release/2.14.4.2406.02
|
2024-06-13 14:14:38 +08:00 |
|
Harryxzy
|
6513c2b6e6
|
Merge branch 'fix/240601-补差导入模板bug' into release/2.14.4.2406.02
|
2024-06-13 14:14:21 +08:00 |
|
Harryxzy
|
1dd3439ce3
|
社保福利台账小数位优化
|
2024-06-13 13:59:43 +08:00 |
|
钱涛
|
db391f01c4
|
处理大数据内存溢出
|
2024-06-13 13:39:24 +08:00 |
|
钱涛
|
4798f5d4a6
|
处理大数据内存溢出
|
2024-06-12 17:35:06 +08:00 |
|
Harryxzy
|
e249de9a59
|
报表导出单元格格式
|
2024-06-12 16:01:09 +08:00 |
|
钱涛
|
1983ba968c
|
去除日志
系统薪资项目配置不需要重启
|
2024-06-12 15:35:40 +08:00 |
|
钱涛
|
7e988193c6
|
公式扩展获取月有多少天
|
2024-06-12 14:31:50 +08:00 |
|
钱涛
|
853482141f
|
小数位支持10位
|
2024-06-12 10:45:32 +08:00 |
|
钱涛
|
f073f6d90c
|
处理刷新非正常人员问题
|
2024-06-11 15:48:07 +08:00 |
|
钱涛
|
e94273468e
|
处理刷新非正常人员问题
|
2024-06-11 15:27:00 +08:00 |
|
钱涛
|
a1e7ec160c
|
处理复制异常
|
2024-06-11 10:10:45 +08:00 |
|
钱涛
|
dc85ba6043
|
个税字段配置
|
2024-06-11 10:09:18 +08:00 |
|
钱涛
|
6a8c2dd8ac
|
个税字段配置
|
2024-06-07 11:01:57 +08:00 |
|
钱涛
|
3e11d7240b
|
Merge branch 'release/个税版本' into feature/在线算税
|
2024-06-06 15:56:37 +08:00 |
|
钱涛
|
eca321ee4c
|
Merge branch 'release/个税版本2.14.3.2406.01' into release/个税版本
|
2024-06-06 15:54:23 +08:00 |
|
钱涛
|
b7b1dc8aac
|
Merge branch 'release/2.14.3.2406.01' into release/个税版本2.14.3.2406.01
|
2024-06-06 15:54:07 +08:00 |
|
钱涛
|
7a67253407
|
版本
|
2024-06-06 15:35:12 +08:00 |
|
钱涛
|
789b77ba0b
|
档案导入模板注释
|
2024-06-06 14:54:58 +08:00 |
|
钱涛
|
e1e00f4db0
|
在线算税v1
|
2024-06-06 13:51:33 +08:00 |