Commit Graph

37 Commits

Author SHA1 Message Date
lSun e93df8f3b2 应付录入功能修改 2025-09-16 15:21:24 +08:00
lSun 4ad61835e8 工程预付款统计功能bug修改,系统漏洞修复 2025-08-04 13:57:33 +08:00
lSun 6d9247831c 工程预付款统计功能bug修改,系统漏洞修复 2025-07-31 15:59:47 +08:00
lSun fcfd4fe1b5 工程预付款统计功能意见修改;新增工程管理功能开发 2025-07-30 17:45:15 +08:00
lSun d7bb63f5a6 工程预付款统计功能bug修改,系统漏洞修复 2025-06-16 18:18:08 +08:00
fl e377fda7e5 工程預付款冲销修改 2025-06-12 17:27:31 +08:00
lSun ac2722c3cb 工程预付款统计功能修改、工程预付款统计-字段开发 2025-06-12 14:34:20 +08:00
lSun 676a937b20 应付录入功能修改 2025-05-22 17:37:33 +08:00
lSun 0486e90506 工程预付款统计功能开发 2025-05-13 18:28:38 +08:00
lSun e100624e91 应付录入计功能开发 2025-05-07 13:41:01 +08:00
lSun 548103e265 工程预付款统计功能开发 2025-04-28 19:00:23 +08:00
fl 4e8cee4ef0 Merge branch 'master'
# Conflicts:
#	src/main/java/com/bonus/boot/manager/basic/controller/DownloadController.java
#	src/main/java/com/bonus/boot/manager/ca/bm/entity/PayAccountInfoBean.java
#	src/main/java/com/bonus/boot/manager/ca/bm/service/impl/PayAccountInfoServiceImpl.java
#	src/main/java/com/bonus/boot/manager/ca/im/controller/PayableController.java
#	src/main/java/com/bonus/boot/manager/ca/im/dao/PayableDao.java
#	src/main/java/com/bonus/boot/manager/ca/im/entity/PayableBean.java
#	src/main/java/com/bonus/boot/manager/ca/im/service/PayableService.java
#	src/main/java/com/bonus/boot/manager/ca/im/service/impl/PayableServiceImpl.java
#	src/main/java/com/bonus/boot/manager/manager/utils/ImportNoPhotoExcelHelper.java
#	src/main/java/com/bonus/boot/manager/wages/entity/WagesDetailsBean.java
#	src/main/java/com/bonus/boot/manager/wages/service/impl/WagesServiceImpl.java
#	src/main/java/com/bonus/boot/manager/wages/service/impl/WagesStaticsServiceImpl.java
#	src/main/resources/application.properties
#	src/main/resources/download/招商银行工资导入模板.xlsx
#	src/main/resources/mappers/ca/PayAccountInfoMapper.xml
#	src/main/resources/mappers/ca/PayableMapper.xml
#	src/main/resources/mappers/logs/SysLogsMapper.xml
#	src/main/resources/mappers/wages/WagesMapper.xml
#	src/main/resources/mappers/wages/WagesStaticsMapper.xml
#	src/main/resources/static/js/common.js
#	src/main/resources/static/pages/finance/addPayable.html
#	src/main/resources/static/pages/finance/addPaymentAccount.html
#	src/main/resources/static/pages/finance/payable.html
#	src/main/resources/static/pages/finance/paymentAccount.html
#	src/main/resources/static/pages/wages/uploadReceipt.html
#	src/main/resources/static/pages/wages/uploadWages.html
#	src/main/resources/static/pages/wages/uploadWagesTwo.html
#	src/main/resources/static/pages/wages/wagesStaticsList.html
#	src/main/resources/static/pages/work/SysLogManage.html
2025-04-28 18:54:56 +08:00
fl 2243a8c30d 应付录入样式修改 2025-04-28 18:36:30 +08:00
lSun 66144f07ce 工程预付款统计功能开发 2025-04-27 14:54:47 +08:00
lSun 87390b2702 工程预付款统计功能bug修改 2025-04-19 11:39:11 +08:00
lSun aba9062942 工程预付款统计功能开发 2025-04-17 13:18:05 +08:00
lSun 3c383cb3cc 工程预付款统计功能开发 2025-04-17 10:21:41 +08:00
lSun 8076cefae6 工程预付款统计功能开发 2025-04-16 19:37:11 +08:00
lSun f13a35d40a 工程预付款统计功能开发 2025-04-16 18:52:44 +08:00
lSun 11086496c9 工程预付款统计功能开发 2025-04-16 17:10:46 +08:00
fl 45baefc41a 应付录入样式修改 2025-03-06 13:50:37 +08:00
fl 3ba8b035c4 应付录入添加付款账号,人次
付款账户信息 添加开户时间
2025-03-05 14:00:48 +08:00
fl 209b0a3b50 应付录入添加付款账号,人次
付款账户信息 添加开户时间
2025-03-05 13:47:59 +08:00
cwchen 6581e358ba 招行新模版修改 2025-02-27 18:41:51 +08:00
cwchen f8c35ba173 招行新模版 2025-02-27 18:28:24 +08:00
cwchen 516b83f1dd 测试问题修复 2025-02-13 09:14:57 +08:00
cwchen 3095177ba8 导入修改 2025-02-11 18:24:33 +08:00
jjLv c830441eac feat(wages): 优化工资详情展示和导入功能
- 在 wages 静态页面中添加额外数据列,用于展示额外的工资信息
- 修改 wages 实体类,增加 additionalData 字段存储额外数据
- 更新 wages 映射文件,添加额外数据字段的数据库操作
- 优化 wages 服务实现类,处理导入时的额外数据
2025-01-16 20:01:18 +08:00
haozq d482185e2a first commit 2025-01-16 18:55:23 +08:00
jjLv 2f34c8db5a refactor(ca): 优化付款账户相关页面和报表
- 修改 addPaymentAccount 页面中"账号"标签为"账户"
- 在 PayAccountInfoMapper 中添加 accountNumber 字段映射
- 更新 PayAccountInfoServiceImpl 中导出报表的列顺序和名称
- 修改 paymentAccount 页面中"账号"列标题为"账户"
2025-01-06 15:55:17 +08:00
jjLv 9829dd1d58 refactor(ca): 更新 PayAccountInfoMapper 映射文件
- 在插入语句中添加 account_number 字段
- 从删除语句中移除 account_number 字段
2025-01-06 13:23:14 +08:00
jjLv 9ee24dd5f5 feat(finance): 添加付款账户信息功能
- 新增付款账户信息页面和相关功能
- 添加账户号字段和显示逻辑
- 实现账户号部分隐藏显示
- 更新数据库表结构和映射文件
2025-01-06 13:07:32 +08:00
haozq b9a814d3be 添加 sql和生产 2024-10-08 11:03:21 +08:00
haozq 237c8d5251 添加 sql和生产 2024-10-08 11:02:51 +08:00
cwchen e3304e45a1 财务小工具问题修改 2024-07-12 15:57:13 +08:00
cwchen da2a2accf6 财务小工具问题修改 2024-07-12 10:48:37 +08:00
haozq f03db9da75 http://192.168.0.56:3000/haozq/yn_cw_gj.git 2024-07-09 10:44:08 +08:00