设置调用超时时间

service-oa/src/main/java/com/java110/oa/bmo/oaWorkflowForm/impl/GetOaWorkflowFormBMOImpl.java

@@ -436,7 +436,8 @@ public class GetOaWorkflowFormBMOImpl implements IGetOaWorkflowFormBMO {
         oaWorkflowFormDto.setRow(1);
         oaWorkflowFormDto.setPage(1);
         List<OaWorkflowFormDto> oaWorkflowFormDtos = oaWorkflowFormInnerServiceSMOImpl.queryOaWorkflowForms(oaWorkflowFormDto);
-        Assert.listOnlyOne(oaWorkflowFormDtos, "未包含流程表单，请先设置表单");
+        //Assert.listOnlyOne(oaWorkflowFormDtos, "未包含流程表单，请先设置表单");
+        OaWorkflowFormDto tmpOaWorkflowFormDto = (oaWorkflowFormDtos == null || oaWorkflowFormDtos.size() < 1)?null:oaWorkflowFormDtos.get(0);
 
         OaWorkflowDataDto oaWorkflowDataDto = new OaWorkflowDataDto();
         oaWorkflowDataDto.setFlowId(paramIn.getString("flowId"));
@@ -455,7 +456,7 @@ public class GetOaWorkflowFormBMOImpl implements IGetOaWorkflowFormBMO {
                 datas.add(BeanConvertUtil.beanCovertJson(oaWorkflowDataDto1));
             }
             //刷新 表单数据
-            freshFormData(datas, paramIn, oaWorkflowFormDtos.get(0));
+            freshFormData(datas, paramIn, tmpOaWorkflowFormDto);
         }
 
         ResultVo resultVo = new ResultVo((int) Math.ceil((double) count / (double) paramIn.getInteger("row")), count, datas);
@@ -470,33 +471,19 @@ public class GetOaWorkflowFormBMOImpl implements IGetOaWorkflowFormBMO {
      * @param datas
      */
     private void freshFormData(List<JSONObject> datas, JSONObject paramIn, OaWorkflowFormDto oaWorkflowFormDto) {
-        List<String> ids = new ArrayList<>();
+
         List<String> userIds = new ArrayList<>();
         for (JSONObject data : datas) {
-            ids.add(data.getString("id"));
             if (!StringUtil.isEmpty(data.getString("staffId"))) {
                 userIds.add(data.getString("staffId"));
             }
         }
-        if (ids.size() < 1) {
-            return;
-        }
 
-        Map paramMap = new HashMap();
-        paramMap.put("storeId", paramIn.getString("storeId"));
-        paramMap.put("ids", ids.toArray(new String[ids.size()]));
-        paramMap.put("tableName", oaWorkflowFormDto.getTableName());
-        paramMap.put("page", 1);
-        paramMap.put("row", ids.size());
-        List<Map> formDatas = oaWorkflowFormInnerServiceSMOImpl.queryOaWorkflowFormDatas(paramMap);
+        //输入formData
+        refreshFormData(oaWorkflowFormDto,datas,paramIn);
+
         long duration = 0L;
         for (JSONObject data : datas) {
-            for (Map form : formDatas) {
-                if (data.getString("id").equals(form.get("id"))) {
-                    data.putAll(form);
-                }
-            }
-
             if (data.containsKey("startTime") && data.containsKey("endTime")) {
                 try {
                     if (data.getString("endTime") == null) {
@@ -531,6 +518,35 @@ public class GetOaWorkflowFormBMOImpl implements IGetOaWorkflowFormBMO {
         }
     }
 
+    private void refreshFormData(OaWorkflowFormDto oaWorkflowFormDto, List<JSONObject> datas, JSONObject paramIn) {
+        if(oaWorkflowFormDto == null){
+            return ;
+        }
+
+        List<String> ids = new ArrayList<>();
+        for (JSONObject data : datas) {
+            ids.add(data.getString("id"));
+        }
+        if (ids.size() < 1) {
+            return;
+        }
+
+        Map paramMap = new HashMap();
+        paramMap.put("storeId", paramIn.getString("storeId"));
+        paramMap.put("ids", ids.toArray(new String[ids.size()]));
+        paramMap.put("tableName", oaWorkflowFormDto.getTableName());
+        paramMap.put("page", 1);
+        paramMap.put("row", ids.size());
+        List<Map> formDatas = oaWorkflowFormInnerServiceSMOImpl.queryOaWorkflowFormDatas(paramMap);
+        for (JSONObject data : datas) {
+            for (Map form : formDatas) {
+                if (data.getString("id").equals(form.get("id"))) {
+                    data.putAll(form);
+                }
+            }
+        }
+    }
+
     public String getCostTime(Long time) {
         if (time == null) {
             return "00:00";