Commit fea13b4d760431ab22de35dc58c9135c9c065857
1 parent
5c4ab8d3
feat: 同步耗卡时间和创建时间字段
- 在 lq_xh_pxmx 表添加 yjsj 字段(耗卡时间) - 在 lq_xh_jksyj 表添加 F_CreateTime 字段(创建时间) - 在 lq_xh_kjbsyj 表添加 F_CreateTime 字段(创建时间) - 更新实体类,添加新字段映射 - 更新 LqXhHyhkService,创建记录时同步耗卡时间和创建时间 - 添加 SQL 脚本用于数据库字段添加和数据同步
Showing
5 changed files
with
138 additions
and
4 deletions
netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_xh_jksyj/LqXhJksyjEntity.cs
| @@ -54,6 +54,12 @@ namespace NCC.Extend.Entitys.lq_xh_jksyj | @@ -54,6 +54,12 @@ namespace NCC.Extend.Entitys.lq_xh_jksyj | ||
| 54 | public DateTime? Yjsj { get; set; } | 54 | public DateTime? Yjsj { get; set; } |
| 55 | 55 | ||
| 56 | /// <summary> | 56 | /// <summary> |
| 57 | + /// 创建时间 | ||
| 58 | + /// </summary> | ||
| 59 | + [SugarColumn(ColumnName = "F_CreateTime")] | ||
| 60 | + public DateTime? CreateTime { get; set; } | ||
| 61 | + | ||
| 62 | + /// <summary> | ||
| 57 | /// 金三角id | 63 | /// 金三角id |
| 58 | /// </summary> | 64 | /// </summary> |
| 59 | [SugarColumn(ColumnName = "F_jsjid")] | 65 | [SugarColumn(ColumnName = "F_jsjid")] |
netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_xh_kjbsyj/LqXhKjbsyjEntity.cs
| @@ -54,6 +54,12 @@ namespace NCC.Extend.Entitys.lq_xh_kjbsyj | @@ -54,6 +54,12 @@ namespace NCC.Extend.Entitys.lq_xh_kjbsyj | ||
| 54 | public DateTime? Yjsj { get; set; } | 54 | public DateTime? Yjsj { get; set; } |
| 55 | 55 | ||
| 56 | /// <summary> | 56 | /// <summary> |
| 57 | + /// 创建时间 | ||
| 58 | + /// </summary> | ||
| 59 | + [SugarColumn(ColumnName = "F_CreateTime")] | ||
| 60 | + public DateTime? CreateTime { get; set; } | ||
| 61 | + | ||
| 62 | + /// <summary> | ||
| 57 | /// 耗卡品项Id | 63 | /// 耗卡品项Id |
| 58 | /// </summary> | 64 | /// </summary> |
| 59 | [SugarColumn(ColumnName = "F_hkpxid")] | 65 | [SugarColumn(ColumnName = "F_hkpxid")] |
netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_xh_pxmx/LqXhPxmxEntity.cs
| @@ -60,6 +60,12 @@ namespace NCC.Extend.Entitys.lq_xh_pxmx | @@ -60,6 +60,12 @@ namespace NCC.Extend.Entitys.lq_xh_pxmx | ||
| 60 | public DateTime? CreateTIme { get; set; } | 60 | public DateTime? CreateTIme { get; set; } |
| 61 | 61 | ||
| 62 | /// <summary> | 62 | /// <summary> |
| 63 | + /// 耗卡时间 | ||
| 64 | + /// </summary> | ||
| 65 | + [SugarColumn(ColumnName = "yjsj")] | ||
| 66 | + public DateTime? Yjsj { get; set; } | ||
| 67 | + | ||
| 68 | + /// <summary> | ||
| 63 | /// 项目次数 | 69 | /// 项目次数 |
| 64 | /// </summary> | 70 | /// </summary> |
| 65 | [SugarColumn(ColumnName = "F_ProjectNumber")] | 71 | [SugarColumn(ColumnName = "F_ProjectNumber")] |
netcore/src/Modularity/Extend/NCC.Extend/LqXhHyhkService.cs
| @@ -989,6 +989,7 @@ namespace NCC.Extend.LqXhHyhk | @@ -989,6 +989,7 @@ namespace NCC.Extend.LqXhHyhk | ||
| 989 | ConsumeInfoId = newEntity.Id, | 989 | ConsumeInfoId = newEntity.Id, |
| 990 | BillingItemId = item.billingItemId, | 990 | BillingItemId = item.billingItemId, |
| 991 | CreateTIme = DateTime.Now, | 991 | CreateTIme = DateTime.Now, |
| 992 | + Yjsj = input.hksj, | ||
| 992 | MemberId = entity.Hy, | 993 | MemberId = entity.Hy, |
| 993 | OriginalProjectNumber = item.projectNumber ?? 0, | 994 | OriginalProjectNumber = item.projectNumber ?? 0, |
| 994 | OvertimeProjectNumber = (decimal)(entity.OvertimeCoefficient * (item.projectNumber ?? 0)), | 995 | OvertimeProjectNumber = (decimal)(entity.OvertimeCoefficient * (item.projectNumber ?? 0)), |
| @@ -1017,7 +1018,8 @@ namespace NCC.Extend.LqXhHyhk | @@ -1017,7 +1018,8 @@ namespace NCC.Extend.LqXhHyhk | ||
| 1017 | Jksxm = ijks_tem.jksxm, | 1018 | Jksxm = ijks_tem.jksxm, |
| 1018 | Jkszh = ijks_tem.jkszh, | 1019 | Jkszh = ijks_tem.jkszh, |
| 1019 | Jksyj = ijks_tem.jksyj, | 1020 | Jksyj = ijks_tem.jksyj, |
| 1020 | - Yjsj = DateTime.Now, | 1021 | + Yjsj = input.hksj, |
| 1022 | + CreateTime = DateTime.Now, | ||
| 1021 | JsjId = ijks_tem.jsjId, | 1023 | JsjId = ijks_tem.jsjId, |
| 1022 | Kdpxid = lqXhPxmxEntity.Id, | 1024 | Kdpxid = lqXhPxmxEntity.Id, |
| 1023 | OriginalLaborCost = ijks_tem.laborCost, | 1025 | OriginalLaborCost = ijks_tem.laborCost, |
| @@ -1048,7 +1050,8 @@ namespace NCC.Extend.LqXhHyhk | @@ -1048,7 +1050,8 @@ namespace NCC.Extend.LqXhHyhk | ||
| 1048 | Kjblsxm = ikjbs_tem.kjblsxm, | 1050 | Kjblsxm = ikjbs_tem.kjblsxm, |
| 1049 | Kjblszh = ikjbs_tem.kjblszh, | 1051 | Kjblszh = ikjbs_tem.kjblszh, |
| 1050 | Kjblsyj = ikjbs_tem.kjblsyj, | 1052 | Kjblsyj = ikjbs_tem.kjblsyj, |
| 1051 | - Yjsj = DateTime.Now, | 1053 | + Yjsj = input.hksj, |
| 1054 | + CreateTime = DateTime.Now, | ||
| 1052 | Hkpxid = lqXhPxmxEntity.Id, | 1055 | Hkpxid = lqXhPxmxEntity.Id, |
| 1053 | // OriginalHdpxNumber = ikjbs_tem.hdpxNumber, | 1056 | // OriginalHdpxNumber = ikjbs_tem.hdpxNumber, |
| 1054 | // OvertimeHdpxNumber = (decimal)(entity.OvertimeCoefficient * (ikjbs_tem.hdpxNumber ?? 0)), | 1057 | // OvertimeHdpxNumber = (decimal)(entity.OvertimeCoefficient * (ikjbs_tem.hdpxNumber ?? 0)), |
| @@ -1282,6 +1285,7 @@ namespace NCC.Extend.LqXhHyhk | @@ -1282,6 +1285,7 @@ namespace NCC.Extend.LqXhHyhk | ||
| 1282 | ConsumeInfoId = input.id, | 1285 | ConsumeInfoId = input.id, |
| 1283 | BillingItemId = item.billingItemId, | 1286 | BillingItemId = item.billingItemId, |
| 1284 | CreateTIme = DateTime.Now, | 1287 | CreateTIme = DateTime.Now, |
| 1288 | + Yjsj = input.hksj, | ||
| 1285 | MemberId = entity.Hy, | 1289 | MemberId = entity.Hy, |
| 1286 | TotalPrice = item.pxjg * (item.projectNumber ?? 1), | 1290 | TotalPrice = item.pxjg * (item.projectNumber ?? 1), |
| 1287 | Px = item.px, | 1291 | Px = item.px, |
| @@ -1309,7 +1313,8 @@ namespace NCC.Extend.LqXhHyhk | @@ -1309,7 +1313,8 @@ namespace NCC.Extend.LqXhHyhk | ||
| 1309 | Jksxm = ijks_tem.jksxm, | 1313 | Jksxm = ijks_tem.jksxm, |
| 1310 | Jkszh = ijks_tem.jkszh, | 1314 | Jkszh = ijks_tem.jkszh, |
| 1311 | Jksyj = ijks_tem.jksyj, | 1315 | Jksyj = ijks_tem.jksyj, |
| 1312 | - Yjsj = DateTime.Now, | 1316 | + Yjsj = input.hksj, |
| 1317 | + CreateTime = DateTime.Now, | ||
| 1313 | JsjId = ijks_tem.jsjId, | 1318 | JsjId = ijks_tem.jsjId, |
| 1314 | Kdpxid = lqXhPxmxEntity.Id, | 1319 | Kdpxid = lqXhPxmxEntity.Id, |
| 1315 | OriginalKdpxNumber = ijks_tem.kdpxNumber, | 1320 | OriginalKdpxNumber = ijks_tem.kdpxNumber, |
| @@ -1339,7 +1344,8 @@ namespace NCC.Extend.LqXhHyhk | @@ -1339,7 +1344,8 @@ namespace NCC.Extend.LqXhHyhk | ||
| 1339 | Kjblsxm = ikjbs_tem.kjblsxm, | 1344 | Kjblsxm = ikjbs_tem.kjblsxm, |
| 1340 | Kjblszh = ikjbs_tem.kjblszh, | 1345 | Kjblszh = ikjbs_tem.kjblszh, |
| 1341 | Kjblsyj = ikjbs_tem.kjblsyj, | 1346 | Kjblsyj = ikjbs_tem.kjblsyj, |
| 1342 | - Yjsj = DateTime.Now, | 1347 | + Yjsj = input.hksj, |
| 1348 | + CreateTime = DateTime.Now, | ||
| 1343 | Hkpxid = lqXhPxmxEntity.Id, | 1349 | Hkpxid = lqXhPxmxEntity.Id, |
| 1344 | // OriginalHdpxNumber = ikjbs_tem.hdpxNumber, | 1350 | // OriginalHdpxNumber = ikjbs_tem.hdpxNumber, |
| 1345 | // OvertimeHdpxNumber = (decimal)(entity.OvertimeCoefficient * (ikjbs_tem.hdpxNumber ?? 0)), | 1351 | // OvertimeHdpxNumber = (decimal)(entity.OvertimeCoefficient * (ikjbs_tem.hdpxNumber ?? 0)), |
sql/同步耗卡时间和创建时间字段.sql
0 → 100644
| 1 | +-- ============================================ | ||
| 2 | +-- 同步耗卡时间和创建时间字段 | ||
| 3 | +-- 说明: | ||
| 4 | +-- 1. 在 lq_xh_pxmx 表添加 yjsj 字段(耗卡时间) | ||
| 5 | +-- 2. 在 lq_xh_jksyj 表添加 F_CreateTime 字段(创建时间) | ||
| 6 | +-- 3. 在 lq_xh_kjbsyj 表添加 F_CreateTime 字段(创建时间) | ||
| 7 | +-- 4. 同步 lq_xh_hyhk.hksj 到相关表的 yjsj 字段 | ||
| 8 | +-- 5. 同步 lq_xh_hyhk.F_CreateTime 到相关表的创建时间字段 | ||
| 9 | +-- ============================================ | ||
| 10 | + | ||
| 11 | +-- ============================================ | ||
| 12 | +-- 第一步:添加字段 | ||
| 13 | +-- ============================================ | ||
| 14 | + | ||
| 15 | +-- 1. 在 lq_xh_pxmx 表添加 yjsj 字段(耗卡时间) | ||
| 16 | +ALTER TABLE `lq_xh_pxmx` | ||
| 17 | +ADD COLUMN `yjsj` DATETIME NULL COMMENT '耗卡时间' AFTER `F_CreateTIme`; | ||
| 18 | + | ||
| 19 | +-- 2. 在 lq_xh_jksyj 表添加 F_CreateTime 字段(创建时间) | ||
| 20 | +ALTER TABLE `lq_xh_jksyj` | ||
| 21 | +ADD COLUMN `F_CreateTime` DATETIME NULL COMMENT '创建时间' AFTER `yjsj`; | ||
| 22 | + | ||
| 23 | +-- 3. 在 lq_xh_kjbsyj 表添加 F_CreateTime 字段(创建时间) | ||
| 24 | +ALTER TABLE `lq_xh_kjbsyj` | ||
| 25 | +ADD COLUMN `F_CreateTime` DATETIME NULL COMMENT '创建时间' AFTER `yjsj`; | ||
| 26 | + | ||
| 27 | +-- ============================================ | ||
| 28 | +-- 第二步:同步数据 | ||
| 29 | +-- ============================================ | ||
| 30 | + | ||
| 31 | +-- 4. 同步 lq_xh_hyhk.hksj 到 lq_xh_pxmx.yjsj | ||
| 32 | +UPDATE `lq_xh_pxmx` pxmx | ||
| 33 | +INNER JOIN `lq_xh_hyhk` hyhk ON pxmx.F_ConsumeInfoId = hyhk.F_Id | ||
| 34 | +SET pxmx.yjsj = hyhk.hksj | ||
| 35 | +WHERE hyhk.hksj IS NOT NULL; | ||
| 36 | + | ||
| 37 | +-- 5. 同步 lq_xh_hyhk.hksj 到 lq_xh_jksyj.yjsj | ||
| 38 | +UPDATE `lq_xh_jksyj` jksyj | ||
| 39 | +INNER JOIN `lq_xh_hyhk` hyhk ON jksyj.glkdbh = hyhk.F_Id | ||
| 40 | +SET jksyj.yjsj = hyhk.hksj | ||
| 41 | +WHERE hyhk.hksj IS NOT NULL; | ||
| 42 | + | ||
| 43 | +-- 6. 同步 lq_xh_hyhk.hksj 到 lq_xh_kjbsyj.yjsj | ||
| 44 | +UPDATE `lq_xh_kjbsyj` kjbsyj | ||
| 45 | +INNER JOIN `lq_xh_hyhk` hyhk ON kjbsyj.glkdbh = hyhk.F_Id | ||
| 46 | +SET kjbsyj.yjsj = hyhk.hksj | ||
| 47 | +WHERE hyhk.hksj IS NOT NULL; | ||
| 48 | + | ||
| 49 | +-- 7. 同步 lq_xh_hyhk.F_CreateTime 到 lq_xh_pxmx.F_CreateTIme | ||
| 50 | +-- 注意:lq_xh_pxmx 表的创建时间字段是 F_CreateTIme(注意拼写) | ||
| 51 | +UPDATE `lq_xh_pxmx` pxmx | ||
| 52 | +INNER JOIN `lq_xh_hyhk` hyhk ON pxmx.F_ConsumeInfoId = hyhk.F_Id | ||
| 53 | +SET pxmx.F_CreateTIme = hyhk.F_CreateTime | ||
| 54 | +WHERE hyhk.F_CreateTime IS NOT NULL; | ||
| 55 | + | ||
| 56 | +-- 8. 同步 lq_xh_hyhk.F_CreateTime 到 lq_xh_jksyj.F_CreateTime | ||
| 57 | +UPDATE `lq_xh_jksyj` jksyj | ||
| 58 | +INNER JOIN `lq_xh_hyhk` hyhk ON jksyj.glkdbh = hyhk.F_Id | ||
| 59 | +SET jksyj.F_CreateTime = hyhk.F_CreateTime | ||
| 60 | +WHERE hyhk.F_CreateTime IS NOT NULL; | ||
| 61 | + | ||
| 62 | +-- 9. 同步 lq_xh_hyhk.F_CreateTime 到 lq_xh_kjbsyj.F_CreateTime | ||
| 63 | +UPDATE `lq_xh_kjbsyj` kjbsyj | ||
| 64 | +INNER JOIN `lq_xh_hyhk` hyhk ON kjbsyj.glkdbh = hyhk.F_Id | ||
| 65 | +SET kjbsyj.F_CreateTime = hyhk.F_CreateTime | ||
| 66 | +WHERE hyhk.F_CreateTime IS NOT NULL; | ||
| 67 | + | ||
| 68 | +-- ============================================ | ||
| 69 | +-- 验证查询(可选,用于验证同步结果) | ||
| 70 | +-- ============================================ | ||
| 71 | + | ||
| 72 | +-- 验证 lq_xh_pxmx 表数据同步情况 | ||
| 73 | +-- SELECT | ||
| 74 | +-- pxmx.F_Id, | ||
| 75 | +-- pxmx.F_ConsumeInfoId, | ||
| 76 | +-- pxmx.yjsj as PxmxYjsj, | ||
| 77 | +-- hyhk.hksj as HyhkHksj, | ||
| 78 | +-- pxmx.F_CreateTIme as PxmxCreateTime, | ||
| 79 | +-- hyhk.F_CreateTime as HyhkCreateTime | ||
| 80 | +-- FROM lq_xh_pxmx pxmx | ||
| 81 | +-- LEFT JOIN lq_xh_hyhk hyhk ON pxmx.F_ConsumeInfoId = hyhk.F_Id | ||
| 82 | +-- WHERE pxmx.F_ConsumeInfoId IS NOT NULL | ||
| 83 | +-- LIMIT 10; | ||
| 84 | + | ||
| 85 | +-- 验证 lq_xh_jksyj 表数据同步情况 | ||
| 86 | +-- SELECT | ||
| 87 | +-- jksyj.F_Id, | ||
| 88 | +-- jksyj.glkdbh, | ||
| 89 | +-- jksyj.yjsj as JksyjYjsj, | ||
| 90 | +-- hyhk.hksj as HyhkHksj, | ||
| 91 | +-- jksyj.F_CreateTime as JksyjCreateTime, | ||
| 92 | +-- hyhk.F_CreateTime as HyhkCreateTime | ||
| 93 | +-- FROM lq_xh_jksyj jksyj | ||
| 94 | +-- LEFT JOIN lq_xh_hyhk hyhk ON jksyj.glkdbh = hyhk.F_Id | ||
| 95 | +-- WHERE jksyj.glkdbh IS NOT NULL | ||
| 96 | +-- LIMIT 10; | ||
| 97 | + | ||
| 98 | +-- 验证 lq_xh_kjbsyj 表数据同步情况 | ||
| 99 | +-- SELECT | ||
| 100 | +-- kjbsyj.F_Id, | ||
| 101 | +-- kjbsyj.glkdbh, | ||
| 102 | +-- kjbsyj.yjsj as KjbsyjYjsj, | ||
| 103 | +-- hyhk.hksj as HyhkHksj, | ||
| 104 | +-- kjbsyj.F_CreateTime as KjbsyjCreateTime, | ||
| 105 | +-- hyhk.F_CreateTime as HyhkCreateTime | ||
| 106 | +-- FROM lq_xh_kjbsyj kjbsyj | ||
| 107 | +-- LEFT JOIN lq_xh_hyhk hyhk ON kjbsyj.glkdbh = hyhk.F_Id | ||
| 108 | +-- WHERE kjbsyj.glkdbh IS NOT NULL | ||
| 109 | +-- LIMIT 10; | ||
| 110 | + |