历史排班

controllers/manage_api_controller.go

@@ -2018,83 +2018,78 @@ func (this *MachineApiController) SaveRepair() {
 	loc, _ := time.LoadLocation("Local")
 	adminUserInfo := this.GetAdminUserInfo()
 	id, _ := this.GetInt64("id")
-	fmt.Println("id", id)
+
 	addmacher, _ := service.GetBedId(id)
 	OrgID := adminUserInfo.CurrentOrgId
-	fmt.Println("orgid", OrgID)
+
 	dataBody := make(map[string]interface{}, 0)
 	err := json.Unmarshal(this.Ctx.Input.RequestBody, &dataBody)
 	fmt.Println("err", err)
 	gua_date := dataBody["guarantee_date"].(string)
-	fmt.Println("保修日期", gua_date)
+
 	inLocation, _ := time.ParseInLocation(timeLayout+" 15:04:05", gua_date+" 00:00:00", loc)
 	guaDate := inLocation.Unix()
-	fmt.Println("保修日期", guaDate)
 
 	startDateStr := dataBody["start_time"].(string)
-	fmt.Println("出发时间", startDateStr)
+
 	startDate, _ := utils.ParseTimeStringToTime("2006-01-02 15:04", startDateStr)
-	fmt.Println("触发事件", startDate.Unix())
 
 	arriveDateStr := dataBody["arrive_time"].(string)
-	fmt.Println("到达时间", arriveDateStr)
+
 	arriveDate, _ := utils.ParseTimeStringToTime("2006-01-02 15:04", arriveDateStr)
-	fmt.Println("到达时间", arriveDate.Unix())
 
 	finishDateStr := dataBody["finish_time"].(string)
-	fmt.Println("完成时间", finishDateStr)
+
 	finishDate, _ := utils.ParseTimeStringToTime("2006-01-02 15:04", finishDateStr)
-	fmt.Println("完成时间", finishDate.Unix())
 
 	totaldistance := dataBody["total_distance"].(string)
-	fmt.Println("总公里输", totaldistance)
 
 	failurestate := int64(dataBody["failure_stage"].(float64))
-	fmt.Println("故事范式阶段", failurestate)
 
 	codeInformation := dataBody["code_information"].(string)
-	fmt.Println("故事提示信息及代码", codeInformation)
 
 	faultdescription := dataBody["fault_description"].(string)
-	fmt.Println("故障描述", faultdescription)
 
 	causeAnalysis := dataBody["cause_analysis"].(string)
-	fmt.Println("原因分析", causeAnalysis)
 
 	treatmentprocess := dataBody["treatment_process"].(string)
-	fmt.Println("处理过程", treatmentprocess)
 
 	images := dataBody["images"].(string)
-	fmt.Println("上传图片", images)
 
 	exclude := int64(dataBody["exclude"].(float64))
-	fmt.Println("故障是否排除", exclude)
 
 	reason := dataBody["reason"].(string)
-	fmt.Println("原因", reason)
 
 	imageName := dataBody["imageName"].(string)
 
+	function_accessories_inspection := dataBody["function_accessories_inspection"].(string)
+
+	other_information := dataBody["other_information"].(string)
+
+	admin_user_id := int64(dataBody["admin_user_id"].(float64))
 	repair := models.DeviceRepair{
-		BedId:            addmacher.BedId,
-		EquitmentId:      id,
-		GuaranteeDate:    guaDate,
-		StartTime:        startDate.Unix(),
-		ArriveTime:       arriveDate.Unix(),
-		FinishTime:       finishDate.Unix(),
-		TotalDistance:    totaldistance,
-		FailureStage:     failurestate,
-		FaultDescription: faultdescription,
-		CauseAnalysis:    causeAnalysis,
-		TreatmentProcess: treatmentprocess,
-		Images:           images,
-		Exclude:          exclude,
-		Reason:           reason,
-		Status:           1,
-		UserOrgId:        OrgID,
-		Ctime:            time.Now().Unix(),
-		CodeInformation:  codeInformation,
-		ImageName:        imageName,
+		BedId:                         addmacher.BedId,
+		EquitmentId:                   id,
+		GuaranteeDate:                 guaDate,
+		StartTime:                     startDate.Unix(),
+		ArriveTime:                    arriveDate.Unix(),
+		FinishTime:                    finishDate.Unix(),
+		TotalDistance:                 totaldistance,
+		FailureStage:                  failurestate,
+		FaultDescription:              faultdescription,
+		CauseAnalysis:                 causeAnalysis,
+		TreatmentProcess:              treatmentprocess,
+		Images:                        images,
+		Exclude:                       exclude,
+		Reason:                        reason,
+		Status:                        1,
+		UserOrgId:                     OrgID,
+		Ctime:                         time.Now().Unix(),
+		CodeInformation:               codeInformation,
+		ImageName:                     imageName,
+		FunctionAccessoriesInspection: function_accessories_inspection,
+		OtherInformation:              other_information,
+		AdminUserId:                   admin_user_id,
 	}
 	err = service.CreateRepair(&repair)
 	if err != nil {
@@ -2111,27 +2106,38 @@ func (this *MachineApiController) GetAllRepair() {
 	page, _ := this.GetInt64("page")
 	adminUser := this.GetAdminUserInfo()
 	orgID := adminUser.CurrentOrgId
+	appId := adminUser.CurrentAppId
 	repair, total, err := service.GetAllRepair(orgID, limit, page)
+
+	addmacher, _ := service.GetAllMachineByOrgId(orgID)
+
+	docList, _ := service.GetAllDoctor(orgID, appId)
 	if err != nil {
 		this.ServeFailJsonSend(enums.ErrorCodeDBDelete, "查询失败:（"+err.Error()+"）")
 		return
 	}
 	this.ServeSuccessJSON(map[string]interface{}{
-		"repair": repair,
-		"total":  total,
+		"repair":     repair,
+		"total":      total,
+		"macherList": addmacher,
+		"docList":    docList,
 	})
 }
 
 func (this *MachineApiController) EditRepair() {
 	id, _ := this.GetInt64("id")
-	fmt.Println("id", id)
+
+	appId := this.GetAdminUserInfo().CurrentAppId
+	orgId := this.GetAdminUserInfo().CurrentOrgId
 	repair, err := service.EditRepair(id)
+	docList, _ := service.GetAllDoctor(orgId, appId)
 	if err != nil {
 		this.ServeFailJsonSend(enums.ErrorCodeDBDelete, "查询失败:（"+err.Error()+"）")
 		return
 	}
 	this.ServeSuccessJSON(map[string]interface{}{
-		"repair": repair,
+		"repair":  repair,
+		"docList": docList,
 	})
 }
 
@@ -2194,21 +2200,30 @@ func (this *MachineApiController) UpdateRepair() {
 	fmt.Println("原因", reason)
 
 	imageName := dataBody["image_name"].(string)
+
+	function_accessories_inspection := dataBody["function_accessories_inspection"].(string)
+
+	other_information := dataBody["other_information"].(string)
+
+	admin_user_id := int64(dataBody["admin_user_id"].(float64))
 	deviceRepair := models.DeviceRepair{
-		GuaranteeDate:    guaDate,
-		StartTime:        startDate.Unix(),
-		ArriveTime:       arriveDate.Unix(),
-		FinishTime:       finishDate.Unix(),
-		TotalDistance:    totaldistance,
-		FailureStage:     failurestate,
-		FaultDescription: faultdescription,
-		CauseAnalysis:    causeAnalysis,
-		TreatmentProcess: treatmentprocess,
-		Images:           images,
-		Exclude:          exclude,
-		Reason:           reason,
-		CodeInformation:  codeInformation,
-		ImageName:        imageName,
+		GuaranteeDate:                 guaDate,
+		StartTime:                     startDate.Unix(),
+		ArriveTime:                    arriveDate.Unix(),
+		FinishTime:                    finishDate.Unix(),
+		TotalDistance:                 totaldistance,
+		FailureStage:                  failurestate,
+		FaultDescription:              faultdescription,
+		CauseAnalysis:                 causeAnalysis,
+		TreatmentProcess:              treatmentprocess,
+		Images:                        images,
+		Exclude:                       exclude,
+		Reason:                        reason,
+		CodeInformation:               codeInformation,
+		ImageName:                     imageName,
+		FunctionAccessoriesInspection: function_accessories_inspection,
+		OtherInformation:              other_information,
+		AdminUserId:                   admin_user_id,
 	}
 	err = service.UpdateRepair(id, OrgID, &deviceRepair)
 	if err != nil {

models/device_models.go

@@ -871,27 +871,30 @@ type DeviceRepairs struct {
 }
 
 type DeviceRepair struct {
-	ID               int64  `gorm:"column:id" json:"id" form:"id"`
-	GuaranteeDate    int64  `gorm:"column:guarantee_date" json:"guarantee_date" form:"guarantee_date"`
-	StartTime        int64  `gorm:"column:start_time" json:"start_time" form:"start_time"`
-	ArriveTime       int64  `gorm:"column:arrive_time" json:"arrive_time" form:"arrive_time"`
-	FinishTime       int64  `gorm:"column:finish_time" json:"finish_time" form:"finish_time"`
-	TotalDistance    string `gorm:"column:total_distance" json:"total_distance" form:"total_distance"`
-	FailureStage     int64  `gorm:"column:failure_stage" json:"failure_stage" form:"failure_stage"`
-	FaultDescription string `gorm:"column:fault_description" json:"fault_description" form:"fault_description"`
-	CauseAnalysis    string `gorm:"column:cause_analysis" json:"cause_analysis" form:"cause_analysis"`
-	TreatmentProcess string `gorm:"column:treatment_process" json:"treatment_process" form:"treatment_process"`
-	Images           string `gorm:"column:images" json:"images" form:"images"`
-	Exclude          int64  `gorm:"column:exclude" json:"exclude" form:"exclude"`
-	Reason           string `gorm:"column:reason" json:"reason" form:"reason"`
-	Ctime            int64  `gorm:"column:ctime" json:"ctime" form:"ctime"`
-	Mtime            int64  `gorm:"column:mtime" json:"mtime" form:"mtime"`
-	Status           int64  `gorm:"column:status" json:"status" form:"status"`
-	UserOrgId        int64  `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
-	BedId            int64  `gorm:"column:bed_id" json:"bed_id" form:"bed_id"`
-	EquitmentId      int64  `gorm:"column:equitment_id" json:"equitment_id" form:"equitment_id"`
-	CodeInformation  string `gorm:"column:code_information" json:"code_information" form:"code_information"`
-	ImageName        string `gorm:"column:image_name" json:"image_name" form:"image_name"`
+	ID                            int64  `gorm:"column:id" json:"id" form:"id"`
+	GuaranteeDate                 int64  `gorm:"column:guarantee_date" json:"guarantee_date" form:"guarantee_date"`
+	StartTime                     int64  `gorm:"column:start_time" json:"start_time" form:"start_time"`
+	ArriveTime                    int64  `gorm:"column:arrive_time" json:"arrive_time" form:"arrive_time"`
+	FinishTime                    int64  `gorm:"column:finish_time" json:"finish_time" form:"finish_time"`
+	TotalDistance                 string `gorm:"column:total_distance" json:"total_distance" form:"total_distance"`
+	FailureStage                  int64  `gorm:"column:failure_stage" json:"failure_stage" form:"failure_stage"`
+	FaultDescription              string `gorm:"column:fault_description" json:"fault_description" form:"fault_description"`
+	CauseAnalysis                 string `gorm:"column:cause_analysis" json:"cause_analysis" form:"cause_analysis"`
+	TreatmentProcess              string `gorm:"column:treatment_process" json:"treatment_process" form:"treatment_process"`
+	Images                        string `gorm:"column:images" json:"images" form:"images"`
+	Exclude                       int64  `gorm:"column:exclude" json:"exclude" form:"exclude"`
+	Reason                        string `gorm:"column:reason" json:"reason" form:"reason"`
+	Ctime                         int64  `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime                         int64  `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	Status                        int64  `gorm:"column:status" json:"status" form:"status"`
+	UserOrgId                     int64  `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	BedId                         int64  `gorm:"column:bed_id" json:"bed_id" form:"bed_id"`
+	EquitmentId                   int64  `gorm:"column:equitment_id" json:"equitment_id" form:"equitment_id"`
+	CodeInformation               string `gorm:"column:code_information" json:"code_information" form:"code_information"`
+	ImageName                     string `gorm:"column:image_name" json:"image_name" form:"image_name"`
+	FunctionAccessoriesInspection string `gorm:"column:function_accessories_inspection" json:"function_accessories_inspection" form:"function_accessories_inspection"`
+	OtherInformation              string `gorm:"column:other_information" json:"other_information" form:"other_information"`
+	AdminUserId                   int64  `gorm:"column:admin_user_id" json:"admin_user_id" form:"admin_user_id"`
 }
 
 func (DeviceRepair) TableName() string {

service/manage_service.go

@@ -647,7 +647,7 @@ func EditRepair(id int64) (models.DeviceRepair, error) {
 
 func UpdateRepair(id int64, orgid int64, repair *models.DeviceRepair) error {
 
-	err := writeUserDb.Model(&repair).Where("id=? AND user_org_id = ? AND status = 1", id, orgid).Updates(map[string]interface{}{"guarantee_date": repair.GuaranteeDate, "start_time": repair.StartTime, "arrive_time": repair.ArriveTime, "finish_time": repair.FinishTime, "total_distance": repair.TotalDistance, "failure_stage": repair.FailureStage, "fault_description": repair.FaultDescription, "cause_analysis": repair.CauseAnalysis, "treatment_process": repair.TreatmentProcess, "images": repair.Images, "exclude": repair.Exclude, "reason": repair.Reason, "code_information": repair.CodeInformation, "image_name": repair.ImageName, "mtime": time.Now().Unix()}).Error
+	err := writeUserDb.Model(&repair).Where("id=? AND user_org_id = ? AND status = 1", id, orgid).Updates(map[string]interface{}{"guarantee_date": repair.GuaranteeDate, "start_time": repair.StartTime, "arrive_time": repair.ArriveTime, "finish_time": repair.FinishTime, "total_distance": repair.TotalDistance, "failure_stage": repair.FailureStage, "fault_description": repair.FaultDescription, "cause_analysis": repair.CauseAnalysis, "treatment_process": repair.TreatmentProcess, "images": repair.Images, "exclude": repair.Exclude, "reason": repair.Reason, "code_information": repair.CodeInformation, "image_name": repair.ImageName, "mtime": time.Now().Unix(), "function_accessories_inspection": repair.FunctionAccessoriesInspection, "other_information": repair.OtherInformation, "admin_user_id": repair.AdminUserId}).Error
 	return err
 }