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

965 Commits

Author SHA1 Message Date
钱涛 1d676365c7 Merge remote-tracking branch 'origin/develop' into develop 2022-08-01 14:16:08 +08:00
钱涛 a252d055ab 1、核算接口代理 
2、获取异常真实信息
 2022-08-01 14:15:09 +08:00
liuliang 50f047fb6f Merge branch 'develop' of https://gitee.com/qlmr/weaver-hrm-salary into develop 2022-07-29 17:19:41 +08:00
liuliang ea8a41d930 社保福利档案bug修复 2022-07-29 17:18:38 +08:00
钱涛 3f4c6954d1 Merge remote-tracking branch 'origin/develop' into develop 2022-07-29 10:34:11 +08:00
钱涛 b60758cd28 修复往期累计列表显示异常 2022-07-29 10:33:54 +08:00
liuliang c6c180afef Merge branch 'develop' of https://gitee.com/qlmr/weaver-hrm-salary into develop 2022-07-28 17:57:10 +08:00
liuliang 089cb2aa11 删除社保福利方案测试 2022-07-28 17:56:42 +08:00
钱涛 03f7efa2c9 Merge remote-tracking branch 'origin/develop' into develop 2022-07-28 17:20:41 +08:00
钱涛 c92a215bca 薪资档案导出全部时范围修改 2022-07-28 17:20:24 +08:00
liuliang 35fc07bb9a 社保福利方案bug修复 2022-07-28 17:18:51 +08:00
liuliang 28cc6e67f4 Merge branch 'feature_liuliang_20220726' into develop 2022-07-28 16:31:02 +08:00
liuliang f8c0f1b59d Merge branch 'fixbug_liuliang_recalculate' into develop 2022-07-28 16:30:27 +08:00
liuliang 1effdf42aa liuliang 2022-07-28 16:28:53 +08:00
钱涛 c14cca9b08 核算时添加核算人员过滤不是扣缴义务人下的人员 2022-07-28 16:23:39 +08:00
钱涛 b6f8e857d2 1、档案导入初始化修复 
2、核算档案
3、取消入职、离职日期作为核算人员的筛选条件
 2022-07-28 15:42:25 +08:00
钱涛 36e2f96ae5 社保方案起始缴纳和最后缴纳生效 2022-07-28 14:22:59 +08:00
钱涛 d1e6cec693 增加join 2022-07-28 14:17:30 +08:00
钱涛 259c40758f 1、薪资项目增加系统名 
2、薪资项目增加申报项目名
3、账套对应字段
 2022-07-27 16:56:13 +08:00
liuliang f74f70250d Merge branch 'develop' of https://gitee.com/qlmr/weaver-hrm-salary into develop 2022-07-27 09:29:26 +08:00
liuliang 12d6f733a6 工资单发放范围修正 2022-07-27 09:27:47 +08:00
钱涛 e7968f2545 1、公共枚举接口 
2、薪资档案封存标识
 2022-07-26 18:01:39 +08:00
liuliang 62d8e6589f liuliang 2022-07-26 16:19:13 +08:00
liuliang eb6f0b81ca 删除社保方案福利功能 2022-07-26 16:14:24 +08:00
钱涛 e01a575d58 初始化和调薪档案范围调整 2022-07-25 16:29:20 +08:00
钱涛 92e7ac17c1 档案状态 2022-07-25 15:56:21 +08:00
钱涛 db31190b9e 调整sql配置 2022-07-25 15:01:10 +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 d26ded2261 Merge branch 'develop' of https://gitee.com/qlmr/weaver-hrm-salary into develop 2022-07-25 11:14:48 +08:00
liuliang 03c163bd91 Merge branch 'feature_liuliang_20220720' into develop 2022-07-25 11:14:24 +08:00
liuliang e03c24dfbf 社保福利导入 2022-07-25 11:13:18 +08:00
钱涛 eb957fbfec 修复档案初始化 2022-07-25 10:45:13 +08:00
liuliang 341b122fe7 导入可以带出数据功能 2022-07-25 09:57:15 +08:00
钱涛 3ced92cfc5 修复福利核算 2022-07-21 17:28:47 +08:00
钱涛 8e69159900 薪资档案代码合并 2022-07-21 10:51:38 +08:00
钱涛 b90953873c 薪资档案代码合并 2022-07-21 09:48:40 +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
钱涛 a7b61dc7da 限制福利核算时的扣缴义务人 2022-07-20 18:01:00 +08:00
liuliang 4ff9290d73 Merge branch 'feature_liuliang_20220705' into develop 2022-07-20 16:06:27 +08:00
liuliang 32c15c1c35 Merge branch 'feature_liuliang_20220705' into develop 2022-07-20 15:58:49 +08:00
liuliang 71728b20e9 Merge branch 'feature_liuliang_20220718' into develop 2022-07-20 15:42:14 +08:00
liuliang 6b2c5ba314 社保福利台账重新核算 2022-07-20 15:40:51 +08:00
钱涛 967413827e 修改社保个人实际承担方为个人 2022-07-20 14:25:01 +08:00
钱涛 27c84676b7 修复工资单撤回 2022-07-20 11:50:09 +08:00
钱涛 d1770aadbb 薪资档案定薪调薪适配多个扣缴义务人 2022-07-19 18:40:41 +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
钱涛 f65f3c01eb 流程对接 2022-07-19 10:20:21 +08:00
钱涛 2275f53861 档案设置 2022-07-18 19:14:02 +08:00
钱涛 a721898d3d 薪资档案增加起始发薪和最后发薪 2022-07-18 18:08:59 +08:00
liuliang b9528442f9 薪酬档案导入对接流程-liuliang 2022-07-18 16:19:15 +08:00
钱涛 136641649d 薪资档案 2022-07-18 09:38:12 +08:00
钱涛 9dcebdc994 暂存 2022-07-15 10:15:59 +08:00
钱涛 92977e81c3 更新历史版本排序权重 2022-07-14 15:56:48 +08:00
钱涛 c8aa08fc9f 档案列表显示扣缴义务人 2022-07-14 14:32:59 +08:00
钱涛 01bd6fefd4 支持人员可在多个扣缴单位 2022-07-14 10:36:51 +08:00
liuliang 758a78996d 导入薪酬档案对接流程功能 2022-07-13 18:59:30 +08:00
钱涛 bb8c863bcc 薪酬报表与解密方法 2022-07-13 13:55:31 +08:00
钱涛 1d5c69278f 描述异常 2022-07-13 11:45:16 +08:00
钱涛 057ca97c9e 修复往期累计不显示的问题 2022-07-13 10:13:49 +08:00
钱涛 1d90bb148e 修复往期累计导入数量限制 2022-07-13 09:53:11 +08:00
钱涛 4258e7f545 薪酬版本功能 2022-07-12 17:42:33 +08:00
钱涛 c8d056ee2f 薪酬版本记录 2022-07-12 17:28:06 +08:00
钱涛 91f1fda342 核算档案项不可编辑 2022-07-11 18:24:12 +08:00
钱涛 bf31d993a7 薪酬报表-薪酬核算完成，将数据存储到非加密表，删除人员信息，补充：分部、部门、岗位等其他字段，供数据中心引用 2022-07-11 17:31:33 +08:00
钱涛 97763cc280 定时同步人员范围 2022-07-11 09:39:57 +08:00
钱涛 075f70b0fd 修复福利导入提示行号错误 2022-07-08 14:57:57 +08:00
钱涛 12917f4f8b 去除无用todo 2022-07-08 11:30:10 +08:00
钱涛 f3a216027f 修复福利台账的分权 2022-07-08 11:19:08 +08:00
钱涛 6967a7224c 优化往期删除逻辑 2022-07-07 20:26:43 +08:00
钱涛 eab3e9a6a9 1、福利列表显示扣税扣缴义务人 
2、导入限制
3、修改福利查询异常
4、核算人员范围限制
 2022-07-07 18:29:52 +08:00
钱涛 16c43f8679 考勤引用适配加班数据 2022-07-07 14:37:10 +08:00
钱涛 b23f790fc9 去除Spring注解 2022-07-06 17:36:30 +08:00
钱涛 24853722cb 1、去除@resource 2022-07-06 17:33:45 +08:00
钱涛 7301ee1033 1、福利档案限制缴纳组织必须为扣税扣缴义务人 
2、福利档案人员限制为个税扣缴义务人下
3、个税扣缴义务人单个申报
 2022-07-06 16:42:13 +08:00
钱涛 3c3c679757 获取个税扣缴义务人下的实际人员配置接口 2022-07-06 10:52:37 +08:00
钱涛 9bd1074258 1、档案限制应为个税扣缴义务人下的人员 
2、个税扣缴义务人未开启分权的情况下显示管理员
 2022-07-06 10:13:06 +08:00
钱涛 48d70400e5 薪资档案验证人员是否在义务扣缴人下 2022-07-05 19:19:17 +08:00
钱涛 053c436d49 获取薪酬版本信息 2022-07-05 16:56:09 +08:00
钱涛 190d6da1b2 操作实际管理的个税扣缴人 2022-07-05 15:31:18 +08:00
钱涛 d244883190 薪酬对外提供的解密方法 2022-07-05 15:08:59 +08:00
钱涛 03ba0418ab 福利核算精度异常 2022-07-05 15:04:00 +08:00
钱涛 47113434ad 薪酬报表 2022-07-04 19:21:44 +08:00
钱涛 4fe3a61d5d 修复核算工号不显示的问题 2022-07-04 18:58:49 +08:00
钱涛 c2c4149442 报表接口 2022-07-04 15:34:04 +08:00
钱涛 3f086e154d sql执行 2022-07-04 13:44:17 +08:00
钱涛 c372fff59c 系统异常处理 2022-07-01 15:18:29 +08:00
钱涛 6262aeeb01 1、合并计税处理 
2、考勤引用不生成空记录
 2022-06-30 16:15:19 +08:00
钱涛 7f7cdaf4a8 修复考勤引用删除适配问题 2022-06-30 14:21:29 +08:00
钱涛 317c04a121 公式编辑器，防止参数名和字段名呈现一对多的问题 2022-06-30 11:10:46 +08:00
钱涛 7b468045c8 1、限制核算的人员范围 
2、薪资工资单的导出功能
3、修复工资单批量发放和撤回的问题
4、核算时取各个扣缴义务人的数据
 2022-06-29 17:38:00 +08:00
钱涛 3e300e62eb 修复福利台账补缴功能异常 2022-06-29 14:13:23 +08:00
钱涛 f34eaa7c6f 修复福利台账总览数据 2022-06-28 18:21:44 +08:00
钱涛 4be0d70c4d fix 2022-06-28 16:46:42 +08:00
钱涛 63ce165a74 修复sql的XSS 2022-06-28 16:08:20 +08:00
钱涛 b64f34a14c 福利核算时只核算当前扣缴义务人的 2022-06-28 11:26:01 +08:00
钱涛 43175f6e40 处理福利带名字查询失败 2022-06-28 10:35:30 +08:00
钱涛 12fe1405ba 修复工资单导出 2022-06-27 18:34:41 +08:00
钱涛 75c84566b6 考勤导出自定义字段 2022-06-27 16:01:33 +08:00
钱涛 bcc44fe65e fix 2022-06-27 14:45:23 +08:00
钱涛 e7dc9e1a57 限制个税扣缴名字个备注字符数量 2022-06-27 13:17:15 +08:00
钱涛 7f3cc0a82a fix 2022-06-27 10:58:16 +08:00
钱涛 abdd87a005 fix 2022-06-24 18:05:08 +08:00
钱涛 3682ebd4f2 fix 2022-06-24 15:18:00 +08:00
钱涛 f680aa27d9 fix 2022-06-23 18:05:48 +08:00
钱涛 31a8b4bff9 fix 2022-06-23 17:15:39 +08:00
钱涛 b357bd18a6 fix 2022-06-23 14:08:55 +08:00
钱涛 e1a075cab3 fix 2022-06-22 19:26:05 +08:00
钱涛 15fbf8ac91 fix 2022-06-22 13:45:26 +08:00
钱涛 a577645329 fix 2022-06-22 10:58:18 +08:00
钱涛 fc35eff75d fix 2022-06-21 22:37:22 +08:00
钱涛 e1629a021e oracle错误和薪资项目错误 2022-06-21 15:08:23 +08:00
钱涛 ff88b1f9ca 员工字段不可重复 2022-06-21 11:38:55 +08:00
钱涛 3363120c44 修复核算分权的问题 2022-06-20 19:39:01 +08:00
钱涛 5cea57d477 fix bug 2022-06-17 17:22:48 +08:00
MustangDeng c701314f15 fix bug 福利方案删除多余的编辑 2022-06-16 22:09:50 +08:00
MustangDeng e49f68b842 fix bug 45 2022-06-16 21:04:06 +08:00
钱涛 dfe8fdf57c fixbug 2022-06-16 19:06:45 +08:00
钱涛 035503f26c fixbug 2022-06-16 17:55:26 +08:00
钱涛 5396d7bee3 加解密 2022-06-16 14:22:01 +08:00
钱涛 3e93a85873 Merge branch 'feature/authitem' into release 2022-06-16 14:21:38 +08:00
钱涛 b5871e1ea9 权限项 2022-06-16 14:13:22 +08:00
MustangDeng f51a4e4fd7 加解密 2022-06-16 11:30:28 +08:00
MustangDeng 9042a9bbed 加解密 2022-06-16 11:01:03 +08:00
MustangDeng bd99d3ccf8 加解密问题 2022-06-16 10:31:11 +08:00
MustangDeng fc3cbe8111 Merge remote-tracking branch 'origin/release' into release 2022-06-16 10:24:58 +08:00
MustangDeng 2badaab552 加解密问题 2022-06-16 10:24:43 +08:00
钱涛 17dbef3ef2 sql 2022-06-15 17:53:12 +08:00
MustangDeng 3c13b90a4d Merge remote-tracking branch 'origin/release' into release 2022-06-15 17:04:03 +08:00
MustangDeng 62054871ce 发送工资单 2022-06-15 17:03:48 +08:00
钱涛 2731e4eddd sql 2022-06-15 16:31:40 +08:00
钱涛 455ff23134 申报表导出修改 2022-06-15 16:02:34 +08:00
钱涛 f5b8806eff 账套 2022-06-15 15:27:23 +08:00
钱涛 b42586600a fix申报表 2022-06-15 12:03:17 +08:00
钱涛 baa06f4011 Merge remote-tracking branch 'origin/release' into release 2022-06-15 11:02:55 +08:00
钱涛 cfe2d3c1dc fix申报表 2022-06-15 11:02:44 +08:00
MustangDeng 0e0cc9f97b 福利档案列表 2022-06-15 11:01:09 +08:00
钱涛 fda668ba90 Merge remote-tracking branch 'origin/release' into release 2022-06-15 10:24:54 +08:00
钱涛 7955d67da6 fix申报表 2022-06-15 10:24:46 +08:00
MustangDeng d5228ff1bf 福利档案列表 2022-06-15 10:23:39 +08:00
钱涛 8d6a3c41d7 fix人员同步 2022-06-15 09:29:43 +08:00
钱涛 5634377e47 Merge remote-tracking branch 'origin/release' into release 2022-06-14 16:05:58 +08:00
钱涛 0e8c916262 保存 2022-06-14 16:05:47 +08:00
MustangDeng 8846346dda 台账核算回滚数据 2022-06-14 16:05:23 +08:00
钱涛 811a90f50d 账套项目的顺序性 2022-06-14 11:13:31 +08:00
钱涛 bf7d8dd634 导入时人员唯一校验 2022-06-13 17:05:36 +08:00
钱涛 b78e96c875 考勤列表适配sqlserver 2022-06-13 15:37:52 +08:00
钱涛 081747b334 考勤引用修复 2022-06-13 10:52:32 +08:00
钱涛 1aee6f7ef0 往期累计 2022-06-10 18:16:11 +08:00
钱涛 99e7c1eaef Merge remote-tracking branch 'origin/release' into release 2022-06-10 18:07:36 +08:00
钱涛 33914eae1d 解密 2022-06-10 18:07:25 +08:00
MustangDeng 3bedc88f44 福利加解密 2022-06-10 18:01:55 +08:00
MustangDeng fcb55bc269 fix 冲突 2022-06-10 17:15:19 +08:00
钱涛 df7e3febc3 冲突 2022-06-10 17:03:25 +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
钱涛 6ddf483767 加解密 2022-06-10 16:43:38 +08:00
MustangDeng 9315882742 福利档案列表log 2022-06-10 16:35:01 +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
MustangDeng ca1c20329c fix 福利档案导入bug 2022-06-10 15:12:56 +08:00
钱涛 f1fac5ae90 Merge branch 'feature/申报表' into release 
# Conflicts:
#	resource/sql/申报表.sql
 2022-06-10 14:40:14 +08:00
钱涛 d09856c390 人员范围保存校验 2022-06-10 14:21:21 +08:00
钱涛 ec3838a292 申报表 2022-06-10 13:33:48 +08:00
MustangDeng e1440e9203 台账归档删除 2022-06-10 11:46:57 +08:00
MustangDeng 3d43cc3f56 归档删除 2022-06-10 10:56:09 +08:00
钱涛 382620c589 申报表 2022-06-09 19:02:18 +08:00
MustangDeng 85f0b1164c 福利台账分权 2022-06-09 18:31:36 +08:00
钱涛 b8972bcd43 分权v3 2022-06-09 17:45:28 +08:00
MustangDeng 2d2c993f2a 累计附加扣除详情列表没有解密 fix 2022-06-09 15:22:49 +08:00
MustangDeng 2fe1613868 台账核算 2022-06-09 15:16:33 +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
钱涛 61346f139b 申报和往期异常 2022-06-08 17:59:30 +08:00
MustangDeng 1f7de7bc90 fix bug 2022-06-08 17:55:14 +08:00
MustangDeng 69edbc63d1 福利台账 2022-06-08 17:52:10 +08:00
钱涛 860c89b560 申报和往期异常 2022-06-08 16:36:50 +08:00
钱涛 d765ede418 默认关闭 2022-06-07 19:22:46 +08:00
钱涛 79632dd1bf 申报表分权 2022-06-07 19:10:40 +08:00
MustangDeng 28b49f9987 fix bug 2022-06-07 17:35:39 +08:00
钱涛 cedc9f2644 考勤和申报表的分权 2022-06-07 15:43:22 +08:00
MustangDeng 20e04f503e sql server 分权脚本修改 2022-06-07 15:19:21 +08:00
MustangDeng 83c7ea3f5c sql server 自增问题 2022-06-07 14:24:14 +08:00
MustangDeng 71da39d4d3 Merge branch 'release' into auth-fl 2022-06-07 13:26:40 +08:00
钱涛 38557e2e03 去除自增 2022-06-07 13:24:20 +08:00
MustangDeng f22ac96b12 累计附加扣除加解密问题 2022-06-07 09:48:51 +08:00
MustangDeng bfcb9a78f8 bug修改 2022-06-06 21:21:10 +08:00
MustangDeng 958ffc5aa0 福利台账解密问题 2022-06-06 20:05:37 +08:00
MustangDeng a68de7d088 Merge branch 'develop' into feature/encrypt 2022-06-06 19:25:36 +08:00
钱涛 b20a6e4cbf 去重 2022-06-06 19:24:49 +08:00
MustangDeng e306b6754d 福利台账解密问题 2022-06-06 19:08:51 +08:00
钱涛 eacb04388f 社保福利分权2.0 2022-06-06 19:08:39 +08:00
MustangDeng d36fb221cc 福利档案列表 2022-06-06 18:17:34 +08:00
钱涛 dc27578ddf 社保福利分权1.0 2022-06-06 16:55:02 +08:00
MustangDeng d3c82acac1 发送撤回工资单 2022-06-06 13:56:47 +08:00
MustangDeng 3a1ac7ca93 工资单部分分页调整 2022-06-06 11:43:46 +08:00
MustangDeng d0869e5daa 工资单部分分页调整 2022-06-06 11:40:24 +08:00
MustangDeng 6db127d926 Merge branch 'develop' into feature/encrypt 2022-06-06 11:31:21 +08:00
MustangDeng ddc4edd918 档案高级搜索 2022-06-06 11:28:18 +08:00
MustangDeng 24187b95bf 档案高级搜索 2022-06-06 11:24:16 +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
钱涛 0ed51f8cf9 处理合并dev冲突 2022-06-06 10:26:31 +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
钱涛 3f0bbd3160 剔除主账号 2022-06-06 10:19:11 +08:00
钱涛 6646a2e481 申报表的分权 2022-06-02 18:02:27 +08:00
钱涛 be88b90f56 核算的分权 2022-06-02 17:10:54 +08:00
MustangDeng a24cb2e6d6 加解密自测问题处理 2022-06-02 17:01:26 +08:00
MustangDeng f80365ddd5 Merge branch 'develop' into feature/encrypt 2022-06-02 10:35:07 +08:00
MustangDeng c55cd2d85d 工资单详情高级搜索样式优化 2022-06-02 10:34:24 +08:00
钱涛 a69bd42b49 核算的分权 2022-06-01 21:21:07 +08:00
钱涛 77645074c5 核算的分权 2022-06-01 21:15:48 +08:00
钱涛 758e64e6bc 档案导入 2022-06-01 20:46:51 +08:00
钱涛 bb665500ae 档案 2022-06-01 19:14:05 +08:00
MustangDeng da2a0e5d22 工资单及福利问题修复 2022-06-01 19:13:20 +08:00
钱涛 37a73b94df 同步人员 2022-06-01 17:45:49 +08:00
钱涛 e66c86d32c fix 2022-06-01 15:18:10 +08:00
MustangDeng 4430d50492 工资单及福利问题修复 2022-06-01 14:53:16 +08:00
钱涛 7ffc241b0a 管理 2022-05-31 21:48:00 +08:00
钱涛 084b1e1a99 fix管理员异常 2022-05-31 21:15:33 +08:00
钱涛 efd31013cd 薪资账套分权 2022-05-31 21:05:59 +08:00
钱涛 5596d88c6f adminUser->AdminUserIds 2022-05-31 20:12:25 +08:00
钱涛 69c76ea687 Merge branch 'auth-1' into release 2022-05-31 18:29:43 +08:00
钱涛 d800ab1925 Merge branch 'develop' into release 2022-05-31 18:29:34 +08:00
钱涛 3f958d2886 暂存 2022-05-31 18:27:33 +08:00
钱涛 99b5c36864 暂存 2022-05-31 16:41:11 +08:00
MustangDeng 560c3c9103 cmd 解密转换 2022-05-31 16:20:04 +08:00
MustangDeng df3535c77d 和代码build处理 2022-05-31 16:02:41 +08:00
MustangDeng fd36c67fc6 和代码build处理 2022-05-31 11:45:43 +08:00
MustangDeng 68994ee304 Merge branch 'develop' into feature/encrypt 
# Conflicts:
#	resource/ecology9/WEB-INF/prop/hrmSalary.properties
#	src/com/engine/salary/biz/AddUpDeductionBiz.java
#	src/com/engine/salary/biz/AddUpSituationBiz.java
#	src/com/engine/salary/biz/OtherDeductionBiz.java
#	src/com/engine/salary/biz/SIAccountBiz.java
#	src/com/engine/salary/biz/SalaryArchiveItemBiz.java
#	src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java
#	src/com/engine/salary/service/impl/SalaryComparisonResultServiceImpl.java
#	src/com/engine/salary/service/impl/TaxDeclarationDetailServiceImpl.java
#	src/com/engine/salary/wrapper/TaxDeclarationWrapper.java
 2022-05-31 11:33:36 +08:00
钱涛 019ad96871 其他扣除 2022-05-31 11:21:51 +08:00
钱涛 72d1b48126 fix 2022-05-31 11:03:56 +08:00
钱涛 0898055d77 fix 2022-05-31 10:29:18 +08:00
钱涛 76b05e3d38 fix 2022-05-31 09:59:32 +08:00
钱涛 8b14038b90 分权 2022-05-31 09:58:35 +08:00
钱涛 5925fb5606 分权 2022-05-30 20:13:03 +08:00
钱涛 e38841f280 合并auth 2022-05-30 18:59:48 +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
钱涛 25991fe675 Merge remote-tracking branch 'origin/develop' into develop 2022-05-30 18:03:36 +08:00
钱涛 3907ac49d9 fix bug 2022-05-30 18:03:20 +08:00
MustangDeng 0af5199d9b Merge remote-tracking branch 'origin/develop' into develop 2022-05-30 17:31:40 +08:00
MustangDeng 4e4c190f31 bug修改 2022-05-30 17:31:29 +08:00
钱涛 c7a4f8a8e1 档案导入提示优化 2022-05-30 16:25:27 +08:00
钱涛 6986b39231 暂存 2022-05-30 14:17:02 +08:00
MustangDeng 597e2206e9 like 修改 2022-05-30 13:43:28 +08:00
钱涛 7e09b283da 暂存 2022-05-30 13:33:22 +08:00
钱涛 6470346ed0 oracle的like 2022-05-30 13:30:51 +08:00
钱涛 4baa1643f6 oracle适配 2022-05-30 11:51:00 +08:00
MustangDeng bd7c3e45a5 台账核算 2022-05-30 11:27:39 +08:00
MustangDeng 2ccc30db96 Merge remote-tracking branch 'origin/develop' into develop 2022-05-30 09:14:33 +08:00
MustangDeng d48ef0aeec oracle 适配 2022-05-30 09:14:12 +08:00
钱涛 60ae1ff35b sqlserver 
适配
 2022-05-27 18:07:26 +08:00
钱涛 841ca27c84 暂存 2022-05-27 17:21:39 +08:00
钱涛 71ea4b8609 导入 2022-05-27 15:43:38 +08:00
MustangDeng 224c823590 oracle 自增返回 2022-05-27 15:01:44 +08:00
钱涛 be4ed2229d 暂存 2022-05-27 14:51:53 +08:00
钱涛 c4c04ac87a 暂存 2022-05-27 14:46:01 +08:00
钱涛 ad991954cd 暂存 2022-05-27 11:49:23 +08:00
钱涛 d776220cae fix 2022-05-27 09:33:40 +08:00
钱涛 b5d6adfbde 暂存 2022-05-26 18:16:48 +08:00
钱涛 c6ea4c5698 线下对比 2022-05-26 15:45:37 +08:00
钱涛 cf5e914318 Merge remote-tracking branch 'origin/develop' into develop 2022-05-26 13:42:44 +08:00
钱涛 6103c9233e 批量操作数量限制 2022-05-26 13:41:58 +08:00
MustangDeng 968a48eed2 取消福利归档前异常数据校验 2022-05-26 13:30:23 +08:00
钱涛 f6eb69e62a 暂存 2022-05-26 11:02:55 +08:00
MustangDeng 615bb51a59 Merge remote-tracking branch 'origin/develop' into develop 2022-05-26 11:00:58 +08:00
MustangDeng 05dc46894d 总览数据不对问题 2022-05-26 11:00:38 +08:00
钱涛 8e2e420d6a 处理sqlserver参数过多异常 2022-05-25 17:15:16 +08:00
钱涛 586fad5f2c 分权累计专项附加扣除 2022-05-25 16:51:43 +08:00
钱涛 90a6bd9921 暂存 2022-05-25 13:49:25 +08:00
MustangDeng 5abd648e9b Merge remote-tracking branch 'origin/develop' into develop 2022-05-25 13:23:15 +08:00
MustangDeng 402a3304cc 福利核算数据量过大的情况 2022-05-25 13:23:02 +08:00
钱涛 f066d1ef64 fix档案分页 2022-05-25 13:13:03 +08:00
钱涛 e1b579d480 暂存 2022-05-25 13:10:03 +08:00
钱涛 99fda7ecc3 修复调薪记录 2022-05-25 11:09:48 +08:00
钱涛 bf364a7639 暂存 2022-05-24 15:20:12 +08:00
MustangDeng 5cd4e46b8a Merge remote-tracking branch 'origin/develop' into develop 2022-05-24 13:42:25 +08:00
MustangDeng fe1cb27004 修复 自定义福利中已经停用某项福利，但新增方案时候还能引用 2022-05-24 13:42:15 +08:00
钱涛 895d258a44 分权基本控制开发完毕 2022-05-24 13:25:56 +08:00
钱涛 082d02ae67 Merge branch 'develop' into auth 2022-05-24 11:26:37 +08:00
钱涛 f555192e70 升级 2022-05-24 11:24:21 +08:00
钱涛 705f10f153 Merge remote-tracking branch 'origin/develop' into develop 2022-05-24 10:54:58 +08:00
钱涛 bccd246b2c fix分页异常 2022-05-24 10:54:46 +08:00
MustangDeng 78234f7554 工资单默认模板 2022-05-24 10:24:17 +08:00
MustangDeng 05f529769c 加解密 2022-05-24 09:23:17 +08:00
钱涛 cb1a53c649 暂存 2022-05-24 09:14:26 +08:00
钱涛 49cd388df1 暂存 2022-05-20 15:58:58 +08:00
钱涛 4f36f89e53 Merge branch 'develop' into auth 2022-05-20 14:56:25 +08:00
钱涛 d77e8b0de4 累计扣除字段 2022-05-20 14:41:42 +08:00
钱涛 ac934c901c 暂存 2022-05-19 16:56:57 +08:00
钱涛 2c03d4bc27 暂存 2022-05-19 16:36:18 +08:00
MustangDeng 6b9200121e 福利台账归档 2022-05-19 16:32:33 +08:00
钱涛 ed0ba7ed6d 暂存 2022-05-19 14:50:01 +08:00
MustangDeng 1f636c28d6 福利台账异动清单 2022-05-19 11:23:25 +08:00
MustangDeng 6024a69e84 福利档案导出 2022-05-19 10:20:23 +08:00
MustangDeng 0909e37741 数据采集高级搜索 2022-05-19 09:45:02 +08:00
MustangDeng 69246485ee 福利导入模板 2022-05-19 09:33:07 +08:00
MustangDeng f8105537c9 福利导入 2022-05-18 18:53:30 +08:00
MustangDeng 14daede3d0 Merge remote-tracking branch 'origin/develop' into develop 2022-05-18 16:37:34 +08:00
MustangDeng fcbc6c7202 福利方案分页创建 2022-05-18 16:37:23 +08:00
钱涛 647d4ae28b Merge remote-tracking branch 'origin/develop' into develop 2022-05-18 16:08:13 +08:00