Przeglądaj źródła

加入接口协议

Your Name 3 lat temu
rodzic
commit
257344113f

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

@@ -18,6 +18,8 @@ public class OaWorkflowDto extends PageDto implements Serializable {
     public static final String STATE_WAIT = "W";//待部署
     public static final String STATE_COMPLAINT = "C";//部署完成
 
+    public static final String FLOW_TYPE_ITEM_RELEASE="物品放行";
+
     private String userId;
     private String describle;
     private String modelId;

+ 2 - 1
java110-db/src/main/resources/mapper/common/ItemReleaseTypeV1ServiceDaoImplMapper.xml

@@ -16,7 +16,8 @@
     <!-- 查询放行类型信息 add by wuxw 2018-07-03 -->
     <select id="getItemReleaseTypeInfo" parameterType="Map" resultType="Map">
         select t.type_name,t.type_name typeName,t.type_id,t.type_id typeId,t.remark,t.status_cd,t.status_cd
-        statusCd,t.community_id,t.community_id communityId,t.flow_id,t.flow_id flowId,t.flow_name,t.flow_name flowName
+        statusCd,t.community_id,t.community_id communityId,t.flow_id,t.flow_id flowId,t.flow_name,t.flow_name flowName,
+        t.create_time createTime
         from item_release_type t
         where 1 =1
         <if test="typeName !=null and typeName != ''">

+ 37 - 1
service-common/src/main/java/com/java110/common/cmd/itemRelease/SaveItemReleaseTypeCmd.java

@@ -23,8 +23,14 @@ import com.java110.core.event.cmd.Cmd;
 import com.java110.core.event.cmd.CmdEvent;
 import com.java110.core.factory.GenerateCodeFactory;
 import com.java110.doc.annotation.*;
+import com.java110.dto.oaWorkflow.OaWorkflowDto;
+import com.java110.dto.workflow.WorkflowModelDto;
 import com.java110.intf.common.IItemReleaseTypeV1InnerServiceSMO;
+import com.java110.intf.common.IWorkflowInnerServiceSMO;
+import com.java110.intf.oa.IOaWorkflowInnerServiceSMO;
 import com.java110.po.itemReleaseType.ItemReleaseTypePo;
+import com.java110.po.oaWorkflow.OaWorkflowPo;
+import com.java110.po.oaWorkflowData.OaWorkflowDataPo;
 import com.java110.utils.exception.CmdException;
 import com.java110.utils.util.Assert;
 import com.java110.utils.util.BeanConvertUtil;
@@ -80,6 +86,13 @@ public class SaveItemReleaseTypeCmd extends Cmd {
     @Autowired
     private IItemReleaseTypeV1InnerServiceSMO itemReleaseTypeV1InnerServiceSMOImpl;
 
+
+    @Autowired
+    private IWorkflowInnerServiceSMO workflowInnerServiceSMOImpl;
+
+    @Autowired
+    private IOaWorkflowInnerServiceSMO oaWorkflowInnerServiceSMOImpl;
+
     @Override
     public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
         Assert.hasKeyAndValue(reqJson, "typeName", "请求报文中未包含typeName");
@@ -90,10 +103,33 @@ public class SaveItemReleaseTypeCmd extends Cmd {
     @Override
     @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("保存数据失败");
+        }
+
 
         ItemReleaseTypePo itemReleaseTypePo = BeanConvertUtil.covertBean(reqJson, ItemReleaseTypePo.class);
         itemReleaseTypePo.setTypeId(GenerateCodeFactory.getGeneratorId(CODE_PREFIX_ID));
-        int flag = itemReleaseTypeV1InnerServiceSMOImpl.saveItemReleaseType(itemReleaseTypePo);
+        itemReleaseTypePo.setFlowId(oaWorkflowPo.getFlowId());
+        itemReleaseTypePo.setFlowName(oaWorkflowPo.getFlowName());
+         flag = itemReleaseTypeV1InnerServiceSMOImpl.saveItemReleaseType(itemReleaseTypePo);
 
         if (flag < 1) {
             throw new CmdException("保存数据失败");