Commit Graph

24 Commits

Author SHA1 Message Date
sy b6ee197fe6 薪酬系统,梳理Mapper类使用方式 2023-03-07 14:21:01 +08:00
sy 7da1bfff6b 薪酬系统-福利台账,核算明细导出时企业年金单位数值有误相关问题修复 2023-02-15 09:55:33 +08:00
fcli d3de862d11 feat: 加密统一,薪资项目&社保档案详情... 2022-12-13 17:14:27 +08:00
fcli eabc983100 feat: 加密统一,社保福利档案&薪资核算结果 2022-12-13 10:15:31 +08:00
sy 2b29813f6b 薪酬系统-福利台账,退差数据导出 2022-11-22 13:35:09 +08:00
sy c339798dc8 薪酬系统-福利台账,退差数据导出功能v1 2022-11-16 09:48:17 +08:00
sy 24e5c97197 薪酬系统-福利档案改造,福利台账正常缴纳页导入模板带出数据和导出功能添加runStatus约束 2022-10-20 16:29:49 +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 bd3e44442d 薪酬系统-福利台账,正常缴纳导出添加工号信息 2022-09-27 11:39:57 +08:00
钱涛 e2db30c816 排序 2022-09-27 10:19:09 +08:00
钱涛 5124520850 1、其他福利单位合计导出错误
2、方案删除错误
2022-08-17 11:46:35 +08:00
钱涛 65cfe6c28a 去除无效代码 2022-08-09 16:54:29 +08:00
钱涛 1eba64edd6 1、福利列表统一为个税扣缴义务人
2、补缴导出无数据
2022-08-04 15:09:40 +08:00
钱涛 3ced92cfc5 修复福利核算 2022-07-21 17:28:47 +08:00
liuliang 76661474c4 修改社保福利台账导出按钮无法正确导出bug 2022-07-19 14:05:25 +08:00
钱涛 1d5c69278f 描述异常 2022-07-13 11:45:16 +08:00
钱涛 12917f4f8b 去除无用todo 2022-07-08 11:30:10 +08:00
MustangDeng 3bedc88f44 福利加解密 2022-06-10 18:01:55 +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
MustangDeng 85f0b1164c 福利台账分权 2022-06-09 18:31:36 +08:00
MustangDeng 05f529769c 加解密 2022-05-24 09:23:17 +08:00
Chengliang d0f12c2faf 6个列表页导出完成 2022-04-21 15:04:35 +08:00
Chengliang bef9b30a2e 福利台账导出及列表bug修复 2022-04-19 17:46:24 +08:00
Chengliang 651df1842e 福利台账导出 2022-04-18 20:24:43 +08:00