Merge branch 'dev/v2.4.31_dx' of jianyu/qmx_admin into feature/v2.4.31

src/order/orderManageController.go

@@ -630,9 +630,23 @@ func OrderDetails(context *admin.Context) (interface{}, error) {
 			result["audit"] = auditResult
 		}
 		//盖章记录
-		sealRes := util.JysqlDB.SelectBySql(`SELECT stamp_time,create_time,b.admin_user as salesperson_name,c.admin_user as applicant_name FROM dataexport_order a
-LEFT JOIN cadmin.admin_user b on a.salesperson_id = b.id LEFT JOIN cadmin.admin_user c on a.applicant_id = b.id WHERE a.order_code = ?`, (*res)["order_code"])
+		sealRes := util.JysqlDB.SelectBySql(`SELECT stamp_time,create_time,salesman_id,applicant_id FROM order_seal  WHERE order_code = ?`, (*res)["order_code"])
 		if sealRes != nil && len(*sealRes) > 0 {
+			for _, m := range *sealRes {
+				var salesmanName, applicantName string
+				salesman_id := strings.Split(qutil.InterfaceToStr(m["salesman_id"]), ",")
+				applicant_id := strings.Split(qutil.InterfaceToStr(m["applicant_id"]), ",")
+				salesman := util.JysqlDB.SelectBySql(fmt.Sprintf(`SELECT GROUP_CONCAT(username SEPARATOR ',') as name FROM cadmin.admin_user  WHERE id IN (%s)`, strings.Join(salesman_id, ",")))
+				if salesman != nil && len(*salesman) > 0 {
+					salesmanName = qutil.InterfaceToStr((*salesman)[0]["name"])
+				}
+				applicant := util.JysqlDB.SelectBySql(fmt.Sprintf(`SELECT GROUP_CONCAT(username SEPARATOR ',') as name FROM cadmin.admin_user  WHERE id IN (%s)`, strings.Join(applicant_id, ",")))
+				if applicant != nil && len(*applicant) > 0 {
+					applicantName = qutil.InterfaceToStr((*applicant)[0]["name"])
+				}
+				m["salesperson_name"] = salesmanName
+				m["applicant_name"] = applicantName
+			}
 			result["sealArr"] = sealRes
 		}
 	}

src/order/orderSeal.go

@@ -12,10 +12,10 @@ func OperateOrderSeal(context *admin.Context) (interface{}, error) {
 	param := new(struct {
 		Id          string `form:"id"`
 		OrderCode   string `form:"orderCode"`
-		salesmanId  string `form:"salesman_id"`  //销售人员
+		SalesmanId  string `form:"salesman_id"`  //销售人员
 		StampTime   string `form:"stamp_time"`   //盖章时间
 		RegType     string `form:"regType"`      //请求类型
-		applicantId string `form:"applicant_id"` //申请人
+		ApplicantId string `form:"applicant_id"` //申请人
 	})
 	err := context.Form(param)
 	if err != nil {
@@ -36,8 +36,8 @@ func OperateOrderSeal(context *admin.Context) (interface{}, error) {
 			"order_code":   param.OrderCode,
 			"stamp_time":   param.StampTime,
 			"create_time":  time.Now().Format("2006-01-02 15:04:05"),
-			"salesman_id":  param.salesmanId,
-			"applicant_id": param.applicantId,
+			"salesman_id":  param.SalesmanId,
+			"applicant_id": param.ApplicantId,
 			"status":       0,
 		})
 	case "delete": //删除记录