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

1136 Commits

Author SHA1 Message Date
钱涛 e093c6aa7e 申报明细 2023-12-06 15:19:07 +08:00
sy ec8cb6214d 薪酬系统-福利档案，档案明细编辑保存功能改造，适配福利档案福利基数拆分个人和公司需求 2023-12-06 14:04:12 +08:00
sy 451c9fb07b 薪酬系统-福利档案，档案明细获取逻辑改造，根据应用设置中的区分开关，判定后将公司的福利基数信息单独区分返回 2023-12-06 09:51:07 +08:00
钱涛 1a061aa346 同步所有人员报送发薪日期为入职日期 2023-12-05 17:08:35 +08:00
钱涛 791bc2ffca Merge branch 'release/2.9.9.2312.01' into release/个税版本 
# Conflicts:
#	src/com/engine/salary/service/SalaryArchiveService.java
#	src/com/engine/salary/service/impl/SalaryArchiveServiceImpl.java
 2023-12-05 15:09:40 +08:00
Harryxzy 4eb931686e 鲁控数字temp 2023-12-05 14:57:34 +08:00
Harryxzy 3687bdfcdc Merge remote-tracking branch 'origin/release/2.9.9.2312.01' into release/2.9.9.2312.01 2023-12-05 11:30:04 +08:00
Harryxzy b093717e46 Merge branch 'fix/231102_账套增加义务人筛选' into release/2.9.9.2312.01 2023-12-05 11:28:47 +08:00
sy ce10204dab Merge remote-tracking branch 'remotes/origin/feature/231102-福利台账，补差待编辑项扩充其他可缴纳福利项' into release/2.9.9.2312.01 2023-12-05 11:26:48 +08:00
Harryxzy a0331112be Merge branch 'fie/231102_线下对比列头改造' into release/2.9.9.2312.01 2023-12-05 11:26:22 +08:00
钱涛 121da2f7ad 个税云参数调整 2023-12-01 11:46:21 +08:00
钱涛 895da67d46 Merge branch 'release/2.9.8.2311.02' into release/个税版本 
# Conflicts:
#	src/com/engine/salary/service/impl/TaxDeclarationServiceImpl.java
#	src/com/engine/salary/util/SalaryDateUtil.java
 2023-11-28 15:09:51 +08:00
sy 1bd20b2686 薪酬系统-福利台账，台账查询增加个税扣缴义务人 2023-11-27 11:20:36 +08:00
sy c8e3d6312b 薪酬系统-福利核算，补差待编辑福利项列表功能接口，补缴第三种方式的待编辑福利项获取逻辑优化，补差编辑tab页待编辑福利项获取逻辑优化 2023-11-24 14:05:03 +08:00
钱涛 a143b4fba5 新增工资单模板短信字段 2023-11-23 09:31:09 +08:00
钱涛 f16f93fd43 过滤pdf中的空或0值 2023-11-22 14:06:34 +08:00
Harryxzy 805fb9ff3c 1、薪资账套页面增加义务人筛选条件 
2、薪资核算页面增加义务人列表
 2023-11-20 16:14:51 +08:00
钱涛 753eaa5b22 检查闭环 2023-11-17 16:00:59 +08:00
钱涛 a2f63dee2b 短信模板设置接口 2023-11-16 15:42:11 +08:00
钱涛 e1a4e275ff 短信模板设置接口 2023-11-16 15:41:29 +08:00
钱涛 3de1e62f6b 短信模板 2023-11-16 11:38:21 +08:00
Harryxzy 97a5d4ab91 线下对比表头改造成分组的样式 2023-11-15 17:12:52 +08:00
钱涛 d2127cccff 短信模板 2023-11-15 13:32:37 +08:00
钱涛 fcd5846d08 Merge branch 'release/3.0.0.2311.02' into release/个税版本 2023-11-13 17:13:28 +08:00
钱涛 f3bc735fae 短信发送 2023-11-13 16:52:19 +08:00
钱涛 75717871d0 Merge branch 'release/3.0.0.2311.01' into release/个税版本 
# Conflicts:
#	src/com/engine/salary/service/SalaryEmployeeService.java
#	src/com/engine/salary/service/impl/SalaryEmployeeServiceImpl.java
#	src/com/engine/salary/sys/service/impl/SalarySysConfServiceImpl.java
 2023-11-08 16:20:31 +08:00
钱涛 00f806a8e9 Merge branch 'release/3.0.0.2311.01' into feature/报表支持自定义维度 2023-11-07 19:06:57 +08:00
钱涛 bcee3c5e5a 人员属性扩展 2023-11-07 19:06:43 +08:00
Harryxzy f2a840576e Merge branch 'fix/薪资核算导入下载模板bug' into release/3.0.0.2311.01 2023-11-07 11:24:25 +08:00
钱涛 68bc79ab0b 修改关键字 2023-11-07 11:00:00 +08:00
钱涛 74f7c71ffe 扩展维度属性 2023-11-06 11:19:00 +08:00
钱涛 0634a139b9 显示字符统计规则 2023-11-02 18:41:58 +08:00
钱涛 b050888b7b Merge branch 'release/3.0.0.2311.01' into release/个税版本 2023-10-31 17:19:09 +08:00
钱涛 3d8919da25 账套增加证件号码字段 2023-10-31 15:08:43 +08:00
钱涛 2b4ded9dd0 修复合计没有根据自定义字段过滤 2023-10-30 19:19:07 +08:00
钱涛 872ca0a805 恢复档案pageid 2023-10-26 13:45:38 +08:00
钱涛 adc8bce395 薪资档案改个pageid 2023-10-25 10:14:33 +08:00
sy 05b2c1868b Merge remote-tracking branch 'remotes/origin/feature/231001-福利档案基数调整记录' into release/2.9.6.2310.01 2023-10-24 14:11:22 +08:00
sy 1c0b00d163 薪酬系统-福利档案，福利档案基数调整记录列表查询入参调整 2023-10-23 18:07:37 +08:00
钱涛 328158204d 个税调差累计字段对应 2023-10-23 10:03:04 +08:00
钱涛 e19f00c44d Merge branch 'release/2.9.6.2310.01' into release/个税版本 2023-10-20 09:43:24 +08:00
钱涛 0dd9040408 一键累计bug修复 2023-10-19 17:35:33 +08:00
钱涛 3745be2c5c 状态编码 2023-10-19 15:52:52 +08:00
sy 96bc325b43 薪酬系统-福利档案，福利档案基数调整记录列表查询入参和返回数据调整 2023-10-18 15:13:08 +08:00
sy b9a681a791 薪酬系统-福利台账，线下对比中数值是否存在差异相关逻辑优化 2023-10-18 14:14:05 +08:00
sy 9ac549c06a 薪酬系统-福利档案，福利档案基数调整记录列表查询 2023-10-18 13:34:05 +08:00
sy e68359ef50 Merge branch 'fix/231001-福利台账，导入模板下载接口由get改为post' into release/2.9.6.2310.01 2023-10-18 09:48:19 +08:00
钱涛 5d7a6bc241 调薪记录 2023-10-17 18:04:47 +08:00
钱涛 cf1e1395f7 拓扑图 2023-10-17 14:24:52 +08:00
sy e80a3497d9 薪酬系统-福利档案，福利档案导入逻辑中增加基数调整记录 2023-10-17 11:40:28 +08:00
钱涛 3443cd0dff 拓扑图 2023-10-17 10:24:30 +08:00
钱涛 72fbd5f336 拓扑图暂存 2023-10-16 15:00:54 +08:00
钱涛 5d3e2928c9 Merge branch 'release/2.9.6.2310.01' into release/个税版本 2023-10-13 16:54:46 +08:00
Harryxzy fbc49bff98 公式变量为文本时返回””number返回0 2023-10-12 13:47:18 +08:00
钱涛 665dc7b36a fix重新核算bug 2023-10-11 19:55:09 +08:00
钱涛 7368363631 人员服务客户端 2023-10-11 18:24:02 +08:00
sy 92a7daa9fa 薪酬系统-福利台账，正常缴纳导入模板下载接口改为post类型 2023-10-10 16:17:44 +08:00
钱涛 d5f5cb07ba Merge branch 'release/2.9.6.2310.01' into release/个税版本 2023-10-08 16:21:12 +08:00
钱涛 182e90676c Merge branch 'feature/自定义筛选条件' into release/2.9.6.2310.01 
# Conflicts:
#	src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java
 2023-10-08 14:24:33 +08:00
钱涛 26bbc9c0ee Merge branch 'release/2.9.6.2310.01' into release/个税版本 
# Conflicts:
#	src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java
 2023-10-08 14:21:25 +08:00
钱涛 8166e76081 账套增加状态字段 2023-10-08 13:38:37 +08:00
钱涛 138f832537 时效性过滤 2023-10-08 10:11:07 +08:00
钱涛 d98933832a Merge branch 'feature/生成签名pdf' into release/2.9.6.2310.01 
# Conflicts:
#	src/com/engine/salary/web/SalaryBillController.java
 2023-10-07 15:19:38 +08:00
钱涛 5241972151 工资单时效设置 2023-10-07 14:46:28 +08:00
钱涛 4c5bc5dda7 增加状态 2023-09-28 17:05:42 +08:00
钱涛 4ed4edc9ed pdf按钮控制 2023-09-27 14:19:52 +08:00
钱涛 7562b4e4a3 Merge branch 'feature/生成签名pdf' into feature/自定义筛选条件 2023-09-27 14:01:32 +08:00
钱涛 e37922c52f 工资单pdf 2023-09-26 10:26:12 +08:00
钱涛 1de83a57c2 工资单pdf 2023-09-26 10:00:00 +08:00
钱涛 5d203b0783 自定义搜索 2023-09-25 16:53:01 +08:00
钱涛 faeafbe5ad 暂存 2023-09-25 15:38:14 +08:00
钱涛 5602d65ed8 Merge branch 'release/2.9.5.2309.01' into release/个税版本 
# Conflicts:
#	resource/WEB-INF/prop/hrmSalaryCustom.properties
 2023-09-22 17:59:06 +08:00
钱涛 7c5af2166e 日期格式自定义配置 2023-09-22 17:57:47 +08:00
钱涛 a5d019799c 账套复制 2023-09-22 11:47:51 +08:00
钱涛 0545c6eb8c Merge branch 'release/2.9.5.2309.01' into release/个税版本 2023-09-21 16:58:15 +08:00
Harryxzy bf8ae9fd09 Merge branch 'fix/230902-导出报表为数值类型' into release/2.9.5.2309.01 2023-09-21 16:03:38 +08:00
sy f4883ad87c Merge remote-tracking branch 'remotes/origin/feature/230901-社保福利方案搜索功能' into release/2.9.5.2309.01 2023-09-21 14:10:06 +08:00
sy 5f84ed451b Merge remote-tracking branch 'remotes/origin/feature/230901-福利台账-调差，支持一个人存在多个调差记录' into release/2.9.5.2309.01 2023-09-21 14:09:54 +08:00
Harryxzy efa818f8b9 核算结果导出数值项excel格式为数值 2023-09-21 13:36:23 +08:00
Harryxzy 443368bdb3 Merge branch 'fix/230902-账套中从公式改为输入，核算公式展示错误' into release/2.9.5.2309.01 2023-09-21 11:44:23 +08:00
sy 3167aaab63 薪酬系统-福利方案，修改查询参数 2023-09-20 17:29:44 +08:00
Harryxzy c40c31845c 账套中修改公式为输入，核算的公式页面展示为空字符串不是”输入“ 2023-09-20 15:26:18 +08:00
钱涛 9ab80de441 工资单pdf和签名 2023-09-20 14:45:44 +08:00
Harryxzy 5bd66b626f 查看工资单后能够继续反馈、确认 2023-09-19 16:21:23 +08:00
sy 2afa94e3a4 Merge remote-tracking branch 'remotes/origin/release/2.9.5.2309.01' into feature/230901-福利台账-调差，支持一个人存在多个调差记录 2023-09-19 10:47:13 +08:00
钱涛 12480f8306 生成工资单pdf签名 2023-09-18 18:45:59 +08:00
sy 5538a7d01e 薪酬系统-福利方案，增加查询功能 2023-09-18 16:30:52 +08:00
钱涛 88a59d3d01 处理空指针 2023-09-18 13:49:25 +08:00
钱涛 7b3f7b2e39 签名 2023-09-18 10:25:43 +08:00
Harryxzy 7db0a475ff Merge branch 'fix/230902-薪资账套复制缺少字段' into release/2.9.5.2309.01 2023-09-14 17:35:05 +08:00
Harryxzy 0675de75ed 修复复制账套时少复制 2023-09-14 17:32:01 +08:00
钱涛 2b13d0c7ef 定薪账套 2023-09-14 11:56:00 +08:00
sy 0ad4a63a6b Merge remote-tracking branch 'remotes/origin/fix/230901-福利档案编辑问题修复' into feature/230901-福利台账-调差，支持一个人存在多个调差记录 2023-09-12 11:30:12 +08:00
sy b276066b52 薪酬系统-福利台账，导入模板带出核算数据 2023-09-12 11:05:46 +08:00
sy 39971f726d Merge remote-tracking branch 'remotes/origin/feature/230901-福利档案-非系统人员tab' into release/2.9.5.2309.01 2023-09-08 17:02:03 +08:00
sy 3e7180a25e Merge remote-tracking branch 'remotes/origin/feature/230901-福利档案-非系统人员tab' into feature/230901-福利台账-调差，支持一个人存在多个调差记录 2023-09-08 16:57:32 +08:00
sy ec406b7f8a 薪酬系统-福利档案，福利档案编辑并减员、编辑并增员action 2023-09-08 16:57:09 +08:00
钱涛 83e0b1668e 往期累计 2023-09-07 18:21:22 +08:00
钱涛 02100c2ee3 有向无环拓扑排序 2023-09-07 15:15:59 +08:00
Harryxzy 8ec5def53d Merge branch 'feature/230901-同步薪资项目至账套' into release/2.9.5.2309.01 2023-09-07 10:05:14 +08:00
钱涛 464bb9d623 Merge branch 'release/个税二期' into release/个税版本 2023-09-06 17:06:07 +08:00
钱涛 43cdf98411 核算优先级 2023-09-06 15:48:43 +08:00
钱涛 d03aed1d1b 核算优先级 2023-09-06 14:01:56 +08:00
钱涛 d49b33c66f Merge branch 'release/个税一期' into release/个税版本 2023-09-06 11:40:34 +08:00
钱涛 f9611212d4 个税解析 2023-09-06 11:40:22 +08:00
sy f6094cbc7a 薪酬系统-福利档案，非系统人员tab页列表 2023-09-06 10:04:58 +08:00
钱涛 6059174e7c 往期累计的在线获取 2023-09-06 09:40:50 +08:00
钱涛 f245bd2f49 新增往期累计字段 2023-09-05 11:04:53 +08:00
钱涛 9867728d2e 在线获取累计专项附加扣除 2023-09-04 16:18:02 +08:00
钱涛 96bfdf05ed 在线获取累计专项附加扣除 2023-09-04 14:20:42 +08:00
钱涛 552eaa4589 Merge branch 'release/个税一期' into release/个税二期 2023-09-04 09:30:55 +08:00
钱涛 6871316f98 Merge branch 'release/2.9.4.2308.02' into release/个税一期 
# Conflicts:
#	resource/WEB-INF/prop/hrmSalaryCustom.properties
#	src/com/engine/salary/service/SalaryEmployeeService.java
#	src/com/engine/salary/service/impl/SalaryEmployeeServiceImpl.java
 2023-09-04 09:30:24 +08:00
钱涛 c0c29b7472 在线获取累计专项附加扣除 2023-09-04 09:29:00 +08:00
钱涛 7c5e373b01 2 2023-09-01 09:23:43 +08:00
Harryxzy 6ca1c6eae3 Merge branch 'fix/230802-薪资核算编辑时保留小数位数' into release/2.9.4.2308.02 2023-08-31 11:13:46 +08:00
Harryxzy 190bbe0875 同步薪资项目至账套 2023-08-31 09:24:41 +08:00
Harryxzy 4467f57928 工资单模板新建时重命名无分类名字消失bug 2023-08-30 13:26:25 +08:00
钱涛 7a06fc73f4 fix操作记录创建人 2023-08-30 10:47:41 +08:00
钱涛 cbafca9aab 1、邮件提醒 
2、em提醒
 2023-08-29 19:24:56 +08:00
钱涛 1c9cc632d3 智能算薪导出 2023-08-29 13:55:36 +08:00
钱涛 b5f9477c90 流量监控 2023-08-28 13:31:11 +08:00
Harryxzy e83db15bc7 薪资档案、薪资核算编辑前端控制保留位数 2023-08-25 15:09:12 +08:00
钱涛 3bc0f59d0a 去除为空校验 2023-08-24 18:20:17 +08:00
钱涛 45e69cd6c8 导出 2023-08-24 11:36:17 +08:00
sy f925943b31 Merge remote-tracking branches 'remotes/origin/feature/230802-福利方案-修改方案明细接口' and 'remotes/origin/fix/230802-优化福利台账导出合计列' into feature/230802-福利档案-档案相关action 2023-08-24 09:15:48 +08:00
钱涛 2f2727c4b9 导出 2023-08-23 18:13:31 +08:00
钱涛 9e416123dd 账套薪资项目添加code 2023-08-23 16:49:45 +08:00
钱涛 fdc1df3dba 个税对接v6 2023-08-22 17:48:23 +08:00
钱涛 bb2d2d64e6 在线申报接口 2023-08-21 19:35:14 +08:00
sy 299284872f 薪酬系统-福利方案，福利方案明细数据修改接口 2023-08-21 14:58:01 +08:00
钱涛 215e25fa31 申报表分页问题 2023-08-21 10:30:13 +08:00
钱涛 2f59f8283a 人员报送接口 2023-08-20 14:03:43 +08:00
sy 4ffca1872a 薪酬系统-福利台账，核算明细列表合计行导出 2023-08-18 17:58:36 +08:00
钱涛 988139610b Merge branch 'release/2.9.4.2308.02' into release/230803对接个税 
# Conflicts:
#	src/com/engine/salary/mapper/salarysob/SalarySobItemMapper.xml
#	src/com/engine/salary/web/SalarySobController.java
 2023-08-18 09:36:26 +08:00
钱涛 d88c43c3c6 人员报送接口 2023-08-18 09:27:16 +08:00
钱涛 0d8606c956 在线申报接口 2023-08-17 19:04:20 +08:00
钱涛 914963135a 个税对接辅助缴款 2023-08-17 14:55:32 +08:00
sy 63023ae8e6 薪酬系统-福利档案、台账，档案增加分部字段、tab计数过滤非系统人员、补差取消部分字段展示 2023-08-17 11:31:38 +08:00
钱涛 414f960346 账套-个税字段对应、累计字段对应 2023-08-17 09:22:09 +08:00
钱涛 cf22685fca 账套-个税字段对应、累计字段对应 2023-08-15 20:48:09 +08:00
钱涛 81dae66ea2 个税对接，个税申报接口 2023-08-14 21:03:40 +08:00
钱涛 b1817142b0 个税对接，个税申报接口 2023-08-14 20:07:29 +08:00
Harryxzy 19cb2d9622 Merge branch 'feature/230703-薪资账套项目页面改造' into release/2.9.3.2308.01 2023-08-14 09:19:20 +08:00
Harryxzy 7ebb8d6618 Merge branch 'feature/230702-自定义工资项目展示名' into release/2.9.3.2308.01 2023-08-14 09:19:04 +08:00
钱涛 dc63897165 个税对接，个税申报接口 2023-08-11 14:20:14 +08:00
钱涛 615813c478 个税对接，人员报送相关接口 2023-08-09 18:35:09 +08:00
钱涛 827420c2bd 个税对接，人员报送相关接口 2023-08-08 19:39:53 +08:00
sy 9f021b6d5e 薪酬系统-福利档案，修复非系统人员增量数据造成的bug 2023-08-08 15:03:52 +08:00
Harryxzy 6a01f0d785 Merge branch 'release/2.9.2.2307.02' into feature/230702-自定义工资项目展示名 2023-08-08 11:42:41 +08:00
Harryxzy fa7eb0ee60 Merge branch 'release/2.9.2.2307.02' into feature/230703-薪资账套项目页面改造 2023-08-08 11:06:06 +08:00
Harryxzy 58eaddc33e 人员信息报送temp 2023-08-08 09:21:14 +08:00
sy 8c9049f1f7 Merge remote-tracking branch 'remotes/origin/feature/230702-非系统人员导入功能' into release/2.9.3.2308.01 2023-08-04 15:26:24 +08:00
Harryxzy 190771037e fixbug 2023-08-04 09:33:17 +08:00
sy 3f10c8eb96 Merge remote-tracking branch 'remotes/origin/fix/福利台账-线下对比导入分批' into release/2.9.3.2308.01 2023-08-02 15:41:33 +08:00
sy 293297ad7f 薪酬系统-福利台账，线下对比导入分批,列表逻辑优化 2023-08-01 15:37:32 +08:00
Harryxzy 3827c8963d fix补发模板问题 2023-07-31 17:07:21 +08:00
Harryxzy b7203625c1 自定义工资项目展示名fix 添加 2023-07-31 10:47:00 +08:00
Harryxzy f282f1a3ab 自定义工资项目展示名 2023-07-28 17:51:50 +08:00
Harryxzy 02628d8224 薪资账套-薪资项目编辑fixBUG 2023-07-28 17:43:14 +08:00
sy 007d6df3cd 薪酬系统-非系统人员管理，非系统人员导入 2023-07-28 10:12:59 +08:00
sy 80f4f7d43b 薪酬系统-非系统人员管理，非系统人员导入模板 2023-07-27 09:39:03 +08:00
Harryxzy 7763f16c0f 薪资账套薪资项目编辑功能 2023-07-26 13:43:53 +08:00
Harryxzy da18b0f884 薪资账套项目页面改造temp 2023-07-25 16:46:57 +08:00
Harryxzy a8a414a48b 薪资账套项目页面改造temp 2023-07-24 17:11:19 +08:00
sy ea4b603c36 薪酬系统-薪资档案、核算，列表不要显示离职日期、核算人员确认页面范围列表不要显示离职日期 2023-07-24 11:26:36 +08:00
Harryxzy ad6a571310 自定义工资项目展示名fix 2023-07-21 11:08:54 +08:00
Harryxzy 19c297dfe9 自定义工资项目展示名fix补发 2023-07-20 15:57:27 +08:00
Harryxzy fd3abc7f65 自定义工资项目展示名 2023-07-20 14:12:33 +08:00
钱涛 38f3461c64 v1 2023-07-20 14:05:19 +08:00
Harryxzy b95663ada8 自定义工资项目展示名 2023-07-20 10:42:16 +08:00
钱涛 e75d5ab427 v1 2023-07-20 10:36:29 +08:00
钱涛 c0660e5476 暂存 2023-07-20 10:36:28 +08:00
sy c7fe4fee23 Merge branches 'feature/230701-社保福利-核算记录的校验' and 'feature/230701-薪资核算-导出功能可选择字段导出' into release/2.9.2.2307.02 2023-07-20 10:19:40 +08:00
钱涛 01b02531ce Merge branch 'feature/外部人员' into release/2.9.2.2307.02 
# Conflicts:
#	src/com/engine/salary/mapper/salarybill/SalarySendInfoMapper.xml
#	src/com/engine/salary/service/impl/SalarySendServiceImpl.java
#	src/com/engine/salary/sys/service/SalarySysConfService.java
#	src/com/engine/salary/sys/service/impl/SalarySysConfServiceImpl.java
#	src/com/engine/salary/wrapper/SalarySystemConfigWrapper.java
 2023-07-20 10:08:05 +08:00
Harryxzy 8e6bd24d0d 自定义工资项目展示名 2023-07-19 16:14:25 +08:00
Harryxzy 0a4c19fb36 Merge branch 'feature/230702-薪资项目-核算时隐藏' into release/2.9.2.2307.02 2023-07-19 11:11:46 +08:00
sy 4b503513f2 Merge remote-tracking branch 'remotes/origin/release/2.9.2.2307.02' into feature/230701-薪资核算-导出功能可选择字段导出 2023-07-19 10:04:58 +08:00
Harryxzy 78e5d37cf3 薪资项目-核算时隐藏 2023-07-18 17:22:42 +08:00
Harryxzy db9a0e22eb 薪资项目-核算时隐藏fixbug 2023-07-18 17:00:09 +08:00
Harryxzy bbb8417008 自定义工资项目展示名temp 2023-07-18 16:28:29 +08:00
Harryxzy d551f5ae76 薪资项目核算时隐藏 2023-07-18 14:03:59 +08:00
Harryxzy b8f44dd5b6 薪资项目核算时隐藏 2023-07-18 11:00:13 +08:00
Harryxzy 88892f1aac 工资单反馈fixBug 2023-07-17 12:36:20 +08:00
Harryxzy 8221d4da69 工资单反馈 2023-07-17 11:27:40 +08:00
Harryxzy faf9636a0d 薪资项目-核算时隐藏 temp 2023-07-14 11:34:53 +08:00
Harryxzy 30d61e352f 工资单确认反馈 2023-07-13 11:50:02 +08:00
sy c78c8375f0 薪酬系统-薪资核算，自定义导出字段 2023-07-12 15:20:02 +08:00
Harryxzy 820d15d06f 工资单确认反馈 2023-07-12 15:17:59 +08:00
sy 47dc9e35bd 薪酬系统-福利台账，已归档状态下重新核算按钮增加是否被薪资核算引用校验逻辑 2023-07-11 17:56:45 +08:00
钱涛 aec6918c12 Merge branch 'release/2.9.1.2307.01' into feature/外部人员 
# Conflicts:
#	src/com/engine/salary/biz/EmployBiz.java
#	src/com/engine/salary/biz/SIAccountBiz.java
#	src/com/engine/salary/entity/salaryBill/dto/SalarySendDetailListDTO.java
#	src/com/engine/salary/entity/salaryarchive/param/SalaryArchiveQueryParam.java
#	src/com/engine/salary/mapper/archive/SalaryArchiveMapper.java
#	src/com/engine/salary/service/SalaryEmployeeService.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/SIAccountServiceImpl.java
#	src/com/engine/salary/service/impl/SalaryAcctCalculateServiceImpl.java
#	src/com/engine/salary/service/impl/SalaryArchiveExcelServiceImpl.java
#	src/com/engine/salary/service/impl/SalaryEmployeeServiceImpl.java
#	src/com/engine/salary/service/impl/SalarySendRangeServiceImpl.java
#	src/com/engine/salary/service/impl/TaxAgentManageRangeServiceImpl.java
#	src/com/engine/salary/web/SalarySobController.java
#	src/com/engine/salary/wrapper/SalaryAcctRecordWrapper.java
#	src/com/engine/salary/wrapper/SalaryArchiveWrapper.java
#	src/com/engine/salary/wrapper/SalarySendWrapper.java
#	src/com/engine/salary/wrapper/TaxAgentSubAdminWrapper.java
#	src/com/engine/salary/wrapper/TaxDeclarationWrapper.java
 2023-07-11 16:08:15 +08:00
Harryxzy 33a0723ad2 Merge branch 'release/2.9.1.2307.01' into feature/230701-工资单反馈 2023-07-11 15:29:21 +08:00
Harryxzy be895829c2 工资单反馈 2023-07-11 15:29:13 +08:00
sy c28f782f19 Merge remote-tracking branch 'remotes/origin/fix/salaryExportBug-0706' into release/2.9.1.2307.01 2023-07-11 11:11:15 +08:00
sy 83604ba534 薪酬系统-福利台账，修改台账列表返回台账状态值返回逻辑 2023-07-11 11:10:32 +08:00
sy a55ca5182e Merge remote-tracking branch 'remotes/origin/fix/salaryExportBug-0706' into release/2.9.1.2307.01 2023-07-11 09:59:29 +08:00
sy b705161492 薪酬系统-薪资核算、薪资档案、福利档案，高级搜索功能问题修复 2023-07-10 14:33:43 +08:00
Harryxzy 938f03946b Merge branch 'feature/230701-系统薪资项目可配置删除' into release/2.9.1.2307.01 2023-07-10 10:09:52 +08:00
Harryxzy 9b7ba19d64 Merge branch 'feature/230701-工资单定时发送' into release/2.9.1.2307.01 2023-07-10 10:09:45 +08:00
sy b92c7ff599 薪酬系统-薪资核算、薪资档案、福利档案，高级搜索中的状态条件改为数组类型的入参 2023-07-07 15:32:12 +08:00
sy 9c34fb9497 薪酬系统-薪资核算，搜索条件新增字段 2023-07-07 11:47:43 +08:00
Harryxzy 40fc4ea13c 工资单定时发送 调整周期类型 2023-07-05 11:39:54 +08:00
Harryxzy 896e0c9e34 工资单定时发送 添加 发放周期 2023-07-05 09:59:45 +08:00
Harryxzy c78839d8c0 工资单定时发送 添加 发放周期 2023-07-04 18:03:57 +08:00
Harryxzy c8cf6090ff 系统薪资项目可配置删除、工资单模板默认没有隐藏项目 2023-07-04 13:21:19 +08:00
钱涛 82ab6c1e11 非系统算税功能 2023-07-04 09:32:12 +08:00
钱涛 a37d6758bb 核算状态标识 2023-07-03 14:27:20 +08:00
钱涛 1403b22cf7 修复邮件保存 2023-07-03 14:02:34 +08:00
Harryxzy 11c416601d 工资单定时发送渲染bug 2023-07-03 11:21:49 +08:00
Harryxzy faa2b9c16e 工资单模板信息 2023-07-03 09:44:10 +08:00
Harryxzy 9842784297 工资单定时发送 - 模板保存 2023-06-30 15:58:55 +08:00
sy 041303275b Merge remote-tracking branch 'remotes/origin/release/2.8.4.2306.02' into feature/230602-数据库适配-PG 2023-06-27 15:09:12 +08:00
sy d65a792076 Merge remote-tracking branch 'remotes/origin/release/2.8.4.2306.02' into feature/230602-数据库适配-PG 2023-06-27 15:05:22 +08:00
sy 1ed02f4d07 薪酬系统-福利台账，(修改台账列表返回台账状态值返回逻辑)——暂时取消 2023-06-27 15:05:07 +08:00
钱涛 6f3593f44b Merge branch 'feature/短信验证码' into release/2.8.4.2306.02 
# Conflicts:
#	src/com/engine/salary/service/impl/SalarySendServiceImpl.java
#	src/com/engine/salary/sys/constant/SalarySysConstant.java
 2023-06-26 13:54:56 +08:00
Harryxzy ca248ded98 发送邮件修复bug 2023-06-26 13:32:14 +08:00
Harryxzy 7c44a2ad6b Merge branch 'feature/waterMark' into release/2.8.4.2306.02 
# Conflicts:
#	src/com/engine/salary/entity/salaryBill/bo/SalaryBillBO.java
#	src/com/engine/salary/web/SalaryBillController.java
 2023-06-26 13:28:21 +08:00
Harryxzy a43123efc0 Merge branch 'fix/DBType修改' into release/2.8.4.2306.02 2023-06-26 13:26:27 +08:00
Harryxzy 0117624dc4 Merge branch 'fix/回算后无法发放第二次工资单' into release/2.8.4.2306.02 2023-06-26 13:25:36 +08:00
Harryxzy 5ecba7fa3e Merge branch 'feature/taxDeclarationWithdraw' into release/2.8.4.2306.02 2023-06-26 13:25:01 +08:00
sy cbcd53d92d 薪酬系统-福利台账，修改台账列表返回台账状态值返回逻辑 2023-06-26 10:56:03 +08:00
sy f2cca4cfd7 Merge remote-tracking branch 'remotes/origin/fix/DBType修改' into feature/230602-数据库适配-PG 2023-06-26 10:15:24 +08:00
钱涛 50fa724756 采用线程池发送邮件 2023-06-26 10:11:54 +08:00
Harryxzy 0e601e3967 修改DBType的写法 2023-06-19 13:59:24 +08:00
Harryxzy d9f57ac258 修复回算后无法发放第二次核算的工资单 2023-06-16 16:41:49 +08:00
钱涛 8612f0e5b2 Merge branch 'release/2.8.4.2306.02' into feature/短信验证码 2023-06-16 14:54:24 +08:00
Harryxzy 512510c623 考勤引用校验能够否删除 2023-06-16 11:49:23 +08:00
钱涛 57798a8e3e 短信验证码功能 2023-06-14 15:51:26 +08:00
Harryxzy b544c5e2c1 水印预览 2023-06-13 10:02:11 +08:00
Harryxzy b60904cc03 水印 - 邮件水印不支持图片 2023-06-12 18:55:27 +08:00
Harryxzy 7a40a31d6f 水印 - 暂存2 2023-06-12 15:19:24 +08:00
Harryxzy c37750b538 撤回个税申报 2023-06-12 10:40:01 +08:00
Harryxzy 76977331af 暂存 2023-06-09 17:57:17 +08:00
Harryxzy b2f39f56e2 Merge branch 'fix/sysSalaryItemSearchBUG' into release/2.8.3.2306.01 2023-06-09 09:50:25 +08:00
Harryxzy 5bee0f3b4d Merge branch 'feature/salalryItemAndFieldSort' into release/2.8.3.2306.01 2023-06-09 09:48:56 +08:00
Harryxzy e24579f363 Merge branch 'feature/statisticDataPerspective' into release/2.8.3.2306.01 2023-06-09 09:48:27 +08:00
Harryxzy e464ca8ba6 薪资账套中薪资项目可以删除 2023-06-08 15:30:52 +08:00
Harryxzy dbb2a97be4 系统薪资项目列表显示改造 2023-06-08 11:10:40 +08:00
Harryxzy 94edee7f8c Merge branch 'feature/taxAgentSorted' into release/2.8.3.2306.01 2023-06-08 09:03:21 +08:00
钱涛 7701420430 邮件去除图片 2023-06-07 17:19:00 +08:00
Harryxzy deaa9acfa0 Merge branch 'release/2.8.3.2306.01' into feature/statisticDataPerspective 2023-06-07 15:44:51 +08:00
Harryxzy 4617005e1f 数据透视功能 2023-06-07 15:43:23 +08:00
钱涛 77e9b0a74b Merge branch 'release/2.8.3.2306.01' into feature/短信邮件 2023-06-07 15:12:40 +08:00
Harryxzy a6356a7d3d Merge branch 'feature/salalryItemAndFieldSort' into release/2.8.3.2306.01 2023-06-07 12:27:29 +08:00
Harryxzy f4627b53f9 fix没有公式id内容bug 2023-06-07 12:23:05 +08:00
钱涛 d4c8a66fcf 注释优化 2023-06-07 09:31:46 +08:00
Harryxzy 1584a27fe8 个税扣缴义务人排序 2023-06-06 14:44:00 +08:00
钱涛 4358dc20a5 Merge branch 'release/2.8.3.2306.01' into feature/短信邮件 2023-06-06 14:24:23 +08:00
钱涛 993db67601 公共进度条功能 2023-06-06 10:30:49 +08:00
钱涛 4582ab1e51 邮件审批方法 2023-06-06 09:51:07 +08:00
Harryxzy 0d3a48e7ea 个税扣缴义务人排序 2023-06-05 15:14:25 +08:00