|
@@ -147,7 +147,7 @@ func (this *CompanyApplyController) ApplyServiceUpdate() {
|
|
|
|
|
|
//权益的新签合同重新定义,如果合同起始时间在新签合同起始日期 1年之内的,仍为新签合同。
|
|
|
raicontractType = req.ContractType
|
|
|
- if raicontractType != "新签合同" && companyProduct.Status != utils.COMPANY_STATUS_FOREVER {
|
|
|
+ if raicontractType != "新签合同" {
|
|
|
//startDateTime, _ := time.Parse(utils.FormatDate, req.StartDate)
|
|
|
//startDateTime = startDateTime.AddDate(-1, 0, 0)
|
|
|
totalLastYear, err := contractService.GetCompanyContractCountRaiByLastYear(req.CompanyId, req.StartDate)
|
|
@@ -681,7 +681,7 @@ func (this *CompanyApplyController) ApplyTurnPositive() {
|
|
|
if productId == 2 {
|
|
|
//权益的新签合同重新定义,如果合同起始时间在新签合同起始日期 1年之内的,仍为新签合同。
|
|
|
raicontractType = contractType
|
|
|
- if raicontractType != "新签合同" && companyProduct.Status != utils.COMPANY_STATUS_FOREVER {
|
|
|
+ if raicontractType != "新签合同" {
|
|
|
//startDateTime, _ := time.Parse(utils.FormatDate, req.StartDate)
|
|
|
//startDateTime = startDateTime.AddDate(-1, 0, 0)
|
|
|
totalLastYear, err := contractService.GetCompanyContractCountRaiByLastYear(req.CompanyId, req.StartDate)
|
|
@@ -1294,7 +1294,7 @@ func (this *CompanyApplyController) ApplyBySystemContract() {
|
|
|
if productId == 2 {
|
|
|
//权益的新签合同重新定义,如果合同起始时间在新签合同起始日期 1年之内的,仍为新签合同。
|
|
|
raicontractType = contractType
|
|
|
- if raicontractType != "新签合同" && companyProduct.Status != utils.COMPANY_STATUS_FOREVER {
|
|
|
+ if raicontractType != "新签合同" {
|
|
|
//startDateTime := contractDetail.StartDate.AddDate(-1, 0, 0)
|
|
|
totalLastYear, err := contractService.GetCompanyContractCountRaiByLastYear(req.CompanyId, contractDetail.StartDate.Format(utils.FormatDate))
|
|
|
if err != nil {
|