2
3
Переглянути джерело

修复信息统计时间错误 信息变更不显示错误

Liuqi 6 роки тому
батько
коміт
61e88536ad

+ 3 - 3
src/dashoo.cn/backend/api/business/oilsupplier/selectbusiness/selectservice.go

@@ -127,10 +127,10 @@ SELECT  b.Month,a.AnnualAudit from (select extract(month from ApplyTime) time ,C
 			WHERE ApplyTime >= '` + where +`' AND ApplyTime < '` + timedone +`' AND Status = '11'
 			group by extract(month from ApplyTime)) a 
 			RIGHT JOIN OilCountMonth b ON b.Month = a.time) AnnualAudit
-LEFT JOIN (SELECT  b.Month,a.Store from (select extract(month from ApplyTime) time ,COUNT(*) Store
+LEFT JOIN (SELECT  b.Month,a.Store from (select extract(month from StorageOn) time ,COUNT(*) Store
 			from OilSupplierCert
-			WHERE ApplyTime >= '` + where +`' AND ApplyTime < '` + timedone +`' AND InFlag = '1'
-			group by extract(month from ApplyTime)) a 
+			WHERE StorageOn >= '` + where +`' AND StorageOn < '` + timedone +`' AND InFlag = '1'
+			group by extract(month from StorageOn)) a 
 			RIGHT JOIN OilCountMonth b ON b.Month = a.time) Store ON AnnualAudit.Month = Store.Month
 LEFT JOIN (SELECT  b.Month,a.Append from (select extract(month from ApplyDate) time ,COUNT(*) Append
 			from OilSupplierCertAppend

+ 1 - 1
src/dashoo.cn/backend/api/controllers/oilsupplier/todolist.go

@@ -290,7 +290,7 @@ func (this *TodoListController) GetMyTaskFinishedList() {
 		} else if wfName == workflow.OIL_INFO_CHANGE {
 			//资质变更
 			where := " 1=1 "
-			where = where + " and b.Id = '" + id + "'"
+			where = where + " and Id = '" + id + "'"
 			var todo todolist.TodoList
 			var listInfo infochange.OilInfoChange
 			svc := infochange.GetInfoChangeService(utils.DBE)