Commit cf3ce8df authored by Quxl's avatar Quxl

x

parent 98c9756e
...@@ -66,9 +66,9 @@ public class ActivityServiceImpl implements ActivityService { ...@@ -66,9 +66,9 @@ public class ActivityServiceImpl implements ActivityService {
String projectSql = projectSql(orgNo, projectId); String projectSql = projectSql(orgNo, projectId);
Map<String,Object> projectMap = jdbcTemplate.queryForMap(projectSql); Map<String,Object> projectMap = jdbcTemplate.queryForMap(projectSql);
String orderSql = orderSql(projectId); // String orderSql = orderSql(projectId);
Map<String,Object> orderMap = jdbcTemplate.queryForMap(orderSql); // Map<String,Object> orderMap = jdbcTemplate.queryForMap(orderSql);
projectMap.putAll(orderMap); // projectMap.putAll(orderMap);
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, "
......
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