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