Compare commits
	
		
			No commits in common. "ea76dfab3b55a9655d9ae77c827ffb3a1d944b5e" and "c26b13264251187504adfb66214976a668d66d40" have entirely different histories.
		
	
	
		
			ea76dfab3b
			...
			c26b132642
		
	
		| 
						 | 
					@ -884,10 +884,10 @@
 | 
				
			||||||
            currentMonth.ENABLE_STATUS,
 | 
					            currentMonth.ENABLE_STATUS,
 | 
				
			||||||
            NVL( currentDay.NEW_CONSUME_PV + currentDay.TEAM_NEW_PV, 0 ) todayPv,
 | 
					            NVL( currentDay.NEW_CONSUME_PV + currentDay.TEAM_NEW_PV, 0 ) todayPv,
 | 
				
			||||||
            NVL( currentDay.NEW_BOX_NUM + currentDay.TEAM_NEW_BOX_NUM, 0 ) todayBoxNum,
 | 
					            NVL( currentDay.NEW_BOX_NUM + currentDay.TEAM_NEW_BOX_NUM, 0 ) todayBoxNum,
 | 
				
			||||||
            NVL( NVL( currentMonth.NEW_CONSUME_PV, 0 ) + currentMonth.TEAM_NEW_PV, 0 ) yesterdayPv,
 | 
					            NVL( currentMonth.NEW_CONSUME_PV + currentMonth.TEAM_NEW_PV, 0 ) yesterdayPv,
 | 
				
			||||||
            NVL( NVL( currentMonth.NEW_BOX_NUM, 0 ) + currentMonth.TEAM_NEW_BOX_NUM, 0 ) yesterdayBoxNum,
 | 
					            NVL( currentMonth.NEW_BOX_NUM + currentMonth.TEAM_NEW_BOX_NUM, 0 ) yesterdayBoxNum,
 | 
				
			||||||
            NVL( NVL( currentMonth.MONTH_CONSUME_PV, 0 ) + currentDay.NEW_CONSUME_PV + currentDay.TEAM_NEW_PV, 0 ) currentMonthPv,
 | 
					            NVL( currentMonth.MONTH_CONSUME_PV + currentDay.NEW_CONSUME_PV + currentDay.TEAM_NEW_PV , 0 ) currentMonthPv,
 | 
				
			||||||
            NVL( NVL( currentMonth.MONTH_BOX_NUM, 0 ) + currentDay.NEW_BOX_NUM + currentDay.TEAM_NEW_BOX_NUM, 0 ) currentMonthBoxNum,
 | 
					            NVL( currentMonth.MONTH_BOX_NUM + currentDay.NEW_BOX_NUM + currentDay.TEAM_NEW_BOX_NUM, 0 ) currentMonthBoxNum,
 | 
				
			||||||
            NVL( lastMonth.MONTH_CONSUME_PV, 0 ) lastMonthPv,
 | 
					            NVL( lastMonth.MONTH_CONSUME_PV, 0 ) lastMonthPv,
 | 
				
			||||||
            NVL( lastMonth.MONTH_BOX_NUM, 0 ) lastMonthBoxNum,
 | 
					            NVL( lastMonth.MONTH_BOX_NUM, 0 ) lastMonthBoxNum,
 | 
				
			||||||
            NVL( currentMonth.CONSUME_BOX_NUM + currentDay.NEW_BOX_NUM + currentDay.TEAM_NEW_BOX_NUM, 0 ) totalBoxNum
 | 
					            NVL( currentMonth.CONSUME_BOX_NUM + currentDay.NEW_BOX_NUM + currentDay.TEAM_NEW_BOX_NUM, 0 ) totalBoxNum
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in New Issue