Harryxzy
|
6ae98ce50a
|
Merge branch 'fix/新建定量维度时数据透视没有值' into release/2.8.4.2306.02
|
2023-06-26 14:23:27 +08:00 |
|
Harryxzy
|
e7edb9040c
|
修复无分类
|
2023-06-20 17:27:18 +08:00 |
 钱涛
|
16cf63018f
|
重新核算或者回算时删除报表缓存
|
2023-06-19 09:54:02 +08:00 |
|
钱涛
|
5e6a65e47e
|
获取报表缓存，暂存方法
|
2023-06-15 18:48:31 +08:00 |
|
Harryxzy
|
155a00623a
|
导入编辑自动锁定 根据confValue判断
|
2023-06-12 10:45:01 +08:00 |
|
Harryxzy
|
e24579f363
|
Merge branch 'feature/statisticDataPerspective' into release/2.8.3.2306.01
|
2023-06-09 09:48:27 +08:00 |
|
Harryxzy
|
4617005e1f
|
数据透视功能
|
2023-06-07 15:43:23 +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 |
|
Harryxzy
|
1294e86c8c
|
导入自动锁定添加开关
|
2023-06-02 15:25:46 +08:00 |
|
Harryxzy
|
52b592dd7e
|
薪资核算获取加锁的值时增加项目条件，提速
|
2023-06-02 15:06:07 +08:00 |
|
Harryxzy
|
d53d7a33d7
|
删除锁定多余代码
|
2023-06-02 14:47:15 +08:00 |
|
Harryxzy
|
0ec6e740d3
|
Merge branch 'fix/backCalcSumRow' into release/2.8.3.2306.01
|
2023-05-29 16:48:18 +08:00 |
|
Harryxzy
|
25ffd06dd4
|
修复编辑薪资核算没有未分类
|
2023-05-25 17:06:03 +08:00 |
|
Harryxzy
|
c7bdbe7b85
|
Merge branch 'feature/V3-salaryAcctResultLog' into release/2.8.2.2305.02
# Conflicts:
# src/com/engine/salary/service/impl/SalaryAcctExcelServiceImpl.java
# src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java
|
2023-05-22 14:03:07 +08:00 |
|
Harryxzy
|
ebf966517b
|
修复保存日志获取不到id
|
2023-05-18 14:28:31 +08:00 |
|
Harryxzy
|
72f2ca4439
|
修复核算编辑保存
|
2023-05-17 14:49:53 +08:00 |
|
Harryxzy
|
083916eb0c
|
薪资核算编辑 带上公式
|
2023-05-16 15:41:11 +08:00 |
|
Harryxzy
|
4ff15ca651
|
薪资核算结果编辑导入 记录
|
2023-05-15 10:28:17 +08:00 |
|
Harryxzy
|
b0084cad9c
|
薪资核算编辑 手动编辑后自动锁定
|
2023-05-11 14:40:10 +08:00 |
|
Harryxzy
|
54ca46c653
|
薪资核算导入项自动锁定
|
2023-05-11 10:51:43 +08:00 |
|
钱涛
|
7e940b4db4
|
减少单次核算的人员
|
2023-05-05 17:15:25 +08:00 |
|
钱涛
|
ae719ad65b
|
修复人员过多时bug
|
2023-05-04 11:56:34 +08:00 |
|
Harryxzy
|
0d6355ca4a
|
修复回算工资单的合计列
|
2023-04-28 16:04:52 +08:00 |
|
钱涛
|
2d8b4b07d0
|
Merge branch 'release/2.7.4.2304.02' into feature/报表
# Conflicts:
# src/com/engine/salary/biz/SIArchivesBiz.java
|
2023-04-28 10:49:33 +08:00 |
|
Harryxzy
|
82ee707f16
|
employebiz改成employeeservice
|
2023-04-12 15:27:35 +08:00 |
|
钱涛
|
bb76df3718
|
个人养老金
|
2023-04-04 17:29:56 +08:00 |
|
钱涛
|
fd9b592384
|
修复核算未分类项目不显示
|
2023-03-02 11:25:25 +08:00 |
|
Harryxzy
|
6262f62292
|
薪资回算Excel导入BUG
|
2022-12-26 23:17:32 +08:00 |
|
Harryxzy
|
43511f7922
|
Merge branch 'feature/V3-backItem-1215' into release/2.4.2.2212.03
|
2022-12-21 16:39:55 +08:00 |
|
钱涛
|
85739933a5
|
单次核算5000
|
2022-12-20 16:45:09 +08:00 |
|
Harryxzy
|
b9b0a6f1c5
|
回算批量更新
|
2022-12-15 11:32:32 +08:00 |
|
Harryxzy
|
4ed3f47b36
|
薪资账套修改回算公式后不生效问题
|
2022-12-14 22:34:12 +08:00 |
|
Harryxzy
|
75220416bc
|
merge new解密
|
2022-12-14 12:32:42 +08:00 |
|
Harryxzy
|
0130b83f00
|
Merge branch 'feature/加密方法&分页merge' into feature/V3-backItem-1215
# Conflicts:
# src/com/engine/salary/service/impl/SalarySendServiceImpl.java
|
2022-12-14 12:21:42 +08:00 |
|
Harryxzy
|
3b6418263f
|
薪资账套复制-薪资回算
薪资核算-回算部分四舍五入
|
2022-12-13 16:39:39 +08:00 |
fcli
|
1431308cc5
|
feat: 加密统一，薪资核算结果
|
2022-12-12 16:42:44 +08:00 |
|
Harryxzy
|
aed596523f
|
公司单发放详情报错
|
2022-12-07 18:00:31 +08:00 |
|
Harryxzy
|
c0d916c286
|
薪资回算功能，工资单部分
|
2022-12-06 15:29:08 +08:00 |
|
Harryxzy
|
3ff3fd8e44
|
薪资回算-薪资核算部分（剩余核算归档）
|
2022-12-02 17:35:14 +08:00 |
|
钱涛
|
d07ded883f
|
修复加锁顺序
|
2022-11-17 18:53:22 +08:00 |
|
钱涛
|
4779cc861e
|
相同itemid
|
2022-11-17 17:04:14 +08:00 |
|
钱涛
|
271daf29be
|
批量锁定功能
|
2022-11-17 09:28:40 +08:00 |
|
钱涛
|
5285e518d9
|
fix核算合计
|
2022-09-29 15:34:21 +08:00 |
|
钱涛
|
1d635f1423
|
核算列表求和
|
2022-09-27 15:47:13 +08:00 |
|
钱涛
|
198075209e
|
1、核算、合并计税使用税款所属期作为依据
2、核算列表分页
|
2022-09-13 16:03:55 +08:00 |
|
Harryxzy
|
e1239d3018
|
xzy-核算自定义列表添加分部
|
2022-08-29 14:50:26 +08:00 |
|
Harryxzy
|
289e685e09
|
xzy-薪资项目显隐控制
|
2022-08-24 10:31:42 +08:00 |
|
钱涛
|
e9c95918eb
|
1、核算表头带上公式
2、修复核算时取福利台账人员信息不准确
|
2022-08-02 14:58:18 +08:00 |
|
钱涛
|
bf31d993a7
|
薪酬报表-薪酬核算完成，将数据存储到非加密表，删除人员信息，补充：分部、部门、岗位等其他字段，供数据中心引用
|
2022-07-11 17:31:33 +08:00 |
|
钱涛
|
4fe3a61d5d
|
修复核算工号不显示的问题
|
2022-07-04 18:58:49 +08:00 |
|
钱涛
|
035503f26c
|
fixbug
|
2022-06-16 17:55:26 +08:00 |
|
钱涛
|
5396d7bee3
|
加解密
|
2022-06-16 14:22:01 +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 |
|
钱涛
|
b42586600a
|
fix申报表
|
2022-06-15 12:03:17 +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 |
|
钱涛
|
79632dd1bf
|
申报表分权
|
2022-06-07 19:10:40 +08:00 |
|
MustangDeng
|
a24cb2e6d6
|
加解密自测问题处理
|
2022-06-02 17:01:26 +08:00 |
|
钱涛
|
efd31013cd
|
薪资账套分权
|
2022-05-31 21:05:59 +08:00 |
|
钱涛
|
99b5c36864
|
暂存
|
2022-05-31 16:41:11 +08:00 |
|
MustangDeng
|
df3535c77d
|
和代码build处理
|
2022-05-31 16:02:41 +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 |
|
钱涛
|
6103c9233e
|
批量操作数量限制
|
2022-05-26 13:41:58 +08:00 |
|
MustangDeng
|
05f529769c
|
加解密
|
2022-05-24 09:23:17 +08:00 |
|
钱涛
|
e49bc9943f
|
薪酬核算第一步不使用线程池
|
2022-05-12 15:41:12 +08:00 |
|
钱涛
|
b0b18ecb5e
|
导出日志和申报表异常
|
2022-05-09 10:32:14 +08:00 |
|
钱涛
|
c852211b0e
|
核算log
|
2022-05-07 15:20:39 +08:00 |
|
钱涛
|
f2f678c6d1
|
核算进度
|
2022-04-29 17:15:22 +08:00 |
|
钱涛
|
23da0fb5e4
|
sql公式
|
2022-04-28 15:02:11 +08:00 |
|
钱涛
|
dc008dad5c
|
核算导入
|
2022-04-19 19:32:09 +08:00 |
|
钱涛
|
4db39902b5
|
公式v2
|
2022-04-14 20:46:17 +08:00 |
|
钱涛
|
a4547db7ff
|
公式
|
2022-04-14 10:03:49 +08:00 |
|
钱涛
|
692c2f5a79
|
核算
|
2022-04-12 19:25:19 +08:00 |
|
钱涛
|
a069447f02
|
核算基础公式
|
2022-04-11 20:17:47 +08:00 |
|
钱涛
|
0b72b2e6cb
|
核算v2
|
2022-04-08 19:08:59 +08:00 |
|
钱涛
|
0dedda4dbd
|
核算
|
2022-04-07 16:54:10 +08:00 |