Commit 1361241d authored by Quxl's avatar Quxl

x

parent d1bd8f51
...@@ -68,7 +68,7 @@ public class ActivityServiceImpl implements ActivityService { ...@@ -68,7 +68,7 @@ public class ActivityServiceImpl implements ActivityService {
Map<String,Object> projectMap = jdbcTemplate.queryForMap(projectSql); Map<String,Object> projectMap = jdbcTemplate.queryForMap(projectSql);
String sql = "SELECT PlanID = a.nPlanID,ProjectID = a.nProjectID,PlanName = a.sPlanName, PlanSummary = a.sPlanSummary,PlanUrl = a.sUrl,AgentContractNO = a.sAgentContractNO, " String sql = "SELECT PlanID = a.nPlanID,ProjectID = a.nProjectID,PlanName = a.sPlanName, PlanSummary = a.sPlanSummary,PlanUrl = a.sUrl,AgentContractNO = a.sAgentContractNO, "
+ " GoodsID = a.nGoodsID, GoodsNO = acg.sGoodsNO,GoodsDesc = acg.sGoodsDesc,PlanStock = a.nPlanStock, PlanPrice = a.nPrice,LimitQty = a.nLimitQty, " + " GoodsID = a.nGoodsID, GoodsNO = acg.sGoodsNO,GoodsDesc = acg.sGoodsDesc,PlanStock = a.nPlanStock, PlanPrice = a.nPrice,LimitQty = a.nLimitQty, "
+ " PlanReturnDays = (select datediff(dd, dEndDate, dReturnDate) from tZHCProject p where p.nProjectID = a.nProjectID), LastUpdateTime = a.dLastUpdateTime ,SaleCount = 0, nTag " + " PlanReturnDays = (select datediff(dd, dEndDate, dReturnDate) from tZHCProject p where p.nProjectID = a.nProjectID), LastUpdateTime = a.dLastUpdateTime ,SaleCount = 0, p.nTag "
+ " FROM tZHCPlan a join tAgentContractGoods acg on a.sAgentContractNO = acg.sAgentContractNO and a.nGoodsID = acg.nGoodsID " + " FROM tZHCPlan a join tAgentContractGoods acg on a.sAgentContractNO = acg.sAgentContractNO and a.nGoodsID = acg.nGoodsID "
+ " WHERE a.nProjectID = ? "; + " WHERE a.nProjectID = ? ";
...@@ -97,6 +97,7 @@ public class ActivityServiceImpl implements ActivityService { ...@@ -97,6 +97,7 @@ public class ActivityServiceImpl implements ActivityService {
+ " PaperQty = ISNULL(a.nSalePaperQty, 0), " + " PaperQty = ISNULL(a.nSalePaperQty, 0), "
+ " SaleQty = ISNULL(a.nSaleQty, 0), " + " SaleQty = ISNULL(a.nSaleQty, 0), "
+ " SaleAmount = ISNULL(a.nSaleAmount, 0) " + " SaleAmount = ISNULL(a.nSaleAmount, 0) "
+ " a.nTag "
+ " FROM tZHCProject a " + " FROM tZHCProject a "
+ " WHERE a.nTag&2=2 AND a.nTag&1=0 and a.sOrgNO = '"+orgNo+"' AND getdate() BETWEEN a.dStartDate AND a.dEndDate "; + " WHERE a.nTag&2=2 AND a.nTag&1=0 and a.sOrgNO = '"+orgNo+"' AND getdate() BETWEEN a.dStartDate AND a.dEndDate ";
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment