xiongzhu %!s(int64=4) %!d(string=hai) anos
pai
achega
83e28f9242

+ 14 - 3
o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/attachment/AttachmentAction.java

@@ -885,17 +885,28 @@ public class AttachmentAction extends StandardJaxrsAction {
 
 	@JaxrsMethodDescribe(value = "将HTML版式公文转换成Word文件并添加在附件中,可以输入WorkId或者WorkCompletedId.", action = ActionDocToWordWorkOrWorkCompleted.class)
 	@POST
-	@Path("doc/to/word/workorworkcompleted/{workOrWorkCompleted}")
+	@Path("doc/to/pdf/workorworkcompleted/{workOrWorkCompleted}")
 	@Produces(HttpMediaType.APPLICATION_JSON_UTF_8)
 	@Consumes(MediaType.APPLICATION_JSON)
 	public void docToWordWorkOrWorkCompleted(@Suspended final AsyncResponse asyncResponse,
 			@Context HttpServletRequest request,
 			@JaxrsParameterDescribe("工作已完成工作标识") @PathParam("workOrWorkCompleted") String workOrWorkCompleted,
 			JsonElement jsonElement) {
-		ActionResult<ActionDocToWordWorkOrWorkCompleted.Wo> result = new ActionResult<>();
+//		ActionResult<ActionDocToWordWorkOrWorkCompleted.Wo> result = new ActionResult<>();
+//		EffectivePerson effectivePerson = this.effectivePerson(request);
+//		try {
+//			result = new ActionDocToWordWorkOrWorkCompleted().execute(effectivePerson, workOrWorkCompleted,
+//					jsonElement);
+//		} catch (Exception e) {
+//			logger.error(e, effectivePerson, request, jsonElement);
+//			result.error(e);
+//		}
+//		asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result));
+
+		ActionResult<ActionDocToPDFWorkOrWorkCompleted.Wo> result = new ActionResult<>();
 		EffectivePerson effectivePerson = this.effectivePerson(request);
 		try {
-			result = new ActionDocToWordWorkOrWorkCompleted().execute(effectivePerson, workOrWorkCompleted,
+			result = new ActionDocToPDFWorkOrWorkCompleted().execute(effectivePerson, workOrWorkCompleted,
 					jsonElement);
 		} catch (Exception e) {
 			logger.error(e, effectivePerson, request, jsonElement);