Merge branch 'fix/2022-06-07' into debug

models/company_product.go

@@ -77,7 +77,14 @@ func CompanyFreeze(companyId, productId int) (companyReportPermissionList []*Com
 func CompanyLoss(companyId, productId int) (err error) {
 	o := orm.NewOrm()
 	//客户产品状态变更
-	sql := `UPDATE company_product SET status='流失',is_formal=0,loss_time=NOW(),modify_time=NOW(),lose_reason='冻结到期系统自动流失',try_stage=1 WHERE company_id=? AND product_id=? `
+	sql := `UPDATE company_product SET status='流失',is_formal=0,loss_time=NOW(),modify_time=NOW(),lose_reason='冻结到期系统自动流失',try_stage=1,todo_status="无任务",todo_create_time=null,todo_approve_time=null,todo_modify_time=null,todo_end_time=null WHERE company_id=? AND product_id=? `
+	_, err = o.Raw(sql, companyId, productId).Exec()
+	if err != nil {
+		return
+	}
+
+	// 将进行中的任务给作废掉
+	sql = `UPDATE company_todo SET status="已作废",modify_time=NOW() WHERE company_id=? AND product_id=? and status="进行中" `
 	_, err = o.Raw(sql, companyId, productId).Exec()
 	if err != nil {
 		return

models/data_manage/edb_info.go

@@ -26,6 +26,7 @@ type EdbInfo struct {
 	MinValue         float64 `description:"指标最小值"`
 	MaxValue         float64 `description:"指标最大值"`
 	CalculateFormula string  `description:"计算公式"`
+	NoUpdate         int8    `description:"是否停止更新，0：继续更新；1：停止更新"`
 }
 
 type EdbInfoList struct {
@@ -42,6 +43,7 @@ type EdbInfoList struct {
 	UniqueCode       string    `description:"指标唯一编码"`
 	CalculateFormula string    `description:"计算公式"`
 	ModifyTime       string    `description:"更新时间"`
+	NoUpdate         int8      `description:"是否停止更新，0：继续更新；1：停止更新"`
 }
 
 type EdbInfoSearchData struct {

services/data/edb_info.go

@@ -89,7 +89,7 @@ func RefreshDataFromWind(wg *sync.WaitGroup) (err error) {
 	}()
 	var condition string
 	var pars []interface{}
-	condition += ` AND source=? `
+	condition += ` AND source=? AND no_update = 0 `
 	pars = append(pars, utils.DATA_SOURCE_WIND)
 
 	items, err := data_manage.GetEdbInfoByCondition(condition, pars, 0)