|
@@ -296,7 +296,7 @@ func GetCompanyContracDetail(condition string, pars []interface{}) (item *Compan
|
|
|
return
|
|
|
}
|
|
|
|
|
|
-// 通过ID获取详情
|
|
|
+// 通过获取列表详情
|
|
|
func GetCompanyContracList(condition string, pars []interface{}) (items []*CompanyContractResp, err error) {
|
|
|
o := orm.NewOrm()
|
|
|
sql := `SELECT * FROM company_contract WHERE 1= 1 ` + condition
|
|
@@ -418,7 +418,8 @@ type CompanyContractRespInit struct {
|
|
|
CompanyProductId int `description:"客户产品id"`
|
|
|
ContractCode string `description:"合同编码"`
|
|
|
StartDate string `description:"合同开始时间"`
|
|
|
- EndDate string `description:"合同结束时间"`
|
|
|
+ EndDate time.Time `description:"合同结束时间"`
|
|
|
+ MaxStartDate time.Time `description:"合同结束时间"`
|
|
|
Money float64 `description:"合同金额"`
|
|
|
PayMethod string `description:"支付方式"`
|
|
|
PayChannel string `description:"支付渠道"`
|
|
@@ -433,31 +434,24 @@ type CompanyContractRespInit struct {
|
|
|
}
|
|
|
|
|
|
// 通过ID获取详情
|
|
|
-func GetCompanyContracListInit(condition string, pars []interface{}) (items []*CompanyContractRespInit, err error) {
|
|
|
+func GetCompanyContracListMaxStartDate(condition string, pars []interface{}) (items []*CompanyContractRespInit, err error) {
|
|
|
o := orm.NewOrm()
|
|
|
sql := `SELECT
|
|
|
- MAX( company_contract_id ) AS max_company_contract_id,
|
|
|
- COUNT(a.company_id) AS cc ,
|
|
|
- a.*
|
|
|
-FROM
|
|
|
- company_contract a
|
|
|
- JOIN company b ON a.company_id = b.company_id
|
|
|
- JOIN company_product c ON a.company_id = c.company_id
|
|
|
- AND a.product_id = c.product_id
|
|
|
-WHERE
|
|
|
- 1 = 1 -- AND b.company_name LIKE "%上海亘%"
|
|
|
-
|
|
|
- AND c.product_id = 2 -- AND b.company_name LIKE "%上海亘%"
|
|
|
-
|
|
|
- AND c.product_id = 2
|
|
|
- AND a.not_renewal_hide = 0
|
|
|
- AND a.STATUS = 1
|
|
|
- AND c.STATUS NOT IN ( "永续", "正式", "关闭" )
|
|
|
-
|
|
|
- AND a.company_contract_id NOT IN (SELECT company_contract_id FROM company_contract_no_renewed_ascribe )
|
|
|
-GROUP BY
|
|
|
- a.company_id
|
|
|
- ` + condition
|
|
|
+ MAX( a.start_date ) AS max_start_date,
|
|
|
+ COUNT(a.company_id) AS cc ,
|
|
|
+ a.*
|
|
|
+ FROM
|
|
|
+ company_contract a
|
|
|
+ JOIN company b ON a.company_id = b.company_id
|
|
|
+ JOIN company_product c ON a.company_id = c.company_id
|
|
|
+ AND a.product_id = c.product_id
|
|
|
+ WHERE
|
|
|
+ 1 = 1
|
|
|
+
|
|
|
+ AND c.product_id = 2
|
|
|
+ AND a.not_renewal_hide = 0
|
|
|
+ AND a.STATUS = 1
|
|
|
+ AND a.company_contract_id NOT IN (SELECT company_contract_id FROM company_contract_no_renewed_ascribe )` + condition + ` GROUP BY a.company_id `
|
|
|
_, err = o.Raw(sql, pars).QueryRows(&items)
|
|
|
return
|
|
|
}
|
|
@@ -466,24 +460,18 @@ GROUP BY
|
|
|
func GetCompanyContracListInit_CRM_16_1(condition string, pars []interface{}) (items []*CompanyContractRespInit, err error) {
|
|
|
o := orm.NewOrm()
|
|
|
sql := `SELECT
|
|
|
- a.*
|
|
|
-FROM
|
|
|
- company_contract a
|
|
|
- JOIN company b ON a.company_id = b.company_id
|
|
|
- JOIN company_product c ON a.company_id = c.company_id
|
|
|
- AND a.product_id = c.product_id
|
|
|
-WHERE
|
|
|
- 1 = 1 -- AND b.company_name LIKE "%上海亘%"
|
|
|
-
|
|
|
- AND c.product_id = 2 -- AND b.company_name LIKE "%上海亘%"
|
|
|
-
|
|
|
- AND c.product_id = 2
|
|
|
- AND a.not_renewal_hide = 0
|
|
|
- AND a.STATUS = 1
|
|
|
- AND c.STATUS NOT IN ( "永续", "正式", "关闭" )
|
|
|
-
|
|
|
- AND a.company_contract_id NOT IN (SELECT company_contract_id FROM company_contract_no_renewed_ascribe )
|
|
|
- ` + condition
|
|
|
+ a.*
|
|
|
+ FROM
|
|
|
+ company_contract a
|
|
|
+ JOIN company b ON a.company_id = b.company_id
|
|
|
+ JOIN company_product c ON a.company_id = c.company_id
|
|
|
+ AND a.product_id = c.product_id
|
|
|
+ WHERE
|
|
|
+ 1 = 1
|
|
|
+ AND c.product_id = 2
|
|
|
+ AND a.not_renewal_hide = 0
|
|
|
+ AND a.STATUS = 1
|
|
|
+ AND a.company_contract_id NOT IN (SELECT company_contract_id FROM company_contract_no_renewed_ascribe ) ` + condition
|
|
|
_, err = o.Raw(sql, pars).QueryRows(&items)
|
|
|
return
|
|
|
}
|