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

469 Commits

Author SHA1 Message Date
钱涛 68d0003f62 新增核算结果的代理 2024-04-16 16:05:42 +08:00
钱涛 0e6449e1e2 外籍人员 2024-04-12 17:46:53 +08:00
Harryxzy a9dd2c2cb3 Merge branch 'release/2.12.1.2403.02' into release/个税版本 2024-04-08 15:53:13 +08:00
Harryxzy 4ccfac80f5 sql 2024-04-01 16:33:13 +08:00
钱涛 5f64acc269 Merge branch 'release/2.12.1.2403.02' into release/个税版本 
# Conflicts:
#	src/com/engine/salary/mapper/datacollection/EmployMapper.java
#	src/com/engine/salary/mapper/datacollection/EmployMapper.xml
#	src/com/engine/salary/mapper/extemp/ExternalEmployeeMapper.java
#	src/com/engine/salary/service/ExtEmpService.java
#	src/com/engine/salary/service/SalaryEmployeeService.java
#	src/com/engine/salary/service/impl/ExtEmpServiceImpl.java
#	src/com/engine/salary/service/impl/SalaryEmployeeServiceImpl.java
 2024-03-29 14:37:00 +08:00
钱涛 2a692b13b4 外籍人员v1 2024-03-29 10:44:55 +08:00
钱涛 68b4d29c40 修改版本号 2024-03-18 09:54:59 +08:00
钱涛 3a79ed9574 Merge branch 'release/2.11.2.2403.01' into release/个税版本 
# Conflicts:
#	src/com/engine/salary/service/impl/AddUpSituationServiceImpl.java
#	src/com/engine/salary/service/impl/SpecialAddDeductionServiceImpl.java
#	src/com/engine/salary/sys/service/impl/SalarySysConfServiceImpl.java
 2024-03-15 15:44:15 +08:00
钱涛 80510c8cfc 修改版本号 2024-03-15 10:20:38 +08:00
Harryxzy a1c6d6ba52 Merge branch 'feature/240301_阅后即焚' into release/3.0.0.2403.01 2024-03-15 09:33:22 +08:00
Harryxzy c3800881bc sql 2024-03-15 09:31:04 +08:00
钱涛 452d7bc57c Merge branch 'release/3.0.0.2403.01' into release/个税版本 
# Conflicts:
#	src/com/engine/salary/entity/datacollection/AddUpSituation.java
#	src/com/engine/salary/entity/salarysob/po/SalarySobPO.java
#	src/com/engine/salary/service/impl/AddUpDeductionServiceImpl.java
#	src/com/engine/salary/service/impl/AddUpSituationServiceImpl.java
#	src/com/engine/salary/service/impl/SalarySobItemServiceImpl.java
#	src/com/engine/salary/service/impl/TaxDeclarationExcelServiceImpl.java
#	src/com/engine/salary/service/impl/TaxDeclarationServiceImpl.java
 2024-03-12 18:56:12 +08:00
钱涛 bef1835c39 jar更新 2024-03-12 16:46:55 +08:00
钱涛 e22e178d08 去除非标准功能 2024-03-12 14:51:28 +08:00
钱涛 9ec3581533 elog配置 2024-03-12 14:42:12 +08:00
钱涛 72861b9a93 Merge branch 'release/3.0.0.2403.01' into release/个税版本 2024-03-07 16:57:03 +08:00
钱涛 e81937c4dd 去除报表原先的表 2024-03-07 11:45:26 +08:00
钱涛 5a9d45f92b Merge branch 'release/2.11.1.2402.01' into release/个税版本 
# Conflicts:
#	resource/WEB-INF/prop/hrmSalaryCustom.properties
#	src/com/engine/salary/entity/datacollection/AddUpSituation.java
#	src/com/engine/salary/entity/datacollection/po/SpecialAddDeductionPO.java
#	src/com/engine/salary/entity/salarysob/po/SalarySobPO.java
#	src/com/engine/salary/formlua/entity/parameter/ExcelFuncs.java
#	src/com/engine/salary/service/impl/AddUpDeductionServiceImpl.java
#	src/com/engine/salary/service/impl/AddUpSituationServiceImpl.java
#	src/com/engine/salary/service/impl/AttendQuoteDataServiceImpl.java
#	src/com/engine/salary/service/impl/SalaryAcctRecordServiceImpl.java
#	src/com/engine/salary/service/impl/SalarySendServiceImpl.java
#	src/com/engine/salary/service/impl/SalarySobItemServiceImpl.java
#	src/com/engine/salary/service/impl/SalarySobServiceImpl.java
#	src/com/engine/salary/service/impl/SalaryTemplateServiceImpl.java
#	src/com/engine/salary/service/impl/TaxDeclarationExcelServiceImpl.java
#	src/com/engine/salary/service/impl/TaxDeclarationServiceImpl.java
#	src/com/engine/salary/util/page/SalaryPageUtil.java
 2024-03-06 15:54:07 +08:00
钱涛 cb005d717a 添加wiki目录 2024-03-05 17:40:10 +08:00
钱涛 c2eab7ce64 添加wiki目录 2024-03-05 17:37:47 +08:00
钱涛 fc807ae005 版本 2024-03-05 15:43:16 +08:00
钱涛 1c62be09d1 Merge branch 'feature/操作日志组件' into release/2.11.1.2402.01 2024-03-05 13:58:50 +08:00
钱涛 93a77fdb6f 日志包添加锁 2024-03-04 16:04:17 +08:00
钱涛 c081581ba7 Merge branch 'feature/报表支持账套筛选' into release/2.11.1.2402.01 2024-03-04 14:01:33 +08:00
钱涛 022b904581 添加账套筛选条件sql 2024-02-28 14:54:13 +08:00
钱涛 4b77af983a 分页jar 2024-02-28 13:40:05 +08:00
钱涛 2edb98475b 更新日志版本 2024-02-27 15:43:36 +08:00
钱涛 f11d6a035c 去除pagehelper jar包 2024-02-26 15:40:52 +08:00
钱涛 53806d9262 Merge branch 'release/2.10.1.2401.01' into release/个税版本 
# Conflicts:
#	src/com/engine/salary/service/impl/SalaryAcctRecordServiceImpl.java
#	src/com/engine/salary/service/impl/SalarySobItemServiceImpl.java
#	src/com/engine/salary/util/excel/ExcelUtil.java
 2024-02-21 15:28:33 +08:00
Harryxzy 117dbeb211 Merge branch 'fix/240101_考勤引用查看数据报错' into feature/操作日志组件 2024-02-20 10:10:22 +08:00
Harryxzy b4f36ab101 Merge branch 'feature/240102_工资单确认和反馈按钮分开' into release/2.10.1.2401.01 2024-02-20 09:51:00 +08:00
Harryxzy c64e9b4b76 工资单确认反馈sql 2024-02-19 14:01:30 +08:00
钱涛 9824a70cce 修复脚本错误 2024-02-18 09:50:32 +08:00
钱涛 8213eedbc5 上传日志包 2024-02-06 14:12:24 +08:00
sy f4ecb19ef2 Merge branch 'release/2.10.1.2401.01' into feature/操作日志组件 2024-02-01 10:21:47 +08:00
Harryxzy acbffb205b sql 2024-01-30 16:00:50 +08:00
钱涛 e1ca39e859 elog脚本 2024-01-23 15:00:46 +08:00
钱涛 858ac8f005 申报表对比功能sql 2024-01-18 11:44:57 +08:00
钱涛 4846cfcf18 Merge branch 'release/2.9.10.2312.02' into release/个税版本 
# Conflicts:
#	src/com/engine/salary/service/impl/SalaryAcctRecordServiceImpl.java
 2024-01-17 14:14:32 +08:00
sy be68f01145 薪酬系统-福利档案，mysql环境中sql脚本优化 2024-01-15 09:45:19 +08:00
Harryxzy 5f7c1c641b Merge remote-tracking branch 'origin/release/2.9.10.2312.02' into release/2.9.10.2312.02 2024-01-08 15:33:11 +08:00
Harryxzy c0c93490fe sql 2024-01-08 15:32:49 +08:00
sy a16ed64ac0 Merge remote-tracking branch 'remotes/origin/feature/231201-福利档案拆分个人和公司福利基数' into release/2.9.10.2312.02 2024-01-08 13:54:25 +08:00
钱涛 7c50e38867 脚本 2023-12-28 19:19:09 +08:00
钱涛 4d84164d48 Merge branch 'feature/个税2312版本功能' into feature/艾志-正常申报补足年终奖人员 2023-12-28 15:49:50 +08:00
钱涛 4a2996e211 Merge branch 'release/2.9.10.2312.02' into release/个税版本 
# Conflicts:
#	src/com/engine/salary/service/impl/TaxDeclarationExcelServiceImpl.java
#	src/com/engine/salary/util/excel/ExcelUtil.java
 2023-12-28 15:48:54 +08:00
钱涛 2befcfd1f2 pg脚本问题 2023-12-28 11:08:53 +08:00
钱涛 1c499ffd94 补充正常工资薪金的申报 2023-12-28 09:39:09 +08:00
钱涛 13f310e9e4 记录申报表数据来源 2023-12-27 17:33:53 +08:00
钱涛 0856f63ca5 Merge branch 'release/2.9.10.2312.02' into release/个税版本 
# Conflicts:
#	src/com/engine/salary/util/page/SalaryPageUtil.java
 2023-12-14 10:41:37 +08:00
sy e97dab27fc 薪酬系统-福利档案，拆分个人和公司福利基数逻辑相关sql脚本 2023-12-13 10:51:24 +08:00
钱涛 bbe4b315cf pg脚本异常 2023-12-08 11:43:19 +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
钱涛 addd937b7b Merge branch 'feature/支持工资单短信' into release/2.9.8.2311.02 2023-11-22 10:40:30 +08:00
sy 30e6bed471 Merge remote-tracking branch 'remotes/origin/feature/231001-福利档案基数调整记录' into release/2.9.8.2311.02 2023-11-22 09:38:16 +08:00
钱涛 118e95465d 短信模板脚本 2023-11-21 16:17:47 +08:00
钱涛 526c8f8514 Merge branch 'release/3.0.0.2311.01' into release/个税版本 2023-11-10 15:29:39 +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
钱涛 e677207eac 新增统计维度展示 2023-11-08 15:59:54 +08:00
钱涛 27255932de 数据库表 2023-11-07 15:12:10 +08:00
钱涛 321a565c35 fix个税sql错误 2023-10-26 14:40:56 +08:00
sy 5b2609d93f 薪酬系统-福利档案，福利档案基数调整记录表新建sql脚本 2023-10-25 09:49:16 +08:00
钱涛 e8f124d58c Merge branch 'release/2.9.6.2310.01' into release/个税版本 2023-10-17 10:25:02 +08:00
钱涛 b4a1aa8039 修改系统公式异常 2023-10-16 10:52:28 +08:00
钱涛 5d3e2928c9 Merge branch 'release/2.9.6.2310.01' into release/个税版本 2023-10-13 16:54:46 +08:00
钱涛 855effccc5 修改系统公式异常 2023-10-13 16:54:33 +08:00
钱涛 053e2855d7 个税sql 2023-10-13 16:33:06 +08:00
钱涛 4a59859fa8 调薪记录 2023-10-12 17:34:09 +08:00
Harryxzy 8e8a502738 prop 2023-10-12 14:26:28 +08:00
钱涛 59f24d3a14 Merge branch 'release/2.9.6.2310.01' into release/个税版本 2023-10-09 16:15:21 +08:00
钱涛 e570c1879e 账套保存异常 2023-10-09 15:35:20 +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
钱涛 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
钱涛 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
钱涛 0545c6eb8c Merge branch 'release/2.9.5.2309.01' into release/个税版本 2023-09-21 16:58:15 +08:00
Harryxzy cdefb1d310 Merge branch 'feature/230902_报表共享' into release/2.9.5.2309.01 2023-09-21 11:45:34 +08:00
Harryxzy 97b451e203 sql 2023-09-21 10:05:32 +08:00
钱涛 b0a25f6cf0 删除与组织冲突sql 2023-09-19 11:37:37 +08:00
钱涛 12480f8306 生成工资单pdf签名 2023-09-18 18:45:59 +08:00
钱涛 464bb9d623 Merge branch 'release/个税二期' into release/个税版本 2023-09-06 17:06:07 +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
钱涛 6059174e7c 往期累计的在线获取 2023-09-06 09:40:50 +08:00
钱涛 f245bd2f49 新增往期累计字段 2023-09-05 11:04:53 +08:00
钱涛 96bfdf05ed 在线获取累计专项附加扣除 2023-09-04 14:20:42 +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
钱涛 5ef4c8c909 解决sql202307100103.sql与组织冲突 2023-09-01 11:33:20 +08:00
钱涛 0ac2fd248e 慢sql提醒 2023-08-31 16:22:02 +08:00
钱涛 2fad3c6c7c Merge branch 'feature/慢sql检测' into release/2.9.4.2308.02 2023-08-31 15:46:29 +08:00
钱涛 283485929f 超时提醒 2023-08-31 15:31:34 +08:00
sy cd5e5d2284 薪酬系统-ST数据库适配，神通数据库-薪酬非标初始化脚本 2023-08-31 14:04:41 +08:00
钱涛 f7f1a85441 流量不足提醒 2023-08-31 10:34:26 +08:00
钱涛 b5f9477c90 流量监控 2023-08-28 13:31:11 +08:00
钱涛 1cd07d7986 去除为空校验 2023-08-24 16:49:53 +08:00
钱涛 4ea735a731 个税标签和菜单 2023-08-24 16:29:13 +08:00
钱涛 45e69cd6c8 导出 2023-08-24 11:36:17 +08:00
钱涛 7e7615bf4a 账套薪资项目添加code 2023-08-23 16:20:45 +08:00
钱涛 bb2d2d64e6 在线申报接口 2023-08-21 19:35:14 +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
Harryxzy ea1a46839d Merge branch 'feature/230703-薪资账套项目页面改造' into release/2.9.3.2308.01 2023-08-17 16:07:24 +08:00
Harryxzy 343edd2df7 sql 2023-08-17 16:06:55 +08:00
钱涛 914963135a 个税对接辅助缴款 2023-08-17 14:55:32 +08:00
钱涛 414f960346 账套-个税字段对应、累计字段对应 2023-08-17 09:22:09 +08:00
钱涛 3004394e96 账套-个税字段对应、累计字段对应 2023-08-15 20:50:47 +08:00
钱涛 cf22685fca 账套-个税字段对应、累计字段对应 2023-08-15 20:48:09 +08:00
钱涛 090b100784 个税对接，个税申报接口 2023-08-14 20:29:19 +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
钱涛 50658012a1 个税对接，个税申报接口 2023-08-10 09:33:04 +08:00
钱涛 615813c478 个税对接，人员报送相关接口 2023-08-09 18:35:09 +08:00
sy 6f9deed908 薪酬系统-福利档案，修改社保、公积金、其他福利表结构 2023-08-09 18:19:42 +08:00
钱涛 827420c2bd 个税对接，人员报送相关接口 2023-08-08 19:39:53 +08:00
Harryxzy 6a01f0d785 Merge branch 'release/2.9.2.2307.02' into feature/230702-自定义工资项目展示名 2023-08-08 11:42:41 +08:00
Harryxzy a85e887356 sql 2023-08-08 11:42:24 +08:00
Harryxzy c977109cb7 sql 2023-08-08 11:05:52 +08:00
钱涛 5b5d3ff447 非系统人员浏览按钮 2023-07-20 15:34:10 +08:00
钱涛 dbe01ca25e 非系统人员初始化语句 2023-07-20 14:43:50 +08:00
钱涛 e75d5ab427 v1 2023-07-20 10:36:29 +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 0a4c19fb36 Merge branch 'feature/230702-薪资项目-核算时隐藏' into release/2.9.2.2307.02 2023-07-19 11:11:46 +08:00
Harryxzy cb3b55f8b4 薪资项目-核算时隐藏sql 2023-07-19 09:35:30 +08:00
钱涛 5d6a471fb8 删除未适配数据库 2023-07-17 14:37:15 +08:00
钱涛 1b289319a4 工资单反馈sql 2023-07-17 11:52:10 +08:00
钱涛 873b90474f Merge branch 'feature/230701qt' into feature/外部人员 2023-07-13 16:55:36 +08:00
钱涛 d5977c053b 添加删除脚本 2023-07-13 09:19:16 +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 287fcae68e 工资单定时发送sql 2023-07-11 10:22:14 +08:00
sy a429c271f4 Merge branch 'feature/230602-数据库适配-PG' into release/2.8.4.2306.02 2023-06-29 15:12:48 +08:00
钱涛 b130fb0121 海康包冲突jar 2023-06-28 18:11:53 +08:00
sy cdf4421ac2 薪酬系统-pg数据库适配，初始化sql脚本 2023-06-28 15:56:30 +08:00
钱涛 abd8431d49 水印上线脚本 2023-06-26 16:22:19 +08:00
钱涛 f5ce086535 上线脚本 2023-06-26 15:48:25 +08:00
钱涛 1cdbe4d19d 薪酬开关配置 2023-06-14 16:26:25 +08:00
钱涛 34046646b3 还原脚本 2023-06-12 15:17:21 +08:00
钱涛 7b0648cc68 拦截工资单demo 2023-06-08 10:40:00 +08:00
钱涛 6b19445a1a Merge branch 'release/2.8.2.2305.02' into feature/公式 
# Conflicts:
#	src/com/engine/salary/service/impl/TaxDeclarationDetailServiceImpl.java
 2023-05-08 11:22:23 +08:00
钱涛 aa8f46e84f 删除sql，修改签名 2023-05-05 14:08:37 +08:00
钱涛 3e8ac01049 公式描述 2023-05-04 18:07:35 +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
钱涛 d36cfe31b3 报表暂存 2023-04-27 16:05:03 +08:00
钱涛 14fca43e18 暂存 2023-04-26 15:17:08 +08:00
钱涛 5cb6752c4c Merge branch 'release/2.7.3.2304.01' into feature/外部人员 2023-04-13 17:32:17 +08:00
钱涛 a87c344581 个人养老金 2023-04-13 17:14:58 +08:00
钱涛 9549e75e00 Merge branch 'release/2.7.3.2304.01' into feature/外部人员 2023-04-13 14:48:43 +08:00
钱涛 f0eb9c8994 养老金最终版 2023-04-12 13:57:13 +08:00
钱涛 671bbc6bfb 养老金最终版 2023-04-12 10:51:52 +08:00
钱涛 58dbdb0d05 养老金 2023-04-12 09:39:53 +08:00
钱涛 a4a829d201 年终奖数据 2023-04-11 17:24:31 +08:00
钱涛 09b2bf54e1 暂存 2023-04-11 09:22:09 +08:00
钱涛 b30a58c1d9 报表功能 2023-04-07 14:38:38 +08:00
钱涛 487dd9f972 非系统人员档案自动化 2023-03-08 16:36:47 +08:00
钱涛 79a29df0de 暂存 2023-03-03 14:40:17 +08:00
钱涛 6de22b142d 1、工资单模板 
2、一键累计
 2023-03-02 17:11:42 +08:00
钱涛 a8fc666e79 fix json转换问题 2023-03-02 10:12:00 +08:00
钱涛 c7d1bbfa35 更新名称 2023-02-17 17:19:17 +08:00
钱涛 258c880543 申报表字段缺失 2023-02-03 15:14:04 +08:00
钱涛 31a075cee5 删除配置 2023-01-06 14:40:23 +08:00
钱涛 c71b73799a 取消插件 2022-12-14 15:02:22 +08:00
钱涛 389022e0ea 配置文件 2022-12-09 10:12:25 +08:00
Harryxzy 1fb96be58b 个税申报开关 2022-11-08 11:22:56 +08:00
钱涛 d72362f7b7 档案模板注释 2022-10-26 18:05:04 +08:00
钱涛 a2716c4330 处理档案重复生成的问题 2022-10-19 13:36:31 +08:00
钱涛 4b37775f78 档案发薪设置 2022-10-18 09:43:58 +08:00
钱涛 919d08a496 修复工资单查询 2022-09-29 10:28:46 +08:00
钱涛 299bbf1f66 达梦适配 2022-09-05 15:50:01 +08:00
钱涛 0629b7323a 升级分页插件版本和jsqlparse版本 2022-09-02 17:30:39 +08:00
钱涛 e0a031e197 oracle异常 2022-08-18 15:02:04 +08:00
钱涛 ab87e5cf08 劳务申报表列表 2022-08-02 10:59:12 +08:00
钱涛 a252d055ab 1、核算接口代理 
2、获取异常真实信息
 2022-08-01 14:15:09 +08:00
钱涛 259c40758f 1、薪资项目增加系统名 
2、薪资项目增加申报项目名
3、账套对应字段
 2022-07-27 16:56:13 +08:00
钱涛 db31190b9e 调整sql配置 2022-07-25 15:01:10 +08:00
钱涛 8e69159900 薪资档案代码合并 2022-07-21 10:51:38 +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
钱涛 967413827e 修改社保个人实际承担方为个人 2022-07-20 14:25:01 +08:00
钱涛 a721898d3d 薪资档案增加起始发薪和最后发薪 2022-07-18 18:08:59 +08:00
钱涛 01bd6fefd4 支持人员可在多个扣缴单位 2022-07-14 10:36:51 +08:00
钱涛 48d70400e5 薪资档案验证人员是否在义务扣缴人下 2022-07-05 19:19:17 +08:00
钱涛 317c04a121 公式编辑器，防止参数名和字段名呈现一对多的问题 2022-06-30 11:10:46 +08:00
钱涛 739414dd04 fix 2022-06-24 18:41:24 +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
钱涛 e1629a021e oracle错误和薪资项目错误 2022-06-21 15:08:23 +08:00
钱涛 ff88b1f9ca 员工字段不可重复 2022-06-21 11:38:55 +08:00
钱涛 3f8ab52b8c 分权 2022-06-20 15:17:08 +08:00
钱涛 3ab0440078 分权 2022-06-20 14:09:18 +08:00
钱涛 b5871e1ea9 权限项 2022-06-16 14:13:22 +08:00
钱涛 2731e4eddd sql 2022-06-15 16:31:40 +08:00
钱涛 f5b8806eff 账套 2022-06-15 15:27:23 +08:00
钱涛 8d6a3c41d7 fix人员同步 2022-06-15 09:29:43 +08:00
钱涛 926bfbce16 sql 2022-06-14 17:39:23 +08:00
钱涛 cea24499f7 sql 2022-06-13 09:23:48 +08:00
钱涛 24e6792818 sql 2022-06-10 18:59:06 +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
钱涛 d09856c390 人员范围保存校验 2022-06-10 14:21:21 +08:00
钱涛 382620c589 申报表 2022-06-09 19:02:18 +08:00
钱涛 860c89b560 申报和往期异常 2022-06-08 16:36:50 +08:00
钱涛 6c54847f88 默认关闭 2022-06-07 19:16:13 +08:00
钱涛 79632dd1bf 申报表分权 2022-06-07 19:10:40 +08:00
MustangDeng 20e04f503e sql server 分权脚本修改 2022-06-07 15:19:21 +08:00
MustangDeng 38c08b6e79 sql server 分权sql 2022-06-07 13:26:00 +08:00
钱涛 eacb04388f 社保福利分权2.0 2022-06-06 19:08:39 +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
钱涛 364bf58bda fix 2022-06-01 15:59:56 +08:00
钱涛 e6da6a3ff1 fix 2022-06-01 15:52:37 +08:00
钱涛 7633a06636 Merge branch 'develop' into release 2022-05-31 20:07:33 +08:00
钱涛 2c71590c98 暂存 2022-05-31 19:29:45 +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
钱涛 3471783d65 薪酬还原脚本 2022-05-31 13:53:57 +08:00
钱涛 45c3f91145 其他扣除 2022-05-31 11:43:45 +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
MustangDeng 6ee93fdeea 默认不开启非标 2022-05-30 17:35:40 +08:00
MustangDeng e0e19d616e oracle脚本调整位置 2022-05-30 17:34:53 +08:00
钱涛 bccda4c7a3 sql 2022-05-30 14:46:52 +08:00
钱涛 843db8db35 Merge remote-tracking branch 'origin/develop' into develop 2022-05-30 13:47:38 +08:00
钱涛 2c1d1a31dc sql 2022-05-30 13:47:31 +08:00
MustangDeng 597e2206e9 like 修改 2022-05-30 13:43:28 +08:00
MustangDeng 5fe3b59ad5 oracle sql修改 2022-05-30 12:10:07 +08:00
MustangDeng b80f31c6f8 oracle sql修改 2022-05-30 12:08:14 +08:00
MustangDeng 1ccb2b94b2 Merge remote-tracking branch 'origin/develop' into develop 2022-05-30 11:53:01 +08:00
MustangDeng bc590ef10d oracle sql修改 2022-05-30 11:52:46 +08:00
钱涛 4baa1643f6 oracle适配 2022-05-30 11:51:00 +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
钱涛 3dfe647a76 新增字段 2022-05-27 15:00:53 +08:00
MustangDeng 6ad9e30bca oracle 原始脚本 2022-05-27 14:11:13 +08:00
MustangDeng 76fd0e68cf oracle 原始脚本 2022-05-27 09:57:44 +08:00
MustangDeng 79b37540f9 oracle 原始脚本修改 2022-05-26 17:59:56 +08:00
MustangDeng 38c31a7e79 oracle 脚本修改 2022-05-26 15:48:00 +08:00
MustangDeng 28eea0d594 oracle 脚本字段修改 2022-05-26 14:24:03 +08:00
MustangDeng a139c184c9 oracle 脚本 2022-05-26 14:07:26 +08:00
钱涛 f6eb69e62a 暂存 2022-05-26 11:02:55 +08:00
MustangDeng 181690e437 福利核算字段长度不够问题 2022-05-24 14:55:23 +08:00
钱涛 082d02ae67 Merge branch 'develop' into auth 2022-05-24 11:26:37 +08:00
MustangDeng 78234f7554 工资单默认模板 2022-05-24 10:24:17 +08:00
钱涛 cb1a53c649 暂存 2022-05-24 09:14:26 +08:00
MustangDeng 46a0b77611 Merge remote-tracking branch 'origin/develop' into develop 2022-05-23 13:39:08 +08:00
MustangDeng 5f2c20eaec 默认不启用非标功能 2022-05-23 13:38:48 +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
钱涛 985af0197d 全量脚本 2022-05-19 16:44:59 +08:00
钱涛 16036d74c5 全量脚本 2022-05-19 16:44:30 +08:00
钱涛 479bc2d39a 出包材料 2022-05-19 14:50:57 +08:00
钱涛 dc1c865a4b 账套项目删除bug 2022-05-18 14:34:06 +08:00
钱涛 fa4d605c8d 暂存 2022-05-18 09:19:50 +08:00