优化添加设备 功能

wuxw

2022-07-19 05683f2b2bdbdbe21cf17ad523c21ab338bd1c54

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

@@ -29,12 +29,7 @@
import com.java110.utils.util.BeanConvertUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestHeader;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;

import java.util.ArrayList;
import java.util.HashMap;
@@ -155,7 +150,10 @@
     */
    @RequestMapping(value = "/queryOaWorkflow", method = RequestMethod.GET)
    public ResponseEntity<String> queryOaWorkflow(@RequestHeader(value = "store-id") String storeId,
                                                  @RequestHeader(value = "user-id") String userId,
                                                  @RequestParam(value = "flowId", required = false) String flowId,
                                                  @RequestParam(value = "flowName", required = false) String flowName,
                                                  @RequestParam(value = "flowType", required = false) String flowType,
                                                  @RequestParam(value = "state", required = false) String state,
                                                  @RequestParam(value = "page") int page,
                                                  @RequestParam(value = "row") int row) {
@@ -164,7 +162,10 @@
        oaWorkflowDto.setRow(row);
        oaWorkflowDto.setStoreId(storeId);
        oaWorkflowDto.setFlowId(flowId);
        oaWorkflowDto.setFlowName(flowName);
        oaWorkflowDto.setFlowType(flowType);
        oaWorkflowDto.setState(state);
        oaWorkflowDto.setUserId(userId);
        return getOaWorkflowBMOImpl.get(oaWorkflowDto);
    }

@@ -384,6 +385,14 @@
            if ("flowId".equals(key)) {
                continue;
            }
            if ("fileName".equals(key)) {
                continue;
            }

            if ("realFileName".equals(key)) {
                continue;
            }

            columns.add(key);
            values.add(reqJson.getString(key));
        }
@@ -453,6 +462,31 @@
    }

    /**
     * 查询已办
     *
     * @param storeId 小区ID
     * @return
     * @serviceCode /oaWorkflow/queryOaWorkflowUser
     * @path /app/oaWorkflow/queryOaWorkflowUser
     */
    @RequestMapping(value = "/queryOaWorkflowUser", method = RequestMethod.GET)
    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) {
        JSONObject paramIn = new JSONObject();
        paramIn.put("page", page);
        paramIn.put("row", row);
        paramIn.put("flowId", flowId);
        paramIn.put("id", id);
        paramIn.put("storeId", storeId);
        paramIn.put("userId", userId);
        return getOaWorkflowFormBMOImpl.queryOaWorkflowUser(paramIn);
    }

    /**
     * 审核流程
     *
     * @param storeId 小区ID
@@ -485,10 +519,15 @@
    @RequestMapping(value = "/getNextTask", method = RequestMethod.GET)
    public ResponseEntity<String> getNextTask(@RequestHeader(value = "store-id") String storeId,
                                              @RequestHeader(value = "user-id") String userId,
                                              @RequestParam(value = "flowId") String flowId,
                                              @RequestParam(value = "id") String id,
                                              @RequestParam(value = "taskId") String taskId) {
        JSONObject reqJson = new JSONObject();
        reqJson.put("storeId", storeId);
        reqJson.put("taskId", taskId);
        reqJson.put("userId", userId);
        reqJson.put("flowId", flowId);
        reqJson.put("id", id);
        return getOaWorkflowFormBMOImpl.getNextTask(reqJson);
    }