Merge branch 'dev-1.13.0' of http://192.168.1.220:10080/EHR/svr-quota into dev-1.13.0

src/main/java/com/yihu/quota/model/cube/Cube.java

@@ -7,6 +7,7 @@ import javax.persistence.*;
import java.util.List;
/**
 * 多维数据集 entity
 * Created by janseny on 2018/9/10.
 * @author janseny
 */

src/main/java/com/yihu/quota/model/cube/CubeMapping.java

@@ -7,6 +7,7 @@ import javax.persistence.*;
import java.util.List;
/**
 * 多维数据集的维度 entity
 * Created by janseny on 2018/9/10.
 * @author janseny
 */

src/main/java/com/yihu/quota/model/cube/CubeMemberMapping.java

@@ -7,6 +7,7 @@ import javax.persistence.*;
import java.util.List;
/**
 * 多维数据集的维度的成员 entity
 * Created by janseny on 2018/9/10.
 * @author janseny
 */

src/main/java/com/yihu/quota/model/dimension/Dimension.java

@@ -5,6 +5,7 @@ import javax.persistence.*;
import java.util.List;
/**
 * 多维数据集维度 entity
 * Created by wxw on 2018/9/7.
 * @author wxw
 */

src/main/java/com/yihu/quota/model/dimension/DimensionMember.java

@@ -5,6 +5,7 @@ import org.hibernate.annotations.Formula;
import javax.persistence.*;
/**
 * 多维数据集维度的成员 entity
 * Created by wxw on 2018/9/7.
 * @author wxw
 */

src/main/java/com/yihu/quota/service/cube/CubeMappingService.java

@@ -14,6 +14,7 @@ import java.util.List;
/**
 * 多维数据集的维度 service
 * Created by janseny on 2018/9/10.
 * @author janseny
 */

src/main/java/com/yihu/quota/service/cube/CubeMemberMappingService.java

@@ -15,6 +15,7 @@ import java.util.List;
/**
 * 多维数据集的维度的成员 service
 * Created by janseny on 2018/9/10.
 * @author janseny
 */

src/main/java/com/yihu/quota/service/cube/CubeService.java

@@ -8,6 +8,7 @@ import org.springframework.stereotype.Service;
/**
 * 多维数据集
 * Created by janseny on 2018/9/10.
 * @author janseny
 */

src/main/java/com/yihu/quota/service/dimension/DimensionMemberService.java

@@ -2,9 +2,12 @@ package com.yihu.quota.service.dimension;
import com.yihu.ehr.query.BaseJpaService;
import com.yihu.quota.dao.dimension.DimensionMemberDao;
import com.yihu.quota.model.dimension.Dimension;
import com.yihu.quota.model.dimension.DimensionMember;
import org.springframework.stereotype.Service;
import java.util.List;
/**
 * Created by wxw on 2018/9/7.
 * @author wxw
@@ -13,4 +16,17 @@ import org.springframework.stereotype.Service;
public class DimensionMemberService extends BaseJpaService<DimensionMember, DimensionMemberDao> {
    /**
     * 根据编码查询相关维度成员信息
     * @param code
     * @param value
     * @return
     */
    public DimensionMember findByCode(String code, Object value){
        List<DimensionMember> dimensionMember =  findByField(code, value);
        if(dimensionMember != null && dimensionMember.size() > 0){
            return dimensionMember.get(0);
        }
        return null;
    }
}

src/main/java/com/yihu/quota/service/dimension/DimensionService.java

@@ -7,6 +7,8 @@ import com.yihu.quota.model.dimension.Dimension;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
/**
 * Created by wxw on 2018/9/7.
@@ -35,4 +37,18 @@ public class DimensionService extends BaseJpaService<Dimension, DimensionDao> {
        // 同时删掉隶属于该维度的成员
        dimensionMemberDao.deleteByDimensionId(id);
    }
    /**
     * 根据编码查询相关维度信息
     * @param code
     * @param value
     * @return
     */
    public Dimension findByCode(String code, Object value){
        List<Dimension> dimensions =  findByField(code, value);
        if(dimensions != null && dimensions.size() > 0){
            return dimensions.get(0);
        }
        return null;
    }
}