diff --git a/Pilot.Report.Exploitation/AnnualSalesPaymentSum/AnnualSalesPaymentSumReport.cs b/Pilot.Report.Exploitation/AnnualSalesPaymentSum/AnnualSalesPaymentSumReport.cs index 7ade571..275fdf4 100644 --- a/Pilot.Report.Exploitation/AnnualSalesPaymentSum/AnnualSalesPaymentSumReport.cs +++ b/Pilot.Report.Exploitation/AnnualSalesPaymentSum/AnnualSalesPaymentSumReport.cs @@ -32,18 +32,18 @@ namespace Pilot.Report.Exploitation.AnnualSalesPaymentSum this.ReportProperty.IsUIDesignerColumns = false; // 简单账表类型：普通、树形、分页 this.ReportProperty.ReportType = ReportType.REPORTTYPE_NORMAL; - this.IsCreateTempTableByPlugin = true; + //this.IsCreateTempTableByPlugin = true; // this.IsCreateTempTableByPlugin = true; // - this.ReportProperty.IsGroupSummary = true; + this.ReportProperty.IsGroupSummary = false; // this.ReportProperty.SimpleAllCols = false; // 单据主键：两行FID相同，则为同一单的两条分录，单据编号可以不重复显示 - this.ReportProperty.PrimaryKeyFieldName = "FID"; + //this.ReportProperty.PrimaryKeyFieldName = "FID"; // this.ReportProperty.IsDefaultOnlyDspSumAndDetailData = true; - + // 设置精度控制 var list = new List { @@ -1143,7 +1143,7 @@ namespace Pilot.Report.Exploitation.AnnualSalesPaymentSum { sqlWhere += string.Format(@" AND [组织ID] in ({0})", organization); } - + string guid = Guid.NewGuid().ToString().Replace("-", ""); string sql2 = $@"/*dialect*/SELECT EE.* ,ee.销售员 AS Salesperson ,[累计销售额] as XCumulative,[往年订单变更金额] as UsualAlterAmount,[兴诺业绩] as SiNO,[兴诺往年订单变更] as SiNOUsualAlter,[武汉派诺-当年业绩] as WuhanPilotThisYear @@ -1152,7 +1152,7 @@ namespace Pilot.Report.Exploitation.AnnualSalesPaymentSum ,[PilotSumAmount]=[累计销售额]+[往年订单变更金额]+[兴诺业绩]+[兴诺往年订单变更]+[武汉派诺-当年业绩]+[武汉派诺-往年订单变更]+[碳索业绩]+[香港派诺业绩]+[华夏云联业绩] ,ROW_NUMBER() OVER (ORDER BY [SBU] ,[销售员ID])*10 AS FID ,ROW_NUMBER() OVER (ORDER BY [SBU] ,[销售员ID])*10 AS FIDENTITYID ,0 AS Sort - into #{tableName} + into {tableName}{guid} FROM ( SELECT DISTINCT A.*"; @@ -1252,7 +1252,7 @@ FROM [ZZZ_SalesRportShareData] AA WITH(NOLOCK) WHERE AA.[销售员ID]=A.[销售 AND AA.[订单日期] >='{yearStart}' AND AA.[订单日期] <'{yearEnd}') kk ),0) FROM - (SELECT DISTINCT [销售员] ,[销售员ID],isnull([SBU],'其他') SBU ,[明细区域] FROM [ZZZ_SalesRportShareData] WITH(NOLOCK) + (SELECT DISTINCT [销售员] ,[销售员ID],[SBU] ,[明细区域],组织ID FROM [ZZZ_SalesRportShareData] WITH(NOLOCK) WHERE [订单日期] >='{yearStart}' AND [订单日期] <'{yearEnd}' {sqlWhere} ) A ) EE ORDER BY [SBU] ,[销售员ID] "; @@ -1378,11 +1378,11 @@ AND AA.[订单日期] >='{yearStart}' AND AA.[订单日期] <'{yearEnd}') kk // || t["SBU"].ToString().Contains("国际事业部") ||( t["SBU"].ToString().Contains("其他")|| t["SBU"]==null)).ToList(); #endregion - - string insertSql = $@"/*dialect*/ UPDATE #{tableName} SET sbu='其他' WHERE sbu IS null;"; + + string insertSql = $@"/*dialect*/ UPDATE {tableName}{guid} SET sbu='其他' WHERE sbu IS null;"; DBUtils.ExecuteDynamicObject(this.Context, sql2); insertSql += $@" /*dialect*/ - insert into #{tableName}(Salesperson,[销售员ID],SBU,DetailArea,X1Month,H1Month,X2Month,H2Month,X3Month,H3Month,X4Month,H4Month + insert into {tableName}{guid} (Salesperson,[销售员ID],SBU,DetailArea,X1Month,H1Month,X2Month,H2Month,X3Month,H3Month,X4Month,H4Month ,X5Month,H5Month,X6Month,H6Month ,X7Month, H7Month,X8Month,H8Month,X9Month,H9Month,X10Month,H10Month,X11Month,H11Month,X12Month,H12Month ,[XCumulative],[UsualAlterAmount],[SiNO],[SiNOUsualAlter],[WuhanPilotThisYear],[WuhanPilotUsualAlter],[Discovery],[HongKongPilot],HuaXiaYunLian @@ -1400,11 +1400,11 @@ AND AA.[订单日期] >='{yearStart}' AND AA.[订单日期] <'{yearEnd}') kk ,SUM([HuaXiaYunLian]) AS [HuaXiaYunLian],SUM([ZhuhaiPilot]) AS [ZhuhaiPilot],SUM([PilotSumAmount]) AS [PilotSumAmount],MAX(FID)+1 AS FID ,MAX(FIDENTITYID)+1 AS FIDENTITYID ,1 as sort ,0 as 累计销售额, 0 [累计回款额],0 [往年订单变更金额],0 [兴诺业绩],0 [兴诺往年订单变更],0 [武汉派诺-当年业绩],0 [武汉派诺-往年订单变更],0 [碳索业绩] ,0 [香港派诺业绩],0 [华夏云联业绩], 100302 [组织ID] - FROM #{tableName} + FROM {tableName}{guid} where [组织ID]=100302 GROUP BY SBU - insert into #{tableName}(Salesperson,[销售员ID],SBU,DetailArea,X1Month,H1Month,X2Month,H2Month,X3Month,H3Month,X4Month,H4Month + insert into {tableName}{guid} (Salesperson,[销售员ID],SBU,DetailArea,X1Month,H1Month,X2Month,H2Month,X3Month,H3Month,X4Month,H4Month ,X5Month,H5Month,X6Month,H6Month ,X7Month, H7Month,X8Month,H8Month,X9Month,H9Month,X10Month,H10Month,X11Month,H11Month,X12Month,H12Month ,[XCumulative],[UsualAlterAmount],[SiNO],[SiNOUsualAlter],[WuhanPilotThisYear],[WuhanPilotUsualAlter],[Discovery],[HongKongPilot],HuaXiaYunLian @@ -1420,23 +1420,23 @@ AND AA.[订单日期] >='{yearStart}' AND AA.[订单日期] <'{yearEnd}') kk , SUM([XCumulative]) AS [XCumulative], SUM([UsualAlterAmount]) AS [UsualAlterAmount],SUM([SiNO]) AS [SiNO], SUM([SiNOUsualAlter]) AS [SiNOUsualAlter] ,SUM([WuhanPilotThisYear]) AS [WuhanPilotThisYear],SUM([WuhanPilotUsualAlter]) AS [WuhanPilotUsualAlter],SUM([Discovery]) AS [Discovery] ,SUM([HongKongPilot]) AS [HongKongPilot] - ,SUM([HuaXiaYunLian]) AS [HuaXiaYunLian],SUM([ZhuhaiPilot]) AS [ZhuhaiPilot],SUM([PilotSumAmount]) AS [PilotSumAmount],(SELECT MAX(FID) FROM #{tableName})+1 +1 AS FID ,(SELECT MAX(FID) FROM #{tableName})+1 AS FIDENTITYID ,1 as sort + ,SUM([HuaXiaYunLian]) AS [HuaXiaYunLian],SUM([ZhuhaiPilot]) AS [ZhuhaiPilot],SUM([PilotSumAmount]) AS [PilotSumAmount],(SELECT MAX(FID) FROM {tableName}{guid} )+1 +1 AS FID ,(SELECT MAX(FID) FROM {tableName}{guid} )+1 AS FIDENTITYID ,2 as sort ,0 as 累计销售额, 0 [累计回款额],0 [往年订单变更金额],SUM([兴诺业绩]) [兴诺业绩],SUM([兴诺往年订单变更]) [兴诺往年订单变更],SUM([武汉派诺-当年业绩]) [武汉派诺-当年业绩],SUM([武汉派诺-往年订单变更]) [武汉派诺-往年订单变更],SUM([碳索业绩]) [碳索业绩] ,SUM([香港派诺业绩]) [香港派诺业绩],SUM([华夏云联业绩]) [华夏云联业绩],100302 as [组织ID] - FROM #{tableName} + FROM {tableName}{guid} where [销售员ID]<99383300 AND 组织ID=100302 - UPDATE #{tableName} SET [XCumulative]=(b.[XCumulative]) ,[UsualAlterAmount]=(b.[UsualAlterAmount]),[SiNO]=(b.[SiNO]),[SiNOUsualAlter]=(b.[SiNOUsualAlter]) + UPDATE {tableName}{guid} SET [XCumulative]=(b.[XCumulative]) ,[UsualAlterAmount]=(b.[UsualAlterAmount]),[SiNO]=(b.[SiNO]),[SiNOUsualAlter]=(b.[SiNOUsualAlter]) ,[WuhanPilotThisYear]=(b.[WuhanPilotThisYear]),[WuhanPilotUsualAlter]=(b.[WuhanPilotUsualAlter]),[Discovery]=(b.[Discovery]),[HongKongPilot]=(b.[HongKongPilot]),[HuaXiaYunLian]=(b.[HuaXiaYunLian]) ,[ZhuhaiPilot]=(b.[ZhuhaiPilot]),[PilotSumAmount]=(b.[PilotSumAmount]) FROM (SELECT [XCumulative]=SUM(b.[XCumulative]) ,[UsualAlterAmount]=SUM(b.[UsualAlterAmount]),[SiNO]=SUM(b.[SiNO]),[SiNOUsualAlter]=SUM(b.[SiNOUsualAlter]) ,[WuhanPilotThisYear]=SUM(b.[WuhanPilotThisYear]),[WuhanPilotUsualAlter]=SUM(b.[WuhanPilotUsualAlter]),[Discovery]=SUM(b.[Discovery]),[HongKongPilot]=SUM(b.[HongKongPilot]),[HuaXiaYunLian]=SUM(b.[HuaXiaYunLian]) - ,[ZhuhaiPilot]=SUM(b.[ZhuhaiPilot]),[PilotSumAmount]=SUM(b.[PilotSumAmount]) FROM #{tableName} b WITH(NOLOCK) WHERE b.[销售员ID] < 99383300 ) b - WHERE #{tableName}.[销售员ID]=99383322; + ,[ZhuhaiPilot]=SUM(b.[ZhuhaiPilot]),[PilotSumAmount]=SUM(b.[PilotSumAmount]) FROM {tableName}{guid} b WITH(NOLOCK) WHERE b.[销售员ID] < 99383300 ) b + WHERE {tableName}{guid} .[销售员ID]=99383322; - insert into #{tableName}(Salesperson,[销售员ID],SBU,DetailArea,X1Month,H1Month,X2Month,H2Month,X3Month,H3Month,X4Month,H4Month + insert into {tableName}{guid} (Salesperson,[销售员ID],SBU,DetailArea,X1Month,H1Month,X2Month,H2Month,X3Month,H3Month,X4Month,H4Month ,X5Month,H5Month,X6Month,H6Month ,X7Month, H7Month,X8Month,H8Month,X9Month,H9Month,X10Month,H10Month,X11Month,H11Month,X12Month,H12Month ,[XCumulative],[UsualAlterAmount],[SiNO],[SiNOUsualAlter],[WuhanPilotThisYear],[WuhanPilotUsualAlter],[Discovery],[HongKongPilot],HuaXiaYunLian @@ -1452,14 +1452,14 @@ AND AA.[订单日期] >='{yearStart}' AND AA.[订单日期] <'{yearEnd}') kk , 0 AS [XCumulative], 0 AS [UsualAlterAmount],0 AS [SiNO], 0 AS [SiNOUsualAlter] ,0 AS [WuhanPilotThisYear],0 AS [WuhanPilotUsualAlter],0 AS [Discovery] ,0 AS [HongKongPilot] - ,0 AS [HuaXiaYunLian],0 AS [ZhuhaiPilot], 0 AS [PilotSumAmount],(SELECT MAX(FID) FROM #{tableName})+1 AS FID ,(SELECT MAX(FID) FROM #{tableName})+1 +1 AS FIDENTITYID ,1 as sort + ,0 AS [HuaXiaYunLian],0 AS [ZhuhaiPilot], 0 AS [PilotSumAmount],(SELECT MAX(FID) FROM {tableName}{guid} )+1 AS FID ,(SELECT MAX(FID) FROM {tableName}{guid} )+1 +1 AS FIDENTITYID ,3 as sort ,0 as 累计销售额, 0 [累计回款额],0 [往年订单变更金额],0 [兴诺业绩],0 [兴诺往年订单变更],0 [武汉派诺-当年业绩],0 [武汉派诺-往年订单变更],0 [碳索业绩] ,0 [香港派诺业绩],0 [华夏云联业绩],100303 as [组织ID] - FROM #{tableName} + FROM {tableName}{guid} where [销售员ID] <99383300 AND 组织ID=100303 - insert into #{tableName}(Salesperson,[销售员ID],SBU,DetailArea,X1Month,H1Month,X2Month,H2Month,X3Month,H3Month,X4Month,H4Month + insert into {tableName}{guid} (Salesperson,[销售员ID],SBU,DetailArea,X1Month,H1Month,X2Month,H2Month,X3Month,H3Month,X4Month,H4Month ,X5Month,H5Month,X6Month,H6Month ,X7Month, H7Month,X8Month,H8Month,X9Month,H9Month,X10Month,H10Month,X11Month,H11Month,X12Month,H12Month ,[XCumulative],[UsualAlterAmount],[SiNO],[SiNOUsualAlter],[WuhanPilotThisYear],[WuhanPilotUsualAlter],[Discovery],[HongKongPilot],HuaXiaYunLian @@ -1475,14 +1475,14 @@ AND AA.[订单日期] >='{yearStart}' AND AA.[订单日期] <'{yearEnd}') kk , 0 AS [XCumulative], 0 AS [UsualAlterAmount],0 AS [SiNO], 0 AS [SiNOUsualAlter] ,0 AS [WuhanPilotThisYear],0 AS [WuhanPilotUsualAlter],0 AS [Discovery] ,0 AS [HongKongPilot] - ,0 AS [HuaXiaYunLian],0 AS [ZhuhaiPilot], 0 AS [PilotSumAmount],(SELECT MAX(FID) FROM #{tableName})+1 AS FID ,(SELECT MAX(FID) FROM #{tableName})+1 +1 AS FIDENTITYID ,1 as sort + ,0 AS [HuaXiaYunLian],0 AS [ZhuhaiPilot], 0 AS [PilotSumAmount],(SELECT MAX(FID) FROM {tableName}{guid} )+1 AS FID ,(SELECT MAX(FID) FROM {tableName}{guid} )+1 +1 AS FIDENTITYID ,3 as sort ,0 as 累计销售额, 0 [累计回款额],0 [往年订单变更金额],0 [兴诺业绩],0 [兴诺往年订单变更],0 [武汉派诺-当年业绩],0 [武汉派诺-往年订单变更],0 [碳索业绩] ,0 [香港派诺业绩],0 [华夏云联业绩],533896 as [组织ID] - FROM #{tableName} + FROM {tableName}{guid} where [销售员ID]!=99383320 AND 组织ID=533896 - insert into #{tableName}(Salesperson,[销售员ID],SBU,DetailArea,X1Month,H1Month,X2Month,H2Month,X3Month,H3Month,X4Month,H4Month + insert into {tableName}{guid} (Salesperson,[销售员ID],SBU,DetailArea,X1Month,H1Month,X2Month,H2Month,X3Month,H3Month,X4Month,H4Month ,X5Month,H5Month,X6Month,H6Month ,X7Month, H7Month,X8Month,H8Month,X9Month,H9Month,X10Month,H10Month,X11Month,H11Month,X12Month,H12Month ,[XCumulative],[UsualAlterAmount],[SiNO],[SiNOUsualAlter],[WuhanPilotThisYear],[WuhanPilotUsualAlter],[Discovery],[HongKongPilot],HuaXiaYunLian @@ -1498,15 +1498,15 @@ AND AA.[订单日期] >='{yearStart}' AND AA.[订单日期] <'{yearEnd}') kk , 0 AS [XCumulative], 0 AS [UsualAlterAmount],0 AS [SiNO], 0 AS [SiNOUsualAlter] ,0 AS [WuhanPilotThisYear],0 AS [WuhanPilotUsualAlter],0 AS [Discovery] ,0 AS [HongKongPilot] - ,0 AS [HuaXiaYunLian],0 AS [ZhuhaiPilot], 0 AS [PilotSumAmount],(SELECT MAX(FID) FROM #{tableName})+1 AS FID ,(SELECT MAX(FID) FROM #{tableName})+1 +1 AS FIDENTITYID ,1 as sort + ,0 AS [HuaXiaYunLian],0 AS [ZhuhaiPilot], 0 AS [PilotSumAmount],(SELECT MAX(FID) FROM {tableName}{guid} )+1 AS FID ,(SELECT MAX(FID) FROM {tableName}{guid} )+1 +1 AS FIDENTITYID ,3 as sort ,0 as 累计销售额, 0 [累计回款额],0 [往年订单变更金额],0 [兴诺业绩],0 [兴诺往年订单变更],0 [武汉派诺-当年业绩],0 [武汉派诺-往年订单变更],0 [碳索业绩] ,0 [香港派诺业绩],0 [华夏云联业绩],438224 as [组织ID] - FROM #{tableName} + FROM {tableName}{guid} where [销售员ID] <99383300 AND 组织ID=438224 - insert into #{tableName}(Salesperson,[销售员ID],SBU,DetailArea,X1Month,H1Month,X2Month,H2Month,X3Month,H3Month,X4Month,H4Month + insert into {tableName}{guid} (Salesperson,[销售员ID],SBU,DetailArea,X1Month,H1Month,X2Month,H2Month,X3Month,H3Month,X4Month,H4Month ,X5Month,H5Month,X6Month,H6Month ,X7Month, H7Month,X8Month,H8Month,X9Month,H9Month,X10Month,H10Month,X11Month,H11Month,X12Month,H12Month ,[XCumulative],[UsualAlterAmount],[SiNO],[SiNOUsualAlter],[WuhanPilotThisYear],[WuhanPilotUsualAlter],[Discovery],[HongKongPilot],HuaXiaYunLian @@ -1522,14 +1522,14 @@ AND AA.[订单日期] >='{yearStart}' AND AA.[订单日期] <'{yearEnd}') kk , 0 AS [XCumulative], 0 AS [UsualAlterAmount],0 AS [SiNO], 0 AS [SiNOUsualAlter] ,0 AS [WuhanPilotThisYear],0 AS [WuhanPilotUsualAlter],0 AS [Discovery] ,0 AS [HongKongPilot] - ,0 AS [HuaXiaYunLian],0 AS [ZhuhaiPilot], 0 AS [PilotSumAmount],(SELECT MAX(FID) FROM #{tableName})+1 AS FID ,(SELECT MAX(FID) FROM #{tableName})+1 +1 AS FIDENTITYID ,1 as sort + ,0 AS [HuaXiaYunLian],0 AS [ZhuhaiPilot], 0 AS [PilotSumAmount],(SELECT MAX(FID) FROM {tableName}{guid} )+1 AS FID ,(SELECT MAX(FID) FROM {tableName}{guid} )+1 +1 AS FIDENTITYID ,3 as sort ,0 as 累计销售额, 0 [累计回款额],0 [往年订单变更金额],0 [兴诺业绩],0 [兴诺往年订单变更],0 [武汉派诺-当年业绩],0 [武汉派诺-往年订单变更],0 [碳索业绩] ,0 [香港派诺业绩],0 [华夏云联业绩],438223 as [组织ID] - FROM #{tableName} + FROM {tableName}{guid} where [销售员ID] <99383300 AND 组织ID=438223 - insert into #{tableName}(Salesperson,[销售员ID],SBU,DetailArea,X1Month,H1Month,X2Month,H2Month,X3Month,H3Month,X4Month,H4Month + insert into {tableName}{guid} (Salesperson,[销售员ID],SBU,DetailArea,X1Month,H1Month,X2Month,H2Month,X3Month,H3Month,X4Month,H4Month ,X5Month,H5Month,X6Month,H6Month ,X7Month, H7Month,X8Month,H8Month,X9Month,H9Month,X10Month,H10Month,X11Month,H11Month,X12Month,H12Month ,[XCumulative],[UsualAlterAmount],[SiNO],[SiNOUsualAlter],[WuhanPilotThisYear],[WuhanPilotUsualAlter],[Discovery],[HongKongPilot],HuaXiaYunLian @@ -1545,15 +1545,15 @@ AND AA.[订单日期] >='{yearStart}' AND AA.[订单日期] <'{yearEnd}') kk , 0 AS [XCumulative], 0 AS [UsualAlterAmount],0 AS [SiNO], 0 AS [SiNOUsualAlter] ,0 AS [WuhanPilotThisYear],0 AS [WuhanPilotUsualAlter],0 AS [Discovery] ,0 AS [HongKongPilot] - ,0 AS [HuaXiaYunLian],0 AS [ZhuhaiPilot], 0 AS [PilotSumAmount],(SELECT MAX(FID) FROM #{tableName})+1 AS FID ,(SELECT MAX(FID) FROM #{tableName})+1 +1 AS FIDENTITYID ,1 as sort + ,0 AS [HuaXiaYunLian],0 AS [ZhuhaiPilot], 0 AS [PilotSumAmount],(SELECT MAX(FID) FROM {tableName}{guid} )+1 AS FID ,(SELECT MAX(FID) FROM {tableName}{guid} )+1 +1 AS FIDENTITYID ,3 as sort ,0 as 累计销售额, 0 [累计回款额],0 [往年订单变更金额],0 [兴诺业绩],0 [兴诺往年订单变更],0 [武汉派诺-当年业绩],0 [武汉派诺-往年订单变更],0 [碳索业绩] ,0 [香港派诺业绩],0 [华夏云联业绩],100305 as [组织ID] - FROM #{tableName} + FROM {tableName}{guid} where [销售员ID] < 99383300 AND 组织ID=100305 - insert into #{tableName}(Salesperson,[销售员ID],SBU,DetailArea,X1Month,H1Month,X2Month,H2Month,X3Month,H3Month,X4Month,H4Month + insert into {tableName}{guid} (Salesperson,[销售员ID],SBU,DetailArea,X1Month,H1Month,X2Month,H2Month,X3Month,H3Month,X4Month,H4Month ,X5Month,H5Month,X6Month,H6Month ,X7Month, H7Month,X8Month,H8Month,X9Month,H9Month,X10Month,H10Month,X11Month,H11Month,X12Month,H12Month ,[XCumulative],[UsualAlterAmount],[SiNO],[SiNOUsualAlter],[WuhanPilotThisYear],[WuhanPilotUsualAlter],[Discovery],[HongKongPilot],HuaXiaYunLian @@ -1569,16 +1569,18 @@ AND AA.[订单日期] >='{yearStart}' AND AA.[订单日期] <'{yearEnd}') kk , SUM([XCumulative]) AS [XCumulative], SUM([UsualAlterAmount]) AS [UsualAlterAmount],SUM([SiNO]) AS [SiNO], SUM([SiNOUsualAlter]) AS [SiNOUsualAlter] ,SUM([WuhanPilotThisYear]) AS [WuhanPilotThisYear],SUM([WuhanPilotUsualAlter]) AS [WuhanPilotUsualAlter],SUM([Discovery]) AS [Discovery] ,SUM([HongKongPilot]) AS [HongKongPilot] - ,SUM([HuaXiaYunLian]) AS [HuaXiaYunLian],SUM([ZhuhaiPilot]) AS [ZhuhaiPilot],SUM([PilotSumAmount]) AS [PilotSumAmount],(SELECT MAX(FID) FROM #{tableName})+1 +1 AS FID ,(SELECT MAX(FID) FROM #{tableName})+1 AS FIDENTITYID ,1 as sort + ,SUM([HuaXiaYunLian]) AS [HuaXiaYunLian],SUM([ZhuhaiPilot]) AS [ZhuhaiPilot],SUM([PilotSumAmount]) AS [PilotSumAmount],(SELECT MAX(FID) FROM {tableName}{guid} )+1 +1 AS FID ,(SELECT MAX(FID) FROM {tableName}{guid} )+1 AS FIDENTITYID ,4 as sort ,0 as 累计销售额, 0 [累计回款额],0 [往年订单变更金额],SUM([兴诺业绩]) [兴诺业绩],SUM([兴诺往年订单变更]) [兴诺往年订单变更],SUM([武汉派诺-当年业绩]) [武汉派诺-当年业绩],SUM([武汉派诺-往年订单变更]) [武汉派诺-往年订单变更],SUM([碳索业绩]) [碳索业绩] ,SUM([香港派诺业绩]) [香港派诺业绩],SUM([华夏云联业绩]) [华夏云联业绩],999999 as [组织ID] - FROM #{tableName} + FROM {tableName}{guid} where [销售员ID] IN (99383327,99383326,99383325,99383324,99383323,99383322) "; + Loghelp.Log("insertSql:"); + Loghelp.Log(insertSql); DBUtils.ExecuteDynamicObject(this.Context, insertSql); insertSql = ""; - insertSql = $@"/*dialect*/ - SELECT Salesperson,SBU,DetailArea,SUM(X1Month) AS X1Month,SUM(H1Month) AS H1Month, SUM(X2Month) AS X2Month,SUM(H2Month) AS H2Month, SUM(X3Month) AS X3Month,SUM(H3Month) AS H3Month, SUM(X4Month) AS X4Month,SUM(H4Month) AS H4Month + insertSql += $@"/*dialect*/ + SELECT ROW_NUMBER() OVER (ORDER BY MAX(FID)) FID, ROW_NUMBER() OVER (ORDER BY MAX(FID)) FIDENTITYID, Salesperson,SBU,DetailArea,SUM(X1Month) AS X1Month,SUM(H1Month) AS H1Month, SUM(X2Month) AS X2Month,SUM(H2Month) AS H2Month, SUM(X3Month) AS X3Month,SUM(H3Month) AS H3Month, SUM(X4Month) AS X4Month,SUM(H4Month) AS H4Month , SUM(X5Month) AS X5Month,SUM(H5Month) AS H5Month, SUM(X6Month) AS X6Month,SUM(H6Month) AS H6Month, SUM(X7Month) AS X7Month,SUM(H7Month) AS H7Month, SUM(X8Month) AS X8Month, SUM(h8Month) AS h8Month,SUM(X9Month) AS X9Month,SUM(H9Month) AS H9Month , SUM(X10Month) AS X10Month,SUM(H10Month) AS H10Month , SUM(X11Month) AS X11Month,SUM(H11Month) AS H11Month @@ -1586,14 +1588,17 @@ AND AA.[订单日期] >='{yearStart}' AND AA.[订单日期] <'{yearEnd}') kk , SUM([XCumulative]) AS [XCumulative], SUM([UsualAlterAmount]) AS [UsualAlterAmount],SUM([SiNO]) AS [SiNO], SUM([SiNOUsualAlter]) AS [SiNOUsualAlter] ,SUM([WuhanPilotThisYear]) AS [WuhanPilotThisYear],SUM([WuhanPilotUsualAlter]) AS [WuhanPilotUsualAlter],SUM([Discovery]) AS [Discovery] ,SUM([HongKongPilot]) AS [HongKongPilot] - ,SUM([HuaXiaYunLian]) AS [HuaXiaYunLian],SUM([ZhuhaiPilot]) AS [ZhuhaiPilot],SUM([PilotSumAmount]) AS [PilotSumAmount],MAX(FID) FID,MAX(FID) FIDENTITYID,MAX(FID) sort + ,SUM([HuaXiaYunLian]) AS [HuaXiaYunLian],SUM([ZhuhaiPilot]) AS [ZhuhaiPilot],SUM([PilotSumAmount]) AS [PilotSumAmount],MAX(sort) sort INTO {tableName} - FROM #{tableName} + FROM {tableName}{guid} GROUP BY Salesperson,SBU,DetailArea -ORDER BY FID desc +ORDER BY FID ; +drop table {tableName}{guid} ; "; + Loghelp.Log("最后创建表:"); + Loghelp.Log(insertSql); DBUtils.Execute(this.Context, insertSql); - //string upsql = $@"update #{tableName} set fid=sortNum,FIDENTITYID=sortNum1"; + //string upsql = $@"update {tableName}{guid} set fid=sortNum,FIDENTITYID=sortNum1"; } } } diff --git a/年度销售额回款额汇总报表yuyubo.sql b/年度销售额回款额汇总报表yuyubo.sql index 6e7a8a7..ac228e1 100644 --- a/年度销售额回款额汇总报表yuyubo.sql +++ b/年度销售额回款额汇总报表yuyubo.sql @@ -427,7 +427,7 @@ AND AA.[ --ORDER BY fid desc - SELECT Salesperson,SBU,DetailArea,SUM(X1Month) AS X1Month,SUM(H1Month) AS H1Month, SUM(X2Month) AS X2Month,SUM(H2Month) AS H2Month, SUM(X3Month) AS X3Month,SUM(H3Month) AS H3Month, SUM(X4Month) AS X4Month,SUM(H4Month) AS H4Month + SELECT ROW_NUMBER() OVER (ORDER BY MAX(FID)) FID, Salesperson,SBU,DetailArea,SUM(X1Month) AS X1Month,SUM(H1Month) AS H1Month, SUM(X2Month) AS X2Month,SUM(H2Month) AS H2Month, SUM(X3Month) AS X3Month,SUM(H3Month) AS H3Month, SUM(X4Month) AS X4Month,SUM(H4Month) AS H4Month , SUM(X5Month) AS X5Month,SUM(H5Month) AS H5Month, SUM(X6Month) AS X6Month,SUM(H6Month) AS H6Month, SUM(X7Month) AS X7Month,SUM(H7Month) AS H7Month, SUM(X8Month) AS X8Month, SUM(h8Month) AS h8Month,SUM(X9Month) AS X9Month,SUM(H9Month) AS H9Month , SUM(X10Month) AS X10Month,SUM(H10Month) AS H10Month , SUM(X11Month) AS X11Month,SUM(H11Month) AS H11Month @@ -435,11 +435,11 @@ AND AA.[ , SUM([XCumulative]) AS [XCumulative], SUM([UsualAlterAmount]) AS [UsualAlterAmount],SUM([SiNO]) AS [SiNO], SUM([SiNOUsualAlter]) AS [SiNOUsualAlter] ,SUM([WuhanPilotThisYear]) AS [WuhanPilotThisYear],SUM([WuhanPilotUsualAlter]) AS [WuhanPilotUsualAlter],SUM([Discovery]) AS [Discovery] ,SUM([HongKongPilot]) AS [HongKongPilot] - ,SUM([HuaXiaYunLian]) AS [HuaXiaYunLian],SUM([ZhuhaiPilot]) AS [ZhuhaiPilot],SUM([PilotSumAmount]) AS [PilotSumAmount],MAX(FID) FID,MAX(FID) FIDENTITYID,MAX(FID) sort + ,SUM([HuaXiaYunLian]) AS [HuaXiaYunLian],SUM([ZhuhaiPilot]) AS [ZhuhaiPilot],SUM([PilotSumAmount]) AS [PilotSumAmount],MAX(FID) FIDENTITYID,MAX(sort) sort --INTO TMPBBC038E0063211F0AD6BB7D6383 FROM #TMPBBC038E0063211F0AD6BB7D6383 GROUP BY Salesperson,SBU,DetailArea -ORDER BY FID desc +ORDER BY FID --DROP TABLE #TMPBBC038E0063211F0AD6BB7D6383 diff --git a/格致_李天华 项目计划0324.xlsx b/格致_李天华 项目计划0324.xlsx index 508e225..758bae1 100644 Binary files a/格致_李天华 项目计划0324.xlsx and b/格致_李天华 项目计划0324.xlsx differ