x

src/main/java/com/egolm/shop/service/impl/ActivityServiceImpl.java

@@ -94,8 +94,9 @@ public class ActivityServiceImpl implements ActivityService {
 				+ "   ProjectDays = datediff(dd, a.dStartDate, a.dEndDate) + 1,  BeginDate = CONVERT(varchar(100), a.dStartDate, 111) , EndDate = CONVERT(varchar(100), a.dEndDate, 111) , ReturnDate = a.dReturnDate, "
 				+ "   DiffDay = datediff(d,GETDATE(), a.dEndDate) , LastUpdateTime = dLastUpdateTime,  "
 				+ "   PicUrl = (select top 1 sZHPicUrl from tZHPic where nProjectID = a.nProjectID and nZHPicTypeID = 1),"
-				+ "   SaleQty = a.nSaleQty ,"
-				+ "   SaleAmount = a.nSaleAmount "
+				+ "   PaperQty = ISNULL(a.nSalePaperQty, 0), "
+				+ "   SaleQty = ISNULL(a.nSaleQty, 0), "
+				+ "   SaleAmount = ISNULL(a.nSaleAmount, 0) "
 				+ "   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  ";