加入 访问设置

java110-bean/src/main/java/com/java110/dto/visitSetting/VisitSettingDto.java

@@ -1,6 +1,8 @@
 package com.java110.dto.visitSetting;
 
 import com.java110.dto.PageDto;
+import com.java110.dto.oaWorkflow.OaWorkflowDto;
+
 import java.io.Serializable;
 import java.util.Date;
 
@@ -12,17 +14,17 @@ import java.util.Date;
  * @Version 1.0
  * add by wuxw 2019/4/24
  **/
-public class VisitSettingDto extends PageDto implements Serializable {
+public class VisitSettingDto extends OaWorkflowDto implements Serializable {
 
     private String carNumWay;
-private String faceWay;
-private String typeName;
-private String auditWay;
-private String remark;
-private String communityId;
-private String flowId;
-private String flowName;
-private String settingId;
+    private String faceWay;
+    private String typeName;
+    private String auditWay;
+    private String remark;
+    private String communityId;
+    private String flowId;
+    private String flowName;
+    private String settingId;
 
 
     private Date createTime;
@@ -33,55 +35,72 @@ private String settingId;
     public String getCarNumWay() {
         return carNumWay;
     }
-public void setCarNumWay(String carNumWay) {
+
+    public void setCarNumWay(String carNumWay) {
         this.carNumWay = carNumWay;
     }
-public String getFaceWay() {
+
+    public String getFaceWay() {
         return faceWay;
     }
-public void setFaceWay(String faceWay) {
+
+    public void setFaceWay(String faceWay) {
         this.faceWay = faceWay;
     }
-public String getTypeName() {
+
+    public String getTypeName() {
         return typeName;
     }
-public void setTypeName(String typeName) {
+
+    public void setTypeName(String typeName) {
         this.typeName = typeName;
     }
-public String getAuditWay() {
+
+    public String getAuditWay() {
         return auditWay;
     }
-public void setAuditWay(String auditWay) {
+
+    public void setAuditWay(String auditWay) {
         this.auditWay = auditWay;
     }
-public String getRemark() {
+
+    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;
     }
 

service-community/src/main/java/com/java110/community/cmd/visit/SaveVisitSettingCmd.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.community.IVisitSettingV1InnerServiceSMO;
+import com.java110.intf.oa.IOaWorkflowInnerServiceSMO;
+import com.java110.po.oaWorkflow.OaWorkflowPo;
 import com.java110.po.visitSetting.VisitSettingPo;
 import com.java110.utils.exception.CmdException;
 import com.java110.utils.util.Assert;
@@ -52,6 +57,12 @@ public class SaveVisitSettingCmd extends Cmd {
     @Autowired
     private IVisitSettingV1InnerServiceSMO visitSettingV1InnerServiceSMOImpl;
 
+    @Autowired
+    private IWorkflowInnerServiceSMO workflowInnerServiceSMOImpl;
+
+    @Autowired
+    private IOaWorkflowInnerServiceSMO oaWorkflowInnerServiceSMOImpl;
+
     @Override
     public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
         Assert.hasKeyAndValue(reqJson, "typeName", "请求报文中未包含typeName");
@@ -66,9 +77,32 @@ public class SaveVisitSettingCmd 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("typeName")+"审批流程");
+        oaWorkflowPo.setFlowType(OaWorkflowDto.FLOW_TYPE_ITEM_RELEASE);
+
+        //创建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("保存数据失败");
+        }
+
         VisitSettingPo visitSettingPo = BeanConvertUtil.covertBean(reqJson, VisitSettingPo.class);
         visitSettingPo.setSettingId(GenerateCodeFactory.getGeneratorId(CODE_PREFIX_ID));
-        int flag = visitSettingV1InnerServiceSMOImpl.saveVisitSetting(visitSettingPo);
+        visitSettingPo.setFlowId(oaWorkflowPo.getFlowId());
+        visitSettingPo.setFlowName(oaWorkflowPo.getFlowName());
+        flag = visitSettingV1InnerServiceSMOImpl.saveVisitSetting(visitSettingPo);
 
         if (flag < 1) {
             throw new CmdException("保存数据失败");

service-community/src/main/java/com/java110/community/smo/impl/VisitSettingV1InnerServiceSMOImpl.java

@@ -17,8 +17,11 @@ package com.java110.community.smo.impl;
 
 
 import com.java110.community.dao.IVisitSettingV1ServiceDao;
+import com.java110.dto.itemReleaseType.ItemReleaseTypeDto;
+import com.java110.dto.oaWorkflow.OaWorkflowDto;
 import com.java110.intf.community.IVisitSettingV1InnerServiceSMO;
 import com.java110.dto.visitSetting.VisitSettingDto;
+import com.java110.intf.oa.IOaWorkflowInnerServiceSMO;
 import com.java110.po.visitSetting.VisitSettingPo;
 import com.java110.utils.util.BeanConvertUtil;
 import com.java110.core.base.smo.BaseServiceSMO;
@@ -44,7 +47,8 @@ public class VisitSettingV1InnerServiceSMOImpl extends BaseServiceSMO implements
 
     @Autowired
     private IVisitSettingV1ServiceDao visitSettingV1ServiceDaoImpl;
-
+    @Autowired
+    private IOaWorkflowInnerServiceSMO oaWorkflowInnerServiceSMOImpl;
 
     @Override
     public int saveVisitSetting(@RequestBody  VisitSettingPo visitSettingPo) {
@@ -77,10 +81,36 @@ public class VisitSettingV1InnerServiceSMOImpl extends BaseServiceSMO implements
         }
 
         List<VisitSettingDto> visitSettings = BeanConvertUtil.covertBeanList(visitSettingV1ServiceDaoImpl.getVisitSettingInfo(BeanConvertUtil.beanCovertMap(visitSettingDto)), VisitSettingDto.class);
-
+        refreshWorkflow(visitSettings);
         return visitSettings;
     }
 
+    /**
+     * 查询工作流信息
+     *
+     * @param visitSettings
+     */
+    private void refreshWorkflow(List<VisitSettingDto> visitSettings) {
+        if(visitSettings == null || visitSettings.size()< 1){
+            return ;
+        }
+        List<String> flowIds = new ArrayList<>();
+        for (VisitSettingDto visitSettingDto : visitSettings) {
+            flowIds.add(visitSettingDto.getFlowId());
+        }
+
+        OaWorkflowDto oaWorkflowDto = new OaWorkflowDto();
+        oaWorkflowDto.setFlowIds(flowIds.toArray(new String[flowIds.size()]));
+        List<OaWorkflowDto> oaWorkflowDtos = oaWorkflowInnerServiceSMOImpl.queryOaWorkflows(oaWorkflowDto);
+        for (VisitSettingDto visitSettingDto : visitSettings) {
+            for (OaWorkflowDto tmpOaWorkflowDto : oaWorkflowDtos) {
+                if (visitSettingDto.getFlowId().equals(tmpOaWorkflowDto.getFlowId())) {
+                    BeanConvertUtil.covertBean(tmpOaWorkflowDto, visitSettingDto);
+                }
+            }
+        }
+    }
+
 
     @Override
     public int queryVisitSettingsCount(@RequestBody VisitSettingDto visitSettingDto) {