style

controllers/admin.go

@@ -14,39 +14,40 @@ type AdminCommon struct {
 	BaseAuth
 }
 
+// Login
 // @Title 用户账号、密码登录接口
 // @Description 用户账号、密码登录接口
 // @Param	request	body admin.LoginReq true "type json string"
 // @Success 200 {object} admin.LoginResp
 // @router /login [post]
-func (this *AdminCommon) Login() {
+func (c *AdminCommon) Login() {
 	var req admin.LoginReq
-	err := json.Unmarshal(this.Ctx.Input.RequestBody, &req)
+	err := json.Unmarshal(c.Ctx.Input.RequestBody, &req)
 	if err != nil {
-		this.FailWithMessage("参数解析异常！", "参数解析失败，Err:"+err.Error())
+		c.FailWithMessage("参数解析异常！", "参数解析失败，Err:"+err.Error())
 		return
 	}
 	if req.Username == "" {
-		this.FailWithMessage("请输入账号", "请输入账号")
+		c.FailWithMessage("请输入账号", "请输入账号")
 		return
 	}
 	if req.Password == "" {
-		this.FailWithMessage("请输入密码", "请输入密码")
+		c.FailWithMessage("请输入密码", "请输入密码")
 		return
 	}
 
-	adminWx, err := services.BindWxUser(this.Session.OpenId, req.Username, req.Password, utils.WxPlatform)
+	adminWx, err := services.BindWxUser(c.Session.OpenId, req.Username, req.Password, utils.WxPlatform)
 	if err != nil {
 		if err.Error() == utils.ErrNoRow() {
-			this.FailWithMessage("登录失败,账号或密码错误", "登录失败,账号或密码错误")
+			c.FailWithMessage("登录失败,账号或密码错误", "登录失败,账号或密码错误")
 			return
 		}
-		this.FailWithMessage("登录失败", "登录失败，Err:"+err.Error())
+		c.FailWithMessage("登录失败", "登录失败，Err:"+err.Error())
 		return
 	}
-	err = h5_admin_session.UpdateSession(this.Session.SessionId, adminWx.AdminId, time.Now().AddDate(0, 0, 90))
+	err = h5_admin_session.UpdateSession(c.Session.SessionId, adminWx.AdminId, time.Now().AddDate(0, 0, 90))
 	if err != nil {
-		this.FailWithMessage("登录失败", "变更session信息失败，Err:"+err.Error())
+		c.FailWithMessage("登录失败", "变更session信息失败，Err:"+err.Error())
 		return
 	}
 	resp := admin3.LoginResp{
@@ -71,24 +72,25 @@ func (this *AdminCommon) Login() {
 	}
 	resp.ProductName = productName
 	resp.Authority = adminWx.Authority
-	this.OkDetailed(resp, "登录成功")
+	c.OkDetailed(resp, "登录成功")
 }
 
+// Logout
 // @Title 用户退出登录接口
 // @Description 用户退出登录接口
 // @Success Ret=200 退出成功
 // @router /logout [post]
-func (this *AdminCommon) Logout() {
-	adminWx := this.AdminWx
+func (c *AdminCommon) Logout() {
+	adminWx := c.AdminWx
 	err := services.UnbindWxUser(adminWx.OpenId)
 	if err != nil {
-		this.FailWithMessage("退出失败", "退出失败，Err:"+err.Error())
+		c.FailWithMessage("退出失败", "退出失败，Err:"+err.Error())
 		return
 	}
-	err = h5_admin_session.UpdateSession(this.Session.SessionId, 0, time.Now().AddDate(0, 0, 10))
+	err = h5_admin_session.UpdateSession(c.Session.SessionId, 0, time.Now().AddDate(0, 0, 10))
 	if err != nil {
-		this.FailWithMessage("退出失败", "变更session信息失败，Err:"+err.Error())
+		c.FailWithMessage("退出失败", "变更session信息失败，Err:"+err.Error())
 		return
 	}
-	this.OkWithMessage("退出成功")
+	c.OkWithMessage("退出成功")
 }

controllers/approval.go

@@ -37,16 +37,16 @@ type ApprovalCommon struct {
 // @Param   KeywordEq   query   string  true       "搜索关键词（全等）"
 // @Success 200 {object} approval.CompanyApprovalListResp
 // @router /list [get]
-func (this *ApprovalCommon) List() {
-	sysUser := this.AdminWx
+func (c *ApprovalCommon) List() {
+	sysUser := c.AdminWx
 	roleTypeCode := sysUser.RoleTypeCode
 
-	pageSize, _ := this.GetInt("PageSize")
-	currentIndex, _ := this.GetInt("CurrentIndex")
-	status := this.GetString("Status")
-	keyword := this.GetString("Keyword")
-	keywordEq := this.GetString("KeywordEq")
-	keyWord := this.GetString("KeyWord")
+	pageSize, _ := c.GetInt("PageSize")
+	currentIndex, _ := c.GetInt("CurrentIndex")
+	status := c.GetString("Status")
+	keyword := c.GetString("Keyword")
+	keywordEq := c.GetString("KeywordEq")
+	keyWord := c.GetString("KeyWord")
 	if keyword == "" {
 		keyword = keyWord
 	}
@@ -92,13 +92,13 @@ func (this *ApprovalCommon) List() {
 
 	total, err := company_approval.GetApprovalCount(condition, pars)
 	if err != nil {
-		this.FailWithMessage("获取失败", "获取数据总数失败，Err:"+err.Error())
+		c.FailWithMessage("获取失败", "获取数据总数失败，Err:"+err.Error())
 		return
 	}
 
 	list, err := company_approval.GetApprovalList(condition, pars, startSize, pageSize)
 	if err != nil {
-		this.FailWithMessage("获取失败", "获取数据失败，Err:"+err.Error())
+		c.FailWithMessage("获取失败", "获取数据失败，Err:"+err.Error())
 		return
 	}
 	listLen := len(list)
@@ -121,7 +121,7 @@ func (this *ApprovalCommon) List() {
 
 		approvalCount, err := company_approval.GetCompanyApprovalCount(item.CompanyId, item.ProductId)
 		if err != nil && err.Error() != utils.ErrNoRow() {
-			this.FailWithMessage("获取失败", "获取延期审批次数失败，Err:"+err.Error())
+			c.FailWithMessage("获取失败", "获取延期审批次数失败，Err:"+err.Error())
 			return
 		}
 		list[i].ApprovalCount = approvalCount
@@ -129,7 +129,7 @@ func (this *ApprovalCommon) List() {
 		if item.ApplyMethod == 3 {
 			delayPermission, err := company_delay_permission.GetApplyDelayPermission(item.CompanyApprovalId)
 			if err != nil && err.Error() != utils.ErrNoRow() {
-				this.FailWithMessage("获取失败", "获取延期审批权限失败，Err:"+err.Error())
+				c.FailWithMessage("获取失败", "获取延期审批权限失败，Err:"+err.Error())
 				return
 			}
 			list[i].DelayPermission = delayPermission
@@ -144,7 +144,7 @@ func (this *ApprovalCommon) List() {
 		Paging: page,
 		List:   list,
 	}
-	this.OkDetailed(resp, "获取成功")
+	c.OkDetailed(resp, "获取成功")
 }
 
 // @Title 获取审批单详情接口
@@ -152,11 +152,11 @@ func (this *ApprovalCommon) List() {
 // @Param   ApprovalId   query   int  true       "审批单id"
 // @Success 200 {object} approval.CompanyApprovalDetailResp
 // @router /detail_old [get]
-func (this *ApprovalCommon) DetailOld() {
-	sysUser := this.AdminWx
+func (c *ApprovalCommon) DetailOld() {
+	sysUser := c.AdminWx
 	roleTypeCode := sysUser.RoleTypeCode
 
-	companyApprovalId, _ := this.GetInt("ApprovalId")
+	companyApprovalId, _ := c.GetInt("ApprovalId")
 	var condition string
 	var pars []interface{}
 
@@ -170,7 +170,7 @@ func (this *ApprovalCommon) DetailOld() {
 
 	item, err := company_approval.GetApprovalListByApprovalId(condition, pars, companyApprovalId)
 	if err != nil {
-		this.FailWithMessage("获取失败", "获取数据失败，Err:"+err.Error())
+		c.FailWithMessage("获取失败", "获取数据失败，Err:"+err.Error())
 		return
 	}
 	if item.FreezeStartDate != "" && item.FreezeEndDate != "" && item.Status == utils.COMPANY_STATUS_FREEZE {
@@ -190,7 +190,7 @@ func (this *ApprovalCommon) DetailOld() {
 
 	approvalCount, err := company_approval.GetCompanyApprovalCount(item.CompanyId, item.ProductId)
 	if err != nil && err.Error() != utils.ErrNoRow() {
-		this.FailWithMessage("获取失败", "获取延期审批次数失败，Err:"+err.Error())
+		c.FailWithMessage("获取失败", "获取延期审批次数失败，Err:"+err.Error())
 		return
 	}
 	item.ApprovalCount = approvalCount
@@ -198,7 +198,7 @@ func (this *ApprovalCommon) DetailOld() {
 	//if item.ApplyMethod == 3 {
 	//	delayPermission, err := company_delay_permission.GetApplyDelayPermission(item.CompanyApprovalId)
 	//	if err != nil && err.Error() != utils.ErrNoRow() {
-	//		this.FailWithMessage("获取失败", "获取延期审批权限失败，Err:"+err.Error())
+	//		c.FailWithMessage("获取失败", "获取延期审批权限失败，Err:"+err.Error())
 	//		return
 	//	}
 	//	item.DelayPermission = delayPermission
@@ -225,7 +225,7 @@ func (this *ApprovalCommon) DetailOld() {
 	//获取需要审批的权限
 	delayPermissionList, err := company_delay_permission.GetDelayPermissionItems(item.CompanyId, item.CompanyApprovalId)
 	if err != nil && err.Error() != utils.ErrNoRow() {
-		this.FailWithMessage("获取失败", "获取审批权限失败，Err:"+err.Error())
+		c.FailWithMessage("获取失败", "获取审批权限失败，Err:"+err.Error())
 		return
 	}
 	delayPermissionIdMap := make(map[int]int)
@@ -239,7 +239,7 @@ func (this *ApprovalCommon) DetailOld() {
 		plist := new(company_report_permission.PermissionLookList)
 		items, err := company_report_permission.GetPermissionLookItems(item.ProductId, v)
 		if err != nil {
-			this.FailWithMessage("获取失败", "获取权限信息失败，Err:"+err.Error())
+			c.FailWithMessage("获取失败", "获取权限信息失败，Err:"+err.Error())
 			return
 		}
 		for _, n := range items {
@@ -266,17 +266,17 @@ func (this *ApprovalCommon) DetailOld() {
 	}
 	flowItem, err := flow.GetApprovalFlow(flowId)
 	if err != nil {
-		this.FailWithMessage("获取失败", "获取数据失败，Err:"+err.Error())
+		c.FailWithMessage("获取失败", "获取数据失败，Err:"+err.Error())
 		return
 	}
 	approveTime, err := time.Parse(utils.FormatDateTime, item.ApproveTime)
 	if err != nil {
-		this.FailWithMessage("获取失败", "审批时间转换失败，Err:"+err.Error())
+		c.FailWithMessage("获取失败", "审批时间转换失败，Err:"+err.Error())
 		return
 	}
 	approvalTime, err := time.Parse(utils.FormatDateTime, item.ApprovalTime)
 	if err != nil {
-		this.FailWithMessage("获取失败", "发起时间转换失败，Err:"+err.Error())
+		c.FailWithMessage("获取失败", "发起时间转换失败，Err:"+err.Error())
 		return
 	}
 	//当前审批流程id
@@ -317,7 +317,7 @@ func (this *ApprovalCommon) DetailOld() {
 
 	resp.FlowNodeList = flowNodeListResp
 
-	this.OkDetailed(resp, "获取成功")
+	c.OkDetailed(resp, "获取成功")
 }
 
 // @Title 获取审批单中的权限列表
@@ -325,20 +325,20 @@ func (this *ApprovalCommon) DetailOld() {
 // @Param   ApprovalId   query   int  true       "审批单id"
 // @Success 200 {object} approval.CompanyPermissionResp
 // @router /getApprovalPermissionList [get]
-func (this *ApprovalCommon) GetApprovalPermissionList() {
-	//this.FailWithMessage("获取失败", "获取数据总数失败，Err:"+err.Error())
+func (c *ApprovalCommon) GetApprovalPermissionList() {
+	//c.FailWithMessage("获取失败", "获取数据总数失败，Err:"+err.Error())
 	//返回基础参数
 	resp := new(approval.CompanyPermissionResp)
 
 	//获取审批单信息
-	approvalId, _ := this.GetInt("ApprovalId")
+	approvalId, _ := c.GetInt("ApprovalId")
 	if approvalId <= 0 {
-		this.FailWithMessage("审批单参数异常", "提交审批单参数异常")
+		c.FailWithMessage("审批单参数异常", "提交审批单参数异常")
 		return
 	}
 	approvalInfo, err := company_approval.GetCompanyApprovalByApprovalId(approvalId)
 	if err != nil {
-		this.FailWithMessage("获取失败", "获取审批单数据失败，Err:"+err.Error())
+		c.FailWithMessage("获取失败", "获取审批单数据失败，Err:"+err.Error())
 		return
 	}
 
@@ -355,7 +355,7 @@ func (this *ApprovalCommon) GetApprovalPermissionList() {
 	//获取需要审批的权限
 	delayPermissionList, err := company_delay_permission.GetDelayPermissionItems(approvalInfo.CompanyId, approvalInfo.CompanyApprovalId)
 	if err != nil && err.Error() != utils.ErrNoRow() {
-		this.FailWithMessage("获取失败", "获取审批权限失败，Err:"+err.Error())
+		c.FailWithMessage("获取失败", "获取审批权限失败，Err:"+err.Error())
 		return
 	}
 
@@ -370,7 +370,7 @@ func (this *ApprovalCommon) GetApprovalPermissionList() {
 		plist := new(company_report_permission.PermissionLookList)
 		items, err := company_report_permission.GetPermissionLookItems(approvalInfo.ProductId, v)
 		if err != nil {
-			this.FailWithMessage("获取失败", "获取权限信息失败，Err:"+err.Error())
+			c.FailWithMessage("获取失败", "获取权限信息失败，Err:"+err.Error())
 			return
 		}
 		for _, n := range items {
@@ -390,7 +390,7 @@ func (this *ApprovalCommon) GetApprovalPermissionList() {
 
 	}
 
-	this.OkDetailed(resp, "获取成功")
+	c.OkDetailed(resp, "获取成功")
 }
 
 // @Title 审批
@@ -398,54 +398,54 @@ func (this *ApprovalCommon) GetApprovalPermissionList() {
 // @Param	request	body approval.CompanyApplyApproveReq true "type json string"
 // @Success Ret=200 审批成功
 // @router /approve_old [post]
-func (this *ApprovalCommon) ApplyApproveOld() {
-	sysUser := this.AdminWx
+func (c *ApprovalCommon) ApplyApproveOld() {
+	sysUser := c.AdminWx
 	var req approval2.CompanyApplyApproveReq
-	err := json.Unmarshal(this.Ctx.Input.RequestBody, &req)
+	err := json.Unmarshal(c.Ctx.Input.RequestBody, &req)
 	if err != nil {
-		this.FailWithMessage("参数解析异常！", "参数解析失败，Err:"+err.Error())
+		c.FailWithMessage("参数解析异常！", "参数解析失败，Err:"+err.Error())
 		return
 	}
 	roleTypeCode := sysUser.RoleTypeCode
 	productId := services.GetProductId(roleTypeCode)
 	if productId == 0 {
-		this.FailWithMessage("参数错误", "参数解析失败，Err:"+"客户类型为："+roleTypeCode)
+		c.FailWithMessage("参数错误", "参数解析失败，Err:"+"客户类型为："+roleTypeCode)
 		return
 	}
 	if req.CompanyId <= 0 {
-		this.FailWithMessage("参数错误", "客户Id小于等于0")
+		c.FailWithMessage("参数错误", "客户Id小于等于0")
 		return
 	}
 	if req.Status != 1 && req.Status != 2 {
-		this.FailWithMessage("参数错误", "审批状态Id小于等于0")
+		c.FailWithMessage("参数错误", "审批状态Id小于等于0")
 		return
 	}
 	companyProduct, err := company_product.GetCompanyProductByCompanyIdAndProductId(req.CompanyId, productId)
 	if err != nil {
-		this.FailWithMessage("获取信息失败", "获取信息失败,Err:"+err.Error())
+		c.FailWithMessage("获取信息失败", "获取信息失败,Err:"+err.Error())
 		return
 	}
 	if companyProduct == nil {
-		this.FailWithMessage("获取审批信息失败", "获取信息失败,Err:"+err.Error())
+		c.FailWithMessage("获取审批信息失败", "获取信息失败,Err:"+err.Error())
 		return
 	}
 
 	approvalItem, err := company_approval.GetCompanyApprovalByCompanyId(req.CompanyId, productId)
 	if err != nil {
 		if err.Error() == utils.ErrNoRow() {
-			this.FailWithMessage("订单已审批，请刷新页面查看最新状态", "待审批信息不存在,CompanyId:"+strconv.Itoa(req.CompanyId)+";productId:"+strconv.Itoa(productId))
+			c.FailWithMessage("订单已审批，请刷新页面查看最新状态", "待审批信息不存在,CompanyId:"+strconv.Itoa(req.CompanyId)+";productId:"+strconv.Itoa(productId))
 		} else {
-			this.FailWithMessage("获取信息失败", "获取信息失败,Err:"+err.Error())
+			c.FailWithMessage("获取信息失败", "获取信息失败,Err:"+err.Error())
 		}
 		return
 	}
 	if approvalItem == nil {
-		this.FailWithMessage("订单已审批，请刷新页面查看最新状态", "待审批信息不存在,CompanyId:"+strconv.Itoa(req.CompanyId)+";productId:"+strconv.Itoa(productId))
+		c.FailWithMessage("订单已审批，请刷新页面查看最新状态", "待审批信息不存在,CompanyId:"+strconv.Itoa(req.CompanyId)+";productId:"+strconv.Itoa(productId))
 		return
 	}
 
 	if approvalItem.ApproveRoleTypeCode != roleTypeCode {
-		this.FailWithMessage("您无权审批", "ApproveRoleTypeCode:"+approvalItem.ApproveRoleTypeCode+";roleTypeCode:"+roleTypeCode)
+		c.FailWithMessage("您无权审批", "ApproveRoleTypeCode:"+approvalItem.ApproveRoleTypeCode+";roleTypeCode:"+roleTypeCode)
 		return
 	}
 
@@ -457,24 +457,24 @@ func (this *ApprovalCommon) ApplyApproveOld() {
 			//获取合同信息
 			contract, err := company_contract.GetCompanyContractDetail(req.CompanyId, productId, req.CompanyContractId)
 			if err != nil {
-				this.FailWithMessage("待审批信息不存在", "待审批信息不存在,CompanyId:"+strconv.Itoa(req.CompanyId)+";productId:"+strconv.Itoa(productId)+";Err:"+err.Error())
+				c.FailWithMessage("待审批信息不存在", "待审批信息不存在,CompanyId:"+strconv.Itoa(req.CompanyId)+";productId:"+strconv.Itoa(productId)+";Err:"+err.Error())
 				return
 			}
 			if contract == nil {
-				this.FailWithMessage("待审批信息不存在", "待审批信息不存在,CompanyId:"+strconv.Itoa(req.CompanyId)+";productId:"+strconv.Itoa(productId))
+				c.FailWithMessage("待审批信息不存在", "待审批信息不存在,CompanyId:"+strconv.Itoa(req.CompanyId)+";productId:"+strconv.Itoa(productId))
 				return
 			}
 
 			//格式化合同开始时间
 			contractStartDate, err := time.Parse(utils.FormatDate, contract.StartDate)
 			if err != nil {
-				this.FailWithMessage("审批失败", "合同开始时间转换失败,Err:"+err.Error())
+				c.FailWithMessage("审批失败", "合同开始时间转换失败,Err:"+err.Error())
 				return
 			}
 			//格式化合同结束日期
 			contractEndDate, err := time.Parse(utils.FormatDate, contract.EndDate)
 			if err != nil {
-				this.FailWithMessage("审批失败", "合同结束时间转换失败,Err:"+err.Error())
+				c.FailWithMessage("审批失败", "合同结束时间转换失败,Err:"+err.Error())
 				return
 			}
 			//格式化 产品中 合同结束日期
@@ -488,13 +488,13 @@ func (this *ApprovalCommon) ApplyApproveOld() {
 			if time.Now().After(contractStartDate) {
 				err = company_approval.TryOutToFormal(req.CompanyId, productId, sysUser.AdminId, approvalItem.CompanyApprovalId, contract.CompanyContractId, contract.StartDate, contract.EndDate, sysUser.RealName, companyProduct.ProductName)
 				if err != nil {
-					this.FailWithMessage("审批失败", "审批失败,Err:"+err.Error())
+					c.FailWithMessage("审批失败", "审批失败,Err:"+err.Error())
 					return
 				}
 			} else {
 				err = company_approval.ApplyApproveContract(req.CompanyId, productId, approvalItem.CompanyApprovalId, contract.CompanyContractId)
 				if err != nil {
-					this.FailWithMessage("审批失败", "审批失败,Err:"+err.Error())
+					c.FailWithMessage("审批失败", "审批失败,Err:"+err.Error())
 					return
 				}
 			}
@@ -508,44 +508,44 @@ func (this *ApprovalCommon) ApplyApproveOld() {
 		} else if approvalItem.ApplyMethod == 2 { //冻结->试用
 			err = company_approval.FreezeToTryOut(req.CompanyId, productId, sysUser.AdminId, approvalItem.CompanyApprovalId, approvalItem.ApplyUserId, sysUser.RealName, companyProduct.ProductName)
 			if err != nil {
-				this.FailWithMessage("审批失败", "审批失败,Err:"+err.Error())
+				c.FailWithMessage("审批失败", "审批失败,Err:"+err.Error())
 				return
 			}
 		} else if approvalItem.ApplyMethod == 3 { //试用延期
 			err = company_approval.TryOutDelay(req.CompanyId, productId, sysUser.AdminId, approvalItem.CompanyApprovalId, sysUser.RealName, companyProduct.EndDate, companyProduct.ProductName)
 			if err != nil {
-				this.FailWithMessage("审批失败", "审批失败,Err:"+err.Error())
+				c.FailWithMessage("审批失败", "审批失败,Err:"+err.Error())
 				return
 			}
 		} else if approvalItem.ApplyMethod == 4 { //原销售申请领取流失客户
 			err = company_approval.ApplyReceive(req.CompanyId, productId, sysUser.AdminId, approvalItem.CompanyApprovalId, approvalItem.ApplyUserId, sysUser.RealName, companyProduct.ProductName)
 			if err != nil {
-				this.FailWithMessage("审批失败", "审批失败,Err:"+err.Error())
+				c.FailWithMessage("审批失败", "审批失败,Err:"+err.Error())
 				return
 			}
 		} else if approvalItem.ApplyMethod == 5 { //正式客户申请服务更新
 			//获取合同信息
 			contract, err := company_contract.GetCompanyContractDetail(req.CompanyId, productId, req.CompanyContractId)
 			if err != nil {
-				this.FailWithMessage("审批失败", "审批失败,Err:"+err.Error())
+				c.FailWithMessage("审批失败", "审批失败,Err:"+err.Error())
 				return
 			}
 			if contract == nil {
-				this.FailWithMessage("审批失败", "审批失败")
+				c.FailWithMessage("审批失败", "审批失败")
 				return
 			}
 
 			//格式化合同开始时间
 			contractStartDate, err := time.Parse(utils.FormatDate, contract.StartDate)
 			if err != nil {
-				this.FailWithMessage("审批失败", "合同开始时间转换失败,Err:"+err.Error())
+				c.FailWithMessage("审批失败", "合同开始时间转换失败,Err:"+err.Error())
 				return
 			}
 
 			//格式化合同结束日期
 			contractEndDate, err := time.Parse(utils.FormatDate, contract.EndDate)
 			if err != nil {
-				this.FailWithMessage("审批失败", "合同结束时间转换失败,Err:"+err.Error())
+				c.FailWithMessage("审批失败", "合同结束时间转换失败,Err:"+err.Error())
 				return
 			}
 			//格式化 产品中 合同结束日期
@@ -560,14 +560,14 @@ func (this *ApprovalCommon) ApplyApproveOld() {
 			if time.Now().After(contractStartDate) {
 				err = company_approval.ApplyServiceUpdate(req.CompanyId, productId, sysUser.AdminId, approvalItem.CompanyApprovalId, contract.CompanyContractId, companyProduct.StartDate, contract.EndDate, sysUser.RealName, companyProduct.ProductName)
 				if err != nil {
-					this.FailWithMessage("审批失败", "审批失败,Err:"+err.Error())
+					c.FailWithMessage("审批失败", "审批失败,Err:"+err.Error())
 					return
 				}
 
 			} else {
 				err = company_approval.ApplyApproveContract(req.CompanyId, productId, approvalItem.CompanyApprovalId, contract.CompanyContractId)
 				if err != nil {
-					this.FailWithMessage("审批失败", "审批失败,Err:"+err.Error())
+					c.FailWithMessage("审批失败", "审批失败,Err:"+err.Error())
 					return
 				}
 			}
@@ -580,21 +580,21 @@ func (this *ApprovalCommon) ApplyApproveOld() {
 				_ = companyProduct.Update(cols)
 			}
 		} else {
-			this.FailWithMessage("审批失败", "无效的审批状态,CompanyId:"+strconv.Itoa(req.CompanyId)+";productId:"+
+			c.FailWithMessage("审批失败", "无效的审批状态,CompanyId:"+strconv.Itoa(req.CompanyId)+";productId:"+
 				strconv.Itoa(productId)+";ApplyMethod:"+strconv.Itoa(approvalItem.ApplyMethod)+" ApproveStatus;"+approvalItem.ApproveStatus)
 			return
 		}
 		approveContent = "审批通过"
 	} else { //拒绝
 		if req.Remark == "" {
-			this.FailWithMessage("请填写驳回理由", "请填写驳回理由")
+			c.FailWithMessage("请填写驳回理由", "请填写驳回理由")
 			return
 		}
 		approveStatus = "驳回"
 		err = company_approval.ApproveRefuse(req.CompanyId, productId, approveStatus, req.Remark)
 		approveContent = "审批驳回"
 		if err != nil {
-			this.FailWithMessage("审批失败", "审批失败,Err:"+err.Error())
+			c.FailWithMessage("审批失败", "审批失败,Err:"+err.Error())
 			return
 		}
 	}
@@ -630,7 +630,7 @@ func (this *ApprovalCommon) ApplyApproveOld() {
 		productLog.LossTime = companyProduct.LossTime
 		productLog.LogType = "modify"
 		productLog.LogCreateTime = time.Now()
-		productLog.AdminId = this.AdminWx.AdminId
+		productLog.AdminId = c.AdminWx.AdminId
 		go company_product_log.AddCompanyProductLog(productLog)
 	}
 	//新增操作记录
@@ -654,7 +654,7 @@ func (this *ApprovalCommon) ApplyApproveOld() {
 			go services.AddCompanyApprovalMessage(sysUser.AdminId, approvalItem.ApplyUserId, req.CompanyId, approvalItem.CompanyApprovalId, 2, 1, approvalStatus, companyProduct.CompanyName, content, content, approvalSysUser.Mobile)
 		}
 	}
-	this.OkWithMessage("审批操作成功")
+	c.OkWithMessage("审批操作成功")
 }
 
 // @Title 获取审批流详情接口
@@ -662,22 +662,22 @@ func (this *ApprovalCommon) ApplyApproveOld() {
 // @Param   FlowId   query   int  true       "审批流程id；1：ficc客户审批；2：权益客户审批；3：ficc合同审批，4：权益合同审批，5：用印审批（合同章），6：用印审批（公章、法人章）"
 // @Success 200 {object} approval_flow.ApprovalFlowItem
 // @router /flowDetail [get]
-func (this *ApprovalCommon) GetFlowDetail() {
-	//sysUser := this.AdminWx
-	flowId, _ := this.GetInt("FlowId", 0)
+func (c *ApprovalCommon) GetFlowDetail() {
+	//sysUser := c.AdminWx
+	flowId, _ := c.GetInt("FlowId", 0)
 	if flowId <= 0 {
-		this.FailWithMessage("参数异常", fmt.Sprint("审批流程id异常,FlowId:", flowId))
+		c.FailWithMessage("参数异常", fmt.Sprint("审批流程id异常,FlowId:", flowId))
 		return
 	}
 
 	flowItem, err := flow.GetApprovalFlow(flowId)
 	if err != nil {
-		this.FailWithMessage("获取失败", "获取数据失败，Err:"+err.Error())
+		c.FailWithMessage("获取失败", "获取数据失败，Err:"+err.Error())
 		return
 	}
 
 	formatFlowItem, err := flow.FormatApprovalFlow(flowItem)
-	this.OkDetailed(formatFlowItem, "获取成功")
+	c.OkDetailed(formatFlowItem, "获取成功")
 }
 
 // CompanyList
@@ -686,17 +686,17 @@ func (this *ApprovalCommon) GetFlowDetail() {
 // @Param   Keyword   query   string  true       "搜索关键字：客户名称、组织社会信用码"
 // @Success 200 {object} []string
 // @router /company_list [get]
-func (this *ApprovalCommon) CompanyList() {
-	keyword := this.GetString("Keyword")
+func (c *ApprovalCommon) CompanyList() {
+	keyword := c.GetString("Keyword")
 	//合同id
 	if keyword == "" {
-		this.FailWithMessage("搜索关键字必传！", "搜索关键字必传！")
+		c.FailWithMessage("搜索关键字必传！", "搜索关键字必传！")
 		return
 	}
 	companyNameList := make([]string, 0)
-	list, err := company_approval.GetCompanyNameList(this.AdminWx.AdminId, this.AdminWx.RoleTypeCode, keyword)
+	list, err := company_approval.GetCompanyNameList(c.AdminWx.AdminId, c.AdminWx.RoleTypeCode, keyword)
 	if err != nil {
-		this.FailWithMessage("获取客户名称列表失败！", "获取客户名称列表失败,ERR:"+err.Error())
+		c.FailWithMessage("获取客户名称列表失败！", "获取客户名称列表失败,ERR:"+err.Error())
 		return
 	}
 
@@ -704,7 +704,7 @@ func (this *ApprovalCommon) CompanyList() {
 		companyNameList = append(companyNameList, v.CompanyName)
 	}
 
-	this.OkDetailed(companyNameList, "获取成功")
+	c.OkDetailed(companyNameList, "获取成功")
 }
 
 //// @Title 审批列表删除
@@ -712,13 +712,13 @@ func (this *ApprovalCommon) CompanyList() {
 //// @Param	request	body company.CompanyApplyDeleteReq true "type json string"
 //// @Success Ret=200 删除成功
 //// @router /approval/delete [post]
-//func (this *CompanyApprovalController) ApplyDelete() {
+//func (c *CompanyApprovalController) ApplyDelete() {
 //	br := new(models.BaseResponse).Init()
 //	defer func() {
-//		this.Data["json"] = br
-//		this.ServeJSON()
+//		c.Data["json"] = br
+//		c.ServeJSON()
 //	}()
-//	sysUser := this.SysUser
+//	sysUser := c.SysUser
 //	if sysUser == nil {
 //		br.Msg = "请登录"
 //		br.ErrMsg = "请登录，SysUser Is Empty"
@@ -726,7 +726,7 @@ func (this *ApprovalCommon) CompanyList() {
 //		return
 //	}
 //	var req company.CompanyApplyDeleteReq
-//	err := json.Unmarshal(this.Ctx.Input.RequestBody, &req)
+//	err := json.Unmarshal(c.Ctx.Input.RequestBody, &req)
 //	if err != nil {
 //		br.Msg = "参数解析异常！"
 //		br.ErrMsg = "参数解析失败，Err:" + err.Error()

controllers/approval_new.go

@@ -32,14 +32,14 @@ import (
 // @Param   KeywordEq   query   string  true       "搜索关键词（全等）"
 // @Success 200 {object} approval.CompanyApprovalListResp
 // @router /listV2 [get]
-func (this *ApprovalCommon) ListV2() {
-	sysUser := this.AdminWx
+func (c *ApprovalCommon) ListV2() {
+	sysUser := c.AdminWx
 
-	pageSize, _ := this.GetInt("PageSize")
-	currentIndex, _ := this.GetInt("CurrentIndex")
-	status := this.GetString("Status")
-	keyword := this.GetString("Keyword")
-	keywordEq := this.GetString("KeywordEq")
+	pageSize, _ := c.GetInt("PageSize")
+	currentIndex, _ := c.GetInt("CurrentIndex")
+	status := c.GetString("Status")
+	keyword := c.GetString("Keyword")
+	keywordEq := c.GetString("KeywordEq")
 
 	condition := ""
 	pars := make([]interface{}, 0)
@@ -94,13 +94,13 @@ func (this *ApprovalCommon) ListV2() {
 
 	total, err := contract_approval.GetCompanyApprovalCount(condition, pars)
 	if err != nil {
-		this.FailWithMessage("获取失败", "获取数据总数失败，Err:"+err.Error())
+		c.FailWithMessage("获取失败", "获取数据总数失败，Err:"+err.Error())
 		return
 	}
 
 	list, err := contract_approval.GetCompanyApprovalList(condition, pars, startSize, pageSize)
 	if err != nil {
-		this.FailWithMessage("获取审批列表失败！", "获取审批列表失败，Err:"+err.Error())
+		c.FailWithMessage("获取审批列表失败！", "获取审批列表失败，Err:"+err.Error())
 		return
 	}
 
@@ -117,7 +117,7 @@ func (this *ApprovalCommon) ListV2() {
 		//获取审批流列表数据
 		contractApprovalRecordList, err := contract_approval_record.GetContractApprovalRecordList(contractApprovalIdStr, sysUser.AdminId)
 		if err != nil {
-			this.FailWithMessage("获取审批流列表失败！", "获取审批流列表失败，Err:"+err.Error())
+			c.FailWithMessage("获取审批流列表失败！", "获取审批流列表失败，Err:"+err.Error())
 			return
 		}
 		contractApprovalRecordMap := make(map[int]*contract_approval_record.ContractApprovalRecord)
@@ -138,7 +138,7 @@ func (this *ApprovalCommon) ListV2() {
 			var contractDetail contract.ContractDetail
 			jsonErr := json.Unmarshal([]byte(list[i].ContractDetail), &contractDetail)
 			if jsonErr != nil {
-				this.FailWithMessage("审批合同数据转换失败！", "审批合同数据转换失败，Err:"+jsonErr.Error())
+				c.FailWithMessage("审批合同数据转换失败！", "审批合同数据转换失败，Err:"+jsonErr.Error())
 				return
 			}
 			list[i].ContractInfo = contractDetail
@@ -227,7 +227,7 @@ func (this *ApprovalCommon) ListV2() {
 
 			approvalCount, err := company_approval.GetCompanyApprovalCount(item.CompanyId, item.ProductId)
 			if err != nil && err.Error() != utils.ErrNoRow() {
-				this.FailWithMessage("获取失败", "获取延期审批次数失败，Err:"+err.Error())
+				c.FailWithMessage("获取失败", "获取延期审批次数失败，Err:"+err.Error())
 				return
 			}
 			respTmp.ApprovalCount = approvalCount
@@ -235,7 +235,7 @@ func (this *ApprovalCommon) ListV2() {
 			if respTmp.ApplyMethod == 3 {
 				delayPermission, err := company_delay_permission.GetApplyDelayPermission(item.CompanyApprovalId)
 				if err != nil && err.Error() != utils.ErrNoRow() {
-					this.FailWithMessage("获取失败", "获取延期审批权限失败，Err:"+err.Error())
+					c.FailWithMessage("获取失败", "获取延期审批权限失败，Err:"+err.Error())
 					return
 				}
 				respTmp.DelayPermission = delayPermission
@@ -245,21 +245,21 @@ func (this *ApprovalCommon) ListV2() {
 	}
 
 	page := paging.GetPaging(currentIndex, pageSize, total)
-	this.OkDetailed(approvalResp.CompanyApprovalListResp{
+	c.OkDetailed(approvalResp.CompanyApprovalListResp{
 		List:   respList,
 		Paging: page,
 	}, "获取成功")
 }
-func (this *ApprovalCommon) ListNew() {
-	sysUser := this.AdminWx
+func (c *ApprovalCommon) ListNew() {
+	sysUser := c.AdminWx
 	roleTypeCode := sysUser.RoleTypeCode
 
-	pageSize, _ := this.GetInt("PageSize")
-	currentIndex, _ := this.GetInt("CurrentIndex")
-	status := this.GetString("Status")
-	keyword := this.GetString("Keyword")
-	keywordEq := this.GetString("KeywordEq")
-	keyWord := this.GetString("KeyWord")
+	pageSize, _ := c.GetInt("PageSize")
+	currentIndex, _ := c.GetInt("CurrentIndex")
+	status := c.GetString("Status")
+	keyword := c.GetString("Keyword")
+	keywordEq := c.GetString("KeywordEq")
+	keyWord := c.GetString("KeyWord")
 	if keyword == "" {
 		keyword = keyWord
 	}
@@ -305,13 +305,13 @@ func (this *ApprovalCommon) ListNew() {
 
 	total, err := company_approval.GetApprovalCount(condition, pars)
 	if err != nil {
-		this.FailWithMessage("获取失败", "获取数据总数失败，Err:"+err.Error())
+		c.FailWithMessage("获取失败", "获取数据总数失败，Err:"+err.Error())
 		return
 	}
 
 	list, err := company_approval.GetApprovalList(condition, pars, startSize, pageSize)
 	if err != nil {
-		this.FailWithMessage("获取失败", "获取数据失败，Err:"+err.Error())
+		c.FailWithMessage("获取失败", "获取数据失败，Err:"+err.Error())
 		return
 	}
 	listLen := len(list)
@@ -334,7 +334,7 @@ func (this *ApprovalCommon) ListNew() {
 
 		approvalCount, err := company_approval.GetCompanyApprovalCount(item.CompanyId, item.ProductId)
 		if err != nil && err.Error() != utils.ErrNoRow() {
-			this.FailWithMessage("获取失败", "获取延期审批次数失败，Err:"+err.Error())
+			c.FailWithMessage("获取失败", "获取延期审批次数失败，Err:"+err.Error())
 			return
 		}
 		list[i].ApprovalCount = approvalCount
@@ -342,7 +342,7 @@ func (this *ApprovalCommon) ListNew() {
 		if item.ApplyMethod == 3 {
 			delayPermission, err := company_delay_permission.GetApplyDelayPermission(item.CompanyApprovalId)
 			if err != nil && err.Error() != utils.ErrNoRow() {
-				this.FailWithMessage("获取失败", "获取延期审批权限失败，Err:"+err.Error())
+				c.FailWithMessage("获取失败", "获取延期审批权限失败，Err:"+err.Error())
 				return
 			}
 			list[i].DelayPermission = delayPermission
@@ -357,7 +357,7 @@ func (this *ApprovalCommon) ListNew() {
 		Paging: page,
 		List:   list,
 	}
-	this.OkDetailed(resp, "获取成功")
+	c.OkDetailed(resp, "获取成功")
 }
 
 // @Title 获取审批单详情接口
@@ -365,8 +365,8 @@ func (this *ApprovalCommon) ListNew() {
 // @Param   ApprovalId   query   int  true       "审批单id"
 // @Success 200 {object} approval.CompanyApprovalDetailResp
 // @router /detail [get]
-func (this *ApprovalCommon) Detail() {
-	companyApprovalId, _ := this.GetInt("ApprovalId")
+func (c *ApprovalCommon) Detail() {
+	companyApprovalId, _ := c.GetInt("ApprovalId")
 
 	//if roleTypeCode == utils.ROLE_TYPE_CODE_FICC_ADMIN || roleTypeCode == utils.ROLE_TYPE_CODE_RAI_ADMIN { //审批
 	//	condition += ` AND c.approve_role_type_code=? `
@@ -376,9 +376,9 @@ func (this *ApprovalCommon) Detail() {
 	//	pars = append(pars, sysUser.AdminId)
 	//}
 
-	item, flowNodeListResp, err := company_apply.GetApprovalDetailByCompanyApprovalId(companyApprovalId, this.AdminWx)
+	item, flowNodeListResp, err := company_apply.GetApprovalDetailByCompanyApprovalId(companyApprovalId, c.AdminWx)
 	if err != nil {
-		this.FailWithMessage("获取失败", "获取数据失败，Err:"+err.Error())
+		c.FailWithMessage("获取失败", "获取数据失败，Err:"+err.Error())
 		return
 	}
 
@@ -401,7 +401,7 @@ func (this *ApprovalCommon) Detail() {
 	//获取需要审批的权限
 	delayPermissionList, err := company_delay_permission.GetDelayPermissionItems(item.CompanyId, item.CompanyApprovalId)
 	if err != nil && err.Error() != utils.ErrNoRow() {
-		this.FailWithMessage("获取失败", "获取审批权限失败，Err:"+err.Error())
+		c.FailWithMessage("获取失败", "获取审批权限失败，Err:"+err.Error())
 		return
 	}
 	delayPermissionIdMap := make(map[int]int)
@@ -415,7 +415,7 @@ func (this *ApprovalCommon) Detail() {
 		plist := new(company_report_permission.PermissionLookList)
 		items, err := company_report_permission.GetPermissionLookItems(item.ProductId, v)
 		if err != nil {
-			this.FailWithMessage("获取失败", "获取权限信息失败，Err:"+err.Error())
+			c.FailWithMessage("获取失败", "获取权限信息失败，Err:"+err.Error())
 			return
 		}
 		for _, n := range items {
@@ -435,7 +435,7 @@ func (this *ApprovalCommon) Detail() {
 
 	}
 
-	this.OkDetailed(resp, "获取成功")
+	c.OkDetailed(resp, "获取成功")
 }
 
 // ApplyApprove
@@ -444,35 +444,35 @@ func (this *ApprovalCommon) Detail() {
 // @Param	request	body approval.CompanyApplyApproveReq true "type json string"
 // @Success Ret=200 审批成功
 // @router /approve [post]
-func (this *ApprovalCommon) ApplyApprove() {
-	sysUser := this.AdminWx
+func (c *ApprovalCommon) ApplyApprove() {
+	sysUser := c.AdminWx
 	var req approval2.CompanyApplyApproveReq
-	err := json.Unmarshal(this.Ctx.Input.RequestBody, &req)
+	err := json.Unmarshal(c.Ctx.Input.RequestBody, &req)
 	if err != nil {
-		this.FailWithMessage("参数解析异常！", "参数解析失败，Err:"+err.Error())
+		c.FailWithMessage("参数解析异常！", "参数解析失败，Err:"+err.Error())
 		return
 	}
 	roleTypeCode := sysUser.RoleTypeCode
 	productId := services.GetProductId(roleTypeCode)
 	if productId == 0 {
-		this.FailWithMessage("参数错误", "参数解析失败，Err:"+"客户类型为："+roleTypeCode)
+		c.FailWithMessage("参数错误", "参数解析失败，Err:"+"客户类型为："+roleTypeCode)
 		return
 	}
 	if req.CompanyId <= 0 {
-		this.FailWithMessage("参数错误", "客户Id小于等于0")
+		c.FailWithMessage("参数错误", "客户Id小于等于0")
 		return
 	}
 	if req.Status != 1 && req.Status != 2 {
-		this.FailWithMessage("参数错误", "审批状态Id小于等于0")
+		c.FailWithMessage("参数错误", "审批状态Id小于等于0")
 		return
 	}
 	companyProduct, err := company_product.GetCompanyProductByCompanyIdAndProductId(req.CompanyId, productId)
 	if err != nil {
-		this.FailWithMessage("获取信息失败", "获取信息失败,Err:"+err.Error())
+		c.FailWithMessage("获取信息失败", "获取信息失败,Err:"+err.Error())
 		return
 	}
 	if companyProduct == nil {
-		this.FailWithMessage("获取审批信息失败", "获取信息失败,Err:"+err.Error())
+		c.FailWithMessage("获取审批信息失败", "获取信息失败,Err:"+err.Error())
 		return
 	}
 
@@ -482,16 +482,16 @@ func (this *ApprovalCommon) ApplyApprove() {
 	if req.Status == 1 {
 		err = company_apply.Approved(approvalRecord, sysUser, req.Remark)
 		if err != nil {
-			this.FailWithMessage("审核失败！", "审核失败，Err:"+err.Error())
+			c.FailWithMessage("审核失败！", "审核失败，Err:"+err.Error())
 			return
 		}
 	} else {
 		err = company_apply.Reject(approvalRecord, sysUser, req.Remark)
 		if err != nil {
-			this.FailWithMessage("审核失败！", "审核失败，Err:"+err.Error())
+			c.FailWithMessage("审核失败！", "审核失败，Err:"+err.Error())
 			return
 		}
 	}
 
-	this.OkWithMessage("审批操作成功")
+	c.OkWithMessage("审批操作成功")
 }

controllers/base_auth.go

@@ -11,7 +11,7 @@ import (
 	"strings"
 )
 
-//需要授权token的基类
+// BaseAuth 需要授权token的基类
 type BaseAuth struct {
 	BaseCommon
 	AdminWx *custom.AdminWx                  `description:"管理员信息"`
@@ -19,58 +19,58 @@ type BaseAuth struct {
 	Session *h5_admin_session.H5AdminSession `description:"用户session"`
 }
 
-func (this *BaseAuth) Prepare() {
+func (c *BaseAuth) Prepare() {
 	var requestBody string
-	method := this.Ctx.Input.Method()
+	method := c.Ctx.Input.Method()
 	if method == "GET" {
-		requestBody = this.Ctx.Request.RequestURI
+		requestBody = c.Ctx.Request.RequestURI
 	} else {
-		requestBody, _ = url.QueryUnescape(string(this.Ctx.Input.RequestBody))
+		requestBody, _ = url.QueryUnescape(string(c.Ctx.Input.RequestBody))
 	}
-	authorization := this.Ctx.Input.Header("Authorization")
+	authorization := c.Ctx.Input.Header("Authorization")
 
 	fmt.Println("requestBody:", requestBody)
-	ip := this.Ctx.Input.IP()
+	ip := c.Ctx.Input.IP()
 	fmt.Println("ip:", ip)
 
-	//apiLog.Println("请求地址：", this.Ctx.Input.URI(), "RequestBody：", requestBody, "IP：", ip, ";authorization：", authorization)
+	//apiLog.Println("请求地址：", c.Ctx.Input.URI(), "RequestBody：", requestBody, "IP：", ip, ";authorization：", authorization)
 	//if authorization == "" {
-	//	cookie := this.Ctx.GetCookie("rddp_access_token")
+	//	cookie := c.Ctx.GetCookie("rddp_access_token")
 	//	utils.FileLog.Info("authorization:%s,cookie:%s", authorization, cookie)
 	//	authorization = cookie
 	//}
-	uri := this.Ctx.Input.URI()
+	uri := c.Ctx.Input.URI()
 	utils.FileLog.Info("URI:%s", uri)
 	//if strings.Contains(uri, "/h5adminapi/wechat/login") {
 	//	authorization = ""
 	//}
 	if authorization == "" {
-		this.TokenMsgError("请求异常，没有携带token！", "请求异常，没有携带token ")
+		c.TokenMsgError("请求异常，没有携带token！", "请求异常，没有携带token ")
 		return
 	}
 
 	session, err := h5_admin_session.GetSessionByToken(authorization)
 	if err != nil {
 		if err.Error() == utils.ErrNoRow() {
-			this.TokenMsgError("信息已变更,请重新登陆！", "Token 信息已变更:Token: "+authorization)
+			c.TokenMsgError("信息已变更,请重新登陆！", "Token 信息已变更:Token: "+authorization)
 			return
 		}
-		this.TokenMsgError("网络异常，请稍后重试！", "获取用户信息异常，Err:"+err.Error())
+		c.TokenMsgError("网络异常，请稍后重试！", "获取用户信息异常，Err:"+err.Error())
 		return
 	}
 	if session == nil {
-		this.TokenMsgError("网络异常，请稍后重试！", "session is empty")
+		c.TokenMsgError("网络异常，请稍后重试！", "session is empty")
 		return
 	}
 
-	this.Session = session
+	c.Session = session
 	var adminWx *custom.AdminWx
 	if session.OpenId != "" {
 		tmpAdminWx, tmpErr := services.GetAdminUserItemByOpenId(session.OpenId)
 		adminWx = tmpAdminWx
 		err = tmpErr
 	} else {
-		this.TokenMsgError("数据异常！", "session is empty")
+		c.TokenMsgError("数据异常！", "session is empty")
 		return
 	}
 	//wxUser, err := models.GetWxUserItemByUserId(session.UserId)
@@ -78,7 +78,7 @@ func (this *BaseAuth) Prepare() {
 	if err != nil {
 		//没有找到记录
 		if err.Error() == utils.ErrNoRow() {
-			this.TokenMsgError("信息已变更,请重新登陆！", "获取admin 信息失败 "+strconv.Itoa(session.AdminId))
+			c.TokenMsgError("信息已变更,请重新登陆！", "获取admin 信息失败 "+strconv.Itoa(session.AdminId))
 			return
 		}
 
@@ -86,21 +86,21 @@ func (this *BaseAuth) Prepare() {
 		if err == services.ERR_ADMIN_NOT_BIND {
 			//如果不是登录接口
 			if !strings.Contains(uri, "/h5adminapi/admin/login") {
-				this.BindMsgError("账户未绑定！", "获取admin_wx信息异常，Err:"+err.Error())
+				c.BindMsgError("账户未绑定！", "获取admin_wx信息异常，Err:"+err.Error())
 				return
 			}
 		} else {
 			//其他错误信息
-			this.TokenMsgError("网络异常，请稍后重试！", "获取admin_wx信息异常，Err:"+err.Error())
+			c.TokenMsgError("网络异常，请稍后重试！", "获取admin_wx信息异常，Err:"+err.Error())
 			return
 		}
 
 	}
 	if adminWx == nil {
-		this.TokenMsgError("网络异常，请稍后重试！", "admin is empty")
+		c.TokenMsgError("网络异常，请稍后重试！", "admin is empty")
 		return
 	}
-	this.AdminWx = adminWx
+	c.AdminWx = adminWx
 
-	this.Token = authorization
+	c.Token = authorization
 }

controllers/base_common.go

@@ -42,112 +42,112 @@ const (
 )
 
 //返回数据
-func (this BaseCommon) Result() {
+func (c BaseCommon) Result() {
 	var content []byte
 	var err error
-	content, err = json.Marshal(this.Response)
-	ip := this.Ctx.Input.IP()
-	requestBody, err := url.QueryUnescape(string(this.Ctx.Input.RequestBody))
+	content, err = json.Marshal(c.Response)
+	ip := c.Ctx.Input.IP()
+	requestBody, err := url.QueryUnescape(string(c.Ctx.Input.RequestBody))
 	if err != nil {
 		fmt.Println("base auth url.QueryUnescape Err:", err.Error())
-		requestBody = string(this.Ctx.Input.RequestBody)
+		requestBody = string(c.Ctx.Input.RequestBody)
 	}
-	apiLog.Println("请求地址：", this.Ctx.Input.URI(), "Authorization:", this.Ctx.Input.Header("Authorization"), "RequestBody：", requestBody, "ResponseBody", string(content), "IP：", ip)
+	apiLog.Println("请求地址：", c.Ctx.Input.URI(), "Authorization:", c.Ctx.Input.Header("Authorization"), "RequestBody：", requestBody, "ResponseBody", string(content), "IP：", ip)
 
-	this.Controller.Data["json"] = this.Response
-	this.Controller.ServeJSON()
-	this.StopRun()
+	c.Controller.Data["json"] = c.Response
+	c.Controller.ServeJSON()
+	c.StopRun()
 }
 
 //没有任何信息的返回
-func (this BaseCommon) Ok() {
-	this.Response.Code = SUCCESS
-	this.Response.Msg = "操作成功"
-	this.Response.Data = map[string]interface{}{}
-	this.Result()
+func (c BaseCommon) Ok() {
+	c.Response.Code = SUCCESS
+	c.Response.Msg = "操作成功"
+	c.Response.Data = map[string]interface{}{}
+	c.Result()
 }
 
-func (this BaseCommon) OkWithMessage(message string) {
-	this.Response.Code = SUCCESS
-	this.Response.Msg = message
-	this.Response.Data = map[string]interface{}{}
-	this.Result()
+func (c BaseCommon) OkWithMessage(message string) {
+	c.Response.Code = SUCCESS
+	c.Response.Msg = message
+	c.Response.Data = map[string]interface{}{}
+	c.Result()
 }
 
-func (this BaseCommon) OkWithData(data interface{}) {
-	this.Response.Code = SUCCESS
-	this.Response.Msg = "操作成功"
-	this.Response.Data = data
-	this.Result()
+func (c BaseCommon) OkWithData(data interface{}) {
+	c.Response.Code = SUCCESS
+	c.Response.Msg = "操作成功"
+	c.Response.Data = data
+	c.Result()
 }
 
-func (this BaseCommon) OkDetailed(data interface{}, message string) {
-	this.Response.Code = SUCCESS
-	this.Response.Msg = message
-	this.Response.Data = data
-	this.Result()
+func (c BaseCommon) OkDetailed(data interface{}, message string) {
+	c.Response.Code = SUCCESS
+	c.Response.Msg = message
+	c.Response.Data = data
+	c.Result()
 }
 
-func (this BaseCommon) Fail() {
-	this.Response.Code = ERROR
-	this.Response.Msg = "操作失败"
-	this.Response.Data = map[string]interface{}{}
-	this.Result()
+func (c BaseCommon) Fail() {
+	c.Response.Code = ERROR
+	c.Response.Msg = "操作失败"
+	c.Response.Data = map[string]interface{}{}
+	c.Result()
 }
 
-func (this BaseCommon) FailWithMessage(message, errMessage string) {
-	this.Response.Code = ERROR
-	this.Response.Msg = message
-	this.Response.ErrMsg = errMessage
-	this.Response.Data = map[string]interface{}{}
-	this.Result()
+func (c BaseCommon) FailWithMessage(message, errMessage string) {
+	c.Response.Code = ERROR
+	c.Response.Msg = message
+	c.Response.ErrMsg = errMessage
+	c.Response.Data = map[string]interface{}{}
+	c.Result()
 }
 
 //token异常
-func (this BaseCommon) TokenError(data interface{}, message string) {
-	this.Response.Code = TOKEN_ERROR
-	this.Response.Msg = message
-	this.Response.Data = data
-	this.Result()
+func (c BaseCommon) TokenError(data interface{}, message string) {
+	c.Response.Code = TOKEN_ERROR
+	c.Response.Msg = message
+	c.Response.Data = data
+	c.Result()
 }
 
 //token异常
-func (this BaseCommon) TokenMsgError(message, errMessage string) {
-	this.Response.Code = TOKEN_ERROR
-	this.Response.Msg = message
-	this.Response.ErrMsg = errMessage
-	//this.Response.Data = data
-	this.Result()
+func (c BaseCommon) TokenMsgError(message, errMessage string) {
+	c.Response.Code = TOKEN_ERROR
+	c.Response.Msg = message
+	c.Response.ErrMsg = errMessage
+	//c.Response.Data = data
+	c.Result()
 }
 
 //账户绑定异常
-func (this BaseCommon) BindError(data interface{}, message string) {
-	this.Response.Code = BIND_ERROR
-	this.Response.Msg = message
-	this.Response.Data = data
-	this.Result()
+func (c BaseCommon) BindError(data interface{}, message string) {
+	c.Response.Code = BIND_ERROR
+	c.Response.Msg = message
+	c.Response.Data = data
+	c.Result()
 }
 
 //账户绑定异常
-func (this BaseCommon) BindMsgError(message, errMessage string) {
-	this.Response.Code = BIND_ERROR
-	this.Response.Msg = message
-	this.Response.ErrMsg = errMessage
-	//this.Response.Data = data
-	this.Result()
+func (c BaseCommon) BindMsgError(message, errMessage string) {
+	c.Response.Code = BIND_ERROR
+	c.Response.Msg = message
+	c.Response.ErrMsg = errMessage
+	//c.Response.Data = data
+	c.Result()
 }
 
 //签名异常
-func (this BaseCommon) SignError(message string) {
-	this.Response.Code = SIGN_ERROR
-	this.Response.Msg = message
-	this.Response.Data = map[string]interface{}{}
-	this.Result()
-}
-
-func (this BaseCommon) FailWithDetailed(code int, data interface{}, message string) {
-	this.Response.Code = code
-	this.Response.Msg = message
-	this.Response.Data = data
-	this.Result()
+func (c BaseCommon) SignError(message string) {
+	c.Response.Code = SIGN_ERROR
+	c.Response.Msg = message
+	c.Response.Data = map[string]interface{}{}
+	c.Result()
+}
+
+func (c BaseCommon) FailWithDetailed(code int, data interface{}, message string) {
+	c.Response.Code = code
+	c.Response.Msg = message
+	c.Response.Data = data
+	c.Result()
 }

controllers/base_not_auth.go

@@ -11,26 +11,26 @@ type BaseNotAuth struct {
 	BaseCommon
 }
 
-func (this *BaseNotAuth) Prepare() {
+func (c *BaseNotAuth) Prepare() {
 	var requestBody string
-	method := this.Ctx.Input.Method()
+	method := c.Ctx.Input.Method()
 	if method == "GET" {
-		requestBody = this.Ctx.Request.RequestURI
+		requestBody = c.Ctx.Request.RequestURI
 	} else {
-		requestBody, _ = url.QueryUnescape(string(this.Ctx.Input.RequestBody))
+		requestBody, _ = url.QueryUnescape(string(c.Ctx.Input.RequestBody))
 	}
 	fmt.Println("requestBody:", requestBody)
-	ip := this.Ctx.Input.IP()
+	ip := c.Ctx.Input.IP()
 	fmt.Println("ip:", ip)
-	//apiLog.Println("请求地址：", this.Ctx.Input.URI(), "RequestBody：", requestBody, "IP：", ip)
+	//apiLog.Println("请求地址：", c.Ctx.Input.URI(), "RequestBody：", requestBody, "IP：", ip)
 
-	authorization := this.Ctx.Input.Header("Authorization")
+	authorization := c.Ctx.Input.Header("Authorization")
 	if authorization == "" {
-		cookie := this.Ctx.GetCookie("rddp_access_token")
+		cookie := c.Ctx.GetCookie("rddp_access_token")
 		utils.FileLog.Info("authorization:%s,cookie:%s", authorization, cookie)
 		authorization = cookie
 	}
-	uri := this.Ctx.Input.URI()
+	uri := c.Ctx.Input.URI()
 	utils.FileLog.Info("URI:%s", uri)
 	//if strings.Contains(uri, "/h5adminapi/wechat/login") {
 	//	authorization = ""

controllers/company_contract.go

@@ -19,25 +19,25 @@ type CompanyContractCommon struct {
 // @Param   CompanyContractId   query   int  true       "合同id"
 // @Success 200 {object} company_contract.CompanyContractDetailResp
 // @router /detail [get]
-func (this *CompanyContractCommon) ApplyContractDetail() {
-	sysUser := this.AdminWx
+func (c *CompanyContractCommon) ApplyContractDetail() {
+	sysUser := c.AdminWx
 
-	companyId, _ := this.GetInt("CompanyId")
+	companyId, _ := c.GetInt("CompanyId")
 	if companyId <= 0 {
-		this.FailWithMessage("参数错误", "参数错误，客户id小于等于0")
+		c.FailWithMessage("参数错误", "参数错误，客户id小于等于0")
 		return
 	}
-	companyContractId, _ := this.GetInt("CompanyContractId")
+	companyContractId, _ := c.GetInt("CompanyContractId")
 
 	roleTypeCode := sysUser.RoleTypeCode
 	productId := services.GetProductId(roleTypeCode)
 	//if productId == 0 {
-	//	this.FailWithMessage("当前账户类型异常", "客户类型为："+roleTypeCode)
+	//	c.FailWithMessage("当前账户类型异常", "客户类型为："+roleTypeCode)
 	//	return
 	//}
 	detail, err := company_contract.GetCompanyContractDetail(companyId, productId, companyContractId)
 	if err != nil {
-		this.FailWithMessage("获取信息失败", "获取信息失败,Err:"+err.Error())
+		c.FailWithMessage("获取信息失败", "获取信息失败,Err:"+err.Error())
 		return
 	}
 	productId = detail.ProductId
@@ -47,13 +47,13 @@ func (this *CompanyContractCommon) ApplyContractDetail() {
 			plist := new(company_report_permission.PermissionLookList)
 			items, err := company_report_permission.GetPermissionLookItems(productId, v)
 			if err != nil {
-				this.FailWithMessage("获取失败", "获取权限信息失败,Err:"+err.Error())
+				c.FailWithMessage("获取失败", "获取权限信息失败,Err:"+err.Error())
 				return
 			}
 			for _, n := range items {
 				count, err := company_contract.GetCompanyContractPermissionCheckByContractId(companyId, detail.CompanyContractId, n.ChartPermissionId)
 				if err != nil {
-					this.FailWithMessage("获取失败", "获取权限信息失败,Err:"+err.Error())
+					c.FailWithMessage("获取失败", "获取权限信息失败,Err:"+err.Error())
 					return
 				}
 				if count > 0 {
@@ -71,13 +71,13 @@ func (this *CompanyContractCommon) ApplyContractDetail() {
 		plist := new(company_report_permission.PermissionLookList)
 		items, err := company_report_permission.GetPermissionLookItems(productId, classifyName)
 		if err != nil {
-			this.FailWithMessage("获取失败", "获取权限信息失败,Err:"+err.Error())
+			c.FailWithMessage("获取失败", "获取权限信息失败,Err:"+err.Error())
 			return
 		}
 		for _, n := range items {
 			count, err := company_contract.GetCompanyContractPermissionCheckByContractId(companyId, detail.CompanyContractId, n.ChartPermissionId)
 			if err != nil {
-				this.FailWithMessage("获取失败", "获取权限信息失败,Err:"+err.Error())
+				c.FailWithMessage("获取失败", "获取权限信息失败,Err:"+err.Error())
 				return
 			}
 			if count > 0 {
@@ -92,5 +92,5 @@ func (this *CompanyContractCommon) ApplyContractDetail() {
 	resp := companyContractResp.CompanyContractDetailResp{
 		detail,
 	}
-	this.OkDetailed(resp, "获取成功")
+	c.OkDetailed(resp, "获取成功")
 }

controllers/contract.go

@@ -22,26 +22,26 @@ type ContractCommon struct {
 // @Param	request	body contract.UploadCheckBackFileReq true "type json string"
 // @Success Ret=200 上传成功
 // @router /upload_check_back_file [post]
-func (this *ContractCommon) UploadCheckBackFile() {
+func (c *ContractCommon) UploadCheckBackFile() {
 	var req contractReq.UploadCheckBackFileReq
-	err := json.Unmarshal(this.Ctx.Input.RequestBody, &req)
+	err := json.Unmarshal(c.Ctx.Input.RequestBody, &req)
 	if err != nil {
-		this.FailWithMessage("参数解析异常！", "参数解析失败，Err:"+err.Error())
+		c.FailWithMessage("参数解析异常！", "参数解析失败，Err:"+err.Error())
 		return
 	}
 	//合同编号
 	if req.ContractId <= 0 {
-		this.FailWithMessage("请传入合同编号！", "请传入合同编号")
+		c.FailWithMessage("请传入合同编号！", "请传入合同编号")
 		return
 	}
 
 	if req.FileUrl == "" {
-		this.FailWithMessage("请先上传附件！", "请先上传附件")
+		c.FailWithMessage("请先上传附件！", "请先上传附件")
 		return
 	}
-	err = contractService.UploadCheckBackFile(req.ContractId, req.FileUrl, this.AdminWx)
+	err = contractService.UploadCheckBackFile(req.ContractId, req.FileUrl, c.AdminWx)
 
-	this.OkWithMessage("上传成功")
+	c.OkWithMessage("上传成功")
 }
 
 // @Title 获取合同详情
@@ -49,20 +49,20 @@ func (this *ContractCommon) UploadCheckBackFile() {
 // @Param   ContractId   query   int  true       "合同id"
 // @Success 200 {object} contract.ContractDetailResp
 // @router /detail [get]
-func (this *ContractCommon) Detail() {
+func (c *ContractCommon) Detail() {
 	//合同类型、产品类型、合同状态、更新时间、所选销售
 	//关键字：合同编号、客户名称，社会信用码
-	contractId, _ := this.GetInt("ContractId")
+	contractId, _ := c.GetInt("ContractId")
 	//合同id
 	if contractId <= 0 {
-		this.FailWithMessage("合同id必传！", "合同id必传！")
+		c.FailWithMessage("合同id必传！", "合同id必传！")
 		return
 	}
 
 	//获取合同详情
-	contractInfo, flowNodeListResp, contractOpButton, err := contractService.GetContractDetailByContractId(contractId, this.AdminWx)
+	contractInfo, flowNodeListResp, contractOpButton, err := contractService.GetContractDetailByContractId(contractId, c.AdminWx)
 	if err != nil {
-		this.FailWithMessage("获取合同详情失败！", "获取合同详情失败,ERR:"+err.Error())
+		c.FailWithMessage("获取合同详情失败！", "获取合同详情失败,ERR:"+err.Error())
 		return
 	}
 	resp := contractResp.ContractDetailResp{
@@ -70,7 +70,7 @@ func (this *ContractCommon) Detail() {
 		FlowNodeList:   flowNodeListResp,
 		OpButton:       contractOpButton,
 	}
-	this.OkDetailed(resp, "获取成功")
+	c.OkDetailed(resp, "获取成功")
 }
 
 // CompanyList
@@ -81,21 +81,21 @@ func (this *ContractCommon) Detail() {
 // @Param   Status   query   string  true       "合同状态"
 // @Success 200 {object} []string
 // @router /company_list [get]
-func (this *ContractCommon) CompanyList() {
-	sysUser := this.AdminWx
+func (c *ContractCommon) CompanyList() {
+	sysUser := c.AdminWx
 
-	keyword := this.GetString("Keyword")
+	keyword := c.GetString("Keyword")
 	//搜索关键字
 	if keyword == "" {
-		this.FailWithMessage("搜索关键字必传！", "搜索关键字必传！")
+		c.FailWithMessage("搜索关键字必传！", "搜索关键字必传！")
 		return
 	}
-	status := this.GetString("Status")
+	status := c.GetString("Status")
 	companyNameList := make([]string, 0)
 
-	list, err := contract.GetCompanyNameList(this.AdminWx.AdminId, keyword, status)
+	list, err := contract.GetCompanyNameList(c.AdminWx.AdminId, keyword, status)
 	if err != nil {
-		this.FailWithMessage("获取客户名称列表失败！", "获取客户名称列表失败,ERR:"+err.Error())
+		c.FailWithMessage("获取客户名称列表失败！", "获取客户名称列表失败,ERR:"+err.Error())
 		return
 	}
 
@@ -125,7 +125,7 @@ func (this *ContractCommon) CompanyList() {
 
 	list2, err := contract_approval.GetCompanyNameListV2(childCondition, condition, childPars, pars)
 	if err != nil {
-		this.FailWithMessage("获取客户名称列表失败！", "获取客户名称列表失败,ERR:"+err.Error())
+		c.FailWithMessage("获取客户名称列表失败！", "获取客户名称列表失败,ERR:"+err.Error())
 		return
 	}
 	for _, v := range list2 {
@@ -133,7 +133,7 @@ func (this *ContractCommon) CompanyList() {
 			companyNameList = append(companyNameList, v.CompanyName)
 		}
 	}
-	this.OkDetailed(companyNameList, "获取成功")
+	c.OkDetailed(companyNameList, "获取成功")
 }
 
 // List
@@ -149,23 +149,23 @@ func (this *ContractCommon) CompanyList() {
 // @Param   KeywordEq   query   string  false       "搜索关键字（全等）"
 // @Success 200 {object} contract.ContractListResp
 // @router /list [get]
-func (this *ContractCommon) List() {
+func (c *ContractCommon) List() {
 	//合同类型、产品类型、合同状态、更新时间、所选销售
 	//关键字：合同编号、客户名称，社会信用码
-	contractType := this.GetString("ContractType")
-	status := this.GetString("Status")
-	productId, _ := this.GetInt("ProductId")
-	modifyStartTime := this.GetString("ModifyStartTime")
-	modifyEndTime := this.GetString("ModifyEndTime")
-	sellerIds := this.GetString("SellerId")
-	keyword := this.GetString("Keyword")
-	keywordEq := this.GetString("KeywordEq")
+	contractType := c.GetString("ContractType")
+	status := c.GetString("Status")
+	productId, _ := c.GetInt("ProductId")
+	modifyStartTime := c.GetString("ModifyStartTime")
+	modifyEndTime := c.GetString("ModifyEndTime")
+	sellerIds := c.GetString("SellerId")
+	keyword := c.GetString("Keyword")
+	keywordEq := c.GetString("KeywordEq")
 
 	condition := ""
 	pars := make([]interface{}, 0)
 	//如果不是超管或者合规，那么只能查看自己的合同
 	condition += ` AND seller_id = ? `
-	pars = append(pars, this.AdminWx.AdminId)
+	pars = append(pars, c.AdminWx.AdminId)
 	//合同类型、、更新时间、所选销售
 	//关键字：合同编号、客户名称，社会信用码
 	if contractType != "" {
@@ -206,8 +206,8 @@ func (this *ContractCommon) List() {
 		pars = append(pars, keywordEq)
 	}
 
-	pageSize, _ := this.GetInt("PageSize")
-	currentIndex, _ := this.GetInt("CurrentIndex")
+	pageSize, _ := c.GetInt("PageSize")
+	currentIndex, _ := c.GetInt("CurrentIndex")
 
 	var startSize int
 	if pageSize <= 0 {
@@ -220,19 +220,19 @@ func (this *ContractCommon) List() {
 
 	total, err := contract.GetContractListCount(condition, pars)
 	if err != nil {
-		this.FailWithMessage("获取失败", "获取数据总数失败，Err:"+err.Error())
+		c.FailWithMessage("获取失败", "获取数据总数失败，Err:"+err.Error())
 		return
 	}
 
 	list, err := contract.GetContractList(condition, pars, startSize, pageSize)
 	if err != nil {
-		this.FailWithMessage("获取合同列表失败", "获取合同列表失败，Err:"+err.Error())
+		c.FailWithMessage("获取合同列表失败", "获取合同列表失败，Err:"+err.Error())
 		return
 	}
 
 	page := paging.GetPaging(currentIndex, pageSize, total)
 
-	this.OkDetailed(contractResp.ContractListResp{
+	c.OkDetailed(contractResp.ContractListResp{
 		List:   list,
 		Paging: page,
 	}, "获取成功")
@@ -246,24 +246,24 @@ func (this *ContractCommon) List() {
 // @Param   Status   query   string  true       "合同状态"
 // @Success 200 {object} []string
 // @router /companyListBySeal [get]
-func (this *ContractCommon) CompanyListBySeal() {
-	sysUser := this.AdminWx
-	keyword := this.GetString("Keyword")
+func (c *ContractCommon) CompanyListBySeal() {
+	sysUser := c.AdminWx
+	keyword := c.GetString("Keyword")
 	//搜索关键字
 	if keyword == "" {
-		this.FailWithMessage("搜索关键字必传！", "搜索关键字必传！")
+		c.FailWithMessage("搜索关键字必传！", "搜索关键字必传！")
 		return
 	}
-	status := this.GetString("Status")
+	status := c.GetString("Status")
 	companyNameList := make([]string, 0)
 
 	sellerId := 0
 	if sysUser.RoleTypeCode != utils.ROLE_TYPE_CODE_COMPLIANCE {
-		sellerId = this.AdminWx.AdminId
+		sellerId = c.AdminWx.AdminId
 	}
 	list, err := contract.GetCompanyNameList(sellerId, keyword, status)
 	if err != nil {
-		this.FailWithMessage("获取客户名称列表失败！", "获取客户名称列表失败,ERR:"+err.Error())
+		c.FailWithMessage("获取客户名称列表失败！", "获取客户名称列表失败,ERR:"+err.Error())
 		return
 	}
 
@@ -295,7 +295,7 @@ func (this *ContractCommon) CompanyListBySeal() {
 	//
 	//list2, err := contract_approval.GetCompanyNameListV2(childCondition, condition, childPars, pars)
 	//if err != nil {
-	//	this.FailWithMessage("获取客户名称列表失败！", "获取客户名称列表失败,ERR:"+err.Error())
+	//	c.FailWithMessage("获取客户名称列表失败！", "获取客户名称列表失败,ERR:"+err.Error())
 	//	return
 	//}
 	//for _, v := range list2 {
@@ -303,7 +303,7 @@ func (this *ContractCommon) CompanyListBySeal() {
 	//		companyNameList = append(companyNameList, v.CompanyName)
 	//	}
 	//}
-	this.OkDetailed(companyNameList, "获取成功")
+	c.OkDetailed(companyNameList, "获取成功")
 }
 
 // ListBySeal
@@ -319,25 +319,25 @@ func (this *ContractCommon) CompanyListBySeal() {
 // @Param   KeywordEq   query   string  false       "搜索关键字（全等）"
 // @Success 200 {object} contract.ContractListResp
 // @router /listBySeal [get]
-func (this *ContractCommon) ListBySeal() {
+func (c *ContractCommon) ListBySeal() {
 	//合同类型、产品类型、合同状态、更新时间、所选销售
 	//关键字：合同编号、客户名称，社会信用码
 
-	contractType := this.GetString("ContractType")
-	status := this.GetString("Status")
-	productId, _ := this.GetInt("ProductId")
-	modifyStartTime := this.GetString("ModifyStartTime")
-	modifyEndTime := this.GetString("ModifyEndTime")
-	sellerIds := this.GetString("SellerId")
-	keyword := this.GetString("Keyword")
-	keywordEq := this.GetString("KeywordEq")
+	contractType := c.GetString("ContractType")
+	status := c.GetString("Status")
+	productId, _ := c.GetInt("ProductId")
+	modifyStartTime := c.GetString("ModifyStartTime")
+	modifyEndTime := c.GetString("ModifyEndTime")
+	sellerIds := c.GetString("SellerId")
+	keyword := c.GetString("Keyword")
+	keywordEq := c.GetString("KeywordEq")
 
 	condition := ""
 	pars := make([]interface{}, 0)
 	//如果不是合规，那么只能查看自己的合同
-	if this.AdminWx.RoleTypeCode != utils.ROLE_TYPE_CODE_COMPLIANCE {
+	if c.AdminWx.RoleTypeCode != utils.ROLE_TYPE_CODE_COMPLIANCE {
 		condition += ` AND seller_id = ? `
-		pars = append(pars, this.AdminWx.AdminId)
+		pars = append(pars, c.AdminWx.AdminId)
 	}
 	//合同类型、、更新时间、所选销售
 	//关键字：合同编号、客户名称，社会信用码
@@ -379,8 +379,8 @@ func (this *ContractCommon) ListBySeal() {
 		pars = append(pars, keywordEq)
 	}
 
-	pageSize, _ := this.GetInt("PageSize")
-	currentIndex, _ := this.GetInt("CurrentIndex")
+	pageSize, _ := c.GetInt("PageSize")
+	currentIndex, _ := c.GetInt("CurrentIndex")
 
 	var startSize int
 	if pageSize <= 0 {
@@ -393,19 +393,19 @@ func (this *ContractCommon) ListBySeal() {
 
 	total, err := contract.GetContractListCount(condition, pars)
 	if err != nil {
-		this.FailWithMessage("获取失败", "获取数据总数失败，Err:"+err.Error())
+		c.FailWithMessage("获取失败", "获取数据总数失败，Err:"+err.Error())
 		return
 	}
 
 	list, err := contract.GetContractList(condition, pars, startSize, pageSize)
 	if err != nil {
-		this.FailWithMessage("获取合同列表失败", "获取合同列表失败，Err:"+err.Error())
+		c.FailWithMessage("获取合同列表失败", "获取合同列表失败，Err:"+err.Error())
 		return
 	}
 
 	page := paging.GetPaging(currentIndex, pageSize, total)
 
-	this.OkDetailed(contractResp.ContractListResp{
+	c.OkDetailed(contractResp.ContractListResp{
 		List:   list,
 		Paging: page,
 	}, "获取成功")
@@ -424,19 +424,19 @@ func (this *ContractCommon) ListBySeal() {
 // @Param   KeywordEq   query   string  false       "搜索关键字（全等）"
 // @Success 200 {object} contract.ContractListRespV2
 // @router /listV2 [get]
-func (this *ContractCommon) ListV2() {
-	sysUser := this.AdminWx
+func (c *ContractCommon) ListV2() {
+	sysUser := c.AdminWx
 
 	//合同类型、产品类型、合同状态、更新时间、所选销售
 	//关键字：合同编号、客户名称，社会信用码
-	contractType := this.GetString("ContractType")
-	status := this.GetString("Status")
-	productId, _ := this.GetInt("ProductId")
-	modifyStartTime := this.GetString("ModifyStartTime")
-	modifyEndTime := this.GetString("ModifyEndTime")
-	sellerIds := this.GetString("SellerId")
-	keyword := this.GetString("Keyword")
-	keywordEq := this.GetString("KeywordEq")
+	contractType := c.GetString("ContractType")
+	status := c.GetString("Status")
+	productId, _ := c.GetInt("ProductId")
+	modifyStartTime := c.GetString("ModifyStartTime")
+	modifyEndTime := c.GetString("ModifyEndTime")
+	sellerIds := c.GetString("SellerId")
+	keyword := c.GetString("Keyword")
+	keywordEq := c.GetString("KeywordEq")
 
 	childCondition := ""
 	condition := ""
@@ -528,8 +528,8 @@ func (this *ContractCommon) ListV2() {
 		unionPars = append(unionPars, keywordEq)
 	}
 
-	pageSize, _ := this.GetInt("PageSize")
-	currentIndex, _ := this.GetInt("CurrentIndex")
+	pageSize, _ := c.GetInt("PageSize")
+	currentIndex, _ := c.GetInt("CurrentIndex")
 
 	var startSize int
 	if pageSize <= 0 {
@@ -545,19 +545,19 @@ func (this *ContractCommon) ListV2() {
 
 	total, err := contract_approval.GetContractListCountV2(childCondition, condition, joinCondition, unionCondition, childPars, pars, unionPars)
 	if err != nil {
-		this.FailWithMessage("获取失败", "获取数据总数失败，Err:"+err.Error())
+		c.FailWithMessage("获取失败", "获取数据总数失败，Err:"+err.Error())
 		return
 	}
 	list, err := contract_approval.GetContractListV2(childCondition, condition, joinCondition, unionCondition, childPars, pars, unionPars, startSize, pageSize)
 
 	if err != nil {
-		this.FailWithMessage("获取合同列表失败", "获取合同列表失败，Err:"+err.Error())
+		c.FailWithMessage("获取合同列表失败", "获取合同列表失败，Err:"+err.Error())
 		return
 	}
 
 	page := paging.GetPaging(currentIndex, pageSize, total)
 
-	this.OkDetailed(contractResp.ContractListRespV2{
+	c.OkDetailed(contractResp.ContractListRespV2{
 		List:   list,
 		Paging: page,
 	}, "获取成功")
@@ -568,25 +568,25 @@ func (this *ContractCommon) ListV2() {
 // @Param	request	body contract.InvalidReq true "type json string"
 // @Success Ret=200 作废成功
 // @router /invalid [post]
-func (this *ContractCommon) Invalid() {
+func (c *ContractCommon) Invalid() {
 	var req contractReq.InvalidReq
-	err := json.Unmarshal(this.Ctx.Input.RequestBody, &req)
+	err := json.Unmarshal(c.Ctx.Input.RequestBody, &req)
 	if err != nil {
-		this.FailWithMessage("参数解析异常！", "参数解析失败，Err:"+err.Error())
+		c.FailWithMessage("参数解析异常！", "参数解析失败，Err:"+err.Error())
 		return
 	}
 	//合同id
 	if req.ContractId <= 0 {
-		this.FailWithMessage("合同id必传！", "合同id必传！")
+		c.FailWithMessage("合同id必传！", "合同id必传！")
 		return
 	}
 
-	err = contractService.InvalidContract(req.ContractId, this.AdminWx)
+	err = contractService.InvalidContract(req.ContractId, c.AdminWx)
 	if err != nil {
-		this.FailWithMessage("作废合同失败！", "作废合同失败，Err:"+err.Error())
+		c.FailWithMessage("作废合同失败！", "作废合同失败，Err:"+err.Error())
 		return
 	}
 
-	this.OkWithMessage("作废成功")
+	c.OkWithMessage("作废成功")
 	return
 }

controllers/contract_approval.go

@@ -31,19 +31,19 @@ type ContractApprovalCommon struct {
 // @Param   ModifyEndTime   query   string  false       "服务更新时间的选择结束时间，格式：2021-05-26 23:59:59"
 // @Success 200 {object} contract.ContractApprovalListResp
 // @router /list [get]
-func (this *ContractApprovalCommon) List() {
-	sysUser := this.AdminWx
+func (c *ContractApprovalCommon) List() {
+	sysUser := c.AdminWx
 
 	//合同类型、产品类型、合同状态、更新时间、所选销售
 	//关键字：合同编号、客户名称，社会信用码
-	contractType := this.GetString("ContractType")
-	status := this.GetString("Status")
-	productId, _ := this.GetInt("ProductId")
-	sellerIds := this.GetString("SellerId")
-	keyword := this.GetString("Keyword")
-	keywordEq := this.GetString("KeywordEq")
-	modifyStartTime := this.GetString("ModifyStartTime")
-	modifyEndTime := this.GetString("ModifyEndTime")
+	contractType := c.GetString("ContractType")
+	status := c.GetString("Status")
+	productId, _ := c.GetInt("ProductId")
+	sellerIds := c.GetString("SellerId")
+	keyword := c.GetString("Keyword")
+	keywordEq := c.GetString("KeywordEq")
+	modifyStartTime := c.GetString("ModifyStartTime")
+	modifyEndTime := c.GetString("ModifyEndTime")
 
 	childCondition := ""
 	condition := ""
@@ -130,8 +130,8 @@ func (this *ContractApprovalCommon) List() {
 		pars = append(pars, keywordEq)
 	}
 
-	pageSize, _ := this.GetInt("PageSize")
-	currentIndex, _ := this.GetInt("CurrentIndex")
+	pageSize, _ := c.GetInt("PageSize")
+	currentIndex, _ := c.GetInt("CurrentIndex")
 
 	var startSize int
 	if pageSize <= 0 {
@@ -148,7 +148,7 @@ func (this *ContractApprovalCommon) List() {
 	if status != "待审批" && status != "处理中" {
 		tmpTotal, err := contract_approval.GetContractApprovalListCountV2(childCondition, condition, childPars, pars)
 		if err != nil {
-			this.FailWithMessage("获取失败", "获取数据总数失败，Err:"+err.Error())
+			c.FailWithMessage("获取失败", "获取数据总数失败，Err:"+err.Error())
 			return
 		}
 
@@ -163,7 +163,7 @@ func (this *ContractApprovalCommon) List() {
 		}
 		tmpList, err := contract_approval.GetContractApprovalListV2(childCondition, condition, orderBy, childPars, pars, startSize, pageSize)
 		if err != nil {
-			this.FailWithMessage("获取审批列表失败！", "获取审批列表失败，Err:"+err.Error())
+			c.FailWithMessage("获取审批列表失败！", "获取审批列表失败，Err:"+err.Error())
 			return
 		}
 		total = tmpTotal
@@ -171,13 +171,13 @@ func (this *ContractApprovalCommon) List() {
 	} else {
 		tmpTotal, err := contract_approval.GetContractApprovalListCount(childCondition, condition, joinCondition, childPars, pars)
 		if err != nil {
-			this.FailWithMessage("获取失败", "获取数据总数失败，Err:"+err.Error())
+			c.FailWithMessage("获取失败", "获取数据总数失败，Err:"+err.Error())
 			return
 		}
 
 		tmpList, err := contract_approval.GetContractApprovalList(childCondition, condition, joinCondition, childPars, pars, startSize, pageSize)
 		if err != nil {
-			this.FailWithMessage("获取审批列表失败！", "获取审批列表失败，Err:"+err.Error())
+			c.FailWithMessage("获取审批列表失败！", "获取审批列表失败，Err:"+err.Error())
 			return
 		}
 		total = tmpTotal
@@ -194,7 +194,7 @@ func (this *ContractApprovalCommon) List() {
 		//获取审批流列表数据
 		contractApprovalRecordList, err := contract_approval_record.GetContractApprovalRecordList(contractApprovalIdStr, sysUser.AdminId)
 		if err != nil {
-			this.FailWithMessage("获取审批列表失败！", "获取审批列表失败，Err:"+err.Error())
+			c.FailWithMessage("获取审批列表失败！", "获取审批列表失败，Err:"+err.Error())
 			return
 		}
 		contractApprovalRecordMap := make(map[int]*contract_approval_record.ContractApprovalRecord)
@@ -250,7 +250,7 @@ func (this *ContractApprovalCommon) List() {
 	}
 
 	page := paging.GetPaging(currentIndex, pageSize, total)
-	this.OkDetailed(contractResp.ContractApprovalListResp{
+	c.OkDetailed(contractResp.ContractApprovalListResp{
 		List:   list,
 		Paging: page,
 	}, "获取成功")
@@ -262,27 +262,27 @@ func (this *ContractApprovalCommon) List() {
 // @Param   ContractApprovalRecordId   query   int  false       "审批流程单id"
 // @Success 200 {object} contract.ContractDetailResp
 // @router /detail [get]
-func (this *ContractApprovalCommon) Detail() {
+func (c *ContractApprovalCommon) Detail() {
 	//审批流程单id
-	contractApprovalRecordId, _ := this.GetInt("ContractApprovalRecordId")
+	contractApprovalRecordId, _ := c.GetInt("ContractApprovalRecordId")
 	if contractApprovalRecordId > 0 {
-		this.detailByApprovalRecordId(contractApprovalRecordId)
+		c.detailByApprovalRecordId(contractApprovalRecordId)
 		return
 	}
 	//审批单id
-	contractApprovalId, _ := this.GetInt("ContractApprovalId")
+	contractApprovalId, _ := c.GetInt("ContractApprovalId")
 
 	//审批单详情
 	contractApprovalInfo, err := contract_approval.GetContractApprovalById(contractApprovalId)
 	if err != nil {
-		this.FailWithMessage("获取审批单失败！", "获取审批单失败，Err:"+err.Error())
+		c.FailWithMessage("获取审批单失败！", "获取审批单失败，Err:"+err.Error())
 		return
 	}
 
 	//合同详情
-	contractInfo, flowNodeListResp, contractOpButton, err := contractService.GetContractDetailByContractId(contractApprovalInfo.ContractId, this.AdminWx)
+	contractInfo, flowNodeListResp, contractOpButton, err := contractService.GetContractDetailByContractId(contractApprovalInfo.ContractId, c.AdminWx)
 	if err != nil {
-		this.FailWithMessage("获取合同详情失败！", "获取合同详情失败,ERR:"+err.Error())
+		c.FailWithMessage("获取合同详情失败！", "获取合同详情失败,ERR:"+err.Error())
 		return
 	}
 	resp := contractResp.ContractDetailResp{
@@ -290,27 +290,27 @@ func (this *ContractApprovalCommon) Detail() {
 		FlowNodeList:   flowNodeListResp,
 		OpButton:       contractOpButton,
 	}
-	this.OkDetailed(resp, "获取成功")
+	c.OkDetailed(resp, "获取成功")
 }
 
-func (this *ContractApprovalCommon) detailByApprovalRecordId(approvalRecordId int) {
+func (c *ContractApprovalCommon) detailByApprovalRecordId(approvalRecordId int) {
 	approvalRecordInfo, err := contract_approval_record.GetContractApprovalRecordById(approvalRecordId)
 	if err != nil {
-		this.FailWithMessage("获取审批流程单失败", "获取审批流程单失败，Err:"+err.Error())
+		c.FailWithMessage("获取审批流程单失败", "获取审批流程单失败，Err:"+err.Error())
 		return
 	}
 
 	//审批单详情
 	contractApprovalInfo, err := contract_approval.GetContractApprovalById(approvalRecordInfo.ContractApprovalId)
 	if err != nil {
-		this.FailWithMessage("获取审批单失败", "获取审批单失败，Err:"+err.Error())
+		c.FailWithMessage("获取审批单失败", "获取审批单失败，Err:"+err.Error())
 		return
 	}
 
 	//合同详情
-	contractInfo, flowNodeListResp, contractOpButton, err := contractService.GetContractDetailByContractId(contractApprovalInfo.ContractId, this.AdminWx)
+	contractInfo, flowNodeListResp, contractOpButton, err := contractService.GetContractDetailByContractId(contractApprovalInfo.ContractId, c.AdminWx)
 	if err != nil {
-		this.FailWithMessage("获取合同详情失败！", "获取合同详情失败,ERR:"+err.Error())
+		c.FailWithMessage("获取合同详情失败！", "获取合同详情失败,ERR:"+err.Error())
 		return
 	}
 	resp := contractResp.ContractDetailResp{
@@ -318,7 +318,7 @@ func (this *ContractApprovalCommon) detailByApprovalRecordId(approvalRecordId in
 		FlowNodeList:   flowNodeListResp,
 		OpButton:       contractOpButton,
 	}
-	this.OkDetailed(resp, "获取成功")
+	c.OkDetailed(resp, "获取成功")
 	return
 }
 
@@ -327,32 +327,32 @@ func (this *ContractApprovalCommon) detailByApprovalRecordId(approvalRecordId in
 // @Param	request	body contract.RejectReq true "type json string"
 // @Success Ret=200 驳回成功
 // @router /reject [post]
-func (this *ContractApprovalCommon) Reject() {
+func (c *ContractApprovalCommon) Reject() {
 	var req contractReq.RejectReq
-	err := json.Unmarshal(this.Ctx.Input.RequestBody, &req)
+	err := json.Unmarshal(c.Ctx.Input.RequestBody, &req)
 	if err != nil {
-		this.FailWithMessage("参数解析异常！", "参数解析失败，Err:"+err.Error())
+		c.FailWithMessage("参数解析异常！", "参数解析失败，Err:"+err.Error())
 		return
 	}
 	//合同id编号
 	contractId := req.ContractId
 	if contractId <= 0 {
-		this.FailWithMessage("请传入合同编号！", "请传入合同编号！")
+		c.FailWithMessage("请传入合同编号！", "请传入合同编号！")
 		return
 	}
 
 	//数据校验
-	contractInfo, approvalInfo, approvalRecord, err := contractService.CheckApproveAuth(contractId, this.AdminWx)
+	contractInfo, approvalInfo, approvalRecord, err := contractService.CheckApproveAuth(contractId, c.AdminWx)
 	if err != nil {
-		this.FailWithMessage("驳回审批失败！", "驳回审批失败，Err:"+err.Error())
+		c.FailWithMessage("驳回审批失败！", "驳回审批失败，Err:"+err.Error())
 		return
 	}
-	err = contractService.Reject(contractInfo, approvalInfo, approvalRecord, this.AdminWx, req.Remark)
+	err = contractService.Reject(contractInfo, approvalInfo, approvalRecord, c.AdminWx, req.Remark)
 	if err != nil {
-		this.FailWithMessage("驳回审批失败！", "驳回审批失败，Err:"+err.Error())
+		c.FailWithMessage("驳回审批失败！", "驳回审批失败，Err:"+err.Error())
 		return
 	}
-	this.OkWithMessage("驳回成功")
+	c.OkWithMessage("驳回成功")
 }
 
 // @Title 处理审批单
@@ -360,29 +360,29 @@ func (this *ContractApprovalCommon) Reject() {
 // @Param	request	body contract.ApprovedReq true "type json string"
 // @Success Ret=200 申请成功
 // @router /approved [post]
-func (this *ContractApprovalCommon) Approved() {
+func (c *ContractApprovalCommon) Approved() {
 	var req contractReq.ApprovedReq
-	err := json.Unmarshal(this.Ctx.Input.RequestBody, &req)
+	err := json.Unmarshal(c.Ctx.Input.RequestBody, &req)
 	if err != nil {
-		this.FailWithMessage("参数解析异常！", "参数解析失败，Err:"+err.Error())
+		c.FailWithMessage("参数解析异常！", "参数解析失败，Err:"+err.Error())
 		return
 	}
 	//合同id编号
 	contractId := req.ContractId
 	if contractId <= 0 {
-		this.FailWithMessage("请传入合同编号！", "请传入合同编号！")
+		c.FailWithMessage("请传入合同编号！", "请传入合同编号！")
 		return
 	}
 	//数据校验
-	contractInfo, approvalInfo, approvalRecord, err := contractService.CheckApproveAuth(contractId, this.AdminWx)
+	contractInfo, approvalInfo, approvalRecord, err := contractService.CheckApproveAuth(contractId, c.AdminWx)
 	if err != nil {
-		this.FailWithMessage("驳回审批失败！", "驳回审批失败，Err:"+err.Error())
+		c.FailWithMessage("驳回审批失败！", "驳回审批失败，Err:"+err.Error())
 		return
 	}
-	err = contractService.Approved(contractInfo, approvalInfo, approvalRecord, this.AdminWx, req.Remark)
+	err = contractService.Approved(contractInfo, approvalInfo, approvalRecord, c.AdminWx, req.Remark)
 	if err != nil {
-		this.FailWithMessage("审核失败！", "审核失败，Err:"+err.Error())
+		c.FailWithMessage("审核失败！", "审核失败，Err:"+err.Error())
 		return
 	}
-	this.OkWithMessage("审核通过")
+	c.OkWithMessage("审核通过")
 }

controllers/message.go

@@ -24,8 +24,8 @@ type MessageCommon struct {
 // @Description 消息列表汇总页接口
 // @Success 200 {object} []message.SummaryMessage
 // @router /summaryMessageList [get]
-func (this *MessageCommon) SummaryMessageList() {
-	sysUser := this.AdminWx
+func (c *MessageCommon) SummaryMessageList() {
+	sysUser := c.AdminWx
 	sysUserId := sysUser.AdminId
 
 	//SummaryMessageListResp := message.SummaryMessageListResp{}
@@ -40,7 +40,7 @@ func (this *MessageCommon) SummaryMessageList() {
 			if err.Error() == utils.ErrNoRow() {
 				continue
 			}
-			this.FailWithMessage("获取失败", "获取消息失败，Err:"+err.Error())
+			c.FailWithMessage("获取失败", "获取消息失败，Err:"+err.Error())
 			return
 		} else {
 			tmpMessage = fmt.Sprint(messageInfo.RealName, " ", messageInfo.CreateTime.Format("2006.01.02"), " ", messageInfo.Content)
@@ -48,7 +48,7 @@ func (this *MessageCommon) SummaryMessageList() {
 
 		notReadTotal, err := company_approval_message.GetNotReadMessageTotal(sysUserId, sourceType)
 		if err != nil {
-			this.FailWithMessage("获取失败", "获取未读消息数失败，Err:"+err.Error())
+			c.FailWithMessage("获取失败", "获取未读消息数失败，Err:"+err.Error())
 			return
 		}
 		CompanyMessage := message.SummaryMessage{
@@ -77,7 +77,7 @@ func (this *MessageCommon) SummaryMessageList() {
 		messageList = append(messageList, messageMap[currTime])
 	}
 	rotate(messageList)
-	this.OkDetailed(messageList, "获取成功")
+	c.OkDetailed(messageList, "获取成功")
 }
 
 //切片数据反转
@@ -102,16 +102,16 @@ func rotate(s []message.SummaryMessage) {
 // @Param   pageSize   query   int  true       "每页数量"
 // @Success 200 {object} message.CompanyApprovalMessageListResp
 // @router /list [get]
-func (this *MessageCommon) MessageList() {
-	sysUser := this.AdminWx
+func (c *MessageCommon) MessageList() {
+	sysUser := c.AdminWx
 	sysUserId := sysUser.AdminId
-	sourceType, err := this.GetInt("SourceType", 1)
+	sourceType, err := c.GetInt("SourceType", 1)
 	if err != nil {
-		this.FailWithMessage("获取失败", "获取消息类型失败，Err:"+err.Error())
+		c.FailWithMessage("获取失败", "获取消息类型失败，Err:"+err.Error())
 		return
 	}
-	pageSize, _ := this.GetInt("PageSize")
-	currentIndex, _ := this.GetInt("CurrentIndex")
+	pageSize, _ := c.GetInt("PageSize")
+	currentIndex, _ := c.GetInt("CurrentIndex")
 
 	var startSize int
 	if pageSize <= 0 {
@@ -124,12 +124,12 @@ func (this *MessageCommon) MessageList() {
 
 	total, err := company_approval_message.GetCompanyApprovalMessageCount(sysUserId, sourceType)
 	if err != nil {
-		this.FailWithMessage("获取失败", "获取消息总数失败，Err:"+err.Error())
+		c.FailWithMessage("获取失败", "获取消息总数失败，Err:"+err.Error())
 		return
 	}
 	list, err := company_approval_message.GetCompanyApprovalMessageList(sysUserId, sourceType, startSize, pageSize)
 	if err != nil {
-		this.FailWithMessage("获取失败", "获取消息列表失败，Err:"+err.Error())
+		c.FailWithMessage("获取失败", "获取消息列表失败，Err:"+err.Error())
 		return
 	}
 
@@ -152,7 +152,7 @@ func (this *MessageCommon) MessageList() {
 	if len(companyApprovalIds) > 0 {
 		companyApprovalList, err := company_approval.GetApprovalListByApprovalIds(strings.Join(companyApprovalIds, ","))
 		if err != nil {
-			this.FailWithMessage("获取失败", "获取申请列表信息失败，Err:"+err.Error())
+			c.FailWithMessage("获取失败", "获取申请列表信息失败，Err:"+err.Error())
 		}
 		for _, companyApproval := range companyApprovalList {
 			companyApprovalMap[companyApproval.CompanyApprovalId] = companyApproval
@@ -163,7 +163,7 @@ func (this *MessageCommon) MessageList() {
 		//审批流程单信息
 		contractApprovalRecordList, err := contract_approval_record.GetContractApprovalRecordByIds(strings.Join(newApprovalRecordIds, ","))
 		if err != nil {
-			this.FailWithMessage("获取失败", "获取申请列表信息失败，Err:"+err.Error())
+			c.FailWithMessage("获取失败", "获取申请列表信息失败，Err:"+err.Error())
 		}
 		newApprovalIds := make([]string, 0)
 
@@ -183,7 +183,7 @@ func (this *MessageCommon) MessageList() {
 		if len(newApprovalIds) > 0 {
 			contractApprovalList, err := contract_approval.GetContractApprovalByIds(strings.Join(newApprovalIds, ","))
 			if err != nil {
-				this.FailWithMessage("获取失败", "获取申请列表信息失败，Err:"+err.Error())
+				c.FailWithMessage("获取失败", "获取申请列表信息失败，Err:"+err.Error())
 			}
 			for _, contractApproval := range contractApprovalList {
 				if _, ok := approvalRecordMap[contractApproval.ContractApprovalId]; ok {
@@ -231,7 +231,7 @@ func (this *MessageCommon) MessageList() {
 		List:  list,
 		Total: total,
 	}
-	this.OkDetailed(resp, "获取成功")
+	c.OkDetailed(resp, "获取成功")
 }
 
 // @Title 消息已读
@@ -239,23 +239,23 @@ func (this *MessageCommon) MessageList() {
 // @Param	request	body company.CompanyApprovalMessageReadReq true "type json string"
 // @Success Ret=200 申请成功
 // @router /read [post]
-func (this *MessageCommon) MessageRead() {
-	//sysUser := this.AdminWx
+func (c *MessageCommon) MessageRead() {
+	//sysUser := c.AdminWx
 	var req company_approval_message.CompanyApprovalMessageReadReq
-	err := json.Unmarshal(this.Ctx.Input.RequestBody, &req)
+	err := json.Unmarshal(c.Ctx.Input.RequestBody, &req)
 	if err != nil {
-		this.FailWithMessage("参数解析异常！", "参数解析失败，Err:"+err.Error())
+		c.FailWithMessage("参数解析异常！", "参数解析失败，Err:"+err.Error())
 
 		return
 	}
 	if req.Id <= 0 {
-		this.FailWithMessage("参数错误", "参数错误，客户id小于等于0")
+		c.FailWithMessage("参数错误", "参数错误，客户id小于等于0")
 		return
 	}
 	err = company_approval_message.ModifyCompanyApprovalMessageStatus(req.Id)
 	if err != nil {
-		this.FailWithMessage("修改失败！", "修改已读失败，Err:"+err.Error())
+		c.FailWithMessage("修改失败！", "修改已读失败，Err:"+err.Error())
 		return
 	}
-	this.OkWithMessage("已读成功")
+	c.OkWithMessage("已读成功")
 }

controllers/resource.go

@@ -22,10 +22,10 @@ type ResourceCommon struct {
 // @Param   file   query   file  true       "文件"
 // @Success 200 新增成功
 // @router /upload [post]
-func (this *ResourceCommon) Upload() {
-	f, h, err := this.GetFile("file")
+func (c *ResourceCommon) Upload() {
+	f, h, err := c.GetFile("file")
 	if err != nil {
-		this.FailWithMessage("获取资源信息失败", "获取资源信息失败,Err:"+err.Error())
+		c.FailWithMessage("获取资源信息失败", "获取资源信息失败,Err:"+err.Error())
 		return
 	}
 	ext := path.Ext(h.Filename)
@@ -33,22 +33,22 @@ func (this *ResourceCommon) Upload() {
 	uploadDir := utils.STATIC_DIR + "hongze/" + dateDir
 	err = os.MkdirAll(uploadDir, 766)
 	if err != nil {
-		this.FailWithMessage("存储目录创建失败", "存储目录创建失败,Err:"+err.Error())
+		c.FailWithMessage("存储目录创建失败", "存储目录创建失败,Err:"+err.Error())
 		return
 	}
 	randStr := utils.GetRandStringNoSpecialChar(28)
 	fileName := randStr + ext
 	fpath := uploadDir + "/" + fileName
 	defer f.Close() //关闭上传文件
-	err = this.SaveToFile("file", fpath)
+	err = c.SaveToFile("file", fpath)
 	if err != nil {
-		this.FailWithMessage("文件上传失败", "文件上传失败,Err:"+err.Error())
+		c.FailWithMessage("文件上传失败", "文件上传失败,Err:"+err.Error())
 		return
 	}
 	//上传到阿里云
 	resourceUrl, err := services.UploadAliyun(fileName, fpath)
 	if err != nil {
-		this.FailWithMessage("文件上传失败", "文件上传失败,Err:"+err.Error())
+		c.FailWithMessage("文件上传失败", "文件上传失败,Err:"+err.Error())
 		return
 	}
 
@@ -62,11 +62,11 @@ func (this *ResourceCommon) Upload() {
 	item.CreateTime = time.Now()
 	newId, err := resource.AddResource(item)
 	if err != nil {
-		this.FailWithMessage("资源上传失败", "资源上传失败,Err:"+err.Error())
+		c.FailWithMessage("资源上传失败", "资源上传失败,Err:"+err.Error())
 		return
 	}
 
-	this.OkDetailed(resourceResp.ResourceResp{
+	c.OkDetailed(resourceResp.ResourceResp{
 		Id:          newId,
 		ResourceUrl: resourceUrl,
 	}, "上传成功")
@@ -78,7 +78,7 @@ func (this *ResourceCommon) Upload() {
 // @Param   Image query  string  false       "图片,base64字符串"
 // @Success 200 {object} models.ImageResponse
 // @router /upload_image_base64 [post]
-func (this *ResourceCommon) UploadImageBase64() {
+func (c *ResourceCommon) UploadImageBase64() {
 	var err error
 	ext := ".png"
 	uploadDir := "./static"
@@ -86,14 +86,14 @@ func (this *ResourceCommon) UploadImageBase64() {
 	fileName := randStr + ext
 	fpath := uploadDir + "/" + fileName
 
-	image := this.Ctx.Request.FormValue("Image")
+	image := c.Ctx.Request.FormValue("Image")
 	if image == "" {
-		this.FailWithMessage("参数错误", "图片内容不能为空")
+		c.FailWithMessage("参数错误", "图片内容不能为空")
 		return
 	}
 	b, _ := regexp.MatchString(`^data:\s*image\/(\w+);base64,`, image)
 	if !b {
-		this.FailWithMessage("图片格式不正确", "图片格式不正确")
+		c.FailWithMessage("图片格式不正确", "图片格式不正确")
 		return
 	}
 	re, _ := regexp.Compile(`^data:\s*image\/(\w+);base64,`)
@@ -108,7 +108,7 @@ func (this *ResourceCommon) UploadImageBase64() {
 	//}
 	err = utils.SaveBase64ToFile(base64Str, fpath)
 	if err != nil {
-		this.FailWithMessage("图片保存失败", "图片保存失败,Err:"+err.Error())
+		c.FailWithMessage("图片保存失败", "图片保存失败,Err:"+err.Error())
 		return
 	}
 	defer os.Remove(fpath)
@@ -118,7 +118,7 @@ func (this *ResourceCommon) UploadImageBase64() {
 	//上传到阿里云
 	err = services.UploadVideoAliyun(fileName, fpath, savePath)
 	if err != nil {
-		this.FailWithMessage("文件上传失败", "文件上传失败,Err:"+err.Error())
+		c.FailWithMessage("文件上传失败", "文件上传失败,Err:"+err.Error())
 		return
 	}
 	utils.FileLog.Info("%s:", time.Now().Format(utils.FormatDateTime))
@@ -131,13 +131,13 @@ func (this *ResourceCommon) UploadImageBase64() {
 	item.CreateTime = time.Now()
 	newId, err := resource.AddResource(item)
 	if err != nil {
-		this.FailWithMessage("资源上传失败", "资源上传失败,Err:"+err.Error())
+		c.FailWithMessage("资源上传失败", "资源上传失败,Err:"+err.Error())
 		return
 	}
 	utils.FileLog.Info("end VideoUpload ")
 	utils.FileLog.Info("%s:", time.Now().Format(utils.FormatDateTime))
 
-	this.OkDetailed(
+	c.OkDetailed(
 		resourceResp.ResourceResp{
 			Id:          newId,
 			ResourceUrl: resourceUrl,

controllers/seal_approval.go

@@ -33,21 +33,21 @@ type SealApprovalCommon struct {
 // @Param   ModifyEndTime   query   string  false       "服务更新时间的选择结束时间，格式：2021-05-26 23:59:59"
 // @Success 200 {object} seal.SealApprovalListResp
 // @router /list [get]
-func (this *SealApprovalCommon) List() {
-	sysUser := this.AdminWx
+func (c *SealApprovalCommon) List() {
+	sysUser := c.AdminWx
 
 	//合同类型、产品类型、合同状态、更新时间、所选销售
 	//关键字：合同编号、客户名称，社会信用码
-	serviceType := this.GetString("ServiceType")
-	use := this.GetString("Use")
-	sealType := this.GetString("SealType")
-	status := this.GetString("Status")
-	productId, _ := this.GetInt("ProductId")
-	sellerIds := this.GetString("SellerId")
-	keyword := this.GetString("Keyword")
-	keywordEq := this.GetString("KeywordEq")
-	modifyStartTime := this.GetString("ModifyStartTime")
-	modifyEndTime := this.GetString("ModifyEndTime")
+	serviceType := c.GetString("ServiceType")
+	use := c.GetString("Use")
+	sealType := c.GetString("SealType")
+	status := c.GetString("Status")
+	productId, _ := c.GetInt("ProductId")
+	sellerIds := c.GetString("SellerId")
+	keyword := c.GetString("Keyword")
+	keywordEq := c.GetString("KeywordEq")
+	modifyStartTime := c.GetString("ModifyStartTime")
+	modifyEndTime := c.GetString("ModifyEndTime")
 
 	childCondition := ""
 	condition := ""
@@ -149,8 +149,8 @@ func (this *SealApprovalCommon) List() {
 		pars = append(pars, keywordEq, keywordEq)
 	}
 
-	pageSize, _ := this.GetInt("PageSize")
-	currentIndex, _ := this.GetInt("CurrentIndex")
+	pageSize, _ := c.GetInt("PageSize")
+	currentIndex, _ := c.GetInt("CurrentIndex")
 
 	var startSize int
 	if pageSize <= 0 {
@@ -167,7 +167,7 @@ func (this *SealApprovalCommon) List() {
 	if status != "待审批" && status != "处理中" {
 		tmpTotal, err := contract_approval.GetSealApprovalListCountV2(childCondition, condition, childPars, pars)
 		if err != nil {
-			this.FailWithMessage("获取失败", "获取数据总数失败，Err:"+err.Error())
+			c.FailWithMessage("获取失败", "获取数据总数失败，Err:"+err.Error())
 			return
 		}
 
@@ -181,7 +181,7 @@ func (this *SealApprovalCommon) List() {
 
 		tmpList, err := contract_approval.GetSealApprovalListV2(childCondition, condition, orderBy, childPars, pars, startSize, pageSize)
 		if err != nil {
-			this.FailWithMessage("获取审批列表失败！", "获取审批列表失败，Err:"+err.Error())
+			c.FailWithMessage("获取审批列表失败！", "获取审批列表失败，Err:"+err.Error())
 			return
 		}
 		total = tmpTotal
@@ -189,13 +189,13 @@ func (this *SealApprovalCommon) List() {
 	} else {
 		tmpTotal, err := contract_approval.GetSealApprovalListCount(childCondition, condition, joinCondition, childPars, pars)
 		if err != nil {
-			this.FailWithMessage("获取失败", "获取数据总数失败，Err:"+err.Error())
+			c.FailWithMessage("获取失败", "获取数据总数失败，Err:"+err.Error())
 			return
 		}
 
 		tmpList, err := contract_approval.GetSealApprovalList(childCondition, condition, joinCondition, childPars, pars, startSize, pageSize)
 		if err != nil {
-			this.FailWithMessage("获取审批列表失败！", "获取审批列表失败，Err:"+err.Error())
+			c.FailWithMessage("获取审批列表失败！", "获取审批列表失败，Err:"+err.Error())
 			return
 		}
 		total = tmpTotal
@@ -212,7 +212,7 @@ func (this *SealApprovalCommon) List() {
 		//获取审批流列表数据
 		contractApprovalRecordList, err := contract_approval_record.GetContractApprovalRecordList(contractApprovalIdStr, sysUser.AdminId)
 		if err != nil {
-			this.FailWithMessage("获取审批列表失败！", "获取审批列表失败，Err:"+err.Error())
+			c.FailWithMessage("获取审批列表失败！", "获取审批列表失败，Err:"+err.Error())
 			return
 		}
 		contractApprovalRecordMap := make(map[int]*contract_approval_record.ContractApprovalRecord)
@@ -269,7 +269,7 @@ func (this *SealApprovalCommon) List() {
 	}
 
 	page := paging.GetPaging(currentIndex, pageSize, total)
-	this.OkDetailed(sealResp.SealApprovalListResp{
+	c.OkDetailed(sealResp.SealApprovalListResp{
 		List:   list,
 		Paging: page,
 	}, "获取成功")
@@ -283,36 +283,36 @@ func (this *SealApprovalCommon) List() {
 // @Param   ContractApprovalRecordId   query   int  false       "审批流程单id"
 // @Success 200 {object} seal.SealDetailResp
 // @router /detail [get]
-func (this *SealApprovalCommon) Detail() {
+func (c *SealApprovalCommon) Detail() {
 	//审批流程单id
-	contractApprovalRecordId, _ := this.GetInt("ContractApprovalRecordId")
+	contractApprovalRecordId, _ := c.GetInt("ContractApprovalRecordId")
 	if contractApprovalRecordId > 0 {
-		this.detailByApprovalRecordId(contractApprovalRecordId)
+		c.detailByApprovalRecordId(contractApprovalRecordId)
 		return
 	}
 
 	//用印id
-	sealId, _ := this.GetInt("SealId")
+	sealId, _ := c.GetInt("SealId")
 	if sealId <= 0 {
 		//审批单id
-		contractApprovalId, _ := this.GetInt("ContractApprovalId")
+		contractApprovalId, _ := c.GetInt("ContractApprovalId")
 		if contractApprovalId <= 0 {
-			this.FailWithMessage("获取审批单失败！审批单id未传", "获取审批单失败！审批单id未传")
+			c.FailWithMessage("获取审批单失败！审批单id未传", "获取审批单失败！审批单id未传")
 			return
 		}
 		//审批单详情
 		contractApprovalInfo, err := contract_approval.GetContractApprovalById(contractApprovalId)
 		if err != nil {
-			this.FailWithMessage("获取审批单失败！", "获取审批单失败，Err:"+err.Error())
+			c.FailWithMessage("获取审批单失败！", "获取审批单失败，Err:"+err.Error())
 			return
 		}
 		sealId = contractApprovalInfo.ContractId
 	}
 
 	//用印详情
-	sealInfo, flowNodeListResp, opButton, err := sealService.GetSealDetailBySealId(sealId, this.AdminWx)
+	sealInfo, flowNodeListResp, opButton, err := sealService.GetSealDetailBySealId(sealId, c.AdminWx)
 	if err != nil {
-		this.FailWithMessage("获取详情失败", "获取详情失败,Err:"+err.Error())
+		c.FailWithMessage("获取详情失败", "获取详情失败,Err:"+err.Error())
 		return
 	}
 	resp := sealResp.SealDetailResp{
@@ -320,27 +320,27 @@ func (this *SealApprovalCommon) Detail() {
 		FlowNodeList: flowNodeListResp,
 		OpButton:     opButton,
 	}
-	this.OkDetailed(resp, "获取成功")
+	c.OkDetailed(resp, "获取成功")
 }
 
-func (this *SealApprovalCommon) detailByApprovalRecordId(approvalRecordId int) {
+func (c *SealApprovalCommon) detailByApprovalRecordId(approvalRecordId int) {
 	approvalRecordInfo, err := contract_approval_record.GetContractApprovalRecordById(approvalRecordId)
 	if err != nil {
-		this.FailWithMessage("获取审批流程单失败", "获取审批流程单失败，Err:"+err.Error())
+		c.FailWithMessage("获取审批流程单失败", "获取审批流程单失败，Err:"+err.Error())
 		return
 	}
 
 	//审批单详情
 	contractApprovalInfo, err := contract_approval.GetContractApprovalById(approvalRecordInfo.ContractApprovalId)
 	if err != nil {
-		this.FailWithMessage("获取审批单失败", "获取审批单失败，Err:"+err.Error())
+		c.FailWithMessage("获取审批单失败", "获取审批单失败，Err:"+err.Error())
 		return
 	}
 
 	//用印详情
-	sealInfo, flowNodeListResp, opButton, err := sealService.GetSealDetailBySealId(contractApprovalInfo.ContractId, this.AdminWx)
+	sealInfo, flowNodeListResp, opButton, err := sealService.GetSealDetailBySealId(contractApprovalInfo.ContractId, c.AdminWx)
 	if err != nil {
-		this.FailWithMessage("获取详情失败", "获取详情失败,Err:"+err.Error())
+		c.FailWithMessage("获取详情失败", "获取详情失败,Err:"+err.Error())
 		return
 	}
 	resp := sealResp.SealDetailResp{
@@ -349,7 +349,7 @@ func (this *SealApprovalCommon) detailByApprovalRecordId(approvalRecordId int) {
 		OpButton:     opButton,
 	}
 
-	this.OkDetailed(resp, "获取成功")
+	c.OkDetailed(resp, "获取成功")
 	return
 }
 
@@ -359,32 +359,32 @@ func (this *SealApprovalCommon) detailByApprovalRecordId(approvalRecordId int) {
 // @Param	request	body seal.RejectReq true "type json string"
 // @Success Ret=200 驳回成功
 // @router /reject [post]
-func (this *SealApprovalCommon) Reject() {
+func (c *SealApprovalCommon) Reject() {
 	var req sealReq.RejectReq
-	err := json.Unmarshal(this.Ctx.Input.RequestBody, &req)
+	err := json.Unmarshal(c.Ctx.Input.RequestBody, &req)
 	if err != nil {
-		this.FailWithMessage("参数解析异常！", "参数解析失败，Err:"+err.Error())
+		c.FailWithMessage("参数解析异常！", "参数解析失败，Err:"+err.Error())
 		return
 	}
 	//用印id编号
 	sealId := req.SealId
 	if sealId <= 0 {
-		this.FailWithMessage("请传入用印单编号！", "请传入用印单编号！")
+		c.FailWithMessage("请传入用印单编号！", "请传入用印单编号！")
 		return
 	}
 
 	//数据校验
-	sealInfo, approvalInfo, approvalRecord, err := sealService.CheckApproveAuth(sealId, this.AdminWx)
+	sealInfo, approvalInfo, approvalRecord, err := sealService.CheckApproveAuth(sealId, c.AdminWx)
 	if err != nil {
-		this.FailWithMessage("驳回审批失败！", "驳回审批失败，Err:"+err.Error())
+		c.FailWithMessage("驳回审批失败！", "驳回审批失败，Err:"+err.Error())
 		return
 	}
-	err = sealService.Reject(sealInfo, approvalInfo, approvalRecord, this.AdminWx, req.Remark)
+	err = sealService.Reject(sealInfo, approvalInfo, approvalRecord, c.AdminWx, req.Remark)
 	if err != nil {
-		this.FailWithMessage("驳回审批失败！", "驳回审批失败，Err:"+err.Error())
+		c.FailWithMessage("驳回审批失败！", "驳回审批失败，Err:"+err.Error())
 		return
 	}
-	this.OkWithMessage("驳回成功")
+	c.OkWithMessage("驳回成功")
 }
 
 // @Title 处理审批单
@@ -392,32 +392,32 @@ func (this *SealApprovalCommon) Reject() {
 // @Param	request	body seal.ApprovedReq true "type json string"
 // @Success Ret=200 申请成功
 // @router /approved [post]
-func (this *SealApprovalCommon) Approved() {
+func (c *SealApprovalCommon) Approved() {
 	var req sealReq.ApprovedReq
-	err := json.Unmarshal(this.Ctx.Input.RequestBody, &req)
+	err := json.Unmarshal(c.Ctx.Input.RequestBody, &req)
 	if err != nil {
-		this.FailWithMessage("参数解析异常！", "参数解析失败，Err:"+err.Error())
+		c.FailWithMessage("参数解析异常！", "参数解析失败，Err:"+err.Error())
 		return
 	}
 	//用印编号id编号
 	sealId := req.SealId
 	if sealId <= 0 {
-		this.FailWithMessage("请传入用印单编号！", "请传入用印单编号！")
+		c.FailWithMessage("请传入用印单编号！", "请传入用印单编号！")
 		return
 	}
 
 	//数据校验
-	sealInfo, approvalInfo, approvalRecord, err := sealService.CheckApproveAuth(sealId, this.AdminWx)
+	sealInfo, approvalInfo, approvalRecord, err := sealService.CheckApproveAuth(sealId, c.AdminWx)
 	if err != nil {
-		this.FailWithMessage("驳回审批失败！", "驳回审批失败，Err:"+err.Error())
+		c.FailWithMessage("驳回审批失败！", "驳回审批失败，Err:"+err.Error())
 		return
 	}
-	err = sealService.Approved(sealInfo, approvalInfo, approvalRecord, this.AdminWx, req.Remark)
+	err = sealService.Approved(sealInfo, approvalInfo, approvalRecord, c.AdminWx, req.Remark)
 	if err != nil {
-		this.FailWithMessage("审核失败！", "审核失败，Err:"+err.Error())
+		c.FailWithMessage("审核失败！", "审核失败，Err:"+err.Error())
 		return
 	}
-	this.OkWithMessage("审核通过")
+	c.OkWithMessage("审核通过")
 }
 
 // @Title 撤回审批申请
@@ -425,24 +425,24 @@ func (this *SealApprovalCommon) Approved() {
 // @Param   SealId   query   int  true       "用印id编号"
 // @Success Ret=200 撤回申请成功
 // @router /cancelApply [get]
-func (this *SealApprovalCommon) CancelApply() {
+func (c *SealApprovalCommon) CancelApply() {
 	//用印id编号
-	sealId, err := this.GetInt("SealId")
+	sealId, err := c.GetInt("SealId")
 	if err != nil {
-		this.FailWithMessage("获取审批流编号失败", "获取审批流编号失败，err："+err.Error())
+		c.FailWithMessage("获取审批流编号失败", "获取审批流编号失败，err："+err.Error())
 		return
 	}
 
 	//获取用印信息
 	sealInfo, err := seal.GetSealInfoById(sealId)
 	if err != nil {
-		this.FailWithMessage("获取审批流信息失败", "获取审批流信息失败，err："+err.Error())
+		c.FailWithMessage("获取审批流信息失败", "获取审批流信息失败，err："+err.Error())
 		return
 	}
-	err = sealService.CancelApply(sealInfo, this.AdminWx.AdminId)
+	err = sealService.CancelApply(sealInfo, c.AdminWx.AdminId)
 	if err != nil {
-		this.FailWithMessage("撤回申请失败！", "撤回申请失败，Err:"+err.Error())
+		c.FailWithMessage("撤回申请失败！", "撤回申请失败，Err:"+err.Error())
 		return
 	}
-	this.OkWithMessage("撤回申请成功")
+	c.OkWithMessage("撤回申请成功")
 }

controllers/wechat.go

@@ -15,47 +15,48 @@ type WeChatCommon struct {
 	BaseNotAuth
 }
 
+// WeChatLogin
 // @Title 微信登录接口
 // @Description 微信登录接口
 // @Param   Code   query   string  true       "微信唯一编码code"
 // @Success 200 {object} wechat.WxLoginResp
 // @router /login [get]
-func (this *WeChatCommon) WeChatLogin() {
-	code := this.GetString("Code")
+func (c *WeChatCommon) WeChatLogin() {
+	code := c.GetString("Code")
 	fmt.Println("code:", code)
 	utils.FileLog.Info("WechatLogin code:%s", code)
 
 	item, err := services.WxGetUserOpenIdByCode(code)
 	if err != nil {
-		this.FailWithMessage(fmt.Sprintf("%v", err), fmt.Sprintf("%v", err))
+		c.FailWithMessage(fmt.Sprintf("%v", err), fmt.Sprintf("%v", err))
 		return
 	}
 	if item.Errcode != 0 {
-		this.FailWithMessage("获取用户信息失败", "获取access_token 失败 errcode:"+strconv.Itoa(item.Errcode)+" ;errmsg:"+item.Errmsg)
+		c.FailWithMessage("获取用户信息失败", "获取access_token 失败 errCode:"+strconv.Itoa(item.Errcode)+" ;errMsg:"+item.Errmsg)
 	}
 	openId := item.Openid
 	if openId == "" {
-		this.FailWithMessage("获取用户信息失败", "获取openid失败，openid:"+item.Openid)
+		c.FailWithMessage("获取用户信息失败", "获取openid失败，openid:"+item.Openid)
 	}
 	accessToken, err := services.WxGetAccessToken()
 	if err != nil {
-		this.FailWithMessage("获取用户信息失败", "获取access_token失败，err:"+err.Error())
+		c.FailWithMessage("获取用户信息失败", "获取access_token失败，err:"+err.Error())
 	}
 	//获取用户信息
 	wxUserInfo, err := services.WxGetUserInfo(openId, accessToken)
 
 	if err != nil {
-		this.FailWithMessage("获取用户信息失败", "获取微信用户信息失败，Err:"+err.Error())
+		c.FailWithMessage("获取用户信息失败", "获取微信用户信息失败，Err:"+err.Error())
 	}
 	if wxUserInfo.Errcode != 0 {
 		userInfoJson, _ := json.Marshal(wxUserInfo)
-		this.FailWithMessage("登录失败", "获取用户信息失败，err:"+string(userInfoJson))
+		c.FailWithMessage("登录失败", "获取用户信息失败，err:"+string(userInfoJson))
 		return
 	}
 
 	token, adminWx, err := services.WxLogin(utils.WxPlatform, item, wxUserInfo)
 	if err != nil {
-		this.FailWithMessage("微信登录失败", "微信登录失败，err:"+err.Error())
+		c.FailWithMessage("微信登录失败", "微信登录失败，err:"+err.Error())
 		return
 	}
 
@@ -95,32 +96,33 @@ func (this *WeChatCommon) WeChatLogin() {
 	{
 		returnResult, err := json.Marshal(resp)
 		if err != nil {
-			utils.FileLog.Info(this.Ctx.Input.URI() + " Err:%s" + err.Error())
+			utils.FileLog.Info(c.Ctx.Input.URI() + " Err:%s" + err.Error())
 		}
-		utils.FileLog.Info(this.Ctx.Input.URI()+" code: %s , return data: %s", code, string(returnResult))
+		utils.FileLog.Info(c.Ctx.Input.URI()+" code: %s , return data: %s", code, string(returnResult))
 	}
 
-	this.OkDetailed(resp, "登录成功")
+	c.OkDetailed(resp, "登录成功")
 }
 
+// WxAppLogin
 // @Title 微信登录接口
 // @Description 微信登录接口
 // @Param   Code   query   string  true       "微信唯一编码code"
 // @Success 200 {object} wechat.WxLoginResp
 // @router /wxapp/login [get]
-func (this *WeChatCommon) WxAppLogin() {
-	code := this.GetString("Code")
+func (c *WeChatCommon) WxAppLogin() {
+	code := c.GetString("Code")
 	if code == "" {
-		this.FailWithMessage("参数错误", "Code 为空")
+		c.FailWithMessage("参数错误", "Code 为空")
 		return
 	}
 	wxInfo, err := weapp.Login(utils.WxAppId2, utils.WxAppSecret2, code)
 	if err != nil {
-		this.FailWithMessage("获取用户信息失败", "获取用户信息失败,Err:"+err.Error())
+		c.FailWithMessage("获取用户信息失败", "获取用户信息失败,Err:"+err.Error())
 		return
 	}
 	if err = wxInfo.GetResponseError(); err != nil {
-		this.FailWithMessage("获取用户信息失败", "获取用户信息失败,code:"+strconv.Itoa(wxInfo.ErrCode)+",msg:"+wxInfo.ErrMSG)
+		c.FailWithMessage("获取用户信息失败", "获取用户信息失败,code:"+strconv.Itoa(wxInfo.ErrCode)+",msg:"+wxInfo.ErrMSG)
 		return
 	}
 	item := &services.WxAccessToken{
@@ -147,7 +149,7 @@ func (this *WeChatCommon) WxAppLogin() {
 
 	token, adminWx, err := services.WxLogin(utils.WxPlatform2, item, wxUserInfo)
 	if err != nil {
-		this.FailWithMessage("微信登录失败", "微信登录失败，err:"+err.Error())
+		c.FailWithMessage("微信登录失败", "微信登录失败，err:"+err.Error())
 		return
 	}
 
@@ -187,12 +189,12 @@ func (this *WeChatCommon) WxAppLogin() {
 	{
 		returnResult, err := json.Marshal(resp)
 		if err != nil {
-			utils.FileLog.Info(this.Ctx.Input.URI() + " Err:%s" + err.Error())
+			utils.FileLog.Info(c.Ctx.Input.URI() + " Err:%s" + err.Error())
 		}
-		utils.FileLog.Info(this.Ctx.Input.URI()+" code: %s , return data: %s", code, string(returnResult))
+		utils.FileLog.Info(c.Ctx.Input.URI()+" code: %s , return data: %s", code, string(returnResult))
 	}
 
-	this.OkDetailed(resp, "登录成功")
+	c.OkDetailed(resp, "登录成功")
 }
 
 // @Title 小程序获取用户信息
@@ -200,14 +202,14 @@ func (this *WeChatCommon) WxAppLogin() {
 // @Param	request	body models.WxGetUserInfoReq true "type json string"
 // @Success 200 {object} models.WxGetUserInfoResp
 // @router /getUserInfo [post]
-//func (this *WechatController) GetUserInfo() {
+//func (c *WechatController) GetUserInfo() {
 //	br := new(models.BaseResponse).Init()
 //	defer func() {
-//		this.Data["json"] = br
-//		this.ServeJSON()
+//		c.Data["json"] = br
+//		c.ServeJSON()
 //	}()
 //	var req models.WxGetUserInfoReq
-//	err := json.Unmarshal(this.Ctx.Input.RequestBody, &req)
+//	err := json.Unmarshal(c.Ctx.Input.RequestBody, &req)
 //	if err != nil {
 //		br.Msg = "参数解析异常！"
 //		br.ErrMsg = "参数解析失败，Err:" + err.Error()
@@ -217,7 +219,7 @@ func (this *WeChatCommon) WxAppLogin() {
 //		br.Msg = "参数错误"
 //		return
 //	}
-//	user := this.User
+//	user := c.User
 //	if user == nil {
 //		br.Msg = "请登陆"
 //		br.Ret = 408

models/tables/company_approval/company_approval.go

@@ -10,6 +10,7 @@ import (
 	"time"
 )
 
+// CompanyApproval 客户单
 type CompanyApproval struct {
 	CompanyApprovalId   int `orm:"column(company_approval_id);pk"`
 	CompanyId           int
@@ -29,7 +30,7 @@ type CompanyApproval struct {
 	CompanyContractId   int       `description:"合同id"`
 }
 
-//新增客户产品
+// AddCompanyApproval 新增客户产品
 func AddCompanyApproval(item *CompanyApproval) (lastId int, err error) {
 	o := orm.NewOrm()
 	o.Begin()
@@ -58,6 +59,7 @@ func GetCompanyApprovalCountById(companyId, productId int) (count int, err error
 	return
 }
 
+// GetCompanyApprovalByCompanyId 根据客户编号、产品编号获取客户单
 func GetCompanyApprovalByCompanyId(companyId, productId int) (item *CompanyApproval, err error) {
 	sql := `SELECT * FROM company_approval WHERE company_id=? AND product_id=? AND approve_status='待审批' LIMIT 1 `
 	o := orm.NewOrm()
@@ -65,7 +67,7 @@ func GetCompanyApprovalByCompanyId(companyId, productId int) (item *CompanyAppro
 	return
 }
 
-//根据审批单id获取审批单详情
+// GetCompanyApprovalById 根据审批单id获取审批单详情
 func GetCompanyApprovalById(companyApprovalId int) (item *CompanyApproval, err error) {
 	sql := `SELECT * FROM company_approval WHERE company_approval_id=? LIMIT 1 `
 	o := orm.NewOrm()
@@ -73,6 +75,7 @@ func GetCompanyApprovalById(companyApprovalId int) (item *CompanyApproval, err e
 	return
 }
 
+// GetCompanyApprovalByApprovalId 根据客户单id获取客户单
 func GetCompanyApprovalByApprovalId(companyApprovalId int) (item *CompanyApproval, err error) {
 	sql := `SELECT * FROM company_approval WHERE company_approval_id=? LIMIT 1 `
 	o := orm.NewOrm()
@@ -80,7 +83,7 @@ func GetCompanyApprovalByApprovalId(companyApprovalId int) (item *CompanyApprova
 	return
 }
 
-//客户审批单
+// CompanyApprovalList 客户审批单列表
 type CompanyApprovalList struct {
 	CompanyId           int
 	ProductId           int
@@ -117,6 +120,7 @@ type CompanyApprovalList struct {
 	CurrNodeId          int    `description:"当前审批操作节点"`
 }
 
+// GetApprovalList 获取客户单列表
 func GetApprovalList(condition string, pars []interface{}, startSize, pageSize int) (items []*CompanyApprovalList, err error) {
 	o := orm.NewOrm()
 	sql := `SELECT a.company_id,b.product_id,a.company_name,a.credit_code,a.address,b.company_type,b.industry_name,
@@ -168,7 +172,7 @@ func GetApprovalCount(condition string, pars []interface{}) (count int, err erro
 	return
 }
 
-//试用转正式
+// TryOutToFormal 试用转正式
 func TryOutToFormal(companyId, productId, sellerId, companyApprovalId, companyContractId int, startDate, endDate, sellerName, productName string) (err error) {
 	o := orm.NewOrm()
 	o.Begin()
@@ -240,7 +244,7 @@ func TryOutToFormal(companyId, productId, sellerId, companyApprovalId, companyCo
 	return
 }
 
-//冻结转试用
+// FreezeToTryOut 冻结转试用
 func FreezeToTryOut(companyId, productId, sellerId, companyApprovalId, applyUserId int, sellerName, productName string) (err error) {
 	o := orm.NewOrm()
 	o.Begin()
@@ -332,7 +336,7 @@ func FreezeToTryOut(companyId, productId, sellerId, companyApprovalId, applyUser
 	return
 }
 
-//试用延期
+// TryOutDelay 试用延期
 func TryOutDelay(companyId, productId, sellerId, companyApprovalId int, sellerName, endDate, productName string) (err error) {
 	o := orm.NewOrm()
 	o.Begin()
@@ -408,7 +412,7 @@ func TryOutDelay(companyId, productId, sellerId, companyApprovalId int, sellerNa
 	return
 }
 
-//原销售申请领取
+// ApplyReceive 原销售申请领取
 func ApplyReceive(companyId, productId, sysUserId, companyApprovalId, applyUserId int, sysUserName, productName string) (err error) {
 	o := orm.NewOrm()
 	o.Begin()
@@ -499,7 +503,7 @@ func ApplyReceive(companyId, productId, sysUserId, companyApprovalId, applyUserI
 	return
 }
 
-//申请服务更新
+// ApplyServiceUpdate 申请服务更新
 func ApplyServiceUpdate(companyId, productId, sellerId, companyApprovalId, companyContractId int, startDate, endDate, sellerName, productName string) (err error) {
 	o := orm.NewOrm()
 	o.Begin()
@@ -652,7 +656,7 @@ func ApplyServiceUpdate(companyId, productId, sellerId, companyApprovalId, compa
 
 }
 
-//审批拒绝
+// ApproveRefuse 审批拒绝
 func ApproveRefuse(companyId, productId int, approveStatus, approveRemark string) (err error) {
 	o := orm.NewOrm()
 	o.Begin()
@@ -683,7 +687,7 @@ func ApproveRefuse(companyId, productId int, approveStatus, approveRemark string
 	return
 }
 
-//更新审批单、合同状态
+// ApplyApproveContract 更新审批单、合同状态
 func ApplyApproveContract(companyId, productId, companyApprovalId, companyContractId int) (err error) {
 	o := orm.NewOrm()
 	o.Begin()
@@ -723,37 +727,7 @@ func GetCompanyApprovalDetailById(companyId, productId int) (item *CompanyApprov
 	return
 }
 
-type CompanyApplyDeleteReq struct {
-	CompanyId         int `description:"客户id"`
-	CompanyApprovalId int `description:"审批记录ID"`
-}
-
-//申请服务更新
-func ApplyDelete(companyId, companyApprovalId, productId int) (err error) {
-	o := orm.NewOrm()
-	o.Begin()
-	defer func() {
-		if err != nil {
-			o.Rollback()
-		} else {
-			o.Commit()
-		}
-	}()
-
-	sql := `DELETE FROM company_approval WHERE company_approval_id=? `
-	_, err = o.Raw(sql, companyApprovalId).Exec()
-	if err != nil {
-		return
-	}
-	sql = `UPDATE company_product SET approve_status='' WHERE company_id=? AND product_id=? `
-	_, err = o.Raw(sql, companyId, productId).Exec()
-	if err != nil {
-		return
-	}
-	return
-}
-
-//修改申请信息
+// ModifyCompanyApproval 修改申请信息
 func ModifyCompanyApproval(companyId, productId, companyApprovalId int, approveContent, applyReasons string) (err error) {
 	o := orm.NewOrm()
 	o.Begin()
@@ -925,7 +899,7 @@ func GetCompanyApprovalCount(companyId, productId int) (count int, err error) {
 	return
 }
 
-//根据申请id字符串来获取申请单列表
+// GetApprovalListByApprovalIds 根据申请id字符串来获取申请单列表
 func GetApprovalListByApprovalIds(companyApprovalIds string) (list []*CompanyApproval, err error) {
 	o := orm.NewOrm()
 	sql := `SELECT * from company_approval WHERE  company_approval_id in (` + companyApprovalIds + `)`
@@ -937,7 +911,7 @@ type CompanyNameList struct {
 	CompanyName string `description:"客户名称，甲方名称,长度32位"`
 }
 
-//获取客户名称列表数据
+// GetCompanyNameList 获取客户名称列表数据
 func GetCompanyNameList(userId int, userRoleTypeCode, keyword string) (list []*CompanyNameList, err error) {
 	o := orm.NewOrm()
 	sql := `SELECT a.company_name FROM company AS a