瀏覽代碼

no message

xingzai 1 年之前
父節點
當前提交
7d63f91b68
共有 4 個文件被更改,包括 7 次插入14 次删除
  1. 3 1
      controllers/cygx/activity_signup.go
  2. 2 11
      models/cygx/apply_record.go
  3. 1 1
      models/cygx/summary_manage.go
  4. 1 1
      services/cygx/admin_power.go

+ 3 - 1
controllers/cygx/activity_signup.go

@@ -1414,7 +1414,7 @@ func (this *ActivitySignupCoAntroller) SignupFailExport() {
 		for _, v := range companyIds {
 			companyIdstr = append(companyIdstr, strconv.Itoa(v))
 		}
-		sqlStr += ` AND s.company_id IN  IN (` + strings.Join(companyIdstr, ",") + `)`
+		sqlStr += ` AND s.company_id IN  (` + strings.Join(companyIdstr, ",") + `)`
 	}
 	sqlStrOther := sqlStr
 	var listReminder []*cygx.CygxAppointmentList
@@ -1448,6 +1448,8 @@ func (this *ActivitySignupCoAntroller) SignupFailExport() {
 		return
 	}
 
+	return
+
 	//创建excel
 	dir, err := os.Executable()
 	exPath := filepath.Dir(dir)

+ 2 - 11
models/cygx/apply_record.go

@@ -69,7 +69,7 @@ type CygxApplyRecordResp struct {
 func GetCygxApplyRecord(condition string, pars []interface{}, startSize, pageSize int) (items []*CygxApplyRecordResp, err error) {
 	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := ` SELECT DISTINCT a.*
-        FROM cygx_apply_record AS a `
+        FROM cygx_apply_record AS a  WHERE  1 = 1  `
 	if condition != "" {
 		sql += condition
 	}
@@ -80,19 +80,10 @@ func GetCygxApplyRecord(condition string, pars []interface{}, startSize, pageSiz
 
 func GetCygxApplyRecordCount(condition string, pars []interface{}) (count int, err error) {
 	o := orm.NewOrmUsingDB("hz_cygx")
-	//sql := `SELECT COUNT(1) AS count FROM cygx_apply_record AS a
-	//	LEFT JOIN company_product AS b ON a.company_id_pay=b.company_id
-	//	LEFT JOIN wx_user AS c ON a.user_id=c.user_id WHERE 1=1 `
-	//
-	//if condition != "" {
-	//	sql += condition
-	//}
-	sql := `SELECT COUNT(1) AS count FROM ( SELECT DISTINCT a.*
-        FROM cygx_apply_record AS a `
+	sql := `SELECT COUNT( 1 ) AS count FROM cygx_apply_record AS a WHERE  1 = 1  `
 	if condition != "" {
 		sql += condition
 	}
-	sql += ` GROUP BY a.apply_record_id ) b `
 	err = o.Raw(sql, pars).QueryRow(&count)
 	return
 }

+ 1 - 1
models/cygx/summary_manage.go

@@ -296,7 +296,7 @@ type CygxArticleList struct {
 
 // 列表
 func GetSummaryManageList(condition string, pars []interface{}, startSize, pageSize int) (items []*CygxArticleList, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := ` SELECT 
 		(SELECT COUNT(1) FROM cygx_article_history_record_newpv AS h   WHERE h.article_id=art.article_id AND h.company_id != ` + strconv.Itoa(utils.HZ_COMPANY_ID) + ` ) AS pv,
 	   	(SELECT COUNT(DISTINCT h.user_id) FROM cygx_article_history_record_newpv AS h  WHERE h.article_id=art.article_id AND h.company_id != ` + strconv.Itoa(utils.HZ_COMPANY_ID) + ` ) AS uv,

+ 1 - 1
services/cygx/admin_power.go

@@ -104,7 +104,7 @@ func GetAdminLookUserCompanyIdsBySelf(sysUser *system.Admin) (companyIds []int,
 		for _, v := range companyProductList {
 			companyIds = append(companyIds, v.CompanyId)
 		}
+		companyIds = append(companyIds, 0) //添加潜在客户
 	}
-	companyIds = append(companyIds, 0) //添加潜在客户
 	return
 }