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

509 Commits

Author SHA1 Message Date
Harryxzy 510a2e7d29 处理工资单发放历史数据执行时间提前 2023-02-09 19:43:43 +08:00
fcli 5b50903b55 Merge branch 'feature/SalaryItemAuth&FieldManage' into release/2.6.1.2301.02 2023-02-09 18:48:35 +08:00
fcli e99abfddcd feat: 保存更新判断薪资档案引用 2023-02-09 18:47:48 +08:00
钱涛 995689bb1d Merge branch 'feature/考勤引用本身报表' into release/2.6.1.2301.02 2023-02-09 17:31:42 +08:00
fcli 308a44a9a6 Merge remote-tracking branch 'origin/feature/SalaryItemAuth&FieldManage' into release/2.6.1.2301.02 2023-02-09 17:23:07 +08:00
fcli 5ee8097b3e Merge branch 'feat/salaryBillSaveItem042' into release/2.6.1.2301.02 2023-02-09 17:22:53 +08:00
fcli fdf343dbbd fix: 字段管理可以切换薪资引用 2023-02-09 11:08:03 +08:00
钱涛 2ff5ff0dce 考勤列表和导出 2023-02-06 16:28:56 +08:00
钱涛 0fb9fb51a0 修复调薪记录显示问题 2023-02-06 11:08:59 +08:00
fcli 3f145e133b feat: 添加是否补发参数 2023-02-01 13:39:14 +08:00
fcli 78f8630465 feat: 薪资账套项目列表分权 2023-02-01 11:23:43 +08:00
fcli dec7c89856 feat: 发放模板获取可用分组或项目 2023-02-01 11:22:38 +08:00
fcli e92ea00b02 fix: 薪资项目公式按分权处理。 
薪资项目管理列表取出薪资档案引用列
 2023-01-31 14:31:46 +08:00
fcli da47210b22 fix: 薪资档案根据薪资项目分权展示 2023-01-31 14:05:40 +08:00
钱涛 857c39bd2d 年终奖 2023-01-30 17:32:58 +08:00
fcli 80019a029c feat: 获取部分字段 2023-01-28 13:56:02 +08:00
fcli bd2597541d feat: 字段管理 2023-01-18 09:38:43 +08:00
Harryxzy 2b3752a554 Merge branch 'feature/V3-taxAgentsAddImport-0112' into release/2.5.3.2301.01 2023-01-12 09:25:06 +08:00
Harryxzy fd470c56aa 薪资账套人员范围导入 2023-01-09 15:12:44 +08:00
Harryxzy 09ba495bf3 个税扣缴义务人批量导入功能 2023-01-09 10:01:47 +08:00
钱涛 9dac777d5f Merge branch 'feature/sql检查方法' into release/2.5.3.2301.01 
# Conflicts:
#	src/com/engine/salary/wrapper/SalaryFormulaWrapper.java
 2023-01-06 14:41:42 +08:00
sy 84aeb5059f 薪酬系统-福利台账，调差方式3时的福利项 2022-12-28 17:01:15 +08:00
sy 494462092d 薪酬系统-福利台账，补缴方式选择指定月的缴纳基数获取功能 2022-12-27 17:34:46 +08:00
sy c49017f63b Merge branch 'feature/v3-siAccountBalance-1208' into release/2.4.2.2212.03 2022-12-23 18:45:48 +08:00
sy 011d66e298 薪酬系统-福利台账，补差数据导入，过滤未启用福利项 2022-12-23 18:45:10 +08:00
sy d2be8e86ea Merge branch 'feature/v3-siAccountBalance-1208' into release/2.4.2.2212.03 2022-12-22 09:09:00 +08:00
Harryxzy ddea8c9066 回算工资单发放调整 2022-12-19 11:12:26 +08:00
Harryxzy 0ace75ab06 工资单发放模板展示 2022-12-16 14:55:11 +08:00
Harryxzy 82577f97e0 舍入规则保存错误 2022-12-16 11:22:43 +08:00
sy 0787fb4d05 Merge remote-tracking branch 'remotes/origin/release/2.4.1.2212.02' into feature/v3-siAccountBalance-1208 
# Conflicts:
#	src/com/engine/salary/service/impl/SIAccountServiceImpl.java
 2022-12-15 17:08:21 +08:00
Harryxzy 5f37281757 添加backcalctype 2022-12-14 18:21:25 +08:00
Harryxzy 0130b83f00 Merge branch 'feature/加密方法&分页merge' into feature/V3-backItem-1215 
# Conflicts:
#	src/com/engine/salary/service/impl/SalarySendServiceImpl.java
 2022-12-14 12:21:42 +08:00
钱涛 4d677b4d58 mock公式运行 2022-12-13 16:13:45 +08:00
sy ae72d25431 Merge remote-tracking branch 'remotes/origin/master' into feature/v3-siAccountBalance-1208 2022-12-12 13:43:16 +08:00
fcli b58e71989d feat: 统一修改到内存分页 2022-12-12 10:25:55 +08:00
fcli 8e2e85a986 Merge remote-tracking branch 'origin/release/2.3.2.2212.01' into release/2.3.2.2212.01 2022-12-08 16:43:06 +08:00
fcli cc105ca051 Merge branch 'feat/SalarySendRange' into release/2.3.2.2212.01 2022-12-08 16:41:04 +08:00
sy 0399731b9b Merge remote-tracking branch 'remotes/origin/feature/v3-siAccountCompensation-1201' into release/2.3.2.2212.01 2022-12-08 16:25:28 +08:00
sy 0210f6542f 薪酬系统-福利台账，补差数据删除v1 2022-12-08 16:23:18 +08:00
fcli fcca6950ac feat: 修复bug 2022-12-08 15:45:15 +08:00
Harryxzy 19022fc505 fix 编辑工资单模板，补发显示部分 2022-12-07 10:34:41 +08:00
钱涛 b39587e19d 单独调薪action 2022-12-06 18:08:50 +08:00
Harryxzy c0d916c286 薪资回算功能，工资单部分 2022-12-06 15:29:08 +08:00
sy 3fa017b13a 薪酬系统-福利台账，补差福利项列表功能和补差模板导出功能 2022-12-06 11:44:04 +08:00
sy a04f4a915f 薪酬系统-福利台账，可调差人员列表功能取消分页逻辑 2022-12-05 15:42:49 +08:00
Harryxzy 3ff3fd8e44 薪资回算-薪资核算部分（剩余核算归档） 2022-12-02 17:35:14 +08:00
钱涛 991338a10e 合计行异步处理 2022-12-02 16:58:19 +08:00
sy 4d01c324e0 薪酬系统-福利台账，社保调差保存功能优化 2022-11-30 15:05:24 +08:00
钱涛 d8f99abb18 调薪，调薪校验流程接口 2022-11-30 11:23:58 +08:00
sy a0bda933a1 薪酬系统-福利台账，社保调差项公司支出费用统计功能 2022-11-29 17:36:18 +08:00
sy 2ceeeb165f 薪酬系统-福利台账，社保调差列表v1 2022-11-29 15:33:57 +08:00
sy 8bc16ae470 Merge branch 'master' into feature/v3-siAccountCompensation-1201 2022-11-28 14:58:23 +08:00
sy 1747a613dd 薪酬系统-福利台账，社保调差撤回v1 2022-11-28 14:57:29 +08:00
sy 49466f9f3b 薪酬系统-福利台账，社保调差默认配置保存v1 2022-11-28 13:42:53 +08:00
sy 8d211c7db0 薪酬系统-福利台账，社保调差保存v1 2022-11-28 11:35:05 +08:00
Harryxzy 85fef5c5f8 Merge branch 'master' into feature/V3-backItem-1215 2022-11-28 09:26:59 +08:00
sy 75a7497a07 Merge remote-tracking branch 'remotes/origin/feature/v3-siAccountRecession-1117' into release/2.3.1.2211.04 
# Conflicts:
#	src/com/engine/salary/mapper/datacollection/EmployMapper.java
 2022-11-25 13:55:29 +08:00
fcli fc81955b15 feat: 全部范围部分发放撤回功能 2022-11-25 10:53:23 +08:00
钱涛 7808019c43 新增核算时间变量 2022-11-24 17:33:48 +08:00
钱涛 c2371ffcb3 取消缓冲时间 2022-11-24 10:30:00 +08:00
钱涛 2ab7049fa0 单个核算 2022-11-23 18:30:53 +08:00
sy f1bd574c81 薪酬系统-福利台账，调差v2 2022-11-23 15:39:42 +08:00
钱涛 1307f485eb 同步人员范围 2022-11-22 15:53:05 +08:00
钱涛 264edf1bf2 同步人员范围 2022-11-22 15:37:07 +08:00
Harryxzy a53fa14a3d Merge branch 'master' into feature/V3-backItem-MMdd 2022-11-22 14:37:15 +08:00
Harryxzy 036d2d540b 薪资回算-薪资账套部分 2022-11-22 14:36:59 +08:00
sy 96a440a9a7 薪酬系统-福利台账，退差数据新增时的可选择人员列表v1 2022-11-21 15:27:15 +08:00
sy 9c897c87dd Merge remote-tracking branch 'remotes/origin/master' into feature/v3-siAccountRecession-1117 2022-11-21 09:54:44 +08:00
Harryxzy a5ae8c8ea6 回算薪资项（薪资账套部分），剩余处理历史数据 2022-11-18 14:20:18 +08:00
钱涛 9a9a9cdaf3 Merge branch 'feature/加锁221117' into release/2.2.2.2211.03 2022-11-17 19:05:55 +08:00
Harryxzy 11c4b1e4f7 Merge branch 'feature/V3-editSalaryAdjustment-11-17' into release/2.2.2.2211.03 2022-11-17 18:35:12 +08:00
Harryxzy f762fd7030 调薪编辑、删除 放开校验限制 2022-11-17 16:51:07 +08:00
Harryxzy 57f8bb6a6a fix immMAP 2022-11-17 16:30:29 +08:00
fcli b03e5efbcf feat: 沿用上月增加校验 2022-11-17 15:13:59 +08:00
fcli 0aa59757c5 feat: 沿用上月增加校验 2022-11-17 15:13:55 +08:00
fcli 0f51d44cd4 Merge remote-tracking branch 'origin/release/2.2.2.2211.03' into release/2.2.2.2211.03 2022-11-17 14:43:59 +08:00
fcli b3cd118c21 feat: 自动累计功能 2022-11-17 14:28:15 +08:00
fcli 5743fa2162 feat: 其他附加扣除沿用上月功能完成 2022-11-17 14:28:10 +08:00
Harryxzy 1eaef7fcd4 fix分页时，数据不显示 2022-11-17 09:53:40 +08:00
钱涛 271daf29be 批量锁定功能 2022-11-17 09:28:40 +08:00
Harryxzy 1740c99df6 fix immutableBug 2022-11-16 16:47:09 +08:00
Harryxzy 1e307e2f87 薪资回算，薪资账套中薪资回算项目展示 2022-11-16 15:18:43 +08:00
Harryxzy 00357cd9d8 回算功能-新建薪资账套默认 2022-11-16 10:32:05 +08:00
sy ce37694a95 薪酬系统-福利台账，退差数据删除功能v1 2022-11-16 10:15:05 +08:00
Harryxzy a3705c67a4 修改查看编辑调薪 2022-11-15 11:37:55 +08:00
Harryxzy 323c1ec0e0 查看编辑调薪 2022-11-15 09:34:58 +08:00
Harryxzy 9dc6c61ed2 编辑调薪 2022-11-14 21:03:24 +08:00
fcli 459f7e5053 Merge branch 'feature/SpecialAddUpMerge' into release/2.1.3.2211.03 2022-11-10 09:33:22 +08:00
钱涛 f5622df8fe Merge branch 'feature/report1110' into release/2.1.3.2211.03 
# Conflicts:
#	src/com/engine/salary/sys/entity/param/AppSettingSaveParam.java
#	src/com/engine/salary/sys/service/impl/SalarySysConfServiceImpl.java
 2022-11-09 19:03:14 +08:00
fcli 63ee9c9b8e fix: 一键累计添加日期与校验 2022-11-09 18:57:28 +08:00
钱涛 e63c72f51e 逆向解密 2022-11-09 15:47:09 +08:00
fcli bf75c3831f fix: 一键累计添加日期 2022-11-09 15:39:00 +08:00
fcli 07a07d2be8 feat: 专项附加扣除模块, 权限限制，导入导出优化，添加一键累计 2022-11-09 10:40:48 +08:00
fcli 9b77bf7139 feat: 专项附加扣除模块, 一键清空、分页bug等 2022-11-09 10:40:38 +08:00
fcli 92a6512dc8 feat: 专项附加扣除模块,去除月份，添加普通用户登录查看本人记录功能 2022-11-09 10:40:28 +08:00
fcli fafc157e63 feat: 专项附加扣除模块 2022-11-09 10:40:19 +08:00
钱涛 457fe51239 处理薪资档案重复数据 2022-11-07 17:05:50 +08:00
钱涛 2da0455c46 修复薪资档案个税扣缴义务人不显示的问题 
处理历史数据改为异步
 2022-11-07 15:11:24 +08:00
fcli 8873224123 Merge remote-tracking branch 'origin/release/2.1.2.2211.01' into release/2.1.2.2211.01 2022-11-02 17:33:26 +08:00
fcli 11f0a2c418 Merge branch 'fix/089' into release/2.1.2.2211.01 2022-11-02 17:32:49 +08:00
钱涛 28be5f8e41 Merge branch 'hotfix/工资单发放合并计税bug' into release/2.1.2.2211.01 2022-11-02 17:22:19 +08:00
钱涛 73c24bcac5 工资单发放合并计税bug 2022-11-02 17:20:34 +08:00
Harryxzy 5d97954e48 往期累计情况一键清空和删除所选 2022-10-31 19:21:13 +08:00
Harryxzy e8ac395300 fix-专项附加扣除taxAgentId为空 2022-10-31 16:04:06 +08:00
Harryxzy 317fb5e8ac 数据采集-编辑前查看功能 2022-10-31 14:50:54 +08:00
Harryxzy d525c59d6d Merge branch 'feature/V2-editDataCollection-11-03-tempDev' into feature/V2-editDataCollection-11-03 2022-10-28 16:38:17 +08:00
Harryxzy 09d85bdab3 考勤引用=编辑 2022-10-28 16:15:51 +08:00
Harryxzy 1f29ac67eb 累计、其他免税、往期 新增、删除、一键清空、编辑功能 2022-10-28 14:08:27 +08:00
fcli 31982fc1db fix: 工资单发放页高级搜索功能不生效 2022-10-28 09:39:31 +08:00
Harryxzy ddd0c49cdd 其他免税扣除-新增、删除所选、一键清空功能 2022-10-27 18:02:05 +08:00
钱涛 104213fc04 1、提示优化 
2、导入模板
3、定薪流程
 2022-10-27 15:17:22 +08:00
Harryxzy a406eed4b9 累计专项附加扣除-新增、删除所选、一键清空功能 2022-10-27 13:59:11 +08:00
Harryxzy c0bb94bf71 editDataCollection-2 2022-10-26 18:35:23 +08:00
钱涛 7a817af154 档案导入 2022-10-26 13:46:36 +08:00
钱涛 1f48539e1c 删除待定薪代办 
删除待停薪代办
 2022-10-18 16:44:31 +08:00
钱涛 4b37775f78 档案发薪设置 2022-10-18 09:43:58 +08:00
钱涛 77fc944491 获取保存档案配置表单 
保存档案配置
 2022-10-14 16:18:55 +08:00
钱涛 0e05185599 操作接口 2022-10-13 16:24:59 +08:00
钱涛 68076fc724 fix sqlserver增量数据空 2022-10-13 14:57:52 +08:00
李栋 708a947449 薪资档案加密设置加进度 2022-10-12 14:24:01 +08:00
钱涛 ab575db152 Merge branch 'develop' into feature/archive 2022-10-10 17:36:29 +08:00
钱涛 9781b67ddb Merge branch 'develop' into feature/archive 2022-10-10 15:41:31 +08:00
钱涛 816885609d 薪资列表 2022-10-10 15:15:23 +08:00
钱涛 41203342d0 薪资列表 2022-10-10 14:58:29 +08:00
李栋 c92f4f0b28 Merge branch 'develop' into dev-LeeD 2022-10-10 09:44:03 +08:00
李栋 60396e90a3 薪资档案加密设置 2022-10-10 09:43:57 +08:00
Harryxzy b2b0abcaf5 xzy-fix-处理Employee_statuses历史数据 2022-10-08 17:21:38 +08:00
sy 0cfd2fc081 Merge remote-tracking branch 'remotes/origin/develop' into feature/checkImport 2022-09-29 17:32:22 +08:00
sy 1e476e06a5 薪酬系统-福利台账，线下对比结果列表导出v1 2022-09-29 17:32:04 +08:00
李栋 96684b8ea3 Merge branch 'feature-LeeD' into develop 2022-09-29 16:21:22 +08:00
李栋 35e75dbba0 薪资档案引用时不能删除 2022-09-29 16:21:02 +08:00
sy 44e4afbf72 Merge remote-tracking branch 'remotes/origin/develop' into feature/checkImport 
# Conflicts:
#	src/com/engine/salary/mapper/InsuranceExportMapper.java
#	src/com/engine/salary/mapper/InsuranceExportMapper.xml
#	src/com/engine/salary/service/impl/SIAccountServiceImpl.java
 2022-09-29 11:29:17 +08:00
sy cec887a214 薪酬系统-福利台账，线下对比结果列表开发 2022-09-29 11:13:49 +08:00
钱涛 919d08a496 修复工资单查询 2022-09-29 10:28:46 +08:00
钱涛 92b2774ebf 三个数据采集模块删除无效的查询条件 2022-09-29 10:03:51 +08:00
钱涛 e48f576617 显示应用设置接口 2022-09-28 10:08:51 +08:00
钱涛 23a1396c12 核算列表求和 2022-09-27 17:43:43 +08:00
钱涛 1d635f1423 核算列表求和 2022-09-27 15:47:13 +08:00
钱涛 1573fc5bcf 人员状态枚举适配 2022-09-22 11:42:02 +08:00
钱涛 b812454cd3 人员校验规则 2022-09-22 10:10:18 +08:00
钱涛 90c18ec201 定薪 2022-09-20 18:02:45 +08:00
Harryxzy 183e63140a xzy-月度绩效环比增加人员导出功能 2022-09-20 16:18:43 +08:00
钱涛 f678aa46d6 薪资档案排序 2022-09-19 18:21:34 +08:00
钱涛 bc1e874a1c Merge remote-tracking branch 'origin/develop' into develop 
# Conflicts:
#	src/com/engine/salary/service/impl/SalaryAcctEmployeeServiceImpl.java
 2022-09-19 16:45:10 +08:00
钱涛 830e099b57 排序规则 2022-09-19 16:44:32 +08:00
Harryxzy 44b3c76a8e xzy-同比增加人员 2022-09-19 16:05:59 +08:00
钱涛 b464240ff7 Merge remote-tracking branch 'origin/develop' into develop 2022-09-19 13:45:14 +08:00
钱涛 a7bd4a43d6 排序规则 2022-09-19 13:41:09 +08:00
sy 4d9b7af975 薪酬系统-福利台账导入项添加社保合计、公积金合计、其他福利合计、合计四个字段可以选择，并增加这四个字段的更新逻辑 2022-09-16 14:21:15 +08:00
钱涛 b61b83976d 1、系统详情接口 2022-09-15 15:41:48 +08:00
钱涛 d238502b2c 1、修复线下对比 
2、系统配置
 2022-09-15 15:15:34 +08:00
钱涛 8c0b9038d6 1、系统配置列表 
2、修复调薪周期对于核算的结果不准确
 2022-09-14 11:28:17 +08:00
钱涛 198075209e 1、核算、合并计税使用税款所属期作为依据 
2、核算列表分页
 2022-09-13 16:03:55 +08:00
钱涛 243d8e0d6b 批量调薪前置校验 2022-09-07 16:35:57 +08:00
钱涛 572c4cb9f1 调薪前置校验 2022-09-07 16:12:43 +08:00
钱涛 06f6dcf8f2 Merge remote-tracking branch 'origin/develop' into develop 2022-09-07 09:46:02 +08:00
钱涛 8ff4e9e231 停薪操作 2022-09-07 09:45:37 +08:00
sy d4886c0d46 Merge remote-tracking branch 'remotes/origin/develop' into feature/checkImport 2022-09-06 17:14:31 +08:00
sy 5a6df5a257 福利核算结果干预功能，福利核算项列表接口、福利核算导入模板下载接口、福利核算干预数据导入接口 2022-09-06 17:13:33 +08:00
钱涛 e372173b74 获取系统配置接口 2022-09-05 17:20:57 +08:00
钱涛 a4e6042adf 调薪流程按钮 2022-08-24 20:00:57 +08:00
钱涛 e0a031e197 oracle异常 2022-08-18 15:02:04 +08:00
钱涛 7d79dcdfc2 修复社保福利列表高级搜索 2022-08-11 10:27:15 +08:00
钱涛 d9bfd4d617 1、档案接口增强 
2、sql支持大写
3、合并计税搜索
 2022-08-04 11:45:26 +08:00
钱涛 c4831a1612 支持外部数据源 2022-08-03 10:08:43 +08:00
钱涛 e9c95918eb 1、核算表头带上公式 
2、修复核算时取福利台账人员信息不准确
 2022-08-02 14:58:18 +08:00
钱涛 ab87e5cf08 劳务申报表列表 2022-08-02 10:59:12 +08:00
钱涛 a252d055ab 1、核算接口代理 
2、获取异常真实信息
 2022-08-01 14:15:09 +08:00
钱涛 259c40758f 1、薪资项目增加系统名 
2、薪资项目增加申报项目名
3、账套对应字段
 2022-07-27 16:56:13 +08:00
钱涛 92e7ac17c1 档案状态 2022-07-25 15:56:21 +08:00
钱涛 3ced92cfc5 修复福利核算 2022-07-21 17:28:47 +08:00
钱涛 77ca4c2848 Merge branch 'develop' into feature/personIn2taxAgent 
# Conflicts:
#	src/com/engine/salary/service/SalaryArchiveService.java
#	src/com/engine/salary/service/impl/SalaryArchiveServiceImpl.java
#	src/com/engine/salary/wrapper/SalaryArchiveWrapper.java
 2022-07-21 09:43:02 +08:00
liuliang 32c15c1c35 Merge branch 'feature_liuliang_20220705' into develop 2022-07-20 15:58:49 +08:00
钱涛 a721898d3d 薪资档案增加起始发薪和最后发薪 2022-07-18 18:08:59 +08:00
liuliang b9528442f9 薪酬档案导入对接流程-liuliang 2022-07-18 16:19:15 +08:00
liuliang 758a78996d 导入薪酬档案对接流程功能 2022-07-13 18:59:30 +08:00
钱涛 1d5c69278f 描述异常 2022-07-13 11:45:16 +08:00
钱涛 bf31d993a7 薪酬报表-薪酬核算完成，将数据存储到非加密表，删除人员信息，补充：分部、部门、岗位等其他字段，供数据中心引用 2022-07-11 17:31:33 +08:00
钱涛 12917f4f8b 去除无用todo 2022-07-08 11:30:10 +08:00
钱涛 3c3c679757 获取个税扣缴义务人下的实际人员配置接口 2022-07-06 10:52:37 +08:00
钱涛 9bd1074258 1、档案限制应为个税扣缴义务人下的人员 
2、个税扣缴义务人未开启分权的情况下显示管理员
 2022-07-06 10:13:06 +08:00
钱涛 053c436d49 获取薪酬版本信息 2022-07-05 16:56:09 +08:00
钱涛 190d6da1b2 操作实际管理的个税扣缴人 2022-07-05 15:31:18 +08:00
钱涛 c2c4149442 报表接口 2022-07-04 15:34:04 +08:00
钱涛 4be0d70c4d fix 2022-06-28 16:46:42 +08:00
钱涛 abdd87a005 fix 2022-06-24 18:05:08 +08:00
钱涛 b357bd18a6 fix 2022-06-23 14:08:55 +08:00
钱涛 e1a075cab3 fix 2022-06-22 19:26:05 +08:00
钱涛 e1629a021e oracle错误和薪资项目错误 2022-06-21 15:08:23 +08:00
钱涛 5cea57d477 fix bug 2022-06-17 17:22:48 +08:00
钱涛 081747b334 考勤引用修复 2022-06-13 10:52:32 +08:00
钱涛 33914eae1d 解密 2022-06-10 18:07:25 +08:00
钱涛 e83714ba4f Merge branch 'feature/encrypt' into release 
# Conflicts:
#	src/com/engine/salary/biz/AddUpSituationBiz.java
#	src/com/engine/salary/biz/SIArchivesBiz.java
#	src/com/engine/salary/cmd/datacollection/OtherDeductionGetDetailListCmd.java
#	src/com/engine/salary/entity/datacollection/dto/AddUpDeductionDTO.java
#	src/com/engine/salary/entity/datacollection/dto/AddUpDeductionRecordDTO.java
#	src/com/engine/salary/entity/datacollection/dto/AddUpSituationDTO.java
#	src/com/engine/salary/entity/datacollection/dto/AddUpSituationRecordDTO.java
#	src/com/engine/salary/entity/datacollection/dto/OtherDeductionListDTO.java
#	src/com/engine/salary/entity/datacollection/dto/OtherDeductionRecordDTO.java
#	src/com/engine/salary/entity/taxdeclaration/bo/TaxDeclarationBO.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/SISchemeServiceImpl.java
#	src/com/engine/salary/service/impl/SalaryComparisonResultServiceImpl.java
#	src/com/engine/salary/service/impl/TaxAgentServiceImpl.java
#	src/com/engine/salary/service/impl/TaxDeclarationDetailServiceImpl.java
#	src/com/engine/salary/wrapper/TaxDeclarationWrapper.java
 2022-06-10 15:26:43 +08:00
钱涛 ec3838a292 申报表 2022-06-10 13:33:48 +08:00
钱涛 382620c589 申报表 2022-06-09 19:02:18 +08:00
钱涛 b8972bcd43 分权v3 2022-06-09 17:45:28 +08:00
钱涛 7f8d317846 冲突 2022-06-08 18:53:30 +08:00
钱涛 b832910af9 Merge branch 'develop' into release 
# Conflicts:
#	src/com/engine/salary/biz/SIArchivesBiz.java
 2022-06-08 18:48:23 +08:00
钱涛 79632dd1bf 申报表分权 2022-06-07 19:10:40 +08:00
钱涛 cedc9f2644 考勤和申报表的分权 2022-06-07 15:43:22 +08:00