merage

kimi

2020-05-27 c007f0ca1785db093d48f4846cda82fe8e955765

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

@@ -450,36 +450,6 @@
        //return selectOne(new EntityWrapper<Maintain>().eq("table_name", tableName).orderBy("version desc"));
    }

    @Override
    public Maintain getRecentHistoryVersion(String tableName) {
        Maintain nowMaintain = null;
        Wrapper<Maintain> versionWrapper = new EntityWrapper<Maintain>().eq("table_name", tableName).isNotNull("flow_id").orderBy("order_no desc");
        List<Maintain> maintains = selectList(versionWrapper);
        for (Maintain maintain : maintains) {
            Flows flows = flowsService.selectById(maintain.getFlowId());
            if (flows == null) {
                continue;
            }
            ActivitiStatus status = flows.getStatus();
            if (status.equals(ActivitiStatus.open) && nowMaintain == null) {
                nowMaintain = maintain;
                continue;
            }
            if (!status.equals(ActivitiStatus.open) && nowMaintain != null) {
                nowMaintain = null;
            }
        }
        if (nowMaintain == null) {
            nowMaintain = selectOne(new EntityWrapper<Maintain>().eq("table_name", tableName).orderBy("order_no desc"));
        }
        int orderNo = nowMaintain.getOrderNo();
        Maintain nowVersion = getNowVersion(tableName);
        if (nowVersion != null && nowVersion.getOrderNo() == orderNo) {
            orderNo--;
        }
        Maintain maintain = selectOne(new EntityWrapper<Maintain>().eq("table_name", nowMaintain.getTableName()).eq("order_no", orderNo));
        return maintain;
    }

    @Override
    public Maintain getMaintainFromVersion(String tableName, String verison) {
@@ -488,34 +458,10 @@
        return maxVersion;
    }

    @Override
    public List<Map<String, Object>> selectVersionOperator(String tableTempName, String maintaInId, String where) {
        return maintainMapper.selectVersionOperator(tableTempName, where, maintaInId);
    }

    @Override
    public List<Map<String, Object>> selectVersionOperator(String tableTempName, String maintaInId) {
        return maintainMapper.selectVersionOperator(tableTempName, Constant.WHERE_DEFAULT, maintaInId);
    }

    @Override
    public List<Map<String, Object>> selectVersionOperatorByType(String tableTempName, String maintaInId, Operate operate, String where) {
        return maintainMapper.selectVersionOperatorByType(tableTempName, where, maintaInId, operate.name());
    }

    @Override
    public List<Map<String, Object>> selectVersionOperatorByType(String tableTempName, String maintaInId, Operate operate) {
        return maintainMapper.selectVersionOperatorByType(tableTempName, Constant.WHERE_DEFAULT, maintaInId, operate.name());
    }

    @Override
    public long countVersionOperator(String tableTempName, String maintaInId, String whereSegment) {
        return maintainMapper.countVersionOperator(tableTempName, maintaInId, whereSegment);
    }

    @Override
    public long countVersionOperator(String tableTempName, String maintaInId) {
        return maintainMapper.countVersionOperator(tableTempName, maintaInId, Constant.WHERE_DEFAULT);
    }


@@ -524,25 +470,12 @@
        return maintainMapper.countVersionOperatorByType(tableTempName, filterSegment, maintaInId, operate.name());
    }

    @Override
    public List<Map<String, Object>> selectVersionOperatorByPage(String tableTempName, String maintaInId, String limit, String where) {
        return maintainMapper.selectVersionOperatorByPage(tableTempName, maintaInId, limit, where);
    }

    @Override
    public List<Map<String, Object>> selectVersionOperatorByPage(String tableTempName, String maintaInId, String limit) {
        return maintainMapper.selectVersionOperatorByPage(tableTempName, Constant.WHERE_DEFAULT, maintaInId, limit);
    }

    @Override
    public List<Map<String, Object>> selectVersionOperatorByTypeByPage(String tableTempName, String maintaInId, Operate operate, String limit) {
        return maintainMapper.selectVersionOperatorByTypeByPage(tableTempName, Constant.WHERE_DEFAULT, maintaInId, operate.name(), limit);
    }

    @Override
    public List<Map<String, Object>> selectVersionOperatorByTypeByPage(String tableTempName, String maintaInId, Operate operate, String limit, String where) {
        return maintainMapper.selectVersionOperatorByTypeByPage(tableTempName, where, maintaInId, operate.name(), limit);
    }

    @Override
    public List<String> getCompareVersionMaintains(Maintain unFlowMaxVersion, Maintain maintainFromVersion) {