git-svn-id: svn+ssh://10.10.101.21/source/platform/platform-b2b@778 f3bf4e98-0cf0-11e4-a00c-a99a8b9d557d

src/main/java/com/uas/platform/b2b/dao/GrowthProcessDao.java

@@ -23,6 +23,6 @@ public interface GrowthProcessDao extends JpaRepository<GrowthProcess, Long> {
 	public List<GrowthProcess> findByEnUU(@Param("enUU") long enUU);
 
 	@Procedure(procedureName = "log_growth")
-	public void updateProcess(@Param("enUU") long enUU);
+	public void updateProcess(Long enUU);
 
 }

src/main/java/com/uas/platform/b2b/service/impl/GrowthServiceImpl.java

@@ -6,7 +6,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 
-import com.uas.platform.b2b.dao.CommonDao;
 import com.uas.platform.b2b.dao.GrowthProcessDao;
 import com.uas.platform.b2b.model.GrowthProcess;
 import com.uas.platform.b2b.service.GrowthService;
@@ -18,15 +17,13 @@ public class GrowthServiceImpl implements GrowthService {
 	@Autowired
 	private GrowthProcessDao growthProcessDao;
 
-	@Autowired
-	private CommonDao commonDao;
-
 	@Override
 	public List<GrowthProcess> findAllProcess() {
 		long enUU = SystemSession.getUser().getEnterprise().getUu();
 		List<GrowthProcess> processes = growthProcessDao.findByEnUU(enUU);
 		if (CollectionUtils.isEmpty(processes)) {
 			growthProcessDao.updateProcess(enUU);
+			processes = growthProcessDao.findByEnUU(enUU);
 		}
 		return processes;
 	}

src/main/webapp/resources/js/index/app.js

@@ -322,9 +322,10 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'service/Purc', 'ser
 							lineLegend : 'lineEnd'
 						}
 					}
-			}
+			};
 		});
 		SaleStat.seller({}, function(data){
+			console.log(data);
 			var p = [], q = [];
 			angular.forEach(data.month, function(d){
 				p.push({x: d.seller.userName, y: [(d.total || 0)], tooltip: (d.total || 0)});
@@ -332,6 +333,8 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'service/Purc', 'ser
 			angular.forEach(data.year, function(d){
 				q.push({x: d.seller.userName, y: [(d.total || 0)], tooltip: (d.total || 0)});
 			});
+			console.log(p);
+			console.log(q);
 			$scope.sellerCharts = {
 					month : {
 						chartType : 'pie',