制度手册提交

com.awspaas.user.apps.coe.pal.output.zd/src/com/awspaas/apps/coe/pal/output/zd/ReportPrController.java

@@ -175,16 +175,31 @@ public class ReportPrController {
      * @return
      */
     @Mapping("com.awspaas.user.apps.coe.pal.output.zd_systemManualTextExport")
-    public String systemManualTextExport(UserContext me, String id, String teamId, String wsid) {
+    public String systemManualTextExport(UserContext me) {
         ResponseObject ro = null;
-        try {
-            ro = ResponseObject.newOkResponse();
-            InstitutionalTextWeb institutionalTextWeb = new InstitutionalTextWeb(me);
-            institutionalTextWeb.systemManualTextExport();
-        } catch (Exception e) {
-            ro = ResponseObject.newErrResponse();
-            e.printStackTrace();
-        }
+        ro = ResponseObject.newOkResponse();
+        InstitutionalTextWeb institutionalTextWeb = new InstitutionalTextWeb(me);
+        String result = institutionalTextWeb.systemManualTextExport();
+
+        ro.put("result", result);
+        return ro.toString();
+    }
+
+    /**
+     * 制度手册正文导出
+     *
+     * @param me
+     * @param teamId
+     * @param wsid
+     * @return
+     */
+    @Mapping("com.awspaas.user.apps.coe.pal.output.zd_systemManualTextExportoOnce")
+    public String systemManualTextExportoOnce(UserContext me, String targetFileId) {
+        ResponseObject ro = null;
+        ro = ResponseObject.newOkResponse();
+        InstitutionalTextWeb institutionalTextWeb = new InstitutionalTextWeb(me);
+        String result = institutionalTextWeb.systemManualTextExportoOnce(targetFileId);
+        ro.put("result", result);
         return ro.toString();
     }
 

com.awspaas.user.apps.coe.pal.output.zd/src/com/awspaas/apps/coe/pal/output/zd/report1/Report1Gener.java

@@ -165,7 +165,7 @@ public class Report1Gener {
                 }
                 JSONObject dataMap = getData2(repositoryId, wizardJsonData, docPath, fileName);
                 if (dataMap != null) {
-                    OutputWordUtil.createDoc2(dataMap, tempPath, tempName, docName);
+                    OutputWordUtil.createZdDoc2(dataMap, tempPath, tempName, docName, wizardJsonData, repositoryId, docPath);
                 }
             }
         }