Merge remote-tracking branch 'origin/master'

ims-service/ims-eval/src/main/java/com/ims/eval/controller/WorkflowController.java

@@ -112,6 +112,26 @@ public class WorkflowController {
 	}
 
 
+	/**
+	 * 获取流程审批意见
+	 * @param instId
+	 * @param iamCode
+	 * @return
+	 */
+	@PostMapping(value = "getOpinion")
+	public R getOpinion(@RequestParam(value = "instId", required = false) String instId,
+									@RequestParam(value = "iamCode", required = false) String iamCode) {
+		JSONObject json = null;
+		try {
+			json = workflowService.getOpinion(instId,iamCode,request);
+		} catch (Exception e) {
+			log.error("错误",e);
+			return R.error().customError("获取流程审批意见失败");
+		}
+		return R.ok().data(json);
+	}
+
+
 
 
 

ims-service/ims-eval/src/main/java/com/ims/eval/service/custom/WorkflowService.java

@@ -181,10 +181,8 @@ public class WorkflowService {
 	}
 
 
-
-
 	/**
-	 * 获取流程意见
+	 * 获取流程审批意见
 	 * @param instId
 	 * @param iamCode
 	 * @param request
@@ -197,7 +195,7 @@ public class WorkflowService {
 		headers.add("code", request.getHeader("code"));
 
 		HttpEntity<Map> param = new HttpEntity<>(null, headers);
-		ResponseEntity<String> responseEntity2 = restTemplate.postForEntity("http://10.65.78.23:8080/bpm/instance/getOpinion??instId={1}&iamCode={2}",
+		ResponseEntity<String> responseEntity2 = restTemplate.postForEntity("http://10.65.78.23:8080/bpm/instance/getOpinion?instId={1}&iamCode={2}",
 			param, String.class, instId, iamCode);
 
 		log.info("\n code:{}\n header:{}\n body:{}\n", responseEntity2.getStatusCodeValue(), responseEntity2.getHeaders(), responseEntity2.getBody());
@@ -207,6 +205,11 @@ public class WorkflowService {
 		return null;
 	}
 
+
+
+
+
+
 	private boolean updateWorkflowState(String instId, String defKey, String bizKey,String taskName) {
 
 		switch (defKey) {