加入接口协议

java110-bean/src/main/java/com/java110/dto/itemReleaseType/ItemReleaseTypeDto.java

@@ -1,6 +1,7 @@
 package com.java110.dto.itemReleaseType;
 
 import com.java110.dto.PageDto;
+import com.java110.dto.oaWorkflow.OaWorkflowDto;
 
 import java.io.Serializable;
 import java.util.Date;
@@ -13,7 +14,7 @@ import java.util.Date;
  * @Version 1.0
  * add by wuxw 2019/4/24
  **/
-public class ItemReleaseTypeDto extends PageDto implements Serializable {
+public class ItemReleaseTypeDto extends OaWorkflowDto implements Serializable {
 
     private String typeName;
     private String typeId;

java110-bean/src/main/java/com/java110/dto/oaWorkflow/OaWorkflowDto.java

@@ -37,6 +37,8 @@ public class OaWorkflowDto extends PageDto implements Serializable {
 
     private String statusCd = "0";
 
+    private String[] flowIds;
+
 
     public String getDescrible() {
         return describle;
@@ -150,4 +152,12 @@ public class OaWorkflowDto extends PageDto implements Serializable {
     public void setUserId(String userId) {
         this.userId = userId;
     }
+
+    public String[] getFlowIds() {
+        return flowIds;
+    }
+
+    public void setFlowIds(String[] flowIds) {
+        this.flowIds = flowIds;
+    }
 }

java110-db/src/main/resources/mapper/oa/OaWorkflowServiceDaoImplMapper.xml

@@ -41,6 +41,12 @@
         <if test="flowId !=null and flowId != ''">
             and t.flow_id= #{flowId}
         </if>
+        <if test="flowIds !=null ">
+            and t.flow_id in
+            <foreach collection="flowIds" item="item" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+        </if>
         <if test="flowName !=null and flowName != ''">
             and t.flow_name= #{flowName}
         </if>

service-common/src/main/java/com/java110/common/cmd/itemRelease/ListItemReleaseTypeCmd.java

@@ -21,7 +21,9 @@ import com.java110.core.context.ICmdDataFlowContext;
 import com.java110.core.event.cmd.Cmd;
 import com.java110.core.event.cmd.CmdEvent;
 import com.java110.doc.annotation.*;
+import com.java110.dto.oaWorkflow.OaWorkflowDto;
 import com.java110.intf.common.IItemReleaseTypeV1InnerServiceSMO;
+import com.java110.intf.oa.IOaWorkflowInnerServiceSMO;
 import com.java110.utils.exception.CmdException;
 import com.java110.utils.util.Assert;
 import com.java110.utils.util.BeanConvertUtil;
@@ -56,13 +58,13 @@ import org.slf4j.LoggerFactory;
                 @Java110ParamDoc(name = "code", type = "int", length = 11, defaultValue = "0", remark = "返回编号，0 成功 其他失败"),
                 @Java110ParamDoc(name = "msg", type = "String", length = 250, defaultValue = "成功", remark = "描述"),
                 @Java110ParamDoc(name = "data", type = "Array", length = -1, defaultValue = "成功", remark = "数据"),
-                @Java110ParamDoc(parentNodeName = "data", name = "resName", type = "String", length = -1,  remark = "物品名称"),
+                @Java110ParamDoc(parentNodeName = "data", name = "resName", type = "String", length = -1, remark = "物品名称"),
         }
 )
 
 @Java110ExampleDoc(
-        reqBody="http://{ip}:{port}/app/itemRelease.listItemReleaseType?communityId=123123",
-        resBody="{'code':0,'msg':'成功'}"
+        reqBody = "http://{ip}:{port}/app/itemRelease.listItemReleaseType?communityId=123123",
+        resBody = "{'code':0,'msg':'成功'}"
 )
 /**
  * 类表述：查询
@@ -81,10 +83,13 @@ public class ListItemReleaseTypeCmd extends Cmd {
     @Autowired
     private IItemReleaseTypeV1InnerServiceSMO itemReleaseTypeV1InnerServiceSMOImpl;
 
+    @Autowired
+    private IOaWorkflowInnerServiceSMO oaWorkflowInnerServiceSMOImpl;
+
     @Override
     public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
         super.validatePageInfo(reqJson);
-        Assert.hasKeyAndValue(reqJson,"communityId","未包含小区");
+        Assert.hasKeyAndValue(reqJson, "communityId", "未包含小区");
     }
 
     @Override
@@ -98,6 +103,7 @@ public class ListItemReleaseTypeCmd extends Cmd {
 
         if (count > 0) {
             itemReleaseTypeDtos = itemReleaseTypeV1InnerServiceSMOImpl.queryItemReleaseTypes(itemReleaseTypeDto);
+            refreshWorkflow(itemReleaseTypeDtos);
         } else {
             itemReleaseTypeDtos = new ArrayList<>();
         }
@@ -108,4 +114,27 @@ public class ListItemReleaseTypeCmd extends Cmd {
 
         cmdDataFlowContext.setResponseEntity(responseEntity);
     }
+
+    /**
+     * 查询工作流信息
+     *
+     * @param itemReleaseTypeDtos
+     */
+    private void refreshWorkflow(List<ItemReleaseTypeDto> itemReleaseTypeDtos) {
+        List<String> flowIds = new ArrayList<>();
+        for (ItemReleaseTypeDto itemReleaseTypeDto : itemReleaseTypeDtos) {
+            flowIds.add(itemReleaseTypeDto.getFlowId());
+        }
+
+        OaWorkflowDto oaWorkflowDto = new OaWorkflowDto();
+        oaWorkflowDto.setFlowIds(flowIds.toArray(new String[flowIds.size()]));
+        List<OaWorkflowDto> oaWorkflowDtos = oaWorkflowInnerServiceSMOImpl.queryOaWorkflows(oaWorkflowDto);
+        for (ItemReleaseTypeDto itemReleaseTypeDto : itemReleaseTypeDtos) {
+            for (OaWorkflowDto tmpOaWorkflowDto : oaWorkflowDtos) {
+                if (itemReleaseTypeDto.getFlowId().equals(tmpOaWorkflowDto.getFlowId())) {
+                    BeanConvertUtil.covertBean(tmpOaWorkflowDto, itemReleaseTypeDto);
+                }
+            }
+        }
+    }
 }