|
|
@@ -1653,10 +1653,10 @@ func (this *StatisticCompanyMergerController) CompanyContractPercentageListV2()
|
|
|
//}
|
|
|
|
|
|
//判断结束时间是否晚于当前时间，如果晚于当前时间，那么就把当前时间作为截止时间。
|
|
|
- endDateTime, _ := time.Parse(utils.FormatDate, endDate)
|
|
|
- if endDateTime.After(time.Now()) {
|
|
|
- endDate = time.Now().Format(utils.FormatDate)
|
|
|
- }
|
|
|
+ //endDateTime, _ := time.Parse(utils.FormatDate, endDate)
|
|
|
+ //if endDateTime.After(time.Now()) {
|
|
|
+ // endDate = time.Now().Format(utils.FormatDate)
|
|
|
+ //}
|
|
|
//fmt.Println("endDate", endDate)
|
|
|
if contractDataType == "" {
|
|
|
contractDataType = "续约合同"
|
|
|
@@ -1828,6 +1828,7 @@ func (this *StatisticCompanyMergerController) CompanyContractPercentageListV2()
|
|
|
br.ErrMsg = "获取失败，Err:" + err.Error()
|
|
|
return
|
|
|
}
|
|
|
+
|
|
|
totalMoneyEnd, err := company.GetIncrementalRenewalCompanyProductMergeSumMoney(conditionEnd1, parsEnd1)
|
|
|
if err != nil && err.Error() != utils.ErrNoRow() {
|
|
|
br.Msg = "获取失败"
|
