Commit Graph

33 Commits

Author SHA1 Message Date
钱涛 d62473c356 修复往期累计情况 2022-08-08 17:45:18 +08:00
钱涛 1d90bb148e 修复往期累计导入数量限制 2022-07-13 09:53:11 +08:00
钱涛 6967a7224c 优化往期删除逻辑 2022-07-07 20:26:43 +08:00
钱涛 9bd1074258 1、档案限制应为个税扣缴义务人下的人员
2、个税扣缴义务人未开启分权的情况下显示管理员
2022-07-06 10:13:06 +08:00
钱涛 7f3cc0a82a fix 2022-06-27 10:58:16 +08:00
钱涛 abdd87a005 fix 2022-06-24 18:05:08 +08:00
钱涛 fc35eff75d fix 2022-06-21 22:37:22 +08:00
钱涛 bf7d8dd634 导入时人员唯一校验 2022-06-13 17:05:36 +08:00
钱涛 33914eae1d 解密 2022-06-10 18:07:25 +08:00
钱涛 6ddf483767 加解密 2022-06-10 16:43:38 +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
钱涛 b8972bcd43 分权v3 2022-06-09 17:45:28 +08:00
钱涛 860c89b560 申报和往期异常 2022-06-08 16:36:50 +08:00
钱涛 79632dd1bf 申报表分权 2022-06-07 19:10:40 +08:00
钱涛 cedc9f2644 考勤和申报表的分权 2022-06-07 15:43:22 +08:00
钱涛 be88b90f56 核算的分权 2022-06-02 17:10:54 +08:00
钱涛 efd31013cd 薪资账套分权 2022-05-31 21:05:59 +08:00
钱涛 99b5c36864 暂存 2022-05-31 16:41:11 +08:00
钱涛 841ca27c84 暂存 2022-05-27 17:21:39 +08:00
钱涛 c4c04ac87a 暂存 2022-05-27 14:46:01 +08:00
钱涛 ad991954cd 暂存 2022-05-27 11:49:23 +08:00
MustangDeng 05f529769c 加解密 2022-05-24 09:23:17 +08:00
钱涛 d77e8b0de4 累计扣除字段 2022-05-20 14:41:42 +08:00
钱涛 a2c59d15f4 项目分类bug 2022-05-12 14:36:16 +08:00
钱涛 6f3d8e85c0 个税申报bug 2022-05-09 17:47:19 +08:00
钱涛 bf37add9dd 修复导出异常 2022-05-09 14:11:07 +08:00
钱涛 b0ee96eb41 导入模板改为内存生成 2022-04-28 17:44:26 +08:00
钱涛 a069447f02 核算基础公式 2022-04-11 20:17:47 +08:00
钱涛 98c49db986 其他扣除项接口 2022-03-10 17:57:46 +08:00
钱涛 d55fca8eeb 导出明细 2022-03-10 11:09:08 +08:00
钱涛 1319543251 累计接口 2022-03-09 18:58:30 +08:00
钱涛 7ee952e63c 累计 2022-03-09 16:40:14 +08:00
钱涛 c8b05f5ef1 查询参数 2022-03-08 13:17:54 +08:00