Merge branch 'BI_Dashboard' of http://8.136.199.33:3000/eta_gn_server/eta_api into BI_Dashboard

services/bi_approve/bi_approve.go

@@ -995,13 +995,10 @@ func CheckBiOpenApprove(classifyId int) (opening bool, err error) {
 	flowPars := make([]interface{}, 0)
 	flowPars = append(flowPars, classifyId)
 	flowItem, e := flowOb.GetItemByCondition(flowCond, flowPars, "")
-	if e != nil && !utils.IsErrNoRow(e) {
+	if e != nil {
 		err = fmt.Errorf("ApproveFlow GetItemByCondition err: %s", e.Error())
 		return
 	}
-	if utils.IsErrNoRow(e) {
-		return
-	}
 
 	// 开启审批/有审批流
 	if openApprove && (flowItem != nil) {
@@ -1108,10 +1105,10 @@ func toBiApproveItemOrmResp(src []*biapprove.BiApproveItemOrm) (res []*response.
 		r.ApplyUserId = v.ApplyUserId
 		r.ApplyUserName = v.ApplyUserName
 		r.ApproveRemark = v.ApproveRemark
-		r.ApproveTime = v.ApproveTime.Format(utils.FormatDateTime)
-		r.HandleTime = v.HandleTime.Format(utils.FormatDateTime)
-		r.CreateTime = v.CreateTime.Format(utils.FormatDateTime)
-		r.ModifyTime = v.ModifyTime.Format(utils.FormatDateTime)
+		r.ApproveTime = utils.TimeTransferString(utils.FormatDateTime, v.ApproveTime)
+		r.HandleTime = utils.TimeTransferString(utils.FormatDateTime, v.HandleTime)
+		r.CreateTime = utils.TimeTransferString(utils.FormatDateTime, v.CreateTime)
+		r.ModifyTime = utils.TimeTransferString(utils.FormatDateTime, v.ModifyTime)
 		r.NodeState = v.NodeState
 		res = append(res, r)
 	}