Merge branch 'feature/crm_16.6' into debug

models/db_init.go

@@ -134,6 +134,7 @@ func init() {
 		new(cygx_allocation_company_contract.CygxAllocationCompanyContractPermission),    //权益合同派点（行业）
 		new(cygx_allocation_company_contract.CygxAllocationCompanyContractPermissionLog), //权益合同派点日志（行业）
 		new(company_renewal_record.CompanyRenewalRecord),                                 // 客户续约状态记录表
+		new(roadshow.RsCalendarResearcherQuestion),
 	)
 
 	// 社区问答相关

models/roadshow/calendar.go

@@ -85,6 +85,10 @@ type RsCalendarResearcher struct {
 	ApproveTime            time.Time `description:"接受时间"`
 	IsSynced               int       `description:"是否与上海同步 0:未同步 1:已同步"`
 	ResearcherSort         int       `description:"研究员新增排序"`
+	CompanyIndustry        string    `description:"客户行业"`
+	CompanyClassify        string    `description:"客户分类"`
+	QuestionStatus         int       `description:"问答状态：0-未填写；1-已填写"`
+	QuestionMsgStatus      int       `description:"问答模板消息：0-未发送；1-已发送"`
 }
 
 func GetRsCalendarById(rsCalendarId int) (item *RsCalendar, err error) {

models/tables/company_contract/company_contract.go

@@ -4,6 +4,7 @@ import (
 	"github.com/beego/beego/v2/client/orm"
 	"hongze/hongze_mobile_admin/models/tables/company_contract_permission"
 	"hongze/hongze_mobile_admin/models/tables/company_report_permission"
+	"strings"
 	"time"
 )
 
@@ -118,6 +119,14 @@ func GetCompanyContracDetail(condition string, pars []interface{}) (item *Compan
 	return
 }
 
+// 获取列表详情
+func GetCompanyContracList(condition string, pars []interface{}) (items []*CompanyContractDetail, err error) {
+	o := orm.NewOrm()
+	sql := `SELECT * FROM company_contract  WHERE 1= 1 ` + condition
+	_, err = o.Raw(sql, pars).QueryRows(&items)
+	return
+}
+
 // UpdateCompanyContractPackageDifference 更改合同与上一份合同金额对比信息
 func UpdateCompanyContractPackageDifference(packageDifference string, companyContractId int) (err error) {
 	o := orm.NewOrm()
@@ -134,3 +143,80 @@ func GetLastContractListByEndDate(companyId, productId int, endDate string) (ite
 
 	return
 }
+
+type CompanyContractRespInit struct {
+	MaxCompanyContractId int
+	CompanyContractId    int       `orm:"column(company_contract_id);pk" description:"客户合同id"`
+	ContractType         string    `description:"合同类型：枚举值：'新签合同','续约合同','补充协议'"`
+	ProductId            int       `description:"产品id"`
+	ProductName          string    `description:"产品名称"`
+	CompanyId            int       `description:"客户id"`
+	CompanyProductId     int       `description:"客户产品id"`
+	ContractCode         string    `description:"合同编码"`
+	StartDate            string    `description:"合同开始时间"`
+	EndDate              time.Time `description:"合同结束时间"`
+	MaxStartDate         time.Time `description:"合同结束时间"`
+	Money                float64   `description:"合同金额"`
+	PayMethod            string    `description:"支付方式"`
+	PayChannel           string    `description:"支付渠道"`
+	ImgUrl               string    `description:"合同图片，多个用#隔开"`
+	CreateTime           time.Time `description:"合同创建时间"`
+	ModifyTime           time.Time `description:"合同修改时间"`
+	Status               int       `description:"状态"`
+	Source               string    `description:"合同来源，枚举值：上传附件、系统合同，默认上传附件"`
+	PackageType          int       `description:"套餐类型，0：无，1：大套餐，2：小套餐"`
+	RaiPackageType       int       `description:"权益套餐类型: 0-无; 1-70w大套餐; 2-45w大套餐"`
+	PermissionName       string    `description:"权限名"`
+}
+
+// 获取最新的合同的开始时间
+func GetCompanyContracListMaxStartDate(condition string, pars []interface{}) (items []*CompanyContractRespInit, err error) {
+	o := orm.NewOrm()
+	sql := `SELECT
+			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
+}
+
+// 通过ID获取详情
+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 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
+}
+
+// 根据合同ID对相关合同进行隐藏
+func UpdateCompanyContracthide(companyContractId []string) (err error) {
+	o := orm.NewOrm()
+	sql := `UPDATE company_contract SET not_renewal_hide = 1                                
+                            WHERE company_contract_id  IN  (` + strings.Join(companyContractId, ",") + `) `
+	_, err = o.Raw(sql).Exec()
+	return
+}

routers/commentsRouter.go

@@ -241,6 +241,24 @@ func init() {
             Filters: nil,
             Params: nil})
 
+    beego.GlobalControllerRouter["hongze/hongze_mobile_admin/controllers/roadshow:CalendarController"] = append(beego.GlobalControllerRouter["hongze/hongze_mobile_admin/controllers/roadshow:CalendarController"],
+        beego.ControllerComments{
+            Method: "QuestionList",
+            Router: `/question/list`,
+            AllowHTTPMethods: []string{"get"},
+            MethodParams: param.Make(),
+            Filters: nil,
+            Params: nil})
+
+    beego.GlobalControllerRouter["hongze/hongze_mobile_admin/controllers/roadshow:CalendarController"] = append(beego.GlobalControllerRouter["hongze/hongze_mobile_admin/controllers/roadshow:CalendarController"],
+        beego.ControllerComments{
+            Method: "QuestionAdd",
+            Router: `/question/save`,
+            AllowHTTPMethods: []string{"post"},
+            MethodParams: param.Make(),
+            Filters: nil,
+            Params: nil})
+
     beego.GlobalControllerRouter["hongze/hongze_mobile_admin/controllers/roadshow:CalendarController"] = append(beego.GlobalControllerRouter["hongze/hongze_mobile_admin/controllers/roadshow:CalendarController"],
         beego.ControllerComments{
             Method: "Refuse",

routers/commentsRouter_controllers.go

@@ -1,586 +0,0 @@
-package routers
-
-import (
-	beego "github.com/beego/beego/v2/server/web"
-	"github.com/beego/beego/v2/server/web/context/param"
-)
-
-func init() {
-
-    beego.GlobalControllerRouter["hongze/hongze_mobile_admin/controllers/roadshow:CalendarController"] = append(beego.GlobalControllerRouter["hongze/hongze_mobile_admin/controllers/roadshow:CalendarController"],
-        beego.ControllerComments{
-            Method: "Accept",
-            Router: "/accept",
-            AllowHTTPMethods: []string{"post"},
-            MethodParams: param.Make(),
-            Filters: nil,
-            Params: nil})
-
-    beego.GlobalControllerRouter["hongze/hongze_mobile_admin/controllers/roadshow:CalendarController"] = append(beego.GlobalControllerRouter["hongze/hongze_mobile_admin/controllers/roadshow:CalendarController"],
-        beego.ControllerComments{
-            Method: "ActivityTypeList",
-            Router: "/activity/type/list",
-            AllowHTTPMethods: []string{"get"},
-            MethodParams: param.Make(),
-            Filters: nil,
-            Params: nil})
-
-    beego.GlobalControllerRouter["hongze/hongze_mobile_admin/controllers/roadshow:CalendarController"] = append(beego.GlobalControllerRouter["hongze/hongze_mobile_admin/controllers/roadshow:CalendarController"],
-        beego.ControllerComments{
-            Method: "Add",
-            Router: "/add",
-            AllowHTTPMethods: []string{"post"},
-            MethodParams: param.Make(),
-            Filters: nil,
-            Params: nil})
-
-    beego.GlobalControllerRouter["hongze/hongze_mobile_admin/controllers/roadshow:CalendarController"] = append(beego.GlobalControllerRouter["hongze/hongze_mobile_admin/controllers/roadshow:CalendarController"],
-        beego.ControllerComments{
-            Method: "Back",
-            Router: "/back",
-            AllowHTTPMethods: []string{"post"},
-            MethodParams: param.Make(),
-            Filters: nil,
-            Params: nil})
-
-    beego.GlobalControllerRouter["hongze/hongze_mobile_admin/controllers/roadshow:CalendarController"] = append(beego.GlobalControllerRouter["hongze/hongze_mobile_admin/controllers/roadshow:CalendarController"],
-        beego.ControllerComments{
-            Method: "CalendarDetail",
-            Router: "/calendar/detail",
-            AllowHTTPMethods: []string{"get"},
-            MethodParams: param.Make(),
-            Filters: nil,
-            Params: nil})
-
-    beego.GlobalControllerRouter["hongze/hongze_mobile_admin/controllers/roadshow:CalendarController"] = append(beego.GlobalControllerRouter["hongze/hongze_mobile_admin/controllers/roadshow:CalendarController"],
-        beego.ControllerComments{
-            Method: "CalendarList",
-            Router: "/calendar/list",
-            AllowHTTPMethods: []string{"get"},
-            MethodParams: param.Make(),
-            Filters: nil,
-            Params: nil})
-
-    beego.GlobalControllerRouter["hongze/hongze_mobile_admin/controllers/roadshow:CalendarController"] = append(beego.GlobalControllerRouter["hongze/hongze_mobile_admin/controllers/roadshow:CalendarController"],
-        beego.ControllerComments{
-            Method: "CalendarTypeList",
-            Router: "/calendar/type/list",
-            AllowHTTPMethods: []string{"get"},
-            MethodParams: param.Make(),
-            Filters: nil,
-            Params: nil})
-
-    beego.GlobalControllerRouter["hongze/hongze_mobile_admin/controllers/roadshow:CalendarController"] = append(beego.GlobalControllerRouter["hongze/hongze_mobile_admin/controllers/roadshow:CalendarController"],
-        beego.ControllerComments{
-            Method: "CompanyDetail",
-            Router: "/company/detail",
-            AllowHTTPMethods: []string{"get"},
-            MethodParams: param.Make(),
-            Filters: nil,
-            Params: nil})
-
-    beego.GlobalControllerRouter["hongze/hongze_mobile_admin/controllers/roadshow:CalendarController"] = append(beego.GlobalControllerRouter["hongze/hongze_mobile_admin/controllers/roadshow:CalendarController"],
-        beego.ControllerComments{
-            Method: "CompanySearch",
-            Router: "/company/search",
-            AllowHTTPMethods: []string{"get"},
-            MethodParams: param.Make(),
-            Filters: nil,
-            Params: nil})
-
-    beego.GlobalControllerRouter["hongze/hongze_mobile_admin/controllers/roadshow:CalendarController"] = append(beego.GlobalControllerRouter["hongze/hongze_mobile_admin/controllers/roadshow:CalendarController"],
-        beego.ControllerComments{
-            Method: "Delete",
-            Router: "/delete",
-            AllowHTTPMethods: []string{"post"},
-            MethodParams: param.Make(),
-            Filters: nil,
-            Params: nil})
-
-    beego.GlobalControllerRouter["hongze/hongze_mobile_admin/controllers/roadshow:CalendarController"] = append(beego.GlobalControllerRouter["hongze/hongze_mobile_admin/controllers/roadshow:CalendarController"],
-        beego.ControllerComments{
-            Method: "Edit",
-            Router: "/edit",
-            AllowHTTPMethods: []string{"post"},
-            MethodParams: param.Make(),
-            Filters: nil,
-            Params: nil})
-
-    beego.GlobalControllerRouter["hongze/hongze_mobile_admin/controllers/roadshow:CalendarController"] = append(beego.GlobalControllerRouter["hongze/hongze_mobile_admin/controllers/roadshow:CalendarController"],
-        beego.ControllerComments{
-            Method: "MattersAdd",
-            Router: "/matters/add",
-            AllowHTTPMethods: []string{"post"},
-            MethodParams: param.Make(),
-            Filters: nil,
-            Params: nil})
-
-    beego.GlobalControllerRouter["hongze/hongze_mobile_admin/controllers/roadshow:CalendarController"] = append(beego.GlobalControllerRouter["hongze/hongze_mobile_admin/controllers/roadshow:CalendarController"],
-        beego.ControllerComments{
-            Method: "MattersDelete",
-            Router: "/matters/delete",
-            AllowHTTPMethods: []string{"post"},
-            MethodParams: param.Make(),
-            Filters: nil,
-            Params: nil})
-
-    beego.GlobalControllerRouter["hongze/hongze_mobile_admin/controllers/roadshow:CalendarController"] = append(beego.GlobalControllerRouter["hongze/hongze_mobile_admin/controllers/roadshow:CalendarController"],
-        beego.ControllerComments{
-            Method: "MattersList",
-            Router: "/matters/list",
-            AllowHTTPMethods: []string{"get"},
-            MethodParams: param.Make(),
-            Filters: nil,
-            Params: nil})
-
-    beego.GlobalControllerRouter["hongze/hongze_mobile_admin/controllers/roadshow:CalendarController"] = append(beego.GlobalControllerRouter["hongze/hongze_mobile_admin/controllers/roadshow:CalendarController"],
-        beego.ControllerComments{
-            Method: "MattersUpdate",
-            Router: "/matters/update",
-            AllowHTTPMethods: []string{"post"},
-            MethodParams: param.Make(),
-            Filters: nil,
-            Params: nil})
-
-    beego.GlobalControllerRouter["hongze/hongze_mobile_admin/controllers/roadshow:CalendarController"] = append(beego.GlobalControllerRouter["hongze/hongze_mobile_admin/controllers/roadshow:CalendarController"],
-        beego.ControllerComments{
-            Method: "MyCalendarDetail",
-            Router: "/my/calendar/detail",
-            AllowHTTPMethods: []string{"get"},
-            MethodParams: param.Make(),
-            Filters: nil,
-            Params: nil})
-
-    beego.GlobalControllerRouter["hongze/hongze_mobile_admin/controllers/roadshow:CalendarController"] = append(beego.GlobalControllerRouter["hongze/hongze_mobile_admin/controllers/roadshow:CalendarController"],
-        beego.ControllerComments{
-            Method: "Refuse",
-            Router: "/refuse",
-            AllowHTTPMethods: []string{"post"},
-            MethodParams: param.Make(),
-            Filters: nil,
-            Params: nil})
-
-    beego.GlobalControllerRouter["hongze/hongze_mobile_admin/controllers/roadshow:CalendarController"] = append(beego.GlobalControllerRouter["hongze/hongze_mobile_admin/controllers/roadshow:CalendarController"],
-        beego.ControllerComments{
-            Method: "ResearcherCalendarDetail",
-            Router: "/researcher/calendar/detail",
-            AllowHTTPMethods: []string{"get"},
-            MethodParams: param.Make(),
-            Filters: nil,
-            Params: nil})
-
-    beego.GlobalControllerRouter["hongze/hongze_mobile_admin/controllers/roadshow:CalendarController"] = append(beego.GlobalControllerRouter["hongze/hongze_mobile_admin/controllers/roadshow:CalendarController"],
-        beego.ControllerComments{
-            Method: "ResearcherList",
-            Router: "/researcher/list",
-            AllowHTTPMethods: []string{"get"},
-            MethodParams: param.Make(),
-            Filters: nil,
-            Params: nil})
-
-    beego.GlobalControllerRouter["hongze/hongze_mobile_admin/controllers:AdminCommon"] = append(beego.GlobalControllerRouter["hongze/hongze_mobile_admin/controllers:AdminCommon"],
-        beego.ControllerComments{
-            Method: "Login",
-            Router: "/login",
-            AllowHTTPMethods: []string{"post"},
-            MethodParams: param.Make(),
-            Filters: nil,
-            Params: nil})
-
-    beego.GlobalControllerRouter["hongze/hongze_mobile_admin/controllers:AdminCommon"] = append(beego.GlobalControllerRouter["hongze/hongze_mobile_admin/controllers:AdminCommon"],
-        beego.ControllerComments{
-            Method: "Logout",
-            Router: "/logout",
-            AllowHTTPMethods: []string{"post"},
-            MethodParams: param.Make(),
-            Filters: nil,
-            Params: nil})
-
-    beego.GlobalControllerRouter["hongze/hongze_mobile_admin/controllers:ApprovalCommon"] = append(beego.GlobalControllerRouter["hongze/hongze_mobile_admin/controllers:ApprovalCommon"],
-        beego.ControllerComments{
-            Method: "ApplyApprove",
-            Router: "/approve",
-            AllowHTTPMethods: []string{"post"},
-            MethodParams: param.Make(),
-            Filters: nil,
-            Params: nil})
-
-    beego.GlobalControllerRouter["hongze/hongze_mobile_admin/controllers:ApprovalCommon"] = append(beego.GlobalControllerRouter["hongze/hongze_mobile_admin/controllers:ApprovalCommon"],
-        beego.ControllerComments{
-            Method: "ApplyApproveOld",
-            Router: "/approve_old",
-            AllowHTTPMethods: []string{"post"},
-            MethodParams: param.Make(),
-            Filters: nil,
-            Params: nil})
-
-    beego.GlobalControllerRouter["hongze/hongze_mobile_admin/controllers:ApprovalCommon"] = append(beego.GlobalControllerRouter["hongze/hongze_mobile_admin/controllers:ApprovalCommon"],
-        beego.ControllerComments{
-            Method: "CompanyList",
-            Router: "/company_list",
-            AllowHTTPMethods: []string{"get"},
-            MethodParams: param.Make(),
-            Filters: nil,
-            Params: nil})
-
-    beego.GlobalControllerRouter["hongze/hongze_mobile_admin/controllers:ApprovalCommon"] = append(beego.GlobalControllerRouter["hongze/hongze_mobile_admin/controllers:ApprovalCommon"],
-        beego.ControllerComments{
-            Method: "Detail",
-            Router: "/detail",
-            AllowHTTPMethods: []string{"get"},
-            MethodParams: param.Make(),
-            Filters: nil,
-            Params: nil})
-
-    beego.GlobalControllerRouter["hongze/hongze_mobile_admin/controllers:ApprovalCommon"] = append(beego.GlobalControllerRouter["hongze/hongze_mobile_admin/controllers:ApprovalCommon"],
-        beego.ControllerComments{
-            Method: "DetailOld",
-            Router: "/detail_old",
-            AllowHTTPMethods: []string{"get"},
-            MethodParams: param.Make(),
-            Filters: nil,
-            Params: nil})
-
-    beego.GlobalControllerRouter["hongze/hongze_mobile_admin/controllers:ApprovalCommon"] = append(beego.GlobalControllerRouter["hongze/hongze_mobile_admin/controllers:ApprovalCommon"],
-        beego.ControllerComments{
-            Method: "GetFlowDetail",
-            Router: "/flowDetail",
-            AllowHTTPMethods: []string{"get"},
-            MethodParams: param.Make(),
-            Filters: nil,
-            Params: nil})
-
-    beego.GlobalControllerRouter["hongze/hongze_mobile_admin/controllers:ApprovalCommon"] = append(beego.GlobalControllerRouter["hongze/hongze_mobile_admin/controllers:ApprovalCommon"],
-        beego.ControllerComments{
-            Method: "GetApprovalPermissionList",
-            Router: "/getApprovalPermissionList",
-            AllowHTTPMethods: []string{"get"},
-            MethodParams: param.Make(),
-            Filters: nil,
-            Params: nil})
-
-    beego.GlobalControllerRouter["hongze/hongze_mobile_admin/controllers:ApprovalCommon"] = append(beego.GlobalControllerRouter["hongze/hongze_mobile_admin/controllers:ApprovalCommon"],
-        beego.ControllerComments{
-            Method: "ListV2",
-            Router: "/list",
-            AllowHTTPMethods: []string{"get"},
-            MethodParams: param.Make(),
-            Filters: nil,
-            Params: nil})
-
-    beego.GlobalControllerRouter["hongze/hongze_mobile_admin/controllers:ApprovalCommon"] = append(beego.GlobalControllerRouter["hongze/hongze_mobile_admin/controllers:ApprovalCommon"],
-        beego.ControllerComments{
-            Method: "ListOld",
-            Router: "/list_old",
-            AllowHTTPMethods: []string{"get"},
-            MethodParams: param.Make(),
-            Filters: nil,
-            Params: nil})
-
-    beego.GlobalControllerRouter["hongze/hongze_mobile_admin/controllers:CompanyContractCommon"] = append(beego.GlobalControllerRouter["hongze/hongze_mobile_admin/controllers:CompanyContractCommon"],
-        beego.ControllerComments{
-            Method: "ApplyContractDetail",
-            Router: "/detail",
-            AllowHTTPMethods: []string{"get"},
-            MethodParams: param.Make(),
-            Filters: nil,
-            Params: nil})
-
-    beego.GlobalControllerRouter["hongze/hongze_mobile_admin/controllers:ContractApprovalCommon"] = append(beego.GlobalControllerRouter["hongze/hongze_mobile_admin/controllers:ContractApprovalCommon"],
-        beego.ControllerComments{
-            Method: "Approved",
-            Router: "/approved",
-            AllowHTTPMethods: []string{"post"},
-            MethodParams: param.Make(),
-            Filters: nil,
-            Params: nil})
-
-    beego.GlobalControllerRouter["hongze/hongze_mobile_admin/controllers:ContractApprovalCommon"] = append(beego.GlobalControllerRouter["hongze/hongze_mobile_admin/controllers:ContractApprovalCommon"],
-        beego.ControllerComments{
-            Method: "Detail",
-            Router: "/detail",
-            AllowHTTPMethods: []string{"get"},
-            MethodParams: param.Make(),
-            Filters: nil,
-            Params: nil})
-
-    beego.GlobalControllerRouter["hongze/hongze_mobile_admin/controllers:ContractApprovalCommon"] = append(beego.GlobalControllerRouter["hongze/hongze_mobile_admin/controllers:ContractApprovalCommon"],
-        beego.ControllerComments{
-            Method: "List",
-            Router: "/list",
-            AllowHTTPMethods: []string{"get"},
-            MethodParams: param.Make(),
-            Filters: nil,
-            Params: nil})
-
-    beego.GlobalControllerRouter["hongze/hongze_mobile_admin/controllers:ContractApprovalCommon"] = append(beego.GlobalControllerRouter["hongze/hongze_mobile_admin/controllers:ContractApprovalCommon"],
-        beego.ControllerComments{
-            Method: "Reject",
-            Router: "/reject",
-            AllowHTTPMethods: []string{"post"},
-            MethodParams: param.Make(),
-            Filters: nil,
-            Params: nil})
-
-    beego.GlobalControllerRouter["hongze/hongze_mobile_admin/controllers:ContractCommon"] = append(beego.GlobalControllerRouter["hongze/hongze_mobile_admin/controllers:ContractCommon"],
-        beego.ControllerComments{
-            Method: "CompanyListBySeal",
-            Router: "/companyListBySeal",
-            AllowHTTPMethods: []string{"get"},
-            MethodParams: param.Make(),
-            Filters: nil,
-            Params: nil})
-
-    beego.GlobalControllerRouter["hongze/hongze_mobile_admin/controllers:ContractCommon"] = append(beego.GlobalControllerRouter["hongze/hongze_mobile_admin/controllers:ContractCommon"],
-        beego.ControllerComments{
-            Method: "CompanyList",
-            Router: "/company_list",
-            AllowHTTPMethods: []string{"get"},
-            MethodParams: param.Make(),
-            Filters: nil,
-            Params: nil})
-
-    beego.GlobalControllerRouter["hongze/hongze_mobile_admin/controllers:ContractCommon"] = append(beego.GlobalControllerRouter["hongze/hongze_mobile_admin/controllers:ContractCommon"],
-        beego.ControllerComments{
-            Method: "Detail",
-            Router: "/detail",
-            AllowHTTPMethods: []string{"get"},
-            MethodParams: param.Make(),
-            Filters: nil,
-            Params: nil})
-
-    beego.GlobalControllerRouter["hongze/hongze_mobile_admin/controllers:ContractCommon"] = append(beego.GlobalControllerRouter["hongze/hongze_mobile_admin/controllers:ContractCommon"],
-        beego.ControllerComments{
-            Method: "Invalid",
-            Router: "/invalid",
-            AllowHTTPMethods: []string{"post"},
-            MethodParams: param.Make(),
-            Filters: nil,
-            Params: nil})
-
-    beego.GlobalControllerRouter["hongze/hongze_mobile_admin/controllers:ContractCommon"] = append(beego.GlobalControllerRouter["hongze/hongze_mobile_admin/controllers:ContractCommon"],
-        beego.ControllerComments{
-            Method: "List",
-            Router: "/list",
-            AllowHTTPMethods: []string{"get"},
-            MethodParams: param.Make(),
-            Filters: nil,
-            Params: nil})
-
-    beego.GlobalControllerRouter["hongze/hongze_mobile_admin/controllers:ContractCommon"] = append(beego.GlobalControllerRouter["hongze/hongze_mobile_admin/controllers:ContractCommon"],
-        beego.ControllerComments{
-            Method: "ListBySeal",
-            Router: "/listBySeal",
-            AllowHTTPMethods: []string{"get"},
-            MethodParams: param.Make(),
-            Filters: nil,
-            Params: nil})
-
-    beego.GlobalControllerRouter["hongze/hongze_mobile_admin/controllers:ContractCommon"] = append(beego.GlobalControllerRouter["hongze/hongze_mobile_admin/controllers:ContractCommon"],
-        beego.ControllerComments{
-            Method: "ListV2",
-            Router: "/listV2",
-            AllowHTTPMethods: []string{"get"},
-            MethodParams: param.Make(),
-            Filters: nil,
-            Params: nil})
-
-    beego.GlobalControllerRouter["hongze/hongze_mobile_admin/controllers:ContractCommon"] = append(beego.GlobalControllerRouter["hongze/hongze_mobile_admin/controllers:ContractCommon"],
-        beego.ControllerComments{
-            Method: "UploadCheckBackFile",
-            Router: "/upload_check_back_file",
-            AllowHTTPMethods: []string{"post"},
-            MethodParams: param.Make(),
-            Filters: nil,
-            Params: nil})
-
-    beego.GlobalControllerRouter["hongze/hongze_mobile_admin/controllers:MessageCommon"] = append(beego.GlobalControllerRouter["hongze/hongze_mobile_admin/controllers:MessageCommon"],
-        beego.ControllerComments{
-            Method: "MessageList",
-            Router: "/list",
-            AllowHTTPMethods: []string{"get"},
-            MethodParams: param.Make(),
-            Filters: nil,
-            Params: nil})
-
-    beego.GlobalControllerRouter["hongze/hongze_mobile_admin/controllers:MessageCommon"] = append(beego.GlobalControllerRouter["hongze/hongze_mobile_admin/controllers:MessageCommon"],
-        beego.ControllerComments{
-            Method: "MessageRead",
-            Router: "/read",
-            AllowHTTPMethods: []string{"post"},
-            MethodParams: param.Make(),
-            Filters: nil,
-            Params: nil})
-
-    beego.GlobalControllerRouter["hongze/hongze_mobile_admin/controllers:MessageCommon"] = append(beego.GlobalControllerRouter["hongze/hongze_mobile_admin/controllers:MessageCommon"],
-        beego.ControllerComments{
-            Method: "SummaryMessageList",
-            Router: "/summaryMessageList",
-            AllowHTTPMethods: []string{"get"},
-            MethodParams: param.Make(),
-            Filters: nil,
-            Params: nil})
-
-    beego.GlobalControllerRouter["hongze/hongze_mobile_admin/controllers:ResourceCommon"] = append(beego.GlobalControllerRouter["hongze/hongze_mobile_admin/controllers:ResourceCommon"],
-        beego.ControllerComments{
-            Method: "Upload",
-            Router: "/upload",
-            AllowHTTPMethods: []string{"post"},
-            MethodParams: param.Make(),
-            Filters: nil,
-            Params: nil})
-
-    beego.GlobalControllerRouter["hongze/hongze_mobile_admin/controllers:ResourceCommon"] = append(beego.GlobalControllerRouter["hongze/hongze_mobile_admin/controllers:ResourceCommon"],
-        beego.ControllerComments{
-            Method: "UploadImageBase64",
-            Router: "/upload_image_base64",
-            AllowHTTPMethods: []string{"post"},
-            MethodParams: param.Make(),
-            Filters: nil,
-            Params: nil})
-
-    beego.GlobalControllerRouter["hongze/hongze_mobile_admin/controllers:SealApprovalCommon"] = append(beego.GlobalControllerRouter["hongze/hongze_mobile_admin/controllers:SealApprovalCommon"],
-        beego.ControllerComments{
-            Method: "Approved",
-            Router: "/approved",
-            AllowHTTPMethods: []string{"post"},
-            MethodParams: param.Make(),
-            Filters: nil,
-            Params: nil})
-
-    beego.GlobalControllerRouter["hongze/hongze_mobile_admin/controllers:SealApprovalCommon"] = append(beego.GlobalControllerRouter["hongze/hongze_mobile_admin/controllers:SealApprovalCommon"],
-        beego.ControllerComments{
-            Method: "CancelApply",
-            Router: "/cancelApply",
-            AllowHTTPMethods: []string{"get"},
-            MethodParams: param.Make(),
-            Filters: nil,
-            Params: nil})
-
-    beego.GlobalControllerRouter["hongze/hongze_mobile_admin/controllers:SealApprovalCommon"] = append(beego.GlobalControllerRouter["hongze/hongze_mobile_admin/controllers:SealApprovalCommon"],
-        beego.ControllerComments{
-            Method: "Detail",
-            Router: "/detail",
-            AllowHTTPMethods: []string{"get"},
-            MethodParams: param.Make(),
-            Filters: nil,
-            Params: nil})
-
-    beego.GlobalControllerRouter["hongze/hongze_mobile_admin/controllers:SealApprovalCommon"] = append(beego.GlobalControllerRouter["hongze/hongze_mobile_admin/controllers:SealApprovalCommon"],
-        beego.ControllerComments{
-            Method: "List",
-            Router: "/list",
-            AllowHTTPMethods: []string{"get"},
-            MethodParams: param.Make(),
-            Filters: nil,
-            Params: nil})
-
-    beego.GlobalControllerRouter["hongze/hongze_mobile_admin/controllers:SealApprovalCommon"] = append(beego.GlobalControllerRouter["hongze/hongze_mobile_admin/controllers:SealApprovalCommon"],
-        beego.ControllerComments{
-            Method: "Reject",
-            Router: "/reject",
-            AllowHTTPMethods: []string{"post"},
-            MethodParams: param.Make(),
-            Filters: nil,
-            Params: nil})
-
-    beego.GlobalControllerRouter["hongze/hongze_mobile_admin/controllers:SealCommon"] = append(beego.GlobalControllerRouter["hongze/hongze_mobile_admin/controllers:SealCommon"],
-        beego.ControllerComments{
-            Method: "Add",
-            Router: "/add",
-            AllowHTTPMethods: []string{"post"},
-            MethodParams: param.Make(),
-            Filters: nil,
-            Params: nil})
-
-    beego.GlobalControllerRouter["hongze/hongze_mobile_admin/controllers:SealCommon"] = append(beego.GlobalControllerRouter["hongze/hongze_mobile_admin/controllers:SealCommon"],
-        beego.ControllerComments{
-            Method: "CheckEdit",
-            Router: "/check_edit",
-            AllowHTTPMethods: []string{"post"},
-            MethodParams: param.Make(),
-            Filters: nil,
-            Params: nil})
-
-    beego.GlobalControllerRouter["hongze/hongze_mobile_admin/controllers:SealCommon"] = append(beego.GlobalControllerRouter["hongze/hongze_mobile_admin/controllers:SealCommon"],
-        beego.ControllerComments{
-            Method: "CompanyList",
-            Router: "/company_list",
-            AllowHTTPMethods: []string{"get"},
-            MethodParams: param.Make(),
-            Filters: nil,
-            Params: nil})
-
-    beego.GlobalControllerRouter["hongze/hongze_mobile_admin/controllers:SealCommon"] = append(beego.GlobalControllerRouter["hongze/hongze_mobile_admin/controllers:SealCommon"],
-        beego.ControllerComments{
-            Method: "CompanyNameList",
-            Router: "/company_name_list",
-            AllowHTTPMethods: []string{"get"},
-            MethodParams: param.Make(),
-            Filters: nil,
-            Params: nil})
-
-    beego.GlobalControllerRouter["hongze/hongze_mobile_admin/controllers:SealCommon"] = append(beego.GlobalControllerRouter["hongze/hongze_mobile_admin/controllers:SealCommon"],
-        beego.ControllerComments{
-            Method: "Detail",
-            Router: "/detail",
-            AllowHTTPMethods: []string{"get"},
-            MethodParams: param.Make(),
-            Filters: nil,
-            Params: nil})
-
-    beego.GlobalControllerRouter["hongze/hongze_mobile_admin/controllers:SealCommon"] = append(beego.GlobalControllerRouter["hongze/hongze_mobile_admin/controllers:SealCommon"],
-        beego.ControllerComments{
-            Method: "Edit",
-            Router: "/edit",
-            AllowHTTPMethods: []string{"post"},
-            MethodParams: param.Make(),
-            Filters: nil,
-            Params: nil})
-
-    beego.GlobalControllerRouter["hongze/hongze_mobile_admin/controllers:SealCommon"] = append(beego.GlobalControllerRouter["hongze/hongze_mobile_admin/controllers:SealCommon"],
-        beego.ControllerComments{
-            Method: "Invalid",
-            Router: "/invalid",
-            AllowHTTPMethods: []string{"post"},
-            MethodParams: param.Make(),
-            Filters: nil,
-            Params: nil})
-
-    beego.GlobalControllerRouter["hongze/hongze_mobile_admin/controllers:SealCommon"] = append(beego.GlobalControllerRouter["hongze/hongze_mobile_admin/controllers:SealCommon"],
-        beego.ControllerComments{
-            Method: "List",
-            Router: "/list",
-            AllowHTTPMethods: []string{"get"},
-            MethodParams: param.Make(),
-            Filters: nil,
-            Params: nil})
-
-    beego.GlobalControllerRouter["hongze/hongze_mobile_admin/controllers:SealCommon"] = append(beego.GlobalControllerRouter["hongze/hongze_mobile_admin/controllers:SealCommon"],
-        beego.ControllerComments{
-            Method: "UploadCheckBackFile",
-            Router: "/upload_check_back_file",
-            AllowHTTPMethods: []string{"post"},
-            MethodParams: param.Make(),
-            Filters: nil,
-            Params: nil})
-
-    beego.GlobalControllerRouter["hongze/hongze_mobile_admin/controllers:WeChatCommon"] = append(beego.GlobalControllerRouter["hongze/hongze_mobile_admin/controllers:WeChatCommon"],
-        beego.ControllerComments{
-            Method: "WeChatLogin",
-            Router: "/login",
-            AllowHTTPMethods: []string{"get"},
-            MethodParams: param.Make(),
-            Filters: nil,
-            Params: nil})
-
-    beego.GlobalControllerRouter["hongze/hongze_mobile_admin/controllers:WeChatCommon"] = append(beego.GlobalControllerRouter["hongze/hongze_mobile_admin/controllers:WeChatCommon"],
-        beego.ControllerComments{
-            Method: "WxAppLogin",
-            Router: "/wxapp/login",
-            AllowHTTPMethods: []string{"get"},
-            MethodParams: param.Make(),
-            Filters: nil,
-            Params: nil})
-
-}

services/company_approval/company_approval.go

@@ -441,9 +441,10 @@ func Approved(approvalRecord *contract_approval_record.ContractApprovalRecord, o
 
 				cygxService.YanXuanCompanyApproval(recordInfo.CompanyId, recordInfo.CompanyContractId) //研选审批通过的时候研选扣点更新
 				//cygxService.HandleAllocationCompanyContractByYanXuan(recordInfo.CompanyContractId)     //如果合同只有研选的时候，自动处理派点
-				cygxService.HandleCompanyContractPackageDifference(recordInfo.CompanyContractId)           // 更新与上一份合同的金额的对比 '增加套餐','减少套餐','维持套餐'
-				cygxService.HandleCompanyContractPermissionContractType(recordInfo.CompanyContractId)      // 更新合同权限表中的权限名称，以及对应的行业权限类型（行业新签、行业续约）
-				contractService.UpdateCompanyProductSellerMove(recordInfo.CompanyId, recordInfo.ProductId) // 权益客户创建新的有效合同之后，更新所关联的销售信息
+				cygxService.HandleCompanyContractPackageDifference(recordInfo.CompanyContractId)                 // 更新与上一份合同的金额的对比 '增加套餐','减少套餐','维持套餐'
+				cygxService.HandleCompanyContractPermissionContractType(recordInfo.CompanyContractId)            // 更新合同权限表中的权限名称，以及对应的行业权限类型（行业新签、行业续约）
+				contractService.UpdateCompanyProductSellerMove(recordInfo.CompanyId, recordInfo.ProductId)       // 权益客户创建新的有效合同之后，更新所关联的销售信息
+				contractService.UpdateCompanyContracthideBycompanyId(recordInfo.CompanyId, recordInfo.ProductId) //权益客户创建新的有效合同之后，对相关合同进行隐藏
 			}
 		}()
 	} else {

services/contract/company_contract.go

@@ -3,9 +3,11 @@ package contract
 import (
 	"errors"
 	"fmt"
+	"hongze/hongze_mobile_admin/models/tables/company_contract"
 	"hongze/hongze_mobile_admin/models/tables/company_product"
 	"hongze/hongze_mobile_admin/services/alarm_msg"
 	"hongze/hongze_mobile_admin/utils"
+	"strconv"
 	"time"
 )
 
@@ -37,3 +39,61 @@ func UpdateCompanyProductSellerMove(companyId, productId int) {
 
 	return
 }
+
+// 权益客户创建新的有效合同之后，对相关合同进行隐藏
+func UpdateCompanyContracthideBycompanyId(companyId, productId int) {
+	if productId != utils.COMPANY_PRODUCT_RAI_ID {
+		return
+	}
+	var err error
+	defer func() {
+		if err != nil {
+			fmt.Println(err)
+			go alarm_msg.SendAlarmMsg("权益客户创建新的有效合同之后，对相关合同进行隐藏，UpdateCompanyContracthideBycompanyId "+fmt.Sprint("companyId:", companyId, ";err：", err), 3)
+		}
+	}()
+
+	var condition string
+	var pars []interface{}
+
+	if companyId > 0 {
+		condition = ` AND a.company_id = ? `
+		pars = append(pars, companyId)
+	}
+
+	listContractMax, e := company_contract.GetCompanyContracListMaxStartDate(condition, pars)
+	if e != nil {
+		err = errors.New("GetCompanyContracListMaxStartDate, Err: " + e.Error())
+		return
+	}
+	//如果合同结束时间，早于最新一份合同的开始时间，这份合同就隐藏
+	maxId := make(map[int]time.Time)
+	for _, v := range listContractMax {
+		maxId[v.CompanyId] = v.MaxStartDate
+	}
+
+	listContract, e := company_contract.GetCompanyContracListInit_CRM_16_1(condition, pars)
+	if e != nil {
+		err = errors.New("GetCompanyContracListInit_CRM_16_1, Err: " + e.Error())
+		return
+	}
+	var updateId []string
+	for _, v := range listContract {
+		if v.EndDate.After(maxId[v.CompanyId]) {
+			continue
+		}
+		updateId = append(updateId, strconv.Itoa(v.CompanyContractId))
+	}
+
+	if len(updateId) == 0 {
+		return
+	}
+	e = company_contract.UpdateCompanyContracthide(updateId)
+	if e != nil {
+		err = errors.New("UpdateCompanyContracthide, Err: " + e.Error())
+		return
+	}
+	fmt.Println((updateId))
+
+	return
+}

services/cygx/contract_allocation.go

@@ -102,7 +102,7 @@ func HandleCompanyContractPackageDifference(companyContractId int) (err error) {
 	defer func() {
 		if err != nil {
 			fmt.Println(err)
-			go alarm_msg.SendAlarmMsg(fmt.Sprint("如果合同只有研选的时候，自动处理派点失败，Err：", err.Error(), "companyContractId", companyContractId), 2)
+			go alarm_msg.SendAlarmMsg(fmt.Sprint("更新与上一份合同的金额的对比 '增加套餐','减少套餐','维持套餐'失败，，Err：", err.Error(), "companyContractId", companyContractId), 2)
 		}
 	}()
 	var condition string
@@ -115,25 +115,37 @@ func HandleCompanyContractPackageDifference(companyContractId int) (err error) {
 		err = errors.New("GetCompanyContracDetail,detail Err: " + e.Error())
 		return
 	}
+	if detail.ProductId != 2 {
+		return
+	}
+
+	startYeaar := utils.StrDateToDate(detail.StartDate).Year()
+
+	lastYearStartData := fmt.Sprint(startYeaar-1, "-01-01")
+	lastYearEndData := fmt.Sprint(startYeaar-1, "-12-31")
 
 	//如果不是续约合同就不做对比处理
 	if detail.ContractType != "续约合同" {
 		return
 	}
-	//获取前一份合同的信息
+	//获取前一年所有的合同列表
 	pars = make([]interface{}, 0)
-	condition = " AND company_id = ? AND company_contract_id < ?   AND status = 1    AND product_id = ?  ORDER BY company_contract_id DESC   LIMIT  1  "
-	pars = append(pars, detail.CompanyId, companyContractId, detail.ProductId)
-	detailPrevious, e := company_contract.GetCompanyContracDetail(condition, pars)
+	condition = " AND company_id = ? AND company_contract_id < ?   AND status = 1    AND product_id = ? AND  start_date >= ? AND  start_date <= ?  "
+	pars = append(pars, detail.CompanyId, companyContractId, detail.ProductId, lastYearStartData, lastYearEndData)
+	companyContracList, e := company_contract.GetCompanyContracList(condition, pars)
 	if e != nil {
-		err = errors.New("GetCompanyContracDetail,detailPrevious Err: " + e.Error())
+		err = errors.New("GetCompanyContracList Err: " + e.Error())
 		return
 	}
-	var packageDifference string
 
-	if detail.Money > detailPrevious.Money {
+	var sumMoney float64
+	var packageDifference string
+	for _, v := range companyContracList {
+		sumMoney += v.Money
+	}
+	if detail.Money > sumMoney {
 		packageDifference = "增加套餐"
-	} else if detail.Money < detailPrevious.Money {
+	} else if detail.Money < sumMoney {
 		packageDifference = "减少套餐"
 	} else {
 		packageDifference = "维持套餐"

utils/common.go

@@ -1020,3 +1020,11 @@ func ReplaceSpaceAndWrap(str string) string {
 	str = strings.Replace(str, "\n", "", -1)
 	return str
 }
+
+// 字符串转换为time类型
+func StrDateToDate(strTime string) time.Time {
+	timeLayout := "2006-01-02"           //转化所需模板
+	loc, _ := time.LoadLocation("Local") //重要：获取时区
+	resultTime, _ := time.ParseInLocation(timeLayout, strTime, loc)
+	return resultTime
+}