优化代码

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

@@ -21,10 +21,14 @@ import com.java110.po.oaWorkflowForm.OaWorkflowFormPo;
 import com.java110.po.oaWorkflowXml.OaWorkflowXmlPo;
 import com.java110.utils.util.Assert;
 import com.java110.utils.util.BeanConvertUtil;
+import org.bouncycastle.jcajce.provider.digest.MD2;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.HashMap;
+import java.util.Map;
+
 @RestController
 @RequestMapping(value = "/oaWorkflow")
 public class OaWorkflowApi {
@@ -320,13 +324,19 @@ public class OaWorkflowApi {
     @RequestMapping(value = "/queryOaWorkflowFormData", method = RequestMethod.GET)
     public ResponseEntity<String> queryOaWorkflowFormData(@RequestHeader(value = "store-id") String storeId,
                                                       @RequestParam(value = "flowId", required = false) String flowId,
+                                                      @RequestParam(value = "startTime", required = false) String startTime,
+                                                      @RequestParam(value = "endTime", required = false) String endTime,
+                                                      @RequestParam(value = "createUserName", required = false) String createUserName,
                                                       @RequestParam(value = "page") int page,
                                                       @RequestParam(value = "row") int row) {
-        OaWorkflowFormDto oaWorkflowFormDto = new OaWorkflowFormDto();
-        oaWorkflowFormDto.setPage(page);
-        oaWorkflowFormDto.setRow(row);
-        oaWorkflowFormDto.setStoreId(storeId);
-        oaWorkflowFormDto.setFlowId(flowId);
-        return getOaWorkflowFormBMOImpl.queryOaWorkflowFormData(oaWorkflowFormDto);
+        Map paramIn = new HashMap();
+        paramIn.put("page",page);
+        paramIn.put("row",row);
+        paramIn.put("createUserName",createUserName);
+        paramIn.put("endTime",endTime);
+        paramIn.put("startTime",startTime);
+        paramIn.put("flowId",flowId);
+        paramIn.put("storeId",storeId);
+        return getOaWorkflowFormBMOImpl.queryOaWorkflowFormData(paramIn);
     }
 }

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

@@ -1,6 +1,9 @@
 package com.java110.oa.bmo.oaWorkflowForm;
 import com.java110.dto.oaWorkflowForm.OaWorkflowFormDto;
 import org.springframework.http.ResponseEntity;
+
+import java.util.Map;
+
 public interface IGetOaWorkflowFormBMO {
 
 
@@ -13,5 +16,5 @@ public interface IGetOaWorkflowFormBMO {
     ResponseEntity<String> get(OaWorkflowFormDto oaWorkflowFormDto);
 
 
-    ResponseEntity<String> queryOaWorkflowFormData(OaWorkflowFormDto oaWorkflowFormDto);
+    ResponseEntity<String> queryOaWorkflowFormData(Map paramIn);
 }

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

@@ -55,19 +55,22 @@ public class GetOaWorkflowFormBMOImpl implements IGetOaWorkflowFormBMO {
      * {"key":"textdate1","label":"日期","type":"textdate"},
      * {"key":"textdatetime1","label":"时间","type":"textdatetime"},
      * {"action":"submit","key":"button1","label":"Button","type":"button"}],"type":"default"}
-     * @param oaWorkflowFormDto
+     * @param paramIn
      * @return
      */
     @Override
-    public ResponseEntity<String> queryOaWorkflowFormData(OaWorkflowFormDto oaWorkflowFormDto) {
+    public ResponseEntity<String> queryOaWorkflowFormData(Map paramIn) {
+
+        OaWorkflowFormDto oaWorkflowFormDto = new OaWorkflowFormDto();
+        oaWorkflowFormDto.setFlowId(paramIn.get("flowId").toString());
+        oaWorkflowFormDto.setStoreId(paramIn.get("storeId").toString());
+        oaWorkflowFormDto.setRow(1);
+        oaWorkflowFormDto.setPage(1);
         List<OaWorkflowFormDto> oaWorkflowFormDtos = oaWorkflowFormInnerServiceSMOImpl.queryOaWorkflowForms(oaWorkflowFormDto);
 
         Assert.listOnlyOne(oaWorkflowFormDtos, "未包含流程表单，请先设置表单");
 
-        String formJson = oaWorkflowFormDtos.get(0).getFormJson();
-
-        JSONObject formObj = JSONObject.parseObject(formJson);
-        Map paramIn = new HashMap();
+        paramIn.put("tableName",oaWorkflowFormDtos.get(0).getTableName());
 
         int count = oaWorkflowFormInnerServiceSMOImpl.queryOaWorkflowFormDataCount(paramIn);