Commit Graph

Select branches

Hide Pull Requests

dev_1.0.0

dev_2.0.0

dev_2.0.1

dev_2.0.2

dev_2.0.3

main

master

Mono Color

• 15c8e4bc2b 概算毛利提交问题 dev_2.0.3 rdpnr_hemingxia 2025-03-21 14:31:48 +0800
• c45897bb68 概算毛利自动计算 dev_2.0.1 rdpnr_hemingxia 2025-03-21 10:40:36 +0800
• 22a482dd69 feat: 新增 ProjectExportDto 类 dev_2.0.2 chenhao 2025-02-06 15:21:31 +0800
• c117b9a331 feat(project): 增加项目报表导出功能 chenhao 2025-02-06 15:20:43 +0800
• 2dbcc43a43 差旅费和业务费校验 ‘wangjiuyun 2024-12-31 10:50:36 +0800
• f335a780db 收款计划表时间校验 ‘wangjiuyun 2024-12-30 11:02:54 +0800
• 025bfa6ae2 样式调整 ‘wangjiuyun 2024-12-30 10:42:12 +0800
• 7f2562a0d5 预算上传文件增加遮罩层 保存草稿和提交审核，进行数据联动提交 ‘wangjiuyun 2024-12-27 15:49:56 +0800
• fde047a794 审核表格样式问题 ‘wangjiuyun 2024-12-26 16:05:43 +0800
• 6c1fde7727 屏蔽会签 ‘wangjiuyun 2024-12-26 11:05:20 +0800
• d4aed274eb 审核上传特批文件 ‘wangjiuyun 2024-12-26 10:11:56 +0800
• 433928a444 feat(project): 添加项目当前任务信息 chenhao 2024-12-26 09:24:31 +0800
• 8091bd16f1 feat(workflow): 预算项目流程结束后自动设置项目可见性 chenhao 2024-12-25 14:57:26 +0800
• baabb3c5bc feat(流程): 添加财务人员任务跳转功能并更新相关服务- 在 ActTaskDefService 中添加了财务人员任务跳转的逻辑 - 更新了 ProjectBudgetService 中的预算计算方法，支持按名称过滤 - 修改了 ProjectInstanceService 和 ProjectService 中的任务完成方法，增加了文件 URL 参数 - 更新了 application-local.properties 中的上传路径配置 chenhao 2024-12-24 17:30:31 +0800
• 4dba9a69cb 付款计划表保存草稿增加时间校验 ‘wangjiuyun 2024-12-20 16:45:10 +0800
• 4348997e74 Merge branch 'dev_2.0.1' of http://git.unissense.tech/mula/fourcal into dev_2.0.1 ‘wangjiuyun 2024-12-20 14:26:52 +0800
• a7256acb39 。。 ‘wangjiuyun 2024-12-20 14:26:38 +0800
• 203fc9b2ad refactor(Project): 移除 Project 类中未使用的 resolvePlanSynergy 字段 chenhao 2024-12-20 14:26:06 +0800
• 3a72ed0e74 feat(Project): 添加 resolvePlanSynergy 字段 chenhao 2024-12-20 14:24:42 +0800
• 4273ae4d2d 导入完成 ‘wangjiuyun 2024-12-20 11:51:42 +0800
• c40ec93373 refactor(project-budget): 优化项目预算成本明细临时表和采购类别处理 chenhao 2024-12-20 11:47:55 +0800
• b7790d36fb feat(ProjectBudgetService): 优化采购类型匹配逻辑 chenhao 2024-12-20 11:24:59 +0800
• 03ab45f7b8 feat(model): 在 ProjectBudgetCostDetailTemp 类中添加 categoryStr 字段 chenhao 2024-12-20 11:16:06 +0800
• 603ea45788 。。。 ‘wangjiuyun 2024-12-20 11:09:28 +0800
• 8a0eb01ae9 Merge branch 'dev_2.0.1' of http://git.unissense.tech/mula/fourcal into dev_2.0.1 ‘wangjiuyun 2024-12-20 11:01:26 +0800
• 2fdccaa30c 采购和收入导入功能调整 ‘wangjiuyun 2024-12-20 11:01:17 +0800
• f011584e57 feat(project-budget): 优化成本详情模板 chenhao 2024-12-20 11:00:27 +0800
• 010e81c32f Merge branch 'dev_2.0.1' of http://git.unissense.tech/mula/fourcal into dev_2.0.1 ‘wangjiuyun 2024-12-19 16:25:16 +0800
• c202756962 feat(activiti): 添加四算协同解决方案变量 chenhao 2024-12-19 16:24:57 +0800
• 46f099f478 导入调试 ‘wangjiuyun 2024-12-19 16:24:29 +0800
• 77e10082c5 。。。资金计划表readonly问题 ‘wangjiuyun 2024-11-29 17:34:19 +0800
• 6d4cedd5dd 。。。资金计划表计算完善 ‘wangjiuyun 2024-11-29 17:00:03 +0800
• a2c6135305 资金计划表日期bug ‘wangjiuyun 2024-11-29 16:36:24 +0800
• bdec78bf63 。。。改bug ‘wangjiuyun 2024-11-29 16:12:52 +0800
• a884037ae5 Merge branch 'dev_2.0.1' of http://git.unissense.tech/mula/fourcal into dev_2.0.1 ‘wangjiuyun 2024-11-29 16:03:05 +0800
• c2599b40bf 。。。。 ‘wangjiuyun 2024-11-29 16:02:58 +0800
• 60c9576cdd refactor(ProjectBudgetService): 修改销售收益计算方法的参数 chenhao 2024-11-29 15:55:40 +0800
• ccebcc0885 取消收款和采购明细与资金计划表的联动 增加收款和付款计划表与资金计划表的联动 dev_2.0.0 ‘wangjiuyun 2024-11-29 11:49:34 +0800
• e1b14e16ca 保存草稿去掉资金计划表校验 ‘wangjiuyun 2024-11-19 14:19:32 +0800
• 7978c17d96 资金计划表月份吃初始化问题 dev_1.0.0 ‘wangjiuyun 2024-11-14 11:58:38 +0800
• 0d6771b0d5 Merge branch 'dev_1.0.0' of http://git.unissense.tech/mula/fourcal into Branch_dev_1.0.0 ‘wangjiuyun 2024-11-13 16:42:47 +0800
• cf9c367577 资金计划表 付款和收款增加公式校验 ‘wangjiuyun 2024-11-13 16:42:38 +0800
• 0fe38a481e feat :缺失代码提交 1:6月代码未同步 同步代码 chenhao 2024-11-12 16:14:24 +0800
• 182a9991cf 资金计划表公式调整 ‘wangjiuyun 2024-11-11 17:57:05 +0800
• 0973b958bc 资金计划计算问题 ‘wangjiuyun 2024-11-11 17:00:44 +0800
• ea1647b97f 资金计划表资金利息问题，按钮问题 ‘wangjiuyun 2024-11-11 16:24:08 +0800
• 42150fe0a8 注释资金计划表滚动条问题 ‘wangjiuyun 2024-11-07 16:53:08 +0800
• 281cf72c20 重名验证问题 ‘wangjiuyun 2024-11-07 11:22:25 +0800
• 7488e711a4 预算必填 资金计划表输入框 ‘wangjiuyun 2024-11-07 10:50:19 +0800
• 606f0ff7b2 第三期需求问题调整 ‘wangjiuyun 2024-11-06 17:01:04 +0800
• a1c7aa0337 第三期需求 ‘wangjiuyun 2024-11-05 17:47:59 +0800
• 11ca310ec6 文本提示修改 ‘wangjiuyun 2024-11-01 17:05:53 +0800
• c69e81107c 审批采购明细，产品大类展示 ‘wangjiuyun 2024-10-31 20:10:57 +0800
• c4fe63d879 采购成本表和付款表校验 ‘wangjiuyun 2024-10-31 18:47:01 +0800
• a91eb5f0cf 最终完成 ‘wangjiuyun 2024-10-31 17:39:13 +0800
• beeb889780 基本完成 ‘wangjiuyun 2024-10-31 15:56:26 +0800
• 45721a3d84 feat 收入明细表: 1:产品大类修改为字符串 chenhao 2024-10-31 14:06:26 +0800
• 07a6165c2a 基本完成 ‘wangjiuyun 2024-10-31 13:12:29 +0800
• 5209e2c8d0 feat 收入明细表: 1:产品大类修改为字符串 chenhao 2024-10-31 11:00:52 +0800
• 14de7c568d 附件保存完成 ‘wangjiuyun 2024-10-30 19:53:14 +0800
• d0daa67ddf Merge branch 'dev_1.0.0' of http://git.unissense.tech/mula/fourcal into Branch_dev_1.0.0 ‘wangjiuyun 2024-10-30 19:22:34 +0800
• b04d88c0e2 调试文件上传 ‘wangjiuyun 2024-10-30 19:22:22 +0800
• 02da71d4a9 feat 收入明细表: 1:产品大类修改为字符串 chenhao 2024-10-30 17:35:41 +0800
• fd43f2f71f 除附件外功能 ‘wangjiuyun 2024-10-30 16:31:46 +0800
• 09680c6b43 Merge branch 'dev_1.0.0' of http://git.unissense.tech/mula/fourcal into Branch_dev_1.0.0 ‘wangjiuyun 2024-10-30 14:10:20 +0800
• 8050f16a11 未完成文件上传 ‘wangjiuyun 2024-10-30 14:10:11 +0800
• 4f7ae569e9 feat 收入明细表: 1:产品大类修改为字符串 chenhao 2024-10-30 11:52:49 +0800
• 122e560b21 Merge branch 'dev_1.0.0' of http://git.unissense.tech/mula/fourcal into Branch_dev_1.0.0 ‘wangjiuyun 2024-10-30 11:30:46 +0800
• 5057ce6b40 采购明细下拉联动，收入明细下拉联动 ‘wangjiuyun 2024-10-30 11:30:38 +0800
• 949f5558b6 feat 收入明细表: 1:附件改动 chenhao 2024-10-30 11:18:33 +0800
• 5cfa2f90dc Merge branch 'dev_1.0.0' of http://git.unissense.tech/mula/fourcal into Branch_dev_1.0.0 ‘wangjiuyun 2024-10-30 11:11:37 +0800
• e1ca488327 前端2期需求未完成 ‘wangjiuyun 2024-10-30 11:11:27 +0800
• e0704f47da feat 收入明细表: 1:附件改动 chenhao 2024-10-30 10:47:17 +0800
• 6880f80a7c feat 收入明细表: 1:二期需求修改 chenhao 2024-10-29 17:37:24 +0800
• 6a4e423276 Merge branch 'dev_1.0.0' of http://git.unissense.tech/mula/fourcal into Branch_dev_1.0.0 ‘wangjiuyun 2024-10-29 17:08:00 +0800
• e45cbd63c1 第一期调整完成 ‘wangjiuyun 2024-10-29 17:07:51 +0800
• 3cbe4d951f feat 收入明细表: 1:资金计划修改 chenhao 2024-10-29 16:01:53 +0800
• d34ae39d8d 。。。 ‘wangjiuyun 2024-10-29 14:59:46 +0800
• 5c76ef7b93 收支明细项目费用校验注释 ‘wangjiuyun 2024-10-29 14:55:39 +0800
• 01f8f0a525 审核文本调整 ‘wangjiuyun 2024-10-29 12:20:52 +0800
• dc5d86227c bug问题 ‘wangjiuyun 2024-10-29 11:40:07 +0800
• f7b15273b2 Merge branch 'dev_1.0.0' of http://git.unissense.tech/mula/fourcal into Branch_dev_1.0.0 ‘wangjiuyun 2024-10-29 11:14:46 +0800
• 380affd9cc bug修改 ‘wangjiuyun 2024-10-29 11:14:36 +0800
• f9b0c1d551 feat 收入明细表: 1:资金计划修改 chenhao 2024-10-29 11:01:34 +0800
• 9a6d9d8911 。。。合并代码 ‘wangjiuyun 2024-10-29 09:44:58 +0800
• 2656509108 。。。 ‘wangjiuyun 2024-10-29 09:41:33 +0800
• 592cc66492 Merge branch 'dev_1.0.0' of http://git.unissense.tech/mula/fourcal ‘wangjiuyun 2024-10-28 20:58:37 +0800
• 32068bdc03 前端问题 ‘wangjiuyun 2024-10-28 20:58:23 +0800
• f7144673cc feat 收入明细表: 1:资金计划修改 chenhao 2024-10-28 20:57:12 +0800
• 3ea59ec3d5 Merge branch 'dev_1.0.0' of http://git.unissense.tech/mula/fourcal ‘wangjiuyun 2024-10-28 20:31:26 +0800
• 35e8f01d1c 前端调整 ‘wangjiuyun 2024-10-28 20:31:15 +0800
• 5c10b6a64e feat 收入明细表: 1:付款计划改为临时表 整体保存 chenhao 2024-10-28 20:30:29 +0800
• e735747a1b 前端问题调试 ‘wangjiuyun 2024-10-28 20:24:14 +0800
• 750b55940b Merge branch 'dev_1.0.0' of http://git.unissense.tech/mula/fourcal ‘wangjiuyun 2024-10-28 20:04:02 +0800
• b65457f0ec 编辑部分调试 ‘wangjiuyun 2024-10-28 20:03:47 +0800
• 8b88788906 feat 收入明细表: 1:导出修改 2:付款计划改为临时表 整体保存 chenhao 2024-10-28 19:01:21 +0800
• 4662f1bbbd 前端未完成 ‘wangjiuyun 2024-10-28 17:05:31 +0800
• 4e210da487 Merge branch 'dev_1.0.0' of http://git.unissense.tech/mula/fourcal ‘wangjiuyun 2024-10-28 16:46:43 +0800
• b0c6337b91 feat 收入明细表: 1:金额修改 chenhao 2024-10-28 16:42:34 +0800
• 0ad8296232 Merge branch 'dev_1.0.0' of http://git.unissense.tech/mula/fourcal ‘wangjiuyun 2024-10-28 16:21:37 +0800