优化代码

java110-bean/src/main/java/com/java110/dto/itemRelease/ItemReleaseDto.java

@@ -20,7 +20,7 @@ public class ItemReleaseDto extends ItemReleaseTypeDto implements Serializable {
     public static final String STATE_WAIT = "W"; //W待审核
     public static final String STATE_DOING = "D"; //审核中
     public static final String STATE_COMPLETE = "C"; //审核完成
-    public static final String STATE_FAIT = "W"; //审核失败
+    public static final String STATE_FAIT = "F"; //审核失败
 
 
     private String amount;

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

@@ -22,6 +22,8 @@ public class OaWorkflowDto extends PageDto implements Serializable {
     public static final String FLOW_TYPE_VISIT="3003";// 访客审核
     public static final String FLOW_TYPE_PUBLIC="1001";//物品放行
 
+    public static final String FLOW_TYPE_OWNER_SETTLED="4004";// 业主入驻房屋流程
+
     private String userId;
     private String describle;
     private String modelId;

java110-bean/src/main/java/com/java110/dto/ownerSettledApply/OwnerSettledApplyDto.java

@@ -1,6 +1,7 @@
 package com.java110.dto.ownerSettledApply;
 
 import com.java110.dto.PageDto;
+
 import java.io.Serializable;
 import java.util.Date;
 
@@ -14,12 +15,26 @@ import java.util.Date;
  **/
 public class OwnerSettledApplyDto extends PageDto implements Serializable {
 
+    //状态 W待审核 D 审核中 C 审核完成 D 审核失败
+    public static final String STATE_WAIT = "W"; //W待审核
+    public static final String STATE_DOING = "D"; //审核中
+    public static final String STATE_COMPLETE = "C"; //审核完成
+    public static final String STATE_FAIT = "F"; //审核失败
+
     private String applyId;
-private String createUserId;
-private String remark;
-private String state;
-private String ownerId;
-private String communityId;
+    private String createUserId;
+    private String remark;
+    private String state;
+    private String ownerId;
+    private String communityId;
+
+    private String stateName;
+
+    private String ownerName;
+
+    private String ownerLink;
+
+    private String roomCount;
 
 
     private Date createTime;
@@ -30,37 +45,48 @@ private String communityId;
     public String getApplyId() {
         return applyId;
     }
-public void setApplyId(String applyId) {
+
+    public void setApplyId(String applyId) {
         this.applyId = applyId;
     }
-public String getCreateUserId() {
+
+    public String getCreateUserId() {
         return createUserId;
     }
-public void setCreateUserId(String createUserId) {
+
+    public void setCreateUserId(String createUserId) {
         this.createUserId = createUserId;
     }
-public String getRemark() {
+
+    public String getRemark() {
         return remark;
     }
-public void setRemark(String remark) {
+
+    public void setRemark(String remark) {
         this.remark = remark;
     }
-public String getState() {
+
+    public String getState() {
         return state;
     }
-public void setState(String state) {
+
+    public void setState(String state) {
         this.state = state;
     }
-public String getOwnerId() {
+
+    public String getOwnerId() {
         return ownerId;
     }
-public void setOwnerId(String ownerId) {
+
+    public void setOwnerId(String ownerId) {
         this.ownerId = ownerId;
     }
-public String getCommunityId() {
+
+    public String getCommunityId() {
         return communityId;
     }
-public void setCommunityId(String communityId) {
+
+    public void setCommunityId(String communityId) {
         this.communityId = communityId;
     }
 
@@ -80,4 +106,36 @@ public void setCommunityId(String communityId) {
     public void setStatusCd(String statusCd) {
         this.statusCd = statusCd;
     }
+
+    public String getStateName() {
+        return stateName;
+    }
+
+    public void setStateName(String stateName) {
+        this.stateName = stateName;
+    }
+
+    public String getOwnerName() {
+        return ownerName;
+    }
+
+    public void setOwnerName(String ownerName) {
+        this.ownerName = ownerName;
+    }
+
+    public String getOwnerLink() {
+        return ownerLink;
+    }
+
+    public void setOwnerLink(String ownerLink) {
+        this.ownerLink = ownerLink;
+    }
+
+    public String getRoomCount() {
+        return roomCount;
+    }
+
+    public void setRoomCount(String roomCount) {
+        this.roomCount = roomCount;
+    }
 }

java110-bean/src/main/java/com/java110/dto/ownerSettledSetting/OwnerSettledSettingDto.java

@@ -1,6 +1,8 @@
 package com.java110.dto.ownerSettledSetting;
 
 import com.java110.dto.PageDto;
+import com.java110.dto.oaWorkflow.OaWorkflowDto;
+
 import java.io.Serializable;
 import java.util.Date;
 
@@ -12,14 +14,14 @@ import java.util.Date;
  * @Version 1.0
  * add by wuxw 2019/4/24
  **/
-public class OwnerSettledSettingDto extends PageDto implements Serializable {
+public class OwnerSettledSettingDto extends OaWorkflowDto implements Serializable {
 
     private String remark;
-private String communityId;
-private String flowId;
-private String flowName;
-private String settingId;
-private String settingName;
+    private String communityId;
+    private String flowId;
+    private String flowName;
+    private String settingId;
+    private String settingName;
 
 
     private Date createTime;
@@ -30,37 +32,48 @@ private String settingName;
     public String getRemark() {
         return remark;
     }
-public void setRemark(String remark) {
+
+    public void setRemark(String remark) {
         this.remark = remark;
     }
-public String getCommunityId() {
+
+    public String getCommunityId() {
         return communityId;
     }
-public void setCommunityId(String communityId) {
+
+    public void setCommunityId(String communityId) {
         this.communityId = communityId;
     }
-public String getFlowId() {
+
+    public String getFlowId() {
         return flowId;
     }
-public void setFlowId(String flowId) {
+
+    public void setFlowId(String flowId) {
         this.flowId = flowId;
     }
-public String getFlowName() {
+
+    public String getFlowName() {
         return flowName;
     }
-public void setFlowName(String flowName) {
+
+    public void setFlowName(String flowName) {
         this.flowName = flowName;
     }
-public String getSettingId() {
+
+    public String getSettingId() {
         return settingId;
     }
-public void setSettingId(String settingId) {
+
+    public void setSettingId(String settingId) {
         this.settingId = settingId;
     }
-public String getSettingName() {
+
+    public String getSettingName() {
         return settingName;
     }
-public void setSettingName(String settingName) {
+
+    public void setSettingName(String settingName) {
         this.settingName = settingName;
     }
 

java110-db/src/main/resources/mapper/user/OwnerSettledApplyV1ServiceDaoImplMapper.xml

@@ -18,9 +18,13 @@
     <!-- 查询业主入驻申请信息 add by wuxw 2018-07-03 -->
     <select id="getOwnerSettledApplyInfo" parameterType="Map" resultType="Map">
         select t.apply_id,t.apply_id applyId,t.create_user_id,t.create_user_id
-        createUserId,t.remark,t.status_cd,t.status_cd statusCd,t.state,t.owner_id,t.owner_id
-        ownerId,t.community_id,t.community_id communityId
+        createUserId,t.remark,t.state,t.owner_id,t.owner_id
+        ownerId,t.community_id,t.community_id communityId,t.create_time createTime,td.name stateName,bo.`name` ownerName,bo.link ownerLink,
+        count(osr.room_id) roomCount
         from owner_settled_apply t
+        left join building_owner bo on t.owner_id = bo.member_id and bo.status_cd = '0'
+        left join t_dict td on t.state = td.status_cd and td.table_name = 'owner_settled_apply' and td.table_columns = 'state'
+        left join owner_settled_rooms osr on t.apply_id = osr.apply_id and osr.status_cd = '0'
         where 1 =1
         <if test="applyId !=null and applyId != ''">
             and t.apply_id= #{applyId}
@@ -28,6 +32,9 @@
         <if test="createUserId !=null and createUserId != ''">
             and t.create_user_id= #{createUserId}
         </if>
+        <if test="ownerNameLike !=null and ownerNameLike != ''">
+            and bo.name like concat('%',#{ownerNameLike},'%')
+        </if>
         <if test="remark !=null and remark != ''">
             and t.remark= #{remark}
         </if>
@@ -43,6 +50,7 @@
         <if test="communityId !=null and communityId != ''">
             and t.community_id= #{communityId}
         </if>
+        group by t.apply_id,t.create_user_id,t.remark,t.state,t.owner_id,t.community_id,t.create_time ,td.name ,bo.`name` ,bo.link
         order by t.create_time desc
         <if test="page != -1 and page != null ">
             limit #{page}, #{row}
@@ -83,6 +91,7 @@
     <select id="queryOwnerSettledApplysCount" parameterType="Map" resultType="Map">
         select count(1) count
         from owner_settled_apply t
+        left join building_owner bo on t.owner_id = bo.member_id and bo.status_cd = '0'
         where 1 =1
         <if test="applyId !=null and applyId != ''">
             and t.apply_id= #{applyId}
@@ -90,6 +99,9 @@
         <if test="createUserId !=null and createUserId != ''">
             and t.create_user_id= #{createUserId}
         </if>
+        <if test="ownerNameLike !=null and ownerNameLike != ''">
+            and bo.name like concat('%',#{ownerNameLike},'%')
+        </if>
         <if test="remark !=null and remark != ''">
             and t.remark= #{remark}
         </if>

service-user/src/main/java/com/java110/user/cmd/ownerSettled/DeleteOwnerSettledSettingCmd.java

@@ -1,71 +0,0 @@
-/*
- * Copyright 2017-2020 吴学文 and java110 team.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.java110.user.cmd.ownerSettled;
-
-import com.alibaba.fastjson.JSONObject;
-import com.java110.core.annotation.Java110Cmd;
-import com.java110.core.annotation.Java110Transactional;
-import com.java110.core.context.ICmdDataFlowContext;
-import com.java110.core.event.cmd.Cmd;
-import com.java110.core.event.cmd.CmdEvent;
-import com.java110.intf.user.IOwnerSettledSettingV1InnerServiceSMO;
-import com.java110.po.ownerSettledSetting.OwnerSettledSettingPo;
-import com.java110.utils.exception.CmdException;
-import com.java110.utils.util.Assert;
-import com.java110.utils.util.BeanConvertUtil;
-import com.java110.vo.ResultVo;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * 类表述：删除
- * 服务编码：ownerSettledSetting.deleteOwnerSettledSetting
- * 请求路劲：/app/ownerSettledSetting.DeleteOwnerSettledSetting
- * add by 吴学文 at 2023-01-26 00:45:55 mail: 928255095@qq.com
- * open source address: https://gitee.com/wuxw7/MicroCommunity
- * 官网：http://www.homecommunity.cn
- * 温馨提示：如果您对此文件进行修改 请不要删除原有作者及注释信息，请补充您的 修改的原因以及联系邮箱如下
- * // modify by 张三 at 2021-09-12 第10行在某种场景下存在某种bug 需要修复，注释10至20行 加入 20行至30行
- */
-@Java110Cmd(serviceCode = "ownerSettled.deleteOwnerSettledSetting")
-public class DeleteOwnerSettledSettingCmd extends Cmd {
-    private static Logger logger = LoggerFactory.getLogger(DeleteOwnerSettledSettingCmd.class);
-
-    @Autowired
-    private IOwnerSettledSettingV1InnerServiceSMO ownerSettledSettingV1InnerServiceSMOImpl;
-
-    @Override
-    public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
-        Assert.hasKeyAndValue(reqJson, "settingId", "settingId不能为空");
-        Assert.hasKeyAndValue(reqJson, "communityId", "communityId不能为空");
-
-    }
-
-    @Override
-    @Java110Transactional
-    public void doCmd(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
-
-        OwnerSettledSettingPo ownerSettledSettingPo = BeanConvertUtil.covertBean(reqJson, OwnerSettledSettingPo.class);
-        int flag = ownerSettledSettingV1InnerServiceSMOImpl.deleteOwnerSettledSetting(ownerSettledSettingPo);
-
-        if (flag < 1) {
-            throw new CmdException("删除数据失败");
-        }
-
-        cmdDataFlowContext.setResponseEntity(ResultVo.success());
-    }
-}

service-user/src/main/java/com/java110/user/cmd/ownerSettled/ListOwnerSettledApplyCmd.java

@@ -27,8 +27,10 @@ import com.java110.utils.util.BeanConvertUtil;
 import com.java110.vo.ResultVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import com.java110.dto.ownerSettledApply.OwnerSettledApplyDto;
+
 import java.util.List;
 import java.util.ArrayList;
+
 import org.springframework.http.ResponseEntity;
 import org.springframework.http.HttpStatus;
 import org.slf4j.Logger;
@@ -48,7 +50,7 @@ import org.slf4j.LoggerFactory;
 @Java110Cmd(serviceCode = "ownerSettled.listOwnerSettledApply")
 public class ListOwnerSettledApplyCmd extends Cmd {
 
-  private static Logger logger = LoggerFactory.getLogger(ListOwnerSettledApplyCmd.class);
+    private static Logger logger = LoggerFactory.getLogger(ListOwnerSettledApplyCmd.class);
     @Autowired
     private IOwnerSettledApplyV1InnerServiceSMO ownerSettledApplyV1InnerServiceSMOImpl;
 
@@ -61,22 +63,23 @@ public class ListOwnerSettledApplyCmd extends Cmd {
     @Override
     public void doCmd(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
 
-           OwnerSettledApplyDto ownerSettledApplyDto = BeanConvertUtil.covertBean(reqJson, OwnerSettledApplyDto.class);
 
-           int count = ownerSettledApplyV1InnerServiceSMOImpl.queryOwnerSettledApplysCount(ownerSettledApplyDto);
+        OwnerSettledApplyDto ownerSettledApplyDto = BeanConvertUtil.covertBean(reqJson, OwnerSettledApplyDto.class);
+
+        int count = ownerSettledApplyV1InnerServiceSMOImpl.queryOwnerSettledApplysCount(ownerSettledApplyDto);
 
-           List<OwnerSettledApplyDto> ownerSettledApplyDtos = null;
+        List<OwnerSettledApplyDto> ownerSettledApplyDtos = null;
 
-           if (count > 0) {
-               ownerSettledApplyDtos = ownerSettledApplyV1InnerServiceSMOImpl.queryOwnerSettledApplys(ownerSettledApplyDto);
-           } else {
-               ownerSettledApplyDtos = new ArrayList<>();
-           }
+        if (count > 0) {
+            ownerSettledApplyDtos = ownerSettledApplyV1InnerServiceSMOImpl.queryOwnerSettledApplys(ownerSettledApplyDto);
+        } else {
+            ownerSettledApplyDtos = new ArrayList<>();
+        }
 
-           ResultVo resultVo = new ResultVo((int) Math.ceil((double) count / (double) reqJson.getInteger("row")), count, ownerSettledApplyDtos);
+        ResultVo resultVo = new ResultVo((int) Math.ceil((double) count / (double) reqJson.getInteger("row")), count, ownerSettledApplyDtos);
 
-           ResponseEntity<String> responseEntity = new ResponseEntity<String>(resultVo.toString(), HttpStatus.OK);
+        ResponseEntity<String> responseEntity = new ResponseEntity<String>(resultVo.toString(), HttpStatus.OK);
 
-           cmdDataFlowContext.setResponseEntity(responseEntity);
+        cmdDataFlowContext.setResponseEntity(responseEntity);
     }
 }

service-user/src/main/java/com/java110/user/cmd/ownerSettled/SaveOwnerSettledApplyCmd.java

@@ -25,6 +25,7 @@ import com.java110.core.event.cmd.CmdEvent;
 import com.java110.core.factory.GenerateCodeFactory;
 import com.java110.dto.RoomDto;
 import com.java110.dto.owner.OwnerDto;
+import com.java110.dto.ownerSettledApply.OwnerSettledApplyDto;
 import com.java110.intf.community.IRoomV1InnerServiceSMO;
 import com.java110.intf.user.IOwnerSettledApplyV1InnerServiceSMO;
 import com.java110.intf.user.IOwnerSettledRoomsV1InnerServiceSMO;
@@ -94,9 +95,12 @@ public class SaveOwnerSettledApplyCmd extends Cmd {
     @Override
     @Java110Transactional
     public void doCmd(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
+        String userId = cmdDataFlowContext.getReqHeaders().get("user-id");
 
         OwnerSettledApplyPo ownerSettledApplyPo = BeanConvertUtil.covertBean(reqJson, OwnerSettledApplyPo.class);
         ownerSettledApplyPo.setApplyId(GenerateCodeFactory.getGeneratorId(CODE_PREFIX_ID));
+        ownerSettledApplyPo.setCreateUserId(userId);
+        ownerSettledApplyPo.setState(OwnerSettledApplyDto.STATE_WAIT);
         int flag = ownerSettledApplyV1InnerServiceSMOImpl.saveOwnerSettledApply(ownerSettledApplyPo);
 
         if (flag < 1) {

service-user/src/main/java/com/java110/user/cmd/ownerSettled/SaveOwnerSettledSettingCmd.java

@@ -22,7 +22,12 @@ import com.java110.core.context.ICmdDataFlowContext;
 import com.java110.core.event.cmd.Cmd;
 import com.java110.core.event.cmd.CmdEvent;
 import com.java110.core.factory.GenerateCodeFactory;
+import com.java110.dto.oaWorkflow.OaWorkflowDto;
+import com.java110.dto.workflow.WorkflowModelDto;
+import com.java110.intf.common.IWorkflowInnerServiceSMO;
+import com.java110.intf.oa.IOaWorkflowInnerServiceSMO;
 import com.java110.intf.user.IOwnerSettledSettingV1InnerServiceSMO;
+import com.java110.po.oaWorkflow.OaWorkflowPo;
 import com.java110.po.ownerSettledSetting.OwnerSettledSettingPo;
 import com.java110.utils.exception.CmdException;
 import com.java110.utils.util.Assert;
@@ -52,6 +57,12 @@ public class SaveOwnerSettledSettingCmd extends Cmd {
     @Autowired
     private IOwnerSettledSettingV1InnerServiceSMO ownerSettledSettingV1InnerServiceSMOImpl;
 
+    @Autowired
+    private IWorkflowInnerServiceSMO workflowInnerServiceSMOImpl;
+
+    @Autowired
+    private IOaWorkflowInnerServiceSMO oaWorkflowInnerServiceSMOImpl;
+
     @Override
     public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
         Assert.hasKeyAndValue(reqJson, "settingName", "请求报文中未包含settingName");
@@ -63,9 +74,32 @@ public class SaveOwnerSettledSettingCmd extends Cmd {
     @Java110Transactional
     public void doCmd(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
 
+        String storeId = cmdDataFlowContext.getReqHeaders().get("store-id");
+        OaWorkflowPo oaWorkflowPo = new OaWorkflowPo();
+        oaWorkflowPo.setStoreId(storeId);
+        oaWorkflowPo.setFlowId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_flowId));
+        oaWorkflowPo.setFlowName(reqJson.getString("settingName")+"审批流程");
+        oaWorkflowPo.setFlowType(OaWorkflowDto.FLOW_TYPE_OWNER_SETTLED);
+
+        //创建model
+        WorkflowModelDto workflowModelDto = new WorkflowModelDto();
+        workflowModelDto.setName(oaWorkflowPo.getFlowName());
+        workflowModelDto.setKey(oaWorkflowPo.getFlowId());
+        workflowModelDto = workflowInnerServiceSMOImpl.createModel(workflowModelDto);
+
+        oaWorkflowPo.setModelId(workflowModelDto.getModelId());
+        oaWorkflowPo.setFlowKey(workflowModelDto.getKey());
+        oaWorkflowPo.setState(OaWorkflowDto.STATE_WAIT);
+        int flag = oaWorkflowInnerServiceSMOImpl.saveOaWorkflow(oaWorkflowPo);
+        if (flag < 1) {
+            throw new CmdException("保存数据失败");
+        }
+
         OwnerSettledSettingPo ownerSettledSettingPo = BeanConvertUtil.covertBean(reqJson, OwnerSettledSettingPo.class);
         ownerSettledSettingPo.setSettingId(GenerateCodeFactory.getGeneratorId(CODE_PREFIX_ID));
-        int flag = ownerSettledSettingV1InnerServiceSMOImpl.saveOwnerSettledSetting(ownerSettledSettingPo);
+        ownerSettledSettingPo.setFlowId(oaWorkflowPo.getFlowId());
+        ownerSettledSettingPo.setFlowName(oaWorkflowPo.getFlowName());
+        flag = ownerSettledSettingV1InnerServiceSMOImpl.saveOwnerSettledSetting(ownerSettledSettingPo);
 
         if (flag < 1) {
             throw new CmdException("保存数据失败");

service-user/src/main/java/com/java110/user/smo/impl/OwnerSettledSettingV1InnerServiceSMOImpl.java

@@ -16,6 +16,9 @@
 package com.java110.user.smo.impl;
 
 
+import com.java110.dto.oaWorkflow.OaWorkflowDto;
+import com.java110.dto.visitSetting.VisitSettingDto;
+import com.java110.intf.oa.IOaWorkflowInnerServiceSMO;
 import com.java110.user.dao.IOwnerSettledSettingV1ServiceDao;
 import com.java110.intf.user.IOwnerSettledSettingV1InnerServiceSMO;
 import com.java110.dto.ownerSettledSetting.OwnerSettledSettingDto;
@@ -45,6 +48,9 @@ public class OwnerSettledSettingV1InnerServiceSMOImpl extends BaseServiceSMO imp
     @Autowired
     private IOwnerSettledSettingV1ServiceDao ownerSettledSettingV1ServiceDaoImpl;
 
+    @Autowired
+    private IOaWorkflowInnerServiceSMO oaWorkflowInnerServiceSMOImpl;
+
 
     @Override
     public int saveOwnerSettledSetting(@RequestBody  OwnerSettledSettingPo ownerSettledSettingPo) {
@@ -77,10 +83,37 @@ public class OwnerSettledSettingV1InnerServiceSMOImpl extends BaseServiceSMO imp
         }
 
         List<OwnerSettledSettingDto> ownerSettledSettings = BeanConvertUtil.covertBeanList(ownerSettledSettingV1ServiceDaoImpl.getOwnerSettledSettingInfo(BeanConvertUtil.beanCovertMap(ownerSettledSettingDto)), OwnerSettledSettingDto.class);
-
+        refreshWorkflow(ownerSettledSettings);
         return ownerSettledSettings;
     }
 
+    /**
+     * 查询工作流信息
+     *
+     * @param ownerSettledSettings
+     */
+    private void refreshWorkflow(List<OwnerSettledSettingDto> ownerSettledSettings) {
+        if(ownerSettledSettings == null || ownerSettledSettings.size()< 1){
+            return ;
+        }
+        List<String> flowIds = new ArrayList<>();
+        for (OwnerSettledSettingDto visitSettingDto : ownerSettledSettings) {
+            flowIds.add(visitSettingDto.getFlowId());
+        }
+
+        OaWorkflowDto oaWorkflowDto = new OaWorkflowDto();
+        oaWorkflowDto.setFlowIds(flowIds.toArray(new String[flowIds.size()]));
+        List<OaWorkflowDto> oaWorkflowDtos = oaWorkflowInnerServiceSMOImpl.queryOaWorkflows(oaWorkflowDto);
+        for (OwnerSettledSettingDto visitSettingDto : ownerSettledSettings) {
+            for (OaWorkflowDto tmpOaWorkflowDto : oaWorkflowDtos) {
+                if (visitSettingDto.getFlowId().equals(tmpOaWorkflowDto.getFlowId())) {
+                    BeanConvertUtil.covertBean(tmpOaWorkflowDto, visitSettingDto);
+                }
+            }
+        }
+    }
+
+
 
     @Override
     public int queryOwnerSettledSettingsCount(@RequestBody OwnerSettledSettingDto ownerSettledSettingDto) {