merage

kimi

2020-05-27 c007f0ca1785db093d48f4846cda82fe8e955765

 src/main/java/com/highdatas/mdm/service/impl/FlowsServiceImpl.java

@@ -38,8 +38,6 @@
    @Autowired
    SysFieldMapper fieldMapper;
    @Autowired
    ITUserRoleService userRoleService;
    @Autowired
    IMasterModifiedService masterModifiedService;
    @Autowired
    IMaintainService maintainService;
@@ -52,6 +50,16 @@
    @Autowired
    ISysMenuService menuService;

    /**
     *
     * @description:  创建新字段版本
     * @param userId 用户id
     * @param maintainId 数据版本id
     * @param tableName 表名
     *
     * @return: maintainfielid 字段版本对象
     *
     */
    @Override
    public MaintainField createNowVerion(String tableName, String maintainId, String userId) {
        MaintainField nowMaintain = maintainFieldService.getNextMaintain(tableName, userId);
@@ -70,7 +78,13 @@

        return nowMaintain;
    }

    /**
     *
     * @description:  通过业务id获取审批状态
     * @param businessId 业务id
     * @return: status
     *
     */
    @Override
    public ActivitiStatus getStatusByBusinessId(String businessId) {
        Flows flows = selectOne(new EntityWrapper<Flows>().eq("business_id", businessId).orderBy("create_time desc"));
@@ -79,7 +93,14 @@
        }
        return flows.getStatus();
    }

    /**
     *
     * @description:  判断是否为下一节点审批人
     * @param flows 流程
     * @param userId 用户id
     * @return: status
     *
     */
    @Override
    public boolean isNextAudit(Flows flows, String userId) {
        NextTaskUserInfo nestTaskAssignee = taskService.getNestTaskAssignee(flows.getWorkflowId());
@@ -108,6 +129,13 @@
        }
    }

    /**
     *
     * @description:  流程完成后的操作
     * @param flows 流程实例
     *
     */

    @Override
    public void aduitFinish(Flows flows) {
        // 新增线程
@@ -116,8 +144,8 @@
            if (flows.getBusinessType().equals(ActivitiBusinessType.maintain)){
                String maintainId = flows.getBusinessId();
                log.info("flow-maintain:" + maintainId);
                //masterModifiedService.dealFlow(maintainId, flows.getStatus());
               //log.info("flow-masterModifiedService end");
                masterModifiedService.dealFlow(maintainId, flows.getStatus());
                log.info("flow-masterModifiedService end");
                maintainService.dealFlow(maintainId, flows.getStatus());
                log.info("flow-maintainService end");
                viewService.dealFlow(maintainId, flows.getStatus());