|
@@ -549,25 +549,27 @@ func GetResultDataInsertDB(org_id int64) (result []*CmResult) {
|
549
|
549
|
|
550
|
550
|
project_id := int64(0)
|
551
|
551
|
if len("180") > 0 {
|
552
|
|
- project_id, _ = GetGzjhProjectID(org_id, item.Groupname)
|
|
552
|
+ project_id, _ = GetBljhProjectID(org_id, item.Groupname)
|
553
|
553
|
} else {
|
554
|
554
|
continue
|
555
|
555
|
}
|
556
|
556
|
printInfo, _ := GetHisLabelPrintInfoById("180")
|
557
|
557
|
|
558
|
|
- item_id, _ := GetItemID(org_id, item.Groupname, item.Itemname, project_id)
|
|
558
|
+ item_id, _ := GetBlItemID(org_id, item.Groupname, item.Itemname, project_id)
|
559
|
559
|
|
560
|
560
|
tx := writeMiddleDb.Begin()
|
561
|
561
|
var inspection models.MiddleInspection
|
562
|
562
|
var inspection_reference models.MiddleInspectionReference
|
563
|
563
|
|
564
|
564
|
recordDateStr := ""
|
565
|
|
-
|
|
565
|
+ inspect_date := item.Repdate.Format("2006-01-02 15:04")
|
566
|
566
|
if item.Repdate.Unix() == 0 {
|
567
|
567
|
recordDateStr = time.Now().Format("2006-01-02 15:04")
|
|
568
|
+ } else {
|
|
569
|
+
|
|
570
|
+ recordDateStr = inspect_date
|
568
|
571
|
}
|
569
|
572
|
|
570
|
|
- inspect_date := item.Repdate.Format("2006-01-02 15:04")
|
571
|
573
|
date, _ := utils.ParseTimeStringToTime("2006-01-02 15:04", recordDateStr)
|
572
|
574
|
record_date, _ := utils.ParseTimeStringToTime("2006-01-02", date.Format("2006-01-02"))
|
573
|
575
|
var total int
|