瀏覽代碼

章节更新设置同步

xyxie 11 月之前
父節點
當前提交
a01225ac40
共有 3 個文件被更改,包括 23 次插入15 次删除
  1. 9 1
      controllers/report.go
  2. 3 3
      models/company/company_permission.go
  3. 11 11
      models/report_chapter_type.go

+ 9 - 1
controllers/report.go

@@ -1789,7 +1789,11 @@ func (this *ReportController) SetDayWeekReportUpdateRule() {
 		br.ErrMsg = "设置暂停时间失败, Err: " + err.Error()
 		br.ErrMsg = "设置暂停时间失败, Err: " + err.Error()
 		return
 		return
 	}
 	}
-
+	// 同步到crm数据库
+	go func() {
+		var syncReq services.ChapterTypeSyncReq
+		_, _ = services.ReportChapterTypeSync(&syncReq)
+	}()
 	br.Ret = 200
 	br.Ret = 200
 	br.Success = true
 	br.Success = true
 	br.Msg = "操作成功"
 	br.Msg = "操作成功"
@@ -1844,6 +1848,10 @@ func (this *ReportController) SetDayWeekReportEnableRule() {
 		br.ErrMsg = "设置永久停更失败, Err: " + err.Error()
 		br.ErrMsg = "设置永久停更失败, Err: " + err.Error()
 		return
 		return
 	}
 	}
+	go func() {
+		var syncReq services.ChapterTypeSyncReq
+		_, _ = services.ReportChapterTypeSync(&syncReq)
+	}()
 
 
 	br.Ret = 200
 	br.Ret = 200
 	br.Success = true
 	br.Success = true

+ 3 - 3
models/company/company_permission.go

@@ -55,7 +55,7 @@ type PermissionSetResp struct {
 }
 }
 
 
 func GetPermissionSetItems(productId int, classifyName string) (items []*PermissionSetItem, err error) {
 func GetPermissionSetItems(productId int, classifyName string) (items []*PermissionSetItem, err error) {
-	o := orm.NewOrmUsingDB("weekly")
+	o := orm.NewOrmUsingDB("rddp")
 	sql := ` SELECT * FROM chart_permission WHERE enabled=1 AND product_id=? AND classify_name=?  AND permission_type=0 ORDER BY sort ASC `
 	sql := ` SELECT * FROM chart_permission WHERE enabled=1 AND product_id=? AND classify_name=?  AND permission_type=0 ORDER BY sort ASC `
 	_, err = o.Raw(sql, productId, classifyName).QueryRows(&items)
 	_, err = o.Raw(sql, productId, classifyName).QueryRows(&items)
 	return
 	return
@@ -95,7 +95,7 @@ type PermissionVarietyList struct {
 }
 }
 
 
 func GetPermissionVarietyItems(productId int, classifyName string) (items []*PermissionVarietyItem, err error) {
 func GetPermissionVarietyItems(productId int, classifyName string) (items []*PermissionVarietyItem, err error) {
-	o := orm.NewOrmUsingDB("weekly")
+	o := orm.NewOrmUsingDB("rddp")
 	sql := ` SELECT * FROM chart_permission WHERE enabled=1 AND product_id=? AND classify_name=? GROUP BY permission_name ORDER BY sort ASC `
 	sql := ` SELECT * FROM chart_permission WHERE enabled=1 AND product_id=? AND classify_name=? GROUP BY permission_name ORDER BY sort ASC `
 	_, err = o.Raw(sql, productId, classifyName).QueryRows(&items)
 	_, err = o.Raw(sql, productId, classifyName).QueryRows(&items)
 	return
 	return
@@ -103,7 +103,7 @@ func GetPermissionVarietyItems(productId int, classifyName string) (items []*Per
 
 
 // GetChartPermissionListById 根据权限id获取产品权限详情
 // GetChartPermissionListById 根据权限id获取产品权限详情
 func GetChartPermissionListById(chartPermissionId int) (item *ChartPermission, err error) {
 func GetChartPermissionListById(chartPermissionId int) (item *ChartPermission, err error) {
-	o := orm.NewOrmUsingDB("weekly")
+	o := orm.NewOrmUsingDB("rddp")
 	sql := `SELECT * FROM chart_permission WHERE chart_permission_id =? `
 	sql := `SELECT * FROM chart_permission WHERE chart_permission_id =? `
 	err = o.Raw(sql, chartPermissionId).QueryRow(&item)
 	err = o.Raw(sql, chartPermissionId).QueryRow(&item)
 	return
 	return

+ 11 - 11
models/report_chapter_type.go

@@ -33,7 +33,7 @@ type ReportChapterType struct {
 }
 }
 
 
 func (r *ReportChapterType) Create() (err error) {
 func (r *ReportChapterType) Create() (err error) {
-	o := orm.NewOrmUsingDB("weekly")
+	o := orm.NewOrmUsingDB("rddp")
 	id, err := o.Insert(r)
 	id, err := o.Insert(r)
 	if err != nil {
 	if err != nil {
 		return
 		return
@@ -43,14 +43,14 @@ func (r *ReportChapterType) Create() (err error) {
 }
 }
 
 
 func (r *ReportChapterType) Update(cols []string) (err error) {
 func (r *ReportChapterType) Update(cols []string) (err error) {
-	o := orm.NewOrmUsingDB("weekly")
+	o := orm.NewOrmUsingDB("rddp")
 	_, err = o.Update(r, cols...)
 	_, err = o.Update(r, cols...)
 	return
 	return
 }
 }
 
 
 // DeleteReportChapterType 删除章节类型及相关权限
 // DeleteReportChapterType 删除章节类型及相关权限
 func DeleteReportChapterType(typeId int, reportType string) (err error) {
 func DeleteReportChapterType(typeId int, reportType string) (err error) {
-	o := orm.NewOrmUsingDB("weekly")
+	o := orm.NewOrmUsingDB("rddp")
 	to, err := o.Begin()
 	to, err := o.Begin()
 	if err != nil {
 	if err != nil {
 		return
 		return
@@ -151,7 +151,7 @@ type DayWeekReportPauseTime struct {
 
 
 // GetDayWeekReportPauseTimeList 获取晨报周报暂停时间
 // GetDayWeekReportPauseTimeList 获取晨报周报暂停时间
 func GetDayWeekReportPauseTimeList() (list []*DayWeekReportPauseTime, err error) {
 func GetDayWeekReportPauseTimeList() (list []*DayWeekReportPauseTime, err error) {
-	o := orm.NewOrmUsingDB("weekly")
+	o := orm.NewOrmUsingDB("rddp")
 	sql := ` SELECT research_type, MAX(a.pause_start_time) AS pause_start_time, MAX(a.pause_end_time) AS pause_end_time FROM report_chapter_type AS a WHERE a.is_set = 1 GROUP BY a.research_type`
 	sql := ` SELECT research_type, MAX(a.pause_start_time) AS pause_start_time, MAX(a.pause_end_time) AS pause_end_time FROM report_chapter_type AS a WHERE a.is_set = 1 GROUP BY a.research_type`
 	_, err = o.Raw(sql).QueryRows(&list)
 	_, err = o.Raw(sql).QueryRows(&list)
 	return
 	return
@@ -177,7 +177,7 @@ type SetDayWeekReportEnableUpdateRuleReq struct {
 
 
 // ResetDayWeekReportUpdateRule 重置章节类型的暂停时间
 // ResetDayWeekReportUpdateRule 重置章节类型的暂停时间
 func ResetDayWeekReportUpdateRule(researchType string) (err error) {
 func ResetDayWeekReportUpdateRule(researchType string) (err error) {
-	o := orm.NewOrmUsingDB("weekly")
+	o := orm.NewOrmUsingDB("rddp")
 	sql := ` UPDATE report_chapter_type SET pause_start_time = null, pause_end_time = null, is_set = 0 WHERE research_type = ?`
 	sql := ` UPDATE report_chapter_type SET pause_start_time = null, pause_end_time = null, is_set = 0 WHERE research_type = ?`
 	_, err = o.Raw(sql, researchType).Exec()
 	_, err = o.Raw(sql, researchType).Exec()
 	return
 	return
@@ -185,7 +185,7 @@ func ResetDayWeekReportUpdateRule(researchType string) (err error) {
 
 
 // SetDayWeekReportUpdateRule 设置章节类型的暂停时间
 // SetDayWeekReportUpdateRule 设置章节类型的暂停时间
 func SetDayWeekReportUpdateRule(researchType string, list []DayWeekReportUpdateRule) (err error) {
 func SetDayWeekReportUpdateRule(researchType string, list []DayWeekReportUpdateRule) (err error) {
-	o := orm.NewOrmUsingDB("weekly")
+	o := orm.NewOrmUsingDB("rddp")
 	to, err := o.Begin()
 	to, err := o.Begin()
 	if err != nil {
 	if err != nil {
 		return
 		return
@@ -221,7 +221,7 @@ func SetDayWeekReportUpdateRule(researchType string, list []DayWeekReportUpdateR
 
 
 // SetDayWeekReportEnableUpdateRule 设置章节类型的禁用状态
 // SetDayWeekReportEnableUpdateRule 设置章节类型的禁用状态
 func SetDayWeekReportEnableUpdateRule(dayReportChapterTypeIdList, weekReportChapterTypeIdList []string) (err error) {
 func SetDayWeekReportEnableUpdateRule(dayReportChapterTypeIdList, weekReportChapterTypeIdList []string) (err error) {
-	o := orm.NewOrmUsingDB("weekly")
+	o := orm.NewOrmUsingDB("rddp")
 	to, err := o.Begin()
 	to, err := o.Begin()
 	if err != nil {
 	if err != nil {
 		return
 		return
@@ -279,7 +279,7 @@ type StopUpdateReportChapterTypeResp struct {
 
 
 // GetStopUpdateReportChapterTypeListByResearchType 获取暂停更新章节类型列表
 // GetStopUpdateReportChapterTypeListByResearchType 获取暂停更新章节类型列表
 func GetStopUpdateReportChapterTypeListByResearchType() (list []*ReportChapterType, err error) {
 func GetStopUpdateReportChapterTypeListByResearchType() (list []*ReportChapterType, err error) {
-	o := orm.NewOrmUsingDB("weekly")
+	o := orm.NewOrmUsingDB("rddp")
 	sql := ` SELECT * FROM report_chapter_type WHERE is_set = 1 AND pause_end_time >= ? AND enabled = 1 `
 	sql := ` SELECT * FROM report_chapter_type WHERE is_set = 1 AND pause_end_time >= ? AND enabled = 1 `
 	_, err = o.Raw(sql, time.Now().Format(utils.FormatDate)).QueryRows(&list)
 	_, err = o.Raw(sql, time.Now().Format(utils.FormatDate)).QueryRows(&list)
 	return
 	return
@@ -287,7 +287,7 @@ func GetStopUpdateReportChapterTypeListByResearchType() (list []*ReportChapterTy
 
 
 // GetDisableUpdateReportChapterTypeListByResearchType 获取停止更新的章节类型列表
 // GetDisableUpdateReportChapterTypeListByResearchType 获取停止更新的章节类型列表
 func GetDisableUpdateReportChapterTypeListByResearchType() (list []*ReportChapterType, err error) {
 func GetDisableUpdateReportChapterTypeListByResearchType() (list []*ReportChapterType, err error) {
-	o := orm.NewOrmUsingDB("weekly")
+	o := orm.NewOrmUsingDB("rddp")
 	sql := ` SELECT * FROM report_chapter_type WHERE enabled = 0`
 	sql := ` SELECT * FROM report_chapter_type WHERE enabled = 0`
 	_, err = o.Raw(sql).QueryRows(&list)
 	_, err = o.Raw(sql).QueryRows(&list)
 	return
 	return
@@ -305,7 +305,7 @@ type ReportChapterTypeListResp struct {
 
 
 // GetReportChapterTypeCount 获取章节类型总数
 // GetReportChapterTypeCount 获取章节类型总数
 func GetReportChapterTypeCount(condition string, pars []interface{}) (count int, err error) {
 func GetReportChapterTypeCount(condition string, pars []interface{}) (count int, err error) {
-	o := orm.NewOrmUsingDB("weekly")
+	o := orm.NewOrmUsingDB("rddp")
 	sql := ` SELECT COUNT(1) FROM report_chapter_type WHERE 1 = 1 `
 	sql := ` SELECT COUNT(1) FROM report_chapter_type WHERE 1 = 1 `
 	sql += condition
 	sql += condition
 	err = o.Raw(sql, pars).QueryRow(&count)
 	err = o.Raw(sql, pars).QueryRow(&count)
@@ -335,7 +335,7 @@ type ReportChapterTypeListItem struct {
 	EditImgUrl            string `description:"管理后台编辑时选用的图"`
 	EditImgUrl            string `description:"管理后台编辑时选用的图"`
 	IsShow                int    `description:"显示隐藏: 1-显示; 0-隐藏"`
 	IsShow                int    `description:"显示隐藏: 1-显示; 0-隐藏"`
 	ChartPermissionIdList []int  `description:"权限id数组"`
 	ChartPermissionIdList []int  `description:"权限id数组"`
-	Enabled               int
+	Enabled               int    `description:"是否可用,1可用,0禁用"`
 }
 }
 
 
 // ReportChapterTypeAddReq 新增章节类型请求体
 // ReportChapterTypeAddReq 新增章节类型请求体