Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in
Toggle navigation
S
shop
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
曲欣亮
shop
Commits
1361241d
Commit
1361241d
authored
Oct 14, 2019
by
Quxl
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
x
parent
d1bd8f51
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
1 deletion
+2
-1
ActivityServiceImpl.java
...java/com/egolm/shop/service/impl/ActivityServiceImpl.java
+2
-1
No files found.
src/main/java/com/egolm/shop/service/impl/ActivityServiceImpl.java
View file @
1361241d
...
...
@@ -68,7 +68,7 @@ public class ActivityServiceImpl implements ActivityService {
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, "
+
" 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 "
+
" WHERE a.nProjectID = ? "
;
...
...
@@ -97,6 +97,7 @@ public class ActivityServiceImpl implements ActivityService {
+
" PaperQty = ISNULL(a.nSalePaperQty, 0), "
+
" SaleQty = ISNULL(a.nSaleQty, 0), "
+
" SaleAmount = ISNULL(a.nSaleAmount, 0) "
+
" a.nTag "
+
" 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 "
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment