模拟测试

api/version1/taskplatform/taskmanagement/ruanTask.go

@@ -1390,16 +1390,22 @@ func AnalysisMsaterLog(dataStr string, nameKey []customerform.UnitAttribute) (se
 	#
 */
 func (a *ApiMethod) EchoTableFormPage(c *gin.Context) {
-	var requestData publicmethod.PublicId
+	var requestData SimTask
 	err := c.ShouldBindJSON(&requestData)
-	if err != nil {
+	// if err != nil {
-		publicmethod.Result(100, err, c)
+	// 	publicmethod.Result(100, err, c)
-		return
+	// 	return
-	}
+	// }
 	if requestData.Id == "" {
 		publicmethod.Result(107, err, c)
 		return
 	}
+	if requestData.IsRun == 0 {
+		requestData.IsRun = 1
+	}
+	if requestData.UserKey == "" {
+		requestData.IsRun = 1
+	}
 	//获取当前启用的表单版本
 	var tableFormPage CallBackFormStruct
 	err = overall.CONSTANT_DB_AppPlatform.Where("`id` = ?", requestData.Id).Find(&tableFormPage).Error
@@ -1424,9 +1430,11 @@ func (a *ApiMethod) EchoTableFormPage(c *gin.Context) {
 			if err != nil {
 				sendPage["flowPage"] = sendInfo
 			} else {
-				context, _ := c.Get(overall.MyContJwt)
+				// context, _ := c.Get(overall.MyContJwt)
-				var userCont modelshr.ManCont
+				// var userCont modelshr.ManCont
-				userCont.GetLoginCont(context) //获取当前操作人
+				// userCont.GetLoginCont(context) //获取当前操作人
+
+				userCont := GainRunPeople(requestData.IsRun, requestData.UserKey, c)
 				var judgeWhy []ConditionListInfo
 				var ddd []NodelPeopleInfo
 				workFlowInfo := flowCont.NodeConfig.CircularParsing(1, userCont, userCont.AdminOrg, judgeWhy, ddd)
@@ -1442,6 +1450,27 @@ func (a *ApiMethod) EchoTableFormPage(c *gin.Context) {
 	publicmethod.Result(0, sendPage, c)
 }
 
+/*
+*
+@ 作者: 秦东
+@ 时间: 2025-05-08 08:01:24
+@ 功能: 获取执行人信息
+*/
+func GainRunPeople(isRun int, userKey string, c *gin.Context) (userCont modelshr.ManCont) {
+	if isRun == 1 {
+		context, _ := c.Get(overall.MyContJwt)
+		userCont.GetLoginCont(context) //获取当前操作人
+	} else {
+		if userKey != "" {
+			userCont.GetCont(map[string]interface{}{"`key`": userKey})
+		} else {
+			context, _ := c.Get(overall.MyContJwt)
+			userCont.GetLoginCont(context) //获取当前操作人
+		}
+	}
+	return
+}
+
 /*
 *
 @ 作者: 秦东
@@ -2448,13 +2477,21 @@ func TransformPublicUs(v modelshr.ManCont) (userCont OperatorList) {
 func (a *ApiMethod) RealTimeUpdateFlow(c *gin.Context) {
 	var requestData CreatFlowView
 	err := c.ShouldBindJSON(&requestData)
-	if err != nil {
+	// if err != nil {
-		publicmethod.Result(10001, err, c)
+	// 	publicmethod.Result(10001, err, c)
-		return
+	// 	return
-	}
+	// }
 	if requestData.Step == 0 {
 		requestData.Step = 1
 	}
+
+	if requestData.IsRun == 0 {
+		requestData.IsRun = 1
+	}
+	if requestData.UserKey == "" {
+		requestData.IsRun = 1
+	}
+
 	var flowPage modelAppPlatform.FlowVersion
 	err = flowPage.GetCont(map[string]interface{}{"`key`": requestData.Id, "`state`": 1})
 	if err != nil && flowPage.Content == "" {
@@ -2468,15 +2505,17 @@ func (a *ApiMethod) RealTimeUpdateFlow(c *gin.Context) {
 		publicmethod.Result(107, err, c)
 		return
 	}
-	context, _ := c.Get(overall.MyContJwt)
+	// context, _ := c.Get(overall.MyContJwt)
-	var userCont modelshr.ManCont
+	// var userCont modelshr.ManCont
-	userCont.GetLoginCont(context) //获取当前操作人
+	// userCont.GetLoginCont(context) //获取当前操作人
+
+	userCont := GainRunPeople(requestData.IsRun, requestData.UserKey, c)
 
 	workFlowInfo := flowCont.NodeConfig.CircularParsing(1, userCont, userCont.AdminOrg, requestData.ConditionList, requestData.NodelPeople)
-	fmt.Printf("workFlowInfo--->%v\n", workFlowInfo)
+	// fmt.Printf("workFlowInfo--->%v\n", workFlowInfo)
 	sendInfo.Step = requestData.Step
 	sendInfo.NodeKey, sendInfo.NextStep, sendInfo.FlowList = ReformFlow(requestData.Step, workFlowInfo)
-	fmt.Printf("sendInfo.FlowList --->%v\n", sendInfo.FlowList)
+	// fmt.Printf("sendInfo.FlowList --->%v\n", sendInfo.FlowList)
 	// if len(sendInfo.FlowList) > 0 && len(requestData.OldFlow) > 0 {
 	// 	for i, v := range sendInfo.FlowList {
 	// 		for _, ov := range requestData.OldFlow {

api/version1/taskplatform/taskmanagement/types.go

@@ -109,6 +109,9 @@ type CreatFlowView struct {
 	NodelPeople   []NodelPeopleInfo   `json:"nodelPeople"`   //节点操作人
 	Step          int                 `json:"step"`          //当前执行第几步
 	OldFlow       []RunFlow           `json:"oldFlow"`       //已生成的流程
+
+	IsRun   int    `json:"isRun"`   //1：正式；2：模拟
+	UserKey string `json:"userKey"` //模拟操作人
 }
 
 // 修改记录输出
@@ -243,5 +246,12 @@ type TableDataInfo struct {
 	Columns    []interface{} `json:"columns"`    //列表表格元素
 	Config     interface{}   `json:"config"`     //列表表格配置
 	ControlBtn []interface{} `json:"controlBtn"` //列表表格操作按钮
-	operateBtn []interface{} `json:"operateBtn"` //列表表格操作按钮
+	OperateBtn []interface{} `json:"operateBtn"` //列表表格操作按钮
+}
+
+// 判断是不是模拟任务
+type SimTask struct {
+	publicmethod.PublicId        //使用任务表单
+	IsRun                 int    `json:"isRun"`   //1：正式；2：模拟
+	UserKey               string `json:"userKey"` //模拟操作人
 }