1

dao/quality_dao.go

@@ -29,13 +29,14 @@ func NewQualityDao(engine *xorm.Engine) *QualityDao {
 	}
 }
 
-func (d *QualityDao) GetInIdJoinAccount(ids string) []viewmodels.QualityList {
+func (d *QualityDao) GetInIdJoinAccount(ids []int) []viewmodels.QualityList {
 
 	datalist := make([]viewmodels.QualityList, 0)
 	err := d.engine.
 		Table("`cm_quality` as cs").
-		Select("cs.id, cs.`create_time`, cs.`inspection_detail`,cs.code, cs.status, pa.`name` as `audit_name`, pa.`position`,cs.`bidsection_id`").
-		Where("cs.id in ( "+ids+" ) ").
+		Select("cs.id, cs.`create_time`, cs.`inspection_detail`, cs.`inspection`,cs.code, cs.status, pa.`name` as `audit_name`, pa.`position`,cs.`bidsection_id`").
+		In("cs.id", ids).
+		// Where("cs.id in ( "+ids+" ) ").
 		Join("left", "cm_project_account as pa", "pa.id = cs.uid").
 		Desc("id").
 		Find(&datalist)

dao/safe_dao.go

@@ -29,13 +29,14 @@ func NewSafeDao(engine *xorm.Engine) *SafeDao {
 	}
 }
 
-func (d *SafeDao) GetInIdJoinAccount(ids string) []viewmodels.SafeList {
+func (d *SafeDao) GetInIdJoinAccount(ids []int) []viewmodels.SafeList {
 
 	datalist := make([]viewmodels.SafeList, 0)
 	err := d.engine.
 		Table("`cm_safe` as cs").
-		Select("cs.id, cs.`create_time`, cs.`inspection_detail`,cs.code, cs.status, pa.`name` as `audit_name`, pa.`position`,cs.`bidsection_id`").
-		Where("cs.id in ( "+ids+" ) ").
+		Select("cs.id, cs.`create_time`, cs.`inspection_detail`, cs.`inspection`,cs.code, cs.status, pa.`name` as `audit_name`, pa.`position`,cs.`bidsection_id`").
+		In("cs.id", ids).
+		// Where("cs.id in ( "+ids+" ) ").
 		Join("left", "cm_project_account as pa", "pa.id = cs.uid").
 		Desc("id").
 		Find(&datalist)

services/safe_service.go

@@ -4,7 +4,6 @@ import (
 	"fmt"
 	"log"
 	"strconv"
-	"strings"
 	"time"
 
 	"github.com/kataras/iris/v12"
@@ -336,25 +335,25 @@ func (s *safeService) GetPending(projectId int, projectAccountId int) []viewmode
 	// 1.获得审批列表
 	approverData := s.daoApprover.GetStatusByProjectAndAccount(projectId, projectAccountId, 1)
 	// 2.构建数据ID
-	safeIds := []string{}
-	qualityIds := []string{}
+	safeIds := []int{}
+	qualityIds := []int{}
 	for _, item := range approverData {
 		if item.DataType == 1 {
-			safeIds = append(safeIds, strconv.Itoa(item.DataId))
+			safeIds = append(safeIds, item.DataId)
 		} else if item.DataType == 2 {
-			qualityIds = append(qualityIds, strconv.Itoa(item.DataId))
+			qualityIds = append(qualityIds, item.DataId)
 		}
 	}
-	safeInId := strings.Join(safeIds, ",")
-	qualityInId := strings.Join(qualityIds, ",")
+	// safeInId := strings.Join(safeIds, ",")
+	// qualityInId := strings.Join(qualityIds, ",")
 
 	safeList := make([]viewmodels.SafeList, 0)
 	qualityList := make([]viewmodels.QualityList, 0)
-	if safeInId != "" {
-		safeList = s.daoSafe.GetInIdJoinAccount(safeInId)
+	if len(safeIds) != 0 {
+		safeList = s.daoSafe.GetInIdJoinAccount(safeIds)
 	}
-	if qualityInId != "" {
-		qualityList = s.daoQuality.GetInIdJoinAccount(qualityInId)
+	if len(qualityIds) != 0 {
+		qualityList = s.daoQuality.GetInIdJoinAccount(qualityIds)
 	}
 
 	// data := s.daoSafe.GetStatusByProjectAndAccount(projectId, projectAccountId, 1)
@@ -384,6 +383,7 @@ func (s *safeService) GetPending(projectId int, projectAccountId int) []viewmode
 				if dataIdString == data.Id {
 					bidSectionDetail := s.daoBidsection.Get(data.BidsectionId, projectId)
 					approverVM.Code = data.Code
+					approverVM.Inspection = data.Inspection
 					approverVM.InspectionDetail = data.InspectionDetail
 					approverVM.Name = data.AuditName
 					approverVM.Position = data.Position