工作流多实例接口

src/dashoo.cn/backend/api/business/workflow/ActivitiService.go

@@ -138,6 +138,28 @@ func (this *ActivitiService) TaskComplete(processKey string, formEntityId string
 	return string(p)
 }
 
+func (this *ActivitiService) MultiTaskComplete(processKey string, formEntityId string, userNames string, multiOrgAudits []MultiOrgAuditVM, userId string, result string, remarks string) string {
+
+	var ActiComplete MultiActiCompleteVM
+	ActiComplete.ProcessKey = processKey
+	ActiComplete.BusinessKey = formEntityId
+	ActiComplete.UserNames = userNames
+	ActiComplete.MultiOrgAudits = multiOrgAudits
+	ActiComplete.UserId = userId
+	ActiComplete.Result = result
+	ActiComplete.Remarks = remarks
+	jsonParams, err := json.Marshal(ActiComplete)
+	if err != nil {
+		fmt.Println(err, "生成json字符串错误")
+	}
+	params := string(jsonParams)
+	fmt.Println(params)
+	//token = Authorization(this.Username, this.Password)
+	retVal := this.Post("/multi-task-complete", params, "")
+	p, _ := ioutil.ReadAll(retVal.Body)
+	return string(p)
+}
+
 func (this *ActivitiService) GetMyTasks(processKey string, userId string) string {
 	var ActiMyTasks ActiMyTasksVM
 	ActiMyTasks.ProcessKey = processKey

src/dashoo.cn/backend/api/business/workflow/workflow.go

@@ -46,6 +46,22 @@ type WordTemplateVM struct {
 	FileName    string                 `json:"fileName"`
 }
 
+type MultiActiCompleteVM struct {
+	ProcessKey  	string 				`json:"processKey"`
+	BusinessKey 	string 				`json:"businessKey"`
+	UserNames   	string 				`json:"userNames"`
+	UserId      	string 				`json:"userId"`
+	Result      	string 				`json:"result"`
+	Remarks     	string 				`json:"remarks"`
+	MultiOrgAudits 	[]MultiOrgAuditVM 	`json:"multiOrgAudits"`
+}
+
+type MultiOrgAuditVM struct {
+	OrgId     string    `json:"orgId"`
+	OrgName   string    `json:"orgName"`
+	UserIds   string   `json:"userIds"`
+}
+
 const (
 	//特检站数据录入
 	TJZ_DATA_KEY string = "tjz_data_apply"

src/dashoo.cn/backend/api/controllers/base.go

@@ -251,7 +251,7 @@ func (this *BaseController) Prepare() {
 		"/api/webinterface/preparelist", "/api/webinterface/prepareinfo",
 		"/api/sampletest_v/sampletest", "/api/sampletest_v/getpass", "/api/sampletest_v/editpass/",
 		"/api/sampletest_v/donorsdetail", "/api/sampletest_v/testdetail", "/api/uploads/samplesinput", "/api/doctemplate_onlyoffice/callback", "/api/doctemplate_onlyoffice/viewcallback", "/api/limsupload/usersignimg",
-		"/api/uploads/samplestypeimg", "/api/limsdataentry/historyimg/"}
+		"/api/uploads/samplestypeimg", "/api/workflow/historyimg/"}
 	for _, v := range urls {
 		fmt.Println("**this.Ctx.Input.URL()**", this.Ctx.Input.URL())
 		if this.Ctx.Input.URL() == v {
@@ -263,9 +263,9 @@ func (this *BaseController) Prepare() {
 			fmt.Println("/api/sampletest_v/editpass/")
 			break
 		}
-		if strings.Contains(this.Ctx.Input.URL(), "/api/limsdataentry/historyimg/") {
+		if strings.Contains(this.Ctx.Input.URL(), "/api/workflow/historyimg/") {
 			find = true
-			fmt.Println("/api/limsdataentry/historyimg/")
+			fmt.Println("/api/workflow/historyimg/")
 			break
 		}
 	}

src/dashoo.cn/backend/api/controllers/workflow/workflow.go

@@ -55,3 +55,13 @@ func (this *WorkflowController) UserList() {
 	this.ServeJSON()
 }
 
+// @Title get
+// @Description get SampleType by token
+// @Success 200 {object} samplesubpackage.SampleSubpackage
+// @router /historyimg/:id [get]
+func (this *WorkflowController) GetHistoricImg() {
+	processInstanceId := this.Ctx.Input.Param(":id")
+	svcActiviti := workflow.GetActivitiService(utils.DBE)
+	entity := svcActiviti.GetActivitiProccessImage(processInstanceId)
+	this.Ctx.Output.Body(entity)
+}

src/dashoo.cn/frontend_web/src/components/workflow/wfhistory.vue

@@ -27,7 +27,7 @@
       </el-table-column>
     </el-table>
     <div style="margin-top:10px;">
-      <img :src="baseurl + 'limsdataentry/historyimg/' + entryinfo.instance " v-if="entryinfo.instance">
+      <img :src="baseurl + 'workflow/historyimg/' + entryinfo.instance " v-if="entryinfo.instance">
     </div>
   </div>
 </template>