Harryxzy
|
de1efcfd7f
|
艾志优化
|
2024-04-02 10:38:52 +08:00 |
|
Harryxzy
|
d57d5f7e13
|
薪资核算导出模板优化
|
2024-03-29 16:23:08 +08:00 |
|
Harryxzy
|
19732b39b8
|
艾志修复二开操作权限
|
2024-03-19 10:47:38 +08:00 |
|
Harryxzy
|
3c624fe859
|
Merge branch 'release/个税版本' into custom/艾志工业
|
2024-03-12 18:58:57 +08:00 |
 钱涛
|
1d8a1b91c0
|
解决冲突
|
2024-03-12 18:58:36 +08:00 |
|
钱涛
|
452d7bc57c
|
Merge branch 'release/3.0.0.2403.01' into release/个税版本
# Conflicts:
# src/com/engine/salary/entity/datacollection/AddUpSituation.java
# src/com/engine/salary/entity/salarysob/po/SalarySobPO.java
# src/com/engine/salary/service/impl/AddUpDeductionServiceImpl.java
# src/com/engine/salary/service/impl/AddUpSituationServiceImpl.java
# src/com/engine/salary/service/impl/SalarySobItemServiceImpl.java
# src/com/engine/salary/service/impl/TaxDeclarationExcelServiceImpl.java
# src/com/engine/salary/service/impl/TaxDeclarationServiceImpl.java
|
2024-03-12 18:56:12 +08:00 |
|
钱涛
|
bef1835c39
|
jar更新
|
2024-03-12 16:46:55 +08:00 |
|
Harryxzy
|
af57e8ecf4
|
Merge remote-tracking branch 'origin/release/3.0.0.2403.01' into release/3.0.0.2403.01
|
2024-03-12 14:58:21 +08:00 |
|
钱涛
|
e22e178d08
|
去除非标准功能
|
2024-03-12 14:51:28 +08:00 |
|
钱涛
|
9ec3581533
|
elog配置
|
2024-03-12 14:42:12 +08:00 |
|
钱涛
|
836947725f
|
切换了elog位置
|
2024-03-12 14:34:44 +08:00 |
|
Harryxzy
|
83624be06e
|
Merge branch 'fix/240301_薪资核算、社保台账导入提示缺失' into release/3.0.0.2403.01
|
2024-03-12 14:26:42 +08:00 |
|
Harryxzy
|
46626b4c25
|
Merge branch 'release/3.0.0.2403.01' into custom/艾志工业
|
2024-03-12 13:28:28 +08:00 |
|
Harryxzy
|
32f8e8a828
|
Merge branch 'fix/240301_薪资核算、社保台账导入提示缺失' into custom/艾志工业
|
2024-03-12 13:28:12 +08:00 |
|
Harryxzy
|
17b65fca28
|
Merge branch 'release/个税版本' into custom/艾志工业
|
2024-03-12 13:27:25 +08:00 |
|
Harryxzy
|
69480c05cb
|
艾志工业人员信息报送逻辑修改
|
2024-03-12 13:27:19 +08:00 |
|
Harryxzy
|
afb4bfd7ad
|
修复bug：
1、薪资核算结果导入提示缺失
2、社保福利台账导入操作日志导致报错
|
2024-03-11 17:23:20 +08:00 |
|
钱涛
|
4b823ccca7
|
国际化注解
|
2024-03-11 16:50:47 +08:00 |
|
Harryxzy
|
a7b3b7578f
|
增加个税申报表日志
|
2024-03-08 16:33:34 +08:00 |
|
Harryxzy
|
a85e646e9a
|
Merge branch 'release/个税版本' into custom/艾志工业-个税申报-0308bak
|
2024-03-08 15:11:25 +08:00 |
|
Harryxzy
|
f89c13a95f
|
艾志处理空指针
|
2024-03-08 15:11:12 +08:00 |
|
钱涛
|
ddc9188cd9
|
只获取正常且报送成功的
|
2024-03-08 15:09:42 +08:00 |
|
钱涛
|
9415dd8e71
|
可删除报送成功人员
|
2024-03-08 11:34:50 +08:00 |
|
Harryxzy
|
73df953ae5
|
Merge branch 'release/个税版本' into custom/艾志工业-个税申报-0308bak
|
2024-03-08 11:14:31 +08:00 |
|
Harryxzy
|
6aef2856e8
|
个税日志
|
2024-03-08 11:14:00 +08:00 |
|
Harryxzy
|
4516f74d2e
|
艾志-合并0301冲突
|
2024-03-08 10:38:20 +08:00 |
|
Harryxzy
|
878735cbc8
|
Merge branch 'release/个税版本' into custom/艾志工业-个税申报-0308bak
# Conflicts:
# src/com/engine/salary/entity/datacollection/AddUpSituation.java
# src/com/engine/salary/entity/employeedeclare/bo/EmployeeDeclareRefresh.java
# src/com/engine/salary/service/SIArchivesService.java
# src/com/engine/salary/service/impl/SIArchivesServiceImpl.java
# src/com/engine/salary/service/impl/SISchemeServiceImpl.java
# src/com/engine/salary/service/impl/SalaryArchiveServiceImpl.java
# src/com/engine/salary/wrapper/SalaryFormulaWrapper.java
|
2024-03-08 09:59:40 +08:00 |
|
Harryxzy
|
d890ab5a84
|
Merge remote-tracking branch 'origin/release/个税版本' into release/个税版本
|
2024-03-08 09:26:57 +08:00 |
|
钱涛
|
8516a23bba
|
修改人员报送刷新逻辑
刷新人员会集成上月所有人员
|
2024-03-07 21:12:09 +08:00 |
|
钱涛
|
72861b9a93
|
Merge branch 'release/3.0.0.2403.01' into release/个税版本
|
2024-03-07 16:57:03 +08:00 |
|
Harryxzy
|
0f82b8ce10
|
Merge branch 'feature/操作日志组件' into release/2.11.1.2402.01
|
2024-03-07 14:23:46 +08:00 |
|
Harryxzy
|
17428c621e
|
非系统人员范围操作日志
|
2024-03-07 14:23:12 +08:00 |
|
钱涛
|
729c6c7d3a
|
处理空指针
|
2024-03-07 14:12:16 +08:00 |
|
钱涛
|
e81937c4dd
|
去除报表原先的表
|
2024-03-07 11:45:26 +08:00 |
|
Harryxzy
|
a4f4c8c5a4
|
Merge remote-tracking branch 'origin/release/个税版本' into release/个税版本
|
2024-03-07 11:14:43 +08:00 |
|
钱涛
|
e851944e8f
|
优化薪资账套项目保存逻辑
|
2024-03-07 11:11:24 +08:00 |
|
钱涛
|
6d4993f4ff
|
Merge branch 'release/2.11.1.2402.01' into release/个税版本
|
2024-03-07 10:45:36 +08:00 |
|
钱涛
|
3b1edddf00
|
优化薪资账套项目保存逻辑
|
2024-03-07 10:21:06 +08:00 |
|
钱涛
|
730166d771
|
Merge branch 'release/2.11.1.2402.01' into release/个税版本
|
2024-03-07 09:54:35 +08:00 |
|
钱涛
|
e187ee57e0
|
获取所有账套列表接口
|
2024-03-07 09:52:21 +08:00 |
|
钱涛
|
427ce223e7
|
核算闭环提醒
|
2024-03-07 09:43:22 +08:00 |
|
Harryxzy
|
381c705cf8
|
人员信息报送、个税申报表日志
|
2024-03-07 09:29:59 +08:00 |
|
钱涛
|
a52788aa1b
|
往期累计日志调整
|
2024-03-06 16:12:15 +08:00 |
|
钱涛
|
4196a8c596
|
合并冲突
|
2024-03-06 16:05:55 +08:00 |
|
钱涛
|
5a9d45f92b
|
Merge branch 'release/2.11.1.2402.01' into release/个税版本
# Conflicts:
# resource/WEB-INF/prop/hrmSalaryCustom.properties
# src/com/engine/salary/entity/datacollection/AddUpSituation.java
# src/com/engine/salary/entity/datacollection/po/SpecialAddDeductionPO.java
# src/com/engine/salary/entity/salarysob/po/SalarySobPO.java
# src/com/engine/salary/formlua/entity/parameter/ExcelFuncs.java
# src/com/engine/salary/service/impl/AddUpDeductionServiceImpl.java
# src/com/engine/salary/service/impl/AddUpSituationServiceImpl.java
# src/com/engine/salary/service/impl/AttendQuoteDataServiceImpl.java
# src/com/engine/salary/service/impl/SalaryAcctRecordServiceImpl.java
# src/com/engine/salary/service/impl/SalarySendServiceImpl.java
# src/com/engine/salary/service/impl/SalarySobItemServiceImpl.java
# src/com/engine/salary/service/impl/SalarySobServiceImpl.java
# src/com/engine/salary/service/impl/SalaryTemplateServiceImpl.java
# src/com/engine/salary/service/impl/TaxDeclarationExcelServiceImpl.java
# src/com/engine/salary/service/impl/TaxDeclarationServiceImpl.java
# src/com/engine/salary/util/page/SalaryPageUtil.java
|
2024-03-06 15:54:07 +08:00 |
|
钱涛
|
78c1d6f51c
|
项目日志字段解释
|
2024-03-06 15:20:21 +08:00 |
|
Harryxzy
|
20d7266db9
|
Merge branch 'feature/240201_社保福利台账导入字段缓存' into release/2.11.1.2402.01
# Conflicts:
# src/com/engine/salary/service/impl/SIAccountServiceImpl.java
|
2024-03-06 13:50:56 +08:00 |
|
Harryxzy
|
0ac291d83d
|
Merge branch 'feature/操作日志组件' into release/2.11.1.2402.01
|
2024-03-06 09:23:21 +08:00 |
|
钱涛
|
cb005d717a
|
添加wiki目录
|
2024-03-05 17:40:10 +08:00 |
|
钱涛
|
c2eab7ce64
|
添加wiki目录
|
2024-03-05 17:37:47 +08:00 |