Merge branch 'dev2.8' of http://192.168.3.207:8080/jianyu/ent into dev2.8

entniche/src/service/reportform/departmentBoard.go

@@ -77,11 +77,11 @@ func (b *Board) DepartDataOverView() {
 	//SELECT COUNT(p.id) AS pcount FROM entniche_user_customer c LEFT JOIN entniche_project p ON c.customer_id = p.customer_id WHERE c.user_id = 3124  AND p.createtime >= ? AND p.createtime <= ? AND p.customer_id IN (SELECT id FROM entniche_customer WHERE ent_id = 1944 )
 	projectCount1 := util.Mysql.CountBySql("\t\n\tSELECT COUNT( p.id )   FROM entniche_project p,entniche_user_customer c \n\tWHERE c.user_id IN ( SELECT user_id FROM entniche_department_user WHERE dept_id = ? ) \n\tAND p.customer_id = c.customer_id AND p.createtime >= ? AND p.createtime <= ?", departId, startTime, endTime)
 	//不是这段时间发布但是是用户跟进的项目
-	projectCount2 := util.Mysql.CountBySql("\nSELECT\n\tcount( DISTINCT ( project_id ) ) \nFROM\n\tentniche_project_track \nWHERE\n\tuser_id IN ( SELECT user_id FROM entniche_department_user WHERE dept_id = ? ) \n\tAND time >=? \n\tAND time <=? \n\tAND project_id NOT IN (\n\tSELECT\n\t\tp.id \n\tFROM\n\t\tentniche_project p,\n\t\tentniche_user_customer c \n\tWHERE\n\t\tc.user_id IN ( SELECT user_id FROM entniche_department_user WHERE dept_id = ? ) \n\t\tAND p.customer_id = c.customer_id \n\t\tAND p.createtime >= ? \n\t\tAND p.createtime <= ? \n\t)", departId, startTime, endTime, departId, startTime, endTime)
+	projectCount2 := util.Mysql.CountBySql("SELECT\n         COUNT(DISTINCT a.project_id) as count\nFROM\n        entniche_project_track a ,\n        entniche_project b\nWHERE\n        a.user_id IN ( SELECT DISTINCT user_id FROM entniche_department_user WHERE dept_id = ? ) \n        and a.time >= ?        AND a.time <= ?        and  a.project_id=b.id\n        AND b.createtime >= ?\n  AND b.createtime <= ?        and a.project_id is  not  null     ", departId, startTime, endTime, startTime, endTime)
 	projectTotalCount = int(projectCount1 + projectCount2)
 	log.Println("项目总数：", projectTotalCount)
 	//6、新增项目数
-	projectNewCount_ := util.Mysql.CountBySql("SELECT\n\tCOUNT( p.id ) AS projectCount \nFROM\n\tentniche_project p ,\n\tentniche_user_customer  c\nWHERE\n\tc.user_id IN ( SELECT user_id FROM entniche_department_user WHERE dept_id = ? ) \n\tAND p.customer_id = c.customer_id\n\tAND p.createtime >= ? \n\tAND p.createtime <= ? \n\tAND p.id NOT IN (\n\tSELECT\n\t\tp.id \n\tFROM\n\t\tentniche_user_customer c,\n\t\tentniche_project p \n\tWHERE\n\t\tc.customer_id = p.customer_id \n\t\tAND c.user_id IN ( SELECT user_id FROM entniche_department_user WHERE dept_id = ? ) \n\t\tAND p.createtime <= ? \n\t)", departId, startTime, endTime, departId, startTime)
+	projectNewCount_ := util.Mysql.CountBySql("SELECT\n\tCOUNT( p.id ) AS projectCount \nFROM\n\tentniche_project p ,\n\tentniche_user_customer  c\nWHERE\n\tc.user_id IN ( SELECT user_id FROM entniche_department_user WHERE dept_id = ? ) \n\tAND p.customer_id = c.customer_id\n\tAND p.createtime >= ? \n\tAND p.createtime <= ?", departId, startTime, endTime)
 	log.Println("新增项目数：", projectNewCount_)
 	projectNewCount = int(projectNewCount_)
 	// 7. 跟进项目
@@ -136,7 +136,7 @@ func (b *Board) DepartDataOverView() {
 
 			projectcount1 := util.Mysql.CountBySql("SELECT COUNT(p.id) AS pcount FROM entniche_user_customer c LEFT JOIN entniche_project p ON c.customer_id = p.customer_id WHERE c.user_id = ?  AND p.createtime >= ? AND p.createtime <= ? ", userId, startTime, endTime)
 			//不是这段时间发布但是是用户跟进的项目
-			projectcount2 := util.Mysql.CountBySql("SELECT COUNT(DISTINCT project_id) AS fllow_Project FROM entniche_project_track WHERE user_id = ? AND project_id NOT IN (SELECT p.id FROM entniche_user_customer c LEFT JOIN entniche_project p ON c.customer_id = p.customer_id   WHERE user_id = ?  "+")", userId, userId)
+			projectcount2 := util.Mysql.CountBySql("SELECT\n         COUNT(DISTINCT a.project_id) as count\nFROM\n        entniche_project_track a ,\n        entniche_project b\nWHERE\n        a.user_id =?       and a.time >=?        AND a.time <= ?        and  a.project_id=b.id\n        AND b.createtime >= ?  \n  AND b.createtime <= ?        and a.project_id is  not  null     ", userId, startTime, endTime, startTime, endTime)
 			projectCountFinal := projectcount1 + projectcount2
 			log.Println("项目总数：", projectCountFinal)
 			//  跟进项目

entniche/src/service/reportform/employeeDataBoard.go

@@ -78,7 +78,7 @@ func (r *Action) UserDataView() {
 	projectCount := projectCount1 + projectCount2
 	log.Println("项目总数：", projectCount)
 	//6、新增项目数
-	addProjectCount := util.Mysql.CountBySql("SELECT COUNT(p.id) AS projectCount FROM entniche_user_customer c LEFT JOIN entniche_project p ON c.customer_id = p.customer_id WHERE c.user_id = ? AND p.createtime >= ? AND p.createtime <= ? AND p.id NOT IN (SELECT p.id FROM entniche_user_customer c LEFT JOIN entniche_project p ON c.customer_id = p.customer_id LEFT JOIN entniche_customer a ON a.id = p.customer_id WHERE c.user_id = ? AND a.ent_id = ? AND p.createtime <= ?)", entUserId, stime, etime, entUserId, entId, stime)
+	addProjectCount := util.Mysql.CountBySql("SELECT COUNT(p.id) AS projectCount FROM entniche_user_customer c LEFT JOIN entniche_project p ON c.customer_id = p.customer_id WHERE c.user_id = ? AND p.createtime >= ? AND p.createtime <= ? ", entUserId, stime, etime)
 	log.Println("新增项目数：", addProjectCount)
 	//7、用户跟进项目数量
 	followProjectCount := util.Mysql.CountBySql("SELECT COUNT(DISTINCT project_id)  FROM entniche_project_track WHERE project_id IN (SELECT p.id FROM entniche_project p ,entniche_customer c WHERE c.id = p.customer_id AND c.ent_id = ?) AND "+sql3, entId)