diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_xh_jksyj/LqXhJksyjEntity.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_xh_jksyj/LqXhJksyjEntity.cs index 7c76d43..de57f7d 100644 --- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_xh_jksyj/LqXhJksyjEntity.cs +++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_xh_jksyj/LqXhJksyjEntity.cs @@ -54,6 +54,12 @@ namespace NCC.Extend.Entitys.lq_xh_jksyj public DateTime? Yjsj { get; set; } /// + /// 创建时间 + /// + [SugarColumn(ColumnName = "F_CreateTime")] + public DateTime? CreateTime { get; set; } + + /// /// 金三角id /// [SugarColumn(ColumnName = "F_jsjid")] diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_xh_kjbsyj/LqXhKjbsyjEntity.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_xh_kjbsyj/LqXhKjbsyjEntity.cs index 06c074d..1daec75 100644 --- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_xh_kjbsyj/LqXhKjbsyjEntity.cs +++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_xh_kjbsyj/LqXhKjbsyjEntity.cs @@ -54,6 +54,12 @@ namespace NCC.Extend.Entitys.lq_xh_kjbsyj public DateTime? Yjsj { get; set; } /// + /// 创建时间 + /// + [SugarColumn(ColumnName = "F_CreateTime")] + public DateTime? CreateTime { get; set; } + + /// /// 耗卡品项Id /// [SugarColumn(ColumnName = "F_hkpxid")] diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_xh_pxmx/LqXhPxmxEntity.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_xh_pxmx/LqXhPxmxEntity.cs index 23810eb..8e7075e 100644 --- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_xh_pxmx/LqXhPxmxEntity.cs +++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_xh_pxmx/LqXhPxmxEntity.cs @@ -60,6 +60,12 @@ namespace NCC.Extend.Entitys.lq_xh_pxmx public DateTime? CreateTIme { get; set; } /// + /// 耗卡时间 + /// + [SugarColumn(ColumnName = "yjsj")] + public DateTime? Yjsj { get; set; } + + /// /// 项目次数 /// [SugarColumn(ColumnName = "F_ProjectNumber")] diff --git a/netcore/src/Modularity/Extend/NCC.Extend/LqXhHyhkService.cs b/netcore/src/Modularity/Extend/NCC.Extend/LqXhHyhkService.cs index dac043f..25a252b 100644 --- a/netcore/src/Modularity/Extend/NCC.Extend/LqXhHyhkService.cs +++ b/netcore/src/Modularity/Extend/NCC.Extend/LqXhHyhkService.cs @@ -989,6 +989,7 @@ namespace NCC.Extend.LqXhHyhk ConsumeInfoId = newEntity.Id, BillingItemId = item.billingItemId, CreateTIme = DateTime.Now, + Yjsj = input.hksj, MemberId = entity.Hy, OriginalProjectNumber = item.projectNumber ?? 0, OvertimeProjectNumber = (decimal)(entity.OvertimeCoefficient * (item.projectNumber ?? 0)), @@ -1017,7 +1018,8 @@ namespace NCC.Extend.LqXhHyhk Jksxm = ijks_tem.jksxm, Jkszh = ijks_tem.jkszh, Jksyj = ijks_tem.jksyj, - Yjsj = DateTime.Now, + Yjsj = input.hksj, + CreateTime = DateTime.Now, JsjId = ijks_tem.jsjId, Kdpxid = lqXhPxmxEntity.Id, OriginalLaborCost = ijks_tem.laborCost, @@ -1048,7 +1050,8 @@ namespace NCC.Extend.LqXhHyhk Kjblsxm = ikjbs_tem.kjblsxm, Kjblszh = ikjbs_tem.kjblszh, Kjblsyj = ikjbs_tem.kjblsyj, - Yjsj = DateTime.Now, + Yjsj = input.hksj, + CreateTime = DateTime.Now, Hkpxid = lqXhPxmxEntity.Id, // OriginalHdpxNumber = ikjbs_tem.hdpxNumber, // OvertimeHdpxNumber = (decimal)(entity.OvertimeCoefficient * (ikjbs_tem.hdpxNumber ?? 0)), @@ -1282,6 +1285,7 @@ namespace NCC.Extend.LqXhHyhk ConsumeInfoId = input.id, BillingItemId = item.billingItemId, CreateTIme = DateTime.Now, + Yjsj = input.hksj, MemberId = entity.Hy, TotalPrice = item.pxjg * (item.projectNumber ?? 1), Px = item.px, @@ -1309,7 +1313,8 @@ namespace NCC.Extend.LqXhHyhk Jksxm = ijks_tem.jksxm, Jkszh = ijks_tem.jkszh, Jksyj = ijks_tem.jksyj, - Yjsj = DateTime.Now, + Yjsj = input.hksj, + CreateTime = DateTime.Now, JsjId = ijks_tem.jsjId, Kdpxid = lqXhPxmxEntity.Id, OriginalKdpxNumber = ijks_tem.kdpxNumber, @@ -1339,7 +1344,8 @@ namespace NCC.Extend.LqXhHyhk Kjblsxm = ikjbs_tem.kjblsxm, Kjblszh = ikjbs_tem.kjblszh, Kjblsyj = ikjbs_tem.kjblsyj, - Yjsj = DateTime.Now, + Yjsj = input.hksj, + CreateTime = DateTime.Now, Hkpxid = lqXhPxmxEntity.Id, // OriginalHdpxNumber = ikjbs_tem.hdpxNumber, // OvertimeHdpxNumber = (decimal)(entity.OvertimeCoefficient * (ikjbs_tem.hdpxNumber ?? 0)), diff --git a/sql/同步耗卡时间和创建时间字段.sql b/sql/同步耗卡时间和创建时间字段.sql new file mode 100644 index 0000000..c2f107e --- /dev/null +++ b/sql/同步耗卡时间和创建时间字段.sql @@ -0,0 +1,110 @@ +-- ============================================ +-- 同步耗卡时间和创建时间字段 +-- 说明: +-- 1. 在 lq_xh_pxmx 表添加 yjsj 字段(耗卡时间) +-- 2. 在 lq_xh_jksyj 表添加 F_CreateTime 字段(创建时间) +-- 3. 在 lq_xh_kjbsyj 表添加 F_CreateTime 字段(创建时间) +-- 4. 同步 lq_xh_hyhk.hksj 到相关表的 yjsj 字段 +-- 5. 同步 lq_xh_hyhk.F_CreateTime 到相关表的创建时间字段 +-- ============================================ + +-- ============================================ +-- 第一步:添加字段 +-- ============================================ + +-- 1. 在 lq_xh_pxmx 表添加 yjsj 字段(耗卡时间) +ALTER TABLE `lq_xh_pxmx` +ADD COLUMN `yjsj` DATETIME NULL COMMENT '耗卡时间' AFTER `F_CreateTIme`; + +-- 2. 在 lq_xh_jksyj 表添加 F_CreateTime 字段(创建时间) +ALTER TABLE `lq_xh_jksyj` +ADD COLUMN `F_CreateTime` DATETIME NULL COMMENT '创建时间' AFTER `yjsj`; + +-- 3. 在 lq_xh_kjbsyj 表添加 F_CreateTime 字段(创建时间) +ALTER TABLE `lq_xh_kjbsyj` +ADD COLUMN `F_CreateTime` DATETIME NULL COMMENT '创建时间' AFTER `yjsj`; + +-- ============================================ +-- 第二步:同步数据 +-- ============================================ + +-- 4. 同步 lq_xh_hyhk.hksj 到 lq_xh_pxmx.yjsj +UPDATE `lq_xh_pxmx` pxmx +INNER JOIN `lq_xh_hyhk` hyhk ON pxmx.F_ConsumeInfoId = hyhk.F_Id +SET pxmx.yjsj = hyhk.hksj +WHERE hyhk.hksj IS NOT NULL; + +-- 5. 同步 lq_xh_hyhk.hksj 到 lq_xh_jksyj.yjsj +UPDATE `lq_xh_jksyj` jksyj +INNER JOIN `lq_xh_hyhk` hyhk ON jksyj.glkdbh = hyhk.F_Id +SET jksyj.yjsj = hyhk.hksj +WHERE hyhk.hksj IS NOT NULL; + +-- 6. 同步 lq_xh_hyhk.hksj 到 lq_xh_kjbsyj.yjsj +UPDATE `lq_xh_kjbsyj` kjbsyj +INNER JOIN `lq_xh_hyhk` hyhk ON kjbsyj.glkdbh = hyhk.F_Id +SET kjbsyj.yjsj = hyhk.hksj +WHERE hyhk.hksj IS NOT NULL; + +-- 7. 同步 lq_xh_hyhk.F_CreateTime 到 lq_xh_pxmx.F_CreateTIme +-- 注意:lq_xh_pxmx 表的创建时间字段是 F_CreateTIme(注意拼写) +UPDATE `lq_xh_pxmx` pxmx +INNER JOIN `lq_xh_hyhk` hyhk ON pxmx.F_ConsumeInfoId = hyhk.F_Id +SET pxmx.F_CreateTIme = hyhk.F_CreateTime +WHERE hyhk.F_CreateTime IS NOT NULL; + +-- 8. 同步 lq_xh_hyhk.F_CreateTime 到 lq_xh_jksyj.F_CreateTime +UPDATE `lq_xh_jksyj` jksyj +INNER JOIN `lq_xh_hyhk` hyhk ON jksyj.glkdbh = hyhk.F_Id +SET jksyj.F_CreateTime = hyhk.F_CreateTime +WHERE hyhk.F_CreateTime IS NOT NULL; + +-- 9. 同步 lq_xh_hyhk.F_CreateTime 到 lq_xh_kjbsyj.F_CreateTime +UPDATE `lq_xh_kjbsyj` kjbsyj +INNER JOIN `lq_xh_hyhk` hyhk ON kjbsyj.glkdbh = hyhk.F_Id +SET kjbsyj.F_CreateTime = hyhk.F_CreateTime +WHERE hyhk.F_CreateTime IS NOT NULL; + +-- ============================================ +-- 验证查询(可选,用于验证同步结果) +-- ============================================ + +-- 验证 lq_xh_pxmx 表数据同步情况 +-- SELECT +-- pxmx.F_Id, +-- pxmx.F_ConsumeInfoId, +-- pxmx.yjsj as PxmxYjsj, +-- hyhk.hksj as HyhkHksj, +-- pxmx.F_CreateTIme as PxmxCreateTime, +-- hyhk.F_CreateTime as HyhkCreateTime +-- FROM lq_xh_pxmx pxmx +-- LEFT JOIN lq_xh_hyhk hyhk ON pxmx.F_ConsumeInfoId = hyhk.F_Id +-- WHERE pxmx.F_ConsumeInfoId IS NOT NULL +-- LIMIT 10; + +-- 验证 lq_xh_jksyj 表数据同步情况 +-- SELECT +-- jksyj.F_Id, +-- jksyj.glkdbh, +-- jksyj.yjsj as JksyjYjsj, +-- hyhk.hksj as HyhkHksj, +-- jksyj.F_CreateTime as JksyjCreateTime, +-- hyhk.F_CreateTime as HyhkCreateTime +-- FROM lq_xh_jksyj jksyj +-- LEFT JOIN lq_xh_hyhk hyhk ON jksyj.glkdbh = hyhk.F_Id +-- WHERE jksyj.glkdbh IS NOT NULL +-- LIMIT 10; + +-- 验证 lq_xh_kjbsyj 表数据同步情况 +-- SELECT +-- kjbsyj.F_Id, +-- kjbsyj.glkdbh, +-- kjbsyj.yjsj as KjbsyjYjsj, +-- hyhk.hksj as HyhkHksj, +-- kjbsyj.F_CreateTime as KjbsyjCreateTime, +-- hyhk.F_CreateTime as HyhkCreateTime +-- FROM lq_xh_kjbsyj kjbsyj +-- LEFT JOIN lq_xh_hyhk hyhk ON kjbsyj.glkdbh = hyhk.F_Id +-- WHERE kjbsyj.glkdbh IS NOT NULL +-- LIMIT 10; +