优化代码

service-common/src/main/java/com/java110/common/smo/impl/OaWorkflowUserInnerServiceSMOImpl.java

@@ -89,6 +89,12 @@ public class OaWorkflowUserInnerServiceSMOImpl extends BaseServiceSMO implements
         //variables.put("reqJson", reqJson);
         variables.put("startUserId", reqJson.getString("createUserId"));
         variables.put("nextUserId", reqJson.getString("createUserId"));
+        UserDto userDto = new UserDto();
+        userDto.setUserId(reqJson.getString("nextUserId"));
+        List<UserDto> users = userInnerServiceSMOImpl.getUsers(userDto);
+
+        Assert.listOnlyOne(users, "用户不存在");
+
         ProcessInstance processInstance = runtimeService.startProcessInstanceByKey(getWorkflowDto(reqJson.getString("flowId")), reqJson.getString("id"), variables);
         //将得到的实例流程id值赋给之前设置的变量
         String processInstanceId = processInstance.getId();
@@ -96,6 +102,20 @@ public class OaWorkflowUserInnerServiceSMOImpl extends BaseServiceSMO implements
         reqJson.put("processInstanceId", processInstanceId);
         //第一个节点自动提交
         //autoFinishFirstTask(reqJson);
+        //刷入扩展表
+        OaWorkflowDataPo oaWorkflowDataPo = null;
+        oaWorkflowDataPo = new OaWorkflowDataPo();
+        oaWorkflowDataPo.setBusinessKey(reqJson.getString("id"));
+        oaWorkflowDataPo.setFlowId(reqJson.getString("flowId"));
+        oaWorkflowDataPo.setContext(reqJson.getString("auditMessage"));
+        oaWorkflowDataPo.setDataId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_dataId));
+        oaWorkflowDataPo.setEvent(OaWorkflowDataDto.EVENT_COMMIT);
+        oaWorkflowDataPo.setPreDataId("-1");
+        oaWorkflowDataPo.setStaffId(reqJson.getString("nextUserId"));
+        oaWorkflowDataPo.setStaffName(users.get(0).getName());
+        oaWorkflowDataPo.setStartTime(DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_A));
+        oaWorkflowDataPo.setStoreId(reqJson.getString("storeId"));
+        oaWorkflowDataInnerServiceSMOImpl.saveOaWorkflowData(oaWorkflowDataPo);
         return reqJson;
     }
 

service-oa/src/main/java/com/java110/oa/api/OaWorkflowApi.java

@@ -464,12 +464,8 @@ public class OaWorkflowApi {
     public ResponseEntity<String> queryOaWorkflowUser(@RequestHeader(value = "store-id") String storeId,
                                                                      @RequestHeader(value = "user-id") String userId,
                                                                      @RequestParam(value = "flowId", required = false) String flowId,
-                                                                     @RequestParam(value = "id", required = false) String id,
-                                                                     @RequestParam(value = "page") int page,
-                                                                     @RequestParam(value = "row") int row) {
+                                                                     @RequestParam(value = "id", required = false) String id) {
         JSONObject paramIn = new JSONObject();
-        paramIn.put("page", page);
-        paramIn.put("row", row);
         paramIn.put("flowId", flowId);
         paramIn.put("id", id);
         paramIn.put("storeId", storeId);

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

@@ -168,6 +168,8 @@ public class GetOaWorkflowFormBMOImpl implements IGetOaWorkflowFormBMO {
         reqJson.put("processDefinitionKey", oaWorkflowDtos.get(0).getProcessDefinitionKey());
         oaWorkflowUserInnerServiceSMOImpl.startProcess(reqJson);
 
+
+
         return ResultVo.success();
     }
 
@@ -364,14 +366,15 @@ public class GetOaWorkflowFormBMOImpl implements IGetOaWorkflowFormBMO {
 
         long count = oaWorkflowDataInnerServiceSMOImpl.queryOaWorkflowDatasCount(oaWorkflowDataDto);
 
-        List<JSONObject> datas = null;
+        List<JSONObject> datas = new ArrayList<>();
 
         if (count > 0) {
-            datas = BeanConvertUtil.covertBeanList(oaWorkflowDataInnerServiceSMOImpl.queryOaWorkflowDatas(oaWorkflowDataDto), JSONObject.class);
+            List<OaWorkflowDataDto> oaWorkflowDataDtos = oaWorkflowDataInnerServiceSMOImpl.queryOaWorkflowDatas(oaWorkflowDataDto);
+            for(OaWorkflowDataDto oaWorkflowDataDto1 : oaWorkflowDataDtos){
+                datas.add(BeanConvertUtil.beanCovertJson(oaWorkflowDataDto1));
+            }
             //刷新 表单数据
             freshFormData(datas, paramIn, oaWorkflowFormDtos.get(0));
-        } else {
-            datas = new ArrayList<>();
         }
 
         ResultVo resultVo = new ResultVo((int) Math.ceil((double) count / (double) paramIn.getInteger("row")), count, datas);