Merge branch 'master' of http://8.136.199.33:3000/hongze/hz_crm_api into debug

# Conflicts:
#	models/statistic_report.go

controllers/company_renewal.go

@@ -2,6 +2,7 @@ package controllers
 
 import (
 	"encoding/json"
+	"fmt"
 	"hongze/hz_crm_api/models"
 	"hongze/hz_crm_api/models/company"
 	"hongze/hz_crm_api/utils"
@@ -500,3 +501,85 @@ func (this *CompanyRenewalController) CompanyContractNoRenewedAscribeAddDetail()
 	br.Msg = "获取成功"
 	br.Data = resp
 }
+
+func init12123() {
+	var condition string
+	var pars []interface{}
+	list, e := company.GetCompanyNoRenewedAscribeList(condition, pars, 0, 0)
+	if e != nil && e.Error() != utils.ErrNoRow() {
+		fmt.Println(e)
+		return
+	}
+
+	for _, v := range list {
+		pars = make([]interface{}, 0)
+		condition = " AND  company_id = ? "
+		pars = append(pars, v.CompanyId)
+
+		companyContractList, e := company.GetCompanyContractList(condition, pars)
+		if e != nil && e.Error() != utils.ErrNoRow() {
+			fmt.Println(e)
+			return
+		}
+		for _, vC := range companyContractList {
+			item := new(company.CompanyContractNoRenewedAscribe)
+			item.CompanyAscribeId = v.CompanyAscribeId
+			item.AscribeContent = v.AscribeContent
+			item.Content = v.Content
+			item.ProductId = v.ProductId
+			item.CompanyId = v.CompanyId
+			item.CompanyContractId = vC.CompanyContractId
+			item.AdminId = v.AdminId
+			item.CreateTime = utils.StrTimeToTime(v.CreateTime)
+			item.ModifyTime = utils.StrTimeToTime(v.CreateTime)
+
+			itemLog := new(company.CompanyContractNoRenewedAscribeLog)
+			itemLog.CompanyAscribeId = v.CompanyAscribeId
+			itemLog.AscribeContent = v.AscribeContent
+			itemLog.Content = v.Content
+			itemLog.ProductId = v.ProductId
+			itemLog.CompanyId = v.CompanyId
+			itemLog.CompanyContractId = vC.CompanyContractId
+			itemLog.AdminId = v.AdminId
+			itemLog.CreateTime = utils.StrTimeToTime(v.CreateTime)
+			itemLog.ModifyTime = utils.StrTimeToTime(v.CreateTime)
+
+			err := company.AddCompanyContractNoRenewedAscribe(item, itemLog)
+			fmt.Println(err)
+		}
+	}
+	return
+}
+
+func init879() {
+
+	companyContractList, e := models.GetIncrementalCompanyListByOperationRecordMerge879()
+	if e != nil && e.Error() != utils.ErrNoRow() {
+		fmt.Println(e)
+		return
+	}
+	fmt.Println(len(companyContractList))
+	//return
+	for _, v := range companyContractList {
+		item := new(company.CompanyContractNoRenewedAscribe)
+		item.CompanyContractId = v.CompanyContractId
+		item.ProductId = v.ProductId
+		item.CompanyId = v.CompanyId
+		item.CreateTime = time.Now()
+		item.ModifyTime = time.Now()
+
+		itemLog := new(company.CompanyContractNoRenewedAscribeLog)
+		itemLog.AscribeContent = v.AscribeContent
+		itemLog.Content = v.Content
+		itemLog.ProductId = v.ProductId
+		itemLog.CompanyId = v.CompanyId
+		itemLog.CompanyContractId = v.CompanyContractId
+		itemLog.CreateTime = time.Now()
+		itemLog.ModifyTime = time.Now()
+
+		err := company.AddCompanyContractNoRenewedAscribe(item, itemLog)
+		fmt.Println(err)
+	}
+
+	return
+}

controllers/cygx/report_article.go

@@ -196,8 +196,27 @@ func (this *ReportArticleController) ReportArticleList() {
 		condition += ` AND art.publish_date <= ` + "'" + endDate + " 23:59:59'"
 	}
 	//报告匹配类型
-	if matchTypeName != "" {
-		condition += ` AND re.match_type_name  =  ` + "'" + matchTypeName + "' "
+	if matchTypeName != "" && chartPermissionId > 0 {
+		//condition += ` AND re.match_type_name  =  ` + "'" + matchTypeName + "' "
+		mappingCygxDetai, err := cygx.GetCygxReportMappingCygxDetailByNameAndChartPermissionId(matchTypeName, chartPermissionId)
+		if err != nil && err.Error() != utils.ErrNoRow() {
+			br.Msg = "获取失败"
+			br.ErrMsg = "获取失败，Err:" + err.Error()
+			return
+		}
+		if mappingCygxDetai == nil {
+			resp := new(cygx.GetReportArticleListRep)
+			resp.List = make([]*cygx.CygxReportArticle, 0)
+			page := paging.GetPaging(currentIndex, pageSize, 0)
+			resp.Paging = page
+			br.Ret = 200
+			br.Success = true
+			br.Msg = "获取成功"
+			br.Data = resp
+			return
+		}
+		//这里量不大，走一下子查询
+		condition += ` 	AND art.category_id IN ( SELECT category_id_celue FROM cygx_report_mapping_group WHERE id_cygx = ` + strconv.Itoa(mappingCygxDetai.Id) + ` )  `
 	}
 	// 报告标签
 	if reportLabel != "" {

controllers/sys_menu.go

@@ -90,18 +90,18 @@ func (this *SysRoleController) SysMenuList() {
 				}
 			}
 		}
-		//for i, menu := range child {
-		//	if menu.Name == "正式客户共享" && sysUser.RoleTypeCode != utils.ROLE_TYPE_CODE_ADMIN &&
-		//		sysUser.AdminId != 66 && sysUser.AdminId != 15 {
-		//		//如果不是admin角色、共享客户分组下用户、楼颖丹账号、王沛账号 就不显示该页面
-		//		if ok, _ := shareSellerMap[sysUser.AdminId]; !ok {
-		//			child = append(child[:i], child[i+1:]...)
-		//		}
-		//	}
-		//	//if menu.Name == "正式客户共享" && !utils.InArrayByStr([]string{utils.ROLE_TYPE_CODE_ADMIN, utils.ROLE_TYPE_CODE_FICC_ADMIN, utils.ROLE_TYPE_CODE_FICC_SELLER, utils.ROLE_TYPE_CODE_FICC_GROUP, utils.ROLE_TYPE_CODE_FICC_TEAM}, sysUser.RoleTypeCode) {
-		//	//	child = append(child[:i], child[i+1:]...)
-		//	//}
-		//}
+		for i, menu := range child {
+			if menu.Name == "正式客户共享" && sysUser.RoleTypeCode != utils.ROLE_TYPE_CODE_ADMIN &&
+				sysUser.AdminId != 66 && sysUser.AdminId != 15 {
+				//如果不是admin角色、共享客户分组下用户、楼颖丹账号、王沛账号 就不显示该页面
+				if ok, _ := shareSellerMap[sysUser.AdminId]; !ok {
+					child = append(child[:i], child[i+1:]...)
+				}
+			}
+			//if menu.Name == "正式客户共享" && !utils.InArrayByStr([]string{utils.ROLE_TYPE_CODE_ADMIN, utils.ROLE_TYPE_CODE_FICC_ADMIN, utils.ROLE_TYPE_CODE_FICC_SELLER, utils.ROLE_TYPE_CODE_FICC_GROUP, utils.ROLE_TYPE_CODE_FICC_TEAM}, sysUser.RoleTypeCode) {
+			//	child = append(child[:i], child[i+1:]...)
+			//}
+		}
 
 		if strings.Contains(item.Name, "出差管理") && sysUser.AdminId == utils.ApproveUserId {
 			cm := new(system.ChildMenu)

models/cygx/report_mapping_cygx.go

@@ -119,3 +119,11 @@ func GetCygxReportMappingCygxDetailByName(name string) (item *CygxReportMappingC
 	err = o.Raw(sql, name).QueryRow(&item)
 	return
 }
+
+// 通过ID获取详情
+func GetCygxReportMappingCygxDetailByNameAndChartPermissionId(name string, chartPermissionId int) (item *CygxReportMappingCygx, err error) {
+	o := orm.NewOrmUsingDB("hz_cygx")
+	sql := `SELECT * FROM cygx_report_mapping_cygx  WHERE match_type_name=?  AND chart_permission_id = ?  LIMIT 1 `
+	err = o.Raw(sql, name, chartPermissionId).QueryRow(&item)
+	return
+}

models/statistic_report.go

@@ -943,3 +943,52 @@ func GetCompanyContractPermissionNameGroupCount(condition string, pars []interfa
 	_, err = o.Raw(sql, pars).QueryRows(&items)
 	return
 }
+
+// GetIncrementalCompanyListByOperationRecordMerge 未续约合同
+func GetIncrementalCompanyListByOperationRecordMerge879() (items []*IncrementalList, err error) {
+	o := orm.NewOrm()
+	//查询真正的数据
+	sql := `SELECT
+	a.company_contract_id,
+	a.contract_type,
+	a.company_product_id,
+	a.contract_code,
+	a.pay_method,
+	a.pay_channel,
+	a.package_difference,
+	a.company_id,
+	a.start_date,
+	a.end_date,
+	a.money,
+	b.company_name,
+	c.seller_id,
+	c.seller_name,
+	a.product_id,
+	a.product_name,
+	a.create_time,
+	b.region_type,
+	c.renewal_reason,
+	c.renewal_todo,
+	c.STATUS 
+FROM
+	company_contract a
+	RIGHT JOIN company b ON a.company_id = b.company_id
+	JOIN company_product c ON b.company_id = c.company_id 
+	AND a.product_id = c.product_id 
+WHERE
+	1 = 1 
+	AND c.product_id = 2
+	AND a.STATUS = 1 
+	AND a.end_date >= '2017-09-05'
+	AND a.end_date <= '2022-12-31'
+	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_contract_id 
+ORDER BY
+	end_date DESC,
+	company_id DESC  limit	 10
+`
+	_, err = o.Raw(sql).QueryRows(&items)
+	return
+}