java110 %!s(int64=5) %!d(string=hai) anos
pai
achega
6d2c677988

+ 10 - 0
java110-bean/src/main/java/com/java110/dto/workflow/WorkflowDto.java

@@ -38,6 +38,8 @@ public class WorkflowDto extends PageDto implements Serializable {
     private String flowTypeName;
     private String processDefinitionKey;
 
+    private String[] flowTypes;
+
 
     private Date createTime;
 
@@ -143,4 +145,12 @@ public class WorkflowDto extends PageDto implements Serializable {
     public void setProcessDefinitionKey(String processDefinitionKey) {
         this.processDefinitionKey = processDefinitionKey;
     }
+
+    public String[] getFlowTypes() {
+        return flowTypes;
+    }
+
+    public void setFlowTypes(String[] flowTypes) {
+        this.flowTypes = flowTypes;
+    }
 }

+ 13 - 0
java110-db/src/main/resources/mapper/common/WorkflowServiceDaoImplMapper.xml

@@ -124,6 +124,12 @@
         <if test="flowType !=null and flowType != ''">
             and t.flow_type= #{flowType}
         </if>
+        <if test="flowTypes !=null">
+            and t.flow_type in
+            <foreach collection="flowTypes" item="item" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+        </if>
         order by t.create_time desc
         <if test="page != -1 and page != null ">
             limit #{page}, #{row}
@@ -202,6 +208,13 @@
             and t.flow_type= #{flowType}
         </if>
 
+        <if test="flowTypes !=null">
+            and t.flow_type in
+            <foreach collection="flowTypes" item="item" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+        </if>
+
 
     </select>
 

+ 18 - 11
service-api/src/main/java/com/java110/api/listener/workflow/ListWorkflowsListener.java

@@ -64,23 +64,30 @@ public class ListWorkflowsListener extends AbstractServiceApiPlusListener {
 
         List<WorkflowDto> workflowDtos = null;
 
-        if (count > 0) {
+        if (count > 2) {
             workflowDtos = workflowInnerServiceSMOImpl.queryWorkflows(workflowDto);
             ResultVo resultVo = new ResultVo((int) Math.ceil((double) count / (double) reqJson.getInteger("row")), count, workflowDtos);
             ResponseEntity<String> responseEntity = new ResponseEntity<String>(resultVo.toString(), HttpStatus.OK);
             context.setResponseEntity(responseEntity);
             return;
         }
-
-        //插入默认的工作信息  投诉流程
-        WorkflowPo workflowPo = new WorkflowPo();
-        workflowPo.setCommunityId(reqJson.getString("communityId"));
-        workflowPo.setFlowId("-1");
-        workflowPo.setFlowName("投诉建议流程");
-        workflowPo.setFlowType(WorkflowDto.FLOW_TYPE_COMPLAINT);
-        workflowPo.setSkipLevel(WorkflowDto.DEFAULT_SKIP_LEVEL);
-        workflowPo.setStoreId(reqJson.getString("storeId"));
-        super.insert(context, workflowPo, BusinessTypeConstant.BUSINESS_TYPE_SAVE_WORKFLOW);
+        WorkflowPo workflowPo = null;
+        workflowDto = new WorkflowDto();
+        workflowDto.setStoreId(reqJson.getString("storeId"));
+        workflowDto.setCommunityId(reqJson.getString("communityId"));
+        workflowDto.setFlowType(WorkflowDto.FLOW_TYPE_COMPLAINT);
+        count = workflowInnerServiceSMOImpl.queryWorkflowsCount(workflowDto);
+        if (count < 1) {
+            //插入默认的工作信息  投诉流程
+            workflowPo = new WorkflowPo();
+            workflowPo.setCommunityId(reqJson.getString("communityId"));
+            workflowPo.setFlowId("-1");
+            workflowPo.setFlowName("投诉建议流程");
+            workflowPo.setFlowType(WorkflowDto.FLOW_TYPE_COMPLAINT);
+            workflowPo.setSkipLevel(WorkflowDto.DEFAULT_SKIP_LEVEL);
+            workflowPo.setStoreId(reqJson.getString("storeId"));
+            super.insert(context, workflowPo, BusinessTypeConstant.BUSINESS_TYPE_SAVE_WORKFLOW);
+        }
 
         workflowDto = new WorkflowDto();
         workflowDto.setStoreId(reqJson.getString("storeId"));