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

652 Commits

Author SHA1 Message Date
Harryxzy 095a0665b8 Merge branch 'feature/V2-taxDeclarationSwitch-11-10' into release/2.1.3.2211.03 2022-11-09 16:12:35 +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 dffee9206f feat: 专项附加扣除模块 2022-11-09 10:40:05 +08:00
Harryxzy 1fb96be58b 个税申报开关 2022-11-08 11:22:56 +08:00
钱涛 457fe51239 处理薪资档案重复数据 2022-11-07 17:05:50 +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
fcli 59f030adf8 Merge branch 'fix/104' into release/2.1.2.2211.01 
# Conflicts:
#	src/com/engine/salary/service/impl/SalaryArchiveServiceImpl.java
 2022-11-02 17:32:42 +08:00
sy 3cbf9b10e5 Merge branch 'feature/v2-oneToMoreBaseInfo-1104' into release/2.1.2.2211.01 2022-11-02 17:30:21 +08:00
Harryxzy 5d97954e48 往期累计情况一键清空和删除所选 2022-10-31 19:21:13 +08:00
fcli 81d91a3a2c fix: 我的调薪记录问题修改,设置分页默认值 2022-10-31 16:37:39 +08:00
sy 126a048a76 薪酬系统-福利档案选中导出功能优化 2022-10-31 16:30:59 +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 e046b7e3fe fix 一键清空 2022-10-28 16:35:51 +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
fcli 6f09d25077 fix: 我的调薪记录问题修改 2022-10-26 17:48:59 +08:00
钱涛 7a817af154 档案导入 2022-10-26 13:46:36 +08:00
钱涛 61a35854b9 Merge branch 'feature/archive' into develop 2022-10-19 09:41:31 +08:00
钱涛 0e6ec32c12 档案导出 2022-10-19 09:39:01 +08:00
钱涛 47e390eb28 Merge branch 'feature/archive' into develop 2022-10-18 16:47:54 +08:00
钱涛 1f48539e1c 删除待定薪代办 
删除待停薪代办
 2022-10-18 16:44:31 +08:00
李栋 5c3fe06b62 Merge branch 'develop' into dev-LeeD 2022-10-17 11:14:33 +08:00
李栋 fc94b50c60 薪资档案加密设置 2022-10-17 11:14:21 +08:00
sy b16133f61a Merge remote-tracking branch 'remotes/origin/develop' into feature/addSiArchivesBaseInfo_sy 2022-10-17 10:13:59 +08:00
sy 8fa59c2cf9 薪酬系统-福利档案结构改造，增员、减员接口返回结果格式调整 2022-10-17 10:13:38 +08:00
钱涛 5102d51b09 Merge branch 'feature/archive' into develop 2022-10-17 10:03:58 +08:00
sy 8d9a00bfff 薪酬系统-福利档案结构改造，取消停缴、增员、减员接口入参格式调整 2022-10-14 18:00:22 +08:00
sy 3d714c2b8d Merge remote-tracking branch 'remotes/origin/develop' into feature/addSiArchivesBaseInfo_sy 2022-10-14 16:34:25 +08:00
sy 8a0e72f99c 薪酬系统-福利档案结构改造，档案列表接口返回结果优化 2022-10-14 16:34:10 +08:00
钱涛 77fc944491 获取保存档案配置表单 
保存档案配置
 2022-10-14 16:18:55 +08:00
Harryxzy 5233c85c81 Merge branch 'origin/feature/updateAndDeleteCustomCategory_xzy' into develop 2022-10-14 15:32:30 +08:00
Harryxzy 989dd13216 xzy-修改自定义福利名称 2022-10-14 15:17:56 +08:00
sy 4701c4de5c Merge remote-tracking branch 'remotes/origin/develop' into feature/addSiArchivesBaseInfo_sy 2022-10-14 14:31:35 +08:00
sy e61d4f21c7 薪酬系统-福利档案结构改造，待减员页面的减员功能 2022-10-14 14:31:09 +08:00
sy 0e6520f838 薪酬系统-福利档案结构改造，批量更改福利档案状态功能和取消停缴功能 2022-10-13 17:36:15 +08:00
钱涛 0e05185599 操作接口 2022-10-13 16:24:59 +08:00
sy 1aaa8ce43e Merge remote-tracking branch 'remotes/origin/develop' into feature/addSiArchivesBaseInfo_sy 2022-10-13 14:58:42 +08:00
钱涛 68076fc724 fix sqlserver增量数据空 2022-10-13 14:57:52 +08:00
sy 053ac67604 Merge remote-tracking branch 'remotes/origin/develop' into feature/addSiArchivesBaseInfo_sy 2022-10-13 14:45:38 +08:00
李栋 708a947449 薪资档案加密设置加进度 2022-10-12 14:24:01 +08:00
sy 187508c0f9 薪酬系统-福利档案结构改造，福利档案各tap页记录数统计功能 2022-10-12 10:38:41 +08:00
钱涛 a18b008581 Merge branch 'develop' into feature/archive 2022-10-11 14:43:21 +08:00
sy b2284d6669 Merge remote-tracking branch 'remotes/origin/develop' into feature/addSiArchivesBaseInfo_sy 2022-10-11 09:03:46 +08:00
钱涛 ab575db152 Merge branch 'develop' into feature/archive 2022-10-10 17:36:29 +08:00
sy a7b47a8bfe 薪酬系统-福利档案结构改造，档案列表导出增加runstatus条件、并将导入和历史数据生成的福利档案基础信息的默认runStatus置为2 2022-10-10 17:11:44 +08:00
钱涛 824c3ca565 薪资列表 2022-10-10 15:40:51 +08:00
钱涛 816885609d 薪资列表 2022-10-10 15:15:23 +08:00
钱涛 41203342d0 薪资列表 2022-10-10 14:58:29 +08:00
李栋 60396e90a3 薪资档案加密设置 2022-10-10 09:43:57 +08:00
sy 98a297ef27 薪酬系统-福利台账-正常缴纳导入模板数据未带出问题修复 2022-09-30 15:40:15 +08:00
sy 1e476e06a5 薪酬系统-福利台账，线下对比结果列表导出v1 2022-09-29 17:32:04 +08:00
sy a44a48450b 薪酬系统-福利台账，线下对比结果列表开发优化v1 2022-09-29 15:11:13 +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
钱涛 e48f576617 显示应用设置接口 2022-09-28 10:08:51 +08:00
钱涛 dfeb3fc5e4 修复薪资档案导出全部 2022-09-28 09:26:26 +08:00
钱涛 23a1396c12 核算列表求和 2022-09-27 17:43:43 +08:00
sy 78ce712116 薪酬系统-福利台账，线下对比excel数据导入功能 2022-09-27 17:36:06 +08:00
sy 314dc8803c 薪酬系统-福利台账，正常缴纳线下对比模板下载功能 2022-09-27 10:55:57 +08:00
钱涛 66a39a07a3 Merge branch 'feature/order' into develop 
# Conflicts:
#	src/com/engine/salary/biz/SIAccountBiz.java
 2022-09-27 10:25:12 +08:00
钱涛 6e726366ad 排序 2022-09-26 18:51:17 +08:00
sy e6c2dd502c 薪酬系统-数据采集-其他免税扣除导入模板带出数据重复bug修复 2022-09-23 16:08:41 +08:00
钱涛 6717a8235a 我的薪资福利翻页问题 2022-09-22 16:04:48 +08:00
钱涛 1573fc5bcf 人员状态枚举适配 2022-09-22 11:42:02 +08:00
钱涛 b812454cd3 人员校验规则 2022-09-22 10:10:18 +08:00
Harryxzy 183e63140a xzy-月度绩效环比增加人员导出功能 2022-09-20 16:18:43 +08:00
sy 5b74873a6e Merge remote-tracking branch 'remotes/origin/develop' into feature/checkImport 2022-09-20 10:34:43 +08:00
sy 7120d80689 薪酬系统-福利台账-补缴导入模板开发 2022-09-19 17:59:12 +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
sy ff4884fbb9 Merge remote-tracking branch 'remotes/origin/develop' into feature/checkImport 2022-09-19 15:13:42 +08:00
sy f54481bbf1 薪酬系统-福利台账补缴功能开发v1 2022-09-19 15:13:30 +08:00
钱涛 a7bd4a43d6 排序规则 2022-09-19 13:41:09 +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
sy 1b34914e13 Merge remote-tracking branch 'remotes/origin/develop' into feature/checkImport 2022-09-07 14:57:46 +08:00
sy 8f9a335dd0 福利核算干预数据导入预览 2022-09-07 14:57:07 +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
sy 79cab3629e 福利核算干预功能开发v1 2022-09-02 11:53:38 +08:00
Harryxzy 6809839a2c Merge branch 'feature/addSalaryShowSwitch_xzy' into develop 2022-08-25 09:38:59 +08:00
钱涛 a4e6042adf 调薪流程按钮 2022-08-24 20:00:57 +08:00
钱涛 7dfe9ee732 福利方案分权 2022-08-24 12:03:04 +08:00
Harryxzy 289e685e09 xzy-薪资项目显隐控制 2022-08-24 10:31:42 +08:00
Harryxzy 4d0a73e030 xzy-解决社保福利方案删除时校验问题 2022-08-18 12:26:53 +08:00
钱涛 7d79dcdfc2 修复社保福利列表高级搜索 2022-08-11 10:27:15 +08:00
钱涛 99c0806b73 支持外部数据源 2022-08-03 10:47:26 +08:00
钱涛 c4831a1612 支持外部数据源 2022-08-03 10:08:43 +08:00
钱涛 e9c95918eb 1、核算表头带上公式 
2、修复核算时取福利台账人员信息不准确
 2022-08-02 14:58:18 +08:00
liuliang 28cc6e67f4 Merge branch 'feature_liuliang_20220726' into develop 2022-07-28 16:31:02 +08:00
钱涛 259c40758f 1、薪资项目增加系统名 
2、薪资项目增加申报项目名
3、账套对应字段
 2022-07-27 16:56:13 +08:00
钱涛 e7968f2545 1、公共枚举接口 
2、薪资档案封存标识
 2022-07-26 18:01:39 +08:00
liuliang eb6f0b81ca 删除社保方案福利功能 2022-07-26 16:14:24 +08:00
liuliang 9602ed1d87 Merge branch 'feature_liuliang_20220720' into develop 2022-07-25 14:34:31 +08:00
liuliang c8ae60533e 导入修改 2022-07-25 14:33:35 +08:00
liuliang 03c163bd91 Merge branch 'feature_liuliang_20220720' into develop 2022-07-25 11:14:24 +08:00
liuliang 341b122fe7 导入可以带出数据功能 2022-07-25 09:57:15 +08:00
liuliang 6b2c5ba314 社保福利台账重新核算 2022-07-20 15:40:51 +08:00
liuliang 6cda380aa2 Merge branch 'fix_liuliang_20220719' into develop 2022-07-19 14:23:08 +08:00
liuliang 76661474c4 修改社保福利台账导出按钮无法正确导出bug 2022-07-19 14:05:25 +08:00
钱涛 cd7684120b 福利核算 2022-07-19 11:36:19 +08:00
钱涛 1d5c69278f 描述异常 2022-07-13 11:45:16 +08:00
钱涛 12917f4f8b 去除无用todo 2022-07-08 11:30:10 +08:00
钱涛 7301ee1033 1、福利档案限制缴纳组织必须为扣税扣缴义务人 
2、福利档案人员限制为个税扣缴义务人下
3、个税扣缴义务人单个申报
 2022-07-06 16:42:13 +08:00
钱涛 3c3c679757 获取个税扣缴义务人下的实际人员配置接口 2022-07-06 10:52:37 +08:00
钱涛 053c436d49 获取薪酬版本信息 2022-07-05 16:56:09 +08:00
钱涛 190d6da1b2 操作实际管理的个税扣缴人 2022-07-05 15:31:18 +08:00
钱涛 c372fff59c 系统异常处理 2022-07-01 15:18:29 +08:00
钱涛 7b468045c8 1、限制核算的人员范围 
2、薪资工资单的导出功能
3、修复工资单批量发放和撤回的问题
4、核算时取各个扣缴义务人的数据
 2022-06-29 17:38:00 +08:00
钱涛 12fe1405ba 修复工资单导出 2022-06-27 18:34:41 +08:00
钱涛 bcc44fe65e fix 2022-06-27 14:45:23 +08:00
钱涛 e1a075cab3 fix 2022-06-22 19:26:05 +08:00
钱涛 5cea57d477 fix bug 2022-06-17 17:22:48 +08:00
钱涛 811a90f50d 账套项目的顺序性 2022-06-14 11:13:31 +08:00
钱涛 b78e96c875 考勤列表适配sqlserver 2022-06-13 15:37:52 +08:00
钱涛 e6c6b8eb57 Merge branch 'auth-fl' into release 
# Conflicts:
#	resource/sql/分权.sql
#	src/com/engine/salary/biz/SIAccountBiz.java
#	src/com/engine/salary/mapper/taxagent/TaxAgentMapper.xml
#	src/com/engine/salary/service/impl/SIAccountServiceImpl.java
#	src/com/engine/salary/service/impl/SIExportServiceImpl.java
 2022-06-10 16:58:45 +08:00
钱涛 ec3838a292 申报表 2022-06-10 13:33:48 +08:00
钱涛 b8972bcd43 分权v3 2022-06-09 17:45:28 +08:00
MustangDeng 69edbc63d1 福利台账 2022-06-08 17:52:10 +08:00
钱涛 cedc9f2644 考勤和申报表的分权 2022-06-07 15:43:22 +08:00
钱涛 eacb04388f 社保福利分权2.0 2022-06-06 19:08:39 +08:00
钱涛 88a0d08b1f Merge branch 'auth-2' into release 
# Conflicts:
#	src/com/engine/salary/mapper/archive/SalaryArchiveMapper.xml
#	src/com/engine/salary/mapper/datacollection/EmployMapper.xml
 2022-06-06 10:37:07 +08:00
钱涛 2bfd6c90a0 Merge branch 'develop' into release 
# Conflicts:
#	src/com/engine/salary/service/impl/SISchemeServiceImpl.java
 2022-06-06 10:23:19 +08:00
钱涛 be88b90f56 核算的分权 2022-06-02 17:10:54 +08:00
MustangDeng da2a0e5d22 工资单及福利问题修复 2022-06-01 19:13:20 +08:00
钱涛 99b5c36864 暂存 2022-05-31 16:41:11 +08:00
钱涛 019ad96871 其他扣除 2022-05-31 11:21:51 +08:00
钱涛 5925fb5606 分权 2022-05-30 20:13:03 +08:00
钱涛 f8ecb548ed Merge branch 'auth' into release 
# Conflicts:
#	src/com/engine/salary/biz/AddUpDeductionBiz.java
#	src/com/engine/salary/biz/AddUpSituationBiz.java
#	src/com/engine/salary/biz/SIAccountBiz.java
#	src/com/engine/salary/biz/SIArchivesBiz.java
#	src/com/engine/salary/biz/SalaryArchiveBiz.java
#	src/com/engine/salary/biz/SalaryArchiveItemBiz.java
#	src/com/engine/salary/biz/SalaryItemBiz.java
#	src/com/engine/salary/biz/SalarySobCheckRuleBiz.java
#	src/com/engine/salary/cmd/datacollection/AddUpDeductionImportCmd.java
#	src/com/engine/salary/cmd/datacollection/AddUpSituationImportCmd.java
#	src/com/engine/salary/entity/datacollection/dto/AddUpDeductionDTO.java
#	src/com/engine/salary/enums/UserStatusEnum.java
#	src/com/engine/salary/mapper/salarysob/SalarySobMapper.xml
#	src/com/engine/salary/service/impl/SalaryComparisonResultServiceImpl.java
 2022-05-30 18:50:00 +08:00
钱涛 841ca27c84 暂存 2022-05-27 17:21:39 +08:00
钱涛 71ea4b8609 导入 2022-05-27 15:43:38 +08:00
钱涛 c4c04ac87a 暂存 2022-05-27 14:46:01 +08:00
钱涛 c6ea4c5698 线下对比 2022-05-26 15:45:37 +08:00
钱涛 f6eb69e62a 暂存 2022-05-26 11:02:55 +08:00
MustangDeng 05dc46894d 总览数据不对问题 2022-05-26 11:00:38 +08:00
钱涛 586fad5f2c 分权累计专项附加扣除 2022-05-25 16:51:43 +08:00
钱涛 90a6bd9921 暂存 2022-05-25 13:49:25 +08:00
钱涛 cb1a53c649 暂存 2022-05-24 09:14:26 +08:00
钱涛 4f36f89e53 Merge branch 'develop' into auth 2022-05-20 14:56:25 +08:00
MustangDeng 6024a69e84 福利档案导出 2022-05-19 10:20:23 +08:00
钱涛 fa4d605c8d 暂存 2022-05-18 09:19:50 +08:00
MustangDeng b3ca582e3a 我的薪资列表调薪记录 2022-05-10 16:17:37 +08:00
MustangDeng fbf6baa676 我的薪资列表工资单列表 2022-05-10 10:54:41 +08:00
钱涛 bf37add9dd 修复导出异常 2022-05-09 14:11:07 +08:00
MustangDeng 22de36ce59 Merge branch '20220505' into develop 2022-05-09 11:19:35 +08:00
MustangDeng 2200d0c793 工资单撤回 2022-05-09 11:18:54 +08:00
钱涛 b0b18ecb5e 导出日志和申报表异常 2022-05-09 10:32:14 +08:00
MustangDeng 10f76c102c 福利档案导入模板 2022-05-06 16:58:01 +08:00
钱涛 231961663f 核算结果导出 2022-05-05 14:10:19 +08:00
钱涛 a530532a45 去除run方法 2022-05-05 10:35:58 +08:00
钱涛 f2f678c6d1 核算进度 2022-04-29 17:15:22 +08:00
钱涛 b0ee96eb41 导入模板改为内存生成 2022-04-28 17:44:26 +08:00
钱涛 8abfb7631e fix线下对比404 2022-04-27 09:43:24 +08:00
钱涛 151fa2b575 线下对比 2022-04-26 16:39:41 +08:00
钱涛 6a024cb35b 权限构造 2022-04-25 18:06:09 +08:00
钱涛 2ec48b2be1 考勤账套列表 2022-04-25 10:14:43 +08:00
钱涛 3b342d4ec7 我的薪资福利 2022-04-22 19:22:40 +08:00
钱涛 5347c70809 Merge remote-tracking branch 'origin/develop' into develop 2022-04-22 15:46:14 +08:00
钱涛 6b76829b39 考勤接口 2022-04-22 15:46:03 +08:00
reset ef4ffacbcc
!27 修复方案列表 
Merge pull request !27 from reset/archive
 2022-04-22 07:19:56 +00:00
Chengliang c2c7d2dee5 修复方案列表 2022-04-22 15:17:31 +08:00
钱涛 cd8df85e54 公式字段 2022-04-21 20:29:11 +08:00
reset 926b132d50
!26 导出 
Merge pull request !26 from reset/archive
 2022-04-21 07:05:43 +00:00
Chengliang d0f12c2faf 6个列表页导出完成 2022-04-21 15:04:35 +08:00
钱涛 36d65de007 fix 2022-04-21 14:15:56 +08:00
18895359881@163.com 21e4afcbbb Merge branch 'test_xxy' into develop 2022-04-20 21:37:39 +08:00
18895359881@163.com d15cccca8d 申报表生成 2022-04-20 21:36:27 +08:00
reset 5320e0b4f8
!25 福利台账 
Merge pull request !25 from reset/archive
 2022-04-20 11:14:23 +00:00
Chengliang 72e9e152d6 福利台账相关 2022-04-20 19:12:01 +08:00
18895359881@163.com 4fd63c1999 Merge remote-tracking branch 'origin/develop' into develop 2022-04-19 20:59:33 +08:00
18895359881@163.com bfdb9a33d5 个税申报表接口 2022-04-19 20:58:30 +08:00
钱涛 cb30e24e95 公式 2022-04-19 20:33:06 +08:00
钱涛 b1b086caf1 预览 2022-04-19 19:50:00 +08:00
钱涛 ccd4768a0e 线下对比导入 2022-04-19 19:34:57 +08:00
钱涛 72b52de3aa Merge remote-tracking branch 'origin/develop' into develop 2022-04-19 19:32:34 +08:00
钱涛 dc008dad5c 核算导入 2022-04-19 19:32:09 +08:00
reset 24a20e14d0
!24 福利台账导出及列表bug修 
Merge pull request !24 from reset/archive
 2022-04-19 09:47:11 +00:00
Chengliang bef9b30a2e 福利台账导出及列表bug修复 2022-04-19 17:46:24 +08:00
钱涛 c4c757d055 Merge branch 'feature/v1' into develop 2022-04-19 15:13:23 +08:00
钱涛 c537b7d944 补充列 2022-04-19 15:13:08 +08:00
reset 37830fc89e
!22 增加datakey 
Merge pull request !22 from reset/archive
 2022-04-19 04:20:18 +00:00
Chengliang 9c02c9c9fd 列表增加datakey 2022-04-19 12:19:06 +08:00
reset 8ed7bbb3b6
!21 福利台账导出各接口 
Merge pull request !21 from reset/archive
 2022-04-18 12:26:02 +00:00
Chengliang 651df1842e 福利台账导出 2022-04-18 20:24:43 +08:00
18895359881@163.com cd41ca92c7 Merge branch 'test_xxy' into develop 2022-04-18 19:53:52 +08:00
18895359881@163.com 6fce8cdf4c 薪酬接口 2022-04-18 18:56:17 +08:00
MustangDeng 3b3e9ee6fc 福利核算-batchList 2022-04-18 18:25:45 +08:00
钱涛 3bfdef7966 Merge remote-tracking branch 'origin/develop' into develop 2022-04-18 17:28:49 +08:00
钱涛 91da4ab831 自定义按钮 2022-04-18 17:28:34 +08:00
reset 11f0354d3a
!20 合并 
Merge pull request !20 from reset/archive
 2022-04-18 09:16:30 +00:00
MustangDeng fee9a35b42 Merge branch 'feature/salaryBill' into develop 2022-04-18 09:20:00 +08:00
钱涛 7fbe29b36a Merge branch 'feature/acctV2' into develop 2022-04-16 16:49:57 +08:00
钱涛 50d502632f 公式 2022-04-16 16:49:22 +08:00
Chengliang 2d98890c04 台账相关列表 2022-04-16 16:43:33 +08:00
18895359881@163.com a5b73098c9 Merge branch 'develop' into test_xxy 2022-04-16 16:14:56 +08:00
18895359881@163.com 3e64b1cfde 薪酬接口 2022-04-16 15:33:51 +08:00
Chengliang 8ec04e8efc 福利 2022-04-16 13:20:52 +08:00
reset ed096261d3
!19 福利台账相关接口 
Merge pull request !19 from reset/archive
 2022-04-15 11:02:47 +00:00
Chengliang 9813012249 福利台账相关接口 2022-04-15 19:01:09 +08:00
钱涛 fa5f8b7da0 Merge branch 'feature/acctV2' into develop 2022-04-15 13:55:16 +08:00
钱涛 7d440ce005 薪资项目分页 2022-04-15 13:54:47 +08:00
reset 5cb511bdc1
!18 社保档案详情-保存等接口 
Merge pull request !18 from reset/archive
 2022-04-15 05:18:56 +00:00
Chengliang 6ddf60a548 福利台账核算接口 2022-04-15 13:17:25 +08:00
钱涛 941a34990f Merge branch 'feature/acct' into develop 
# Conflicts:
#	src/com/engine/salary/entity/salaryformula/dto/SalaryFormulaEmployeeDTO.java
#	src/com/engine/salary/entity/salarysob/bo/SalarySobItemAggregateBO.java
 2022-04-14 20:49:24 +08:00
钱涛 4db39902b5 公式v2 2022-04-14 20:46:17 +08:00
MustangDeng a739d746f7 工资单发放-测试 2022-04-14 19:32:09 +08:00
MustangDeng 775b39074d 工资单发放-工资单发放信息列表 2022-04-14 16:11:44 +08:00
reset 23388ef017
!17 台账保存核算 
Merge pull request !17 from reset/archive
 2022-04-14 03:56:10 +00:00
Chengliang 2eadc713e1 薪资台账保存核算 2022-04-14 11:54:16 +08:00
钱涛 a2102a49b4 核算v3 2022-04-13 14:18:00 +08:00
MustangDeng 50c03b19e0 Merge branch 'develop' into feature/salaryBill 
# Conflicts:
#	src/com/engine/salary/annotation/SalaryFormulaVar.java
 2022-04-13 11:09:41 +08:00
reset ac86ad0d62
!16 台账 
Merge pull request !16 from reset/archive
 2022-04-12 11:31:07 +00:00
Chengliang 985456ed14 社保台账 2022-04-12 19:29:19 +08:00
钱涛 340fe4c38e Merge remote-tracking branch 'origin/develop' into develop 2022-04-12 19:25:29 +08:00
钱涛 692c2f5a79 核算 2022-04-12 19:25:19 +08:00
MustangDeng 897c98114f 工资单发放-工资单模板接口 2022-04-12 18:28:12 +08:00
reset 9b907a7a36
!15 福利台账 
Merge pull request !15 from reset/archive
 2022-04-12 02:25:50 +00:00
Chengliang 0dd6f4ae35 福利台账 2022-04-12 10:24:21 +08:00
MustangDeng bd8305763e 工资单发放-编译 2022-04-12 10:11:53 +08:00
钱涛 4d674bdd37 Merge branch 'feature/acc' into develop 2022-04-11 20:46:44 +08:00
钱涛 a069447f02 核算基础公式 2022-04-11 20:17:47 +08:00
Chengliang 568cc1811e 薪资台账列表 2022-04-11 19:07:35 +08:00
MustangDeng 1573abd1ee Revert "工资单发放-todo" 
This reverts commit b850f5ad
 2022-04-11 14:30:30 +08:00
MustangDeng 31acdbb606 Merge branch 'feature/djp' into develop 2022-04-11 14:29:25 +08:00
MustangDeng b850f5ad8d 工资单发放-todo 2022-04-11 14:28:45 +08:00
钱涛 0b72b2e6cb 核算v2 2022-04-08 19:08:59 +08:00
钱涛 23adb455fd 核算v1 2022-04-08 16:30:10 +08:00
钱涛 70f3239e98 查询条件 2022-04-07 20:05:58 +08:00
钱涛 61a8605f5a fix 2022-04-07 18:41:40 +08:00
钱涛 0dedda4dbd 核算 2022-04-07 16:54:10 +08:00
钱涛 90335032fd 调整原因 2022-04-07 11:39:22 +08:00
钱涛 9d223c7a06 核算基础类 2022-04-06 20:01:00 +08:00
钱涛 1c38214f6f 薪资档案表单 2022-04-02 16:57:27 +08:00
钱涛 3307c5c67e 薪资档案后续接口 2022-04-02 15:34:27 +08:00
钱涛 126444b9f3 薪资档案 2022-04-01 18:25:24 +08:00
钱涛 63e414e5d7 Merge branch 'develop' into feature/qt 
# Conflicts:
#	src/com/engine/salary/enums/UserStatusEnum.java
 2022-04-01 13:54:27 +08:00
钱涛 f95d8a7d0d 暂存 2022-04-01 13:50:24 +08:00
钱涛 c03078cb12 Merge branch 'feature/qt' into develop 2022-04-01 10:26:44 +08:00
钱涛 8326f3ae6f 导入参数 2022-04-01 10:26:28 +08:00
钱涛 e8de53d51f Merge remote-tracking branch 'origin/develop' into develop 2022-03-31 18:42:23 +08:00
钱涛 e9e03880d9 Merge branch 'feature/qt' into develop 2022-03-31 18:42:06 +08:00
钱涛 163963d463 fix bug 2022-03-31 18:41:41 +08:00
钱涛 a8732708a8 薪资档案导入 2022-03-31 15:41:55 +08:00
MustangDeng 13b69c76eb 档案列表快捷搜索 2022-03-31 14:22:42 +08:00
钱涛 fbfb5f5005 Merge branch 'feature/qt' into develop 2022-03-30 18:01:07 +08:00
钱涛 922a055f97 统一sql 2022-03-30 18:00:56 +08:00
钱涛 50a62e3b29 Merge branch 'feature/qt' into develop 2022-03-30 12:16:07 +08:00
钱涛 a3604a28f0 校驗規則列表 2022-03-30 12:15:49 +08:00
钱涛 cf39049530 Merge branch 'feature/qt' into develop 2022-03-29 17:11:15 +08:00
钱涛 5c550365f1 薪资档案 2022-03-29 17:10:59 +08:00
钱涛 2a5a72f6ab Merge branch 'feature/qt' into develop 2022-03-28 20:04:51 +08:00
钱涛 ba707878fc 薪资档案 2022-03-28 20:04:27 +08:00
钱涛 019cdd9968 Merge branch 'feature/qt' into develop 2022-03-28 16:37:03 +08:00
钱涛 5ae4eb5fc8 项目id 2022-03-28 16:36:40 +08:00
钱涛 dc6ebdb4df Merge branch 'feature/qt' into develop 2022-03-28 13:48:55 +08:00
钱涛 93154ada71 薪资账套项目保存 2022-03-28 13:48:43 +08:00
钱涛 faca2d4d1b Merge branch 'feature/qt' into develop 2022-03-28 11:38:46 +08:00
钱涛 045293426c 账套校验规则 2022-03-28 11:38:33 +08:00
钱涛 c9281bd6db Merge branch 'feature/qt' into develop 2022-03-25 18:05:18 +08:00
钱涛 1db71a97ff 薪资账套 2022-03-25 18:05:07 +08:00
钱涛 466966dac6 Merge branch 'feature/qt' into develop 2022-03-24 17:00:08 +08:00
钱涛 83e1cf2805 相对更新 2022-03-24 16:59:52 +08:00
钱涛 288c274aaf Merge branch 'feature/qt' into develop 2022-03-23 20:54:22 +08:00
钱涛 79f9e010af 账套薪资项目 2022-03-23 20:54:08 +08:00
钱涛 00150f1696 Merge branch 'feature/qt' into develop 2022-03-23 18:41:52 +08:00
钱涛 b3d7123401 列表添加id 2022-03-23 18:41:38 +08:00
钱涛 2c65022174 Merge branch 'feature/qt' into develop 2022-03-23 13:52:58 +08:00
钱涛 e66445ce20 人员sql 2022-03-23 13:52:43 +08:00
钱涛 578b8f7aaa Merge remote-tracking branch 'origin/develop' into develop 2022-03-23 09:26:33 +08:00
钱涛 c01e63040c 薪资项目&账套 2022-03-22 21:01:38 +08:00
reset 24a5b0b48d
!12 福利档案接口 
Merge pull request !12 from reset/archive
 2022-03-22 11:48:54 +00:00
Chengliang 56036bf9cb 福利方案getSearchCondition接口 2022-03-22 19:47:46 +08:00
钱涛 2f8b56e4ac 参数验证类 2022-03-21 20:09:10 +08:00
钱涛 f0a0680bdc Merge branch 'feature/qt' into develop 
# Conflicts:
#	src/com/engine/salary/common/BaseQueryParam.java
#	src/com/engine/salary/demo/DemoPageCmd.java
 2022-03-21 09:36:56 +08:00
钱涛 f8d68fa7bc 分页 2022-03-21 09:33:21 +08:00
Chengliang 19dd1eed17 社保档案动态列接口 2022-03-18 18:00:51 +08:00
Chengliang cc9a650b92 批量保存，批量删除社保档案 2022-03-16 18:26:49 +08:00
reset 23519e2050
!6 payform 及表单组件 
Merge pull request !6 from reset/archive
 2022-03-16 09:06:09 +00:00
Chengliang b0124e250d 福利档案payForm及表单组件 2022-03-16 17:04:21 +08:00
钱涛 59fc1ded4e Merge branch 'feature/qt' into develop 2022-03-16 14:30:54 +08:00
钱涛 00bf811075 考勤导出接口 2022-03-16 14:29:02 +08:00
Chengliang 88c0cc67e6 福利档案获取baseForm 2022-03-15 17:39:19 +08:00
钱涛 1a49dd331d 考勤字段相关接口 2022-03-15 14:18:04 +08:00
钱涛 27c9d669f7 Merge remote-tracking branch 'origin/develop' into develop 2022-03-15 09:56:30 +08:00
钱涛 eb4ca765d7 考勤相关接口 2022-03-15 09:55:58 +08:00
Chengliang 69a1b4d5ae 福利项目表单接口修复 2022-03-15 09:34:53 +08:00
reset 7c30485b88
!3 bug修复 
Merge pull request !3 from reset/archive
 2022-03-11 10:06:47 +00:00
Chengliang 99c9ad807f 福利方案bug修复 2022-03-11 17:46:26 +08:00
钱涛 5c1adf9774 Merge branch 'feature/qt' into develop 2022-03-11 17:27:34 +08:00
钱涛 298d432152 预览 2022-03-11 17:27:15 +08:00
钱涛 9c8238d218 Merge branch 'feature/qt' into develop 2022-03-11 15:47:35 +08:00
钱涛 692a57ae63 累计bug 2022-03-11 15:47:08 +08:00
Chengliang 0474872ab5 Merge branch 'develop' of https://gitee.com/qlmr/weaver-hrm-salary into develop 2022-03-11 14:29:08 +08:00
Chengliang f09c6d197c 福利台账listPage 2022-03-11 14:28:39 +08:00
钱涛 8aabe78182 Merge branch 'feature/qt' into develop 2022-03-11 13:45:03 +08:00
钱涛 d748f3733a 累计bug 2022-03-11 13:44:47 +08:00
钱涛 d601f2fd59 Merge branch 'feature/qt' into develop 2022-03-11 11:09:16 +08:00
钱涛 9676102894 累计bug 2022-03-11 11:08:50 +08:00
Chengliang 843900882b listPage 2022-03-10 18:24:08 +08:00
钱涛 e3c602a8a0 Merge branch 'feature/qt' into develop 2022-03-10 18:00:21 +08:00
钱涛 98c49db986 其他扣除项接口 2022-03-10 17:57:46 +08:00
Chengliang 0957528179 更新自定义福利状态接口 2022-03-10 15:26:09 +08:00
Chengliang 04cf94e498 自定义福利接口 getCustomCategoryForm createSICategory.... 2022-03-10 15:23:56 +08:00
钱涛 784f58533a 导出明细 2022-03-10 11:12:13 +08:00
钱涛 8a7251c076 Merge branch 'feature/qt' into develop 
# Conflicts:
#	src/com/engine/salary/web/AddUpDeductionController.java
 2022-03-10 11:10:40 +08:00
钱涛 d55fca8eeb 导出明细 2022-03-10 11:09:08 +08:00
钱涛 8da28ec05f Merge branch 'feature/qt' into develop 
# Conflicts:
#	src/com/engine/salary/init.sql
 2022-03-09 19:00:21 +08:00
钱涛 1319543251 累计接口 2022-03-09 18:58:30 +08:00
钱涛 7ee952e63c 累计 2022-03-09 16:40:14 +08:00
Chengliang 7d245e786e 社保自定义福利控制器 getForm 2022-03-09 16:12:47 +08:00
Chengliang 0c3322796f solve conflict 2022-03-09 10:09:07 +08:00
钱涛 880cf9ef66 excel导入导出 2022-03-09 09:58:36 +08:00
Chengliang 91958201e5 福利模块insert getForm delete update copy接口 2022-03-09 09:42:10 +08:00
钱涛 e860b30567 累计附加接口 2022-03-08 18:10:03 +08:00
钱涛 9de0f08415 日期转换 2022-03-08 15:40:26 +08:00
钱涛 c8b05f5ef1 查询参数 2022-03-08 13:17:54 +08:00
Chengliang 2b61b030d7 福利模块getForm接口 2022-03-07 22:22:09 +08:00
钱涛 382781fa26 列表注解 2022-03-07 19:27:32 +08:00
钱涛 0759628eb2 excel导入导出 2022-03-07 15:08:56 +08:00
钱涛 97cc5d154f 累计附加扣除-条件接口 2022-03-04 10:10:38 +08:00
钱涛 b028ad6845 税率修改接口bug 2022-03-03 14:52:50 +08:00
钱涛 c183a11cba 统一税率保存参数 2022-03-03 13:50:03 +08:00
钱涛 aa528eccd8 sql异常 2022-03-02 14:07:18 +08:00
钱涛 1e134de35b 税率表详细信息接口 2022-03-02 11:09:23 +08:00
钱涛 fb42a5f041 删除接口ids改为json入参 2022-03-01 18:49:22 +08:00
钱涛 b56a48c885 税率接口 2022-03-01 18:31:29 +08:00
钱涛 8922047306 税率接口及相关基础类 2022-03-01 16:45:57 +08:00
钱涛 fb56c4d379 Merge remote-tracking branch 'origin/master' 2022-03-01 13:45:19 +08:00
钱涛 1519c0a79c mysql查询语句拼接 2022-03-01 13:44:38 +08:00
MustangDeng 9685f03db4 删除demoController相关接口 2022-03-01 11:13:17 +08:00
钱涛 f591c09dc9 个税扣缴义务人相关接口（6） 2022-02-28 17:19:07 +08:00