优化代码

Your Name

2023-01-16 5fc2fc57afc63a906ec5567e91aeab72d20aab7d

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

@@ -24,13 +24,14 @@
import com.java110.core.event.cmd.CmdEvent;
import com.java110.core.factory.GenerateCodeFactory;
import com.java110.doc.annotation.*;
import com.java110.dto.itemRelease.ItemReleaseDto;
import com.java110.dto.itemReleaseType.ItemReleaseTypeDto;
import com.java110.dto.oaWorkflow.OaWorkflowDto;
import com.java110.dto.user.UserDto;
import com.java110.intf.common.IItemReleaseResV1InnerServiceSMO;
import com.java110.intf.common.IItemReleaseTypeV1InnerServiceSMO;
import com.java110.intf.common.IItemReleaseV1InnerServiceSMO;
import com.java110.intf.common.IOaWorkflowUserInnerServiceSMO;
import com.java110.intf.common.IOaWorkflowActivitiInnerServiceSMO;
import com.java110.intf.oa.IOaWorkflowInnerServiceSMO;
import com.java110.intf.user.IUserInnerServiceSMO;
import com.java110.po.itemRelease.ItemReleasePo;
@@ -133,7 +134,7 @@
    private IUserInnerServiceSMO userInnerServiceSMOImpl;

    @Autowired
    private IOaWorkflowUserInnerServiceSMO oaWorkflowUserInnerServiceSMOImpl;
    private IOaWorkflowActivitiInnerServiceSMO oaWorkflowUserInnerServiceSMOImpl;


    @Override
@@ -161,7 +162,6 @@
    @Java110Transactional
    public void doCmd(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {

        String storeId = cmdDataFlowContext.getReqHeaders().get("store-id");
        String userId = cmdDataFlowContext.getReqHeaders().get("user-id");

        ItemReleaseTypeDto itemReleaseTypeDto = new ItemReleaseTypeDto();
@@ -171,7 +171,7 @@
        Assert.listOnlyOne(itemReleaseTypeDtos,"未包含放行类型");

        OaWorkflowDto oaWorkflowDto = new OaWorkflowDto();
        oaWorkflowDto.setStoreId(storeId);
        oaWorkflowDto.setStoreId(itemReleaseTypeDtos.get(0).getStoreId());
        oaWorkflowDto.setFlowId(itemReleaseTypeDtos.get(0).getFlowId());
        List<OaWorkflowDto> oaWorkflowDtos = oaWorkflowInnerServiceSMOImpl.queryOaWorkflows(oaWorkflowDto);
        Assert.listOnlyOne(oaWorkflowDtos, "流程不存在");
@@ -192,6 +192,8 @@

        ItemReleasePo itemReleasePo = BeanConvertUtil.covertBean(reqJson, ItemReleasePo.class);
        itemReleasePo.setIrId(GenerateCodeFactory.getGeneratorId(CODE_PREFIX_ID));
        itemReleasePo.setState(ItemReleaseDto.STATE_WAIT);
        itemReleasePo.setCreateUserId(userId);
        int flag = itemReleaseV1InnerServiceSMOImpl.saveItemRelease(itemReleasePo);

        if (flag < 1) {
@@ -226,7 +228,7 @@
        flowJson.put("flowId",oaWorkflowDtos.get(0).getFlowId());
        flowJson.put("id",itemReleasePo.getIrId());
        flowJson.put("auditMessage","提交审核");
        flowJson.put("storeId",storeId);
        flowJson.put("storeId",itemReleaseTypeDtos.get(0).getStoreId());
        reqJson.put("processDefinitionKey", oaWorkflowDtos.get(0).getProcessDefinitionKey());
        JSONObject result = oaWorkflowUserInnerServiceSMOImpl.startProcess(flowJson);

@@ -235,6 +237,11 @@
        flowJson.put("processInstanceId",result.getString("processInstanceId"));
        flowJson.put("createUserId",userId);
        flowJson.put("nextUserId",reqJson.getJSONObject("audit").getString("staffId"));
        flowJson.put("storeId",itemReleaseTypeDtos.get(0).getStoreId());
        flowJson.put("id",itemReleasePo.getIrId());
        flowJson.put("flowId",oaWorkflowDtos.get(0).getFlowId());


        oaWorkflowUserInnerServiceSMOImpl.autoFinishFirstTask(flowJson);