代码修改

common/common-entity/src/main/java/com/yihu/jw/entity/ehr/quota/TjDimensionSlave.java

@@ -31,6 +31,7 @@ public class TjDimensionSlave implements Serializable{
    private Date updateTime;//修改时间
    private String updateUser;//修改人
    private String updateUserName;//修改人名
    private Boolean checked;
    @Id
    @GeneratedValue(strategy = GenerationType.AUTO)
@@ -139,4 +140,13 @@ public class TjDimensionSlave implements Serializable{
    public void setUpdateUserName(String updateUserName) {
        this.updateUserName = updateUserName;
    }
    @Transient
    public Boolean getChecked() {
        return checked;
    }
    public void setChecked(Boolean checked) {
        this.checked = checked;
    }
}

common/common-entity/src/main/java/com/yihu/jw/entity/ehr/quota/TjQuota.java

@@ -36,6 +36,9 @@ public class TjQuota implements Serializable {
    //周期指标执行状态：0未开启，1执行中
    private String jobStatus;
    private TjQuotaDataSource tjQuotaDataSource;
    private TjQuotaDataSave tjQuotaDataSave;
    private List<TjQuota> children;
    @Id
@@ -239,4 +242,22 @@ public class TjQuota implements Serializable {
    public void setJobStatus(String jobStatus) {
        this.jobStatus = jobStatus;
    }
    @Transient
    public TjQuotaDataSource getTjQuotaDataSource() {
        return tjQuotaDataSource;
    }
    public void setTjQuotaDataSource(TjQuotaDataSource tjQuotaDataSource) {
        this.tjQuotaDataSource = tjQuotaDataSource;
    }
    @Transient
    public TjQuotaDataSave getTjQuotaDataSave() {
        return tjQuotaDataSave;
    }
    public void setTjQuotaDataSave(TjQuotaDataSave tjQuotaDataSave) {
        this.tjQuotaDataSave = tjQuotaDataSave;
    }
}

common/common-entity/src/main/java/com/yihu/jw/entity/ehr/quota/TjQuotaDataSave.java

@@ -15,6 +15,7 @@ public class TjQuotaDataSave implements Serializable{
    private String configJson;
    private String type;
    private String name;
    @Id
    @GeneratedValue(strategy = GenerationType.AUTO)
@@ -62,4 +63,13 @@ public class TjQuotaDataSave implements Serializable{
    public void setType(String type) {
        this.type = type;
    }
    @Transient
    public String getName() {
        return name;
    }
    public void setName(String name) {
        this.name = name;
    }
}

common/common-entity/src/main/java/com/yihu/jw/entity/ehr/quota/TjQuotaDataSource.java

@@ -13,6 +13,7 @@ public class TjQuotaDataSource implements Serializable{
    private String quotaCode;
    private String sourceCode;
    private String configJson;
    private String name;
    @Id
    @GeneratedValue(strategy = GenerationType.AUTO)
@@ -51,4 +52,13 @@ public class TjQuotaDataSource implements Serializable{
    public void setConfigJson(String configJson) {
        this.configJson = configJson;
    }
    @Transient
    public String getName() {
        return name;
    }
    public void setName(String name) {
        this.name = name;
    }
}

common/common-entity/src/main/java/com/yihu/jw/entity/ehr/quota/TjQuotaDimensionSlave.java

@@ -24,6 +24,8 @@ public class TjQuotaDimensionSlave implements Serializable{
    private Integer sort;//纬度顺序
    private String converClass;//转换类
    private String name;
    @Id
    @GeneratedValue(strategy = GenerationType.AUTO)
    @Column(name = "id", unique = true, nullable = false)
@@ -87,4 +89,13 @@ public class TjQuotaDimensionSlave implements Serializable{
    public void setConverClass(String converClass) {
        this.converClass = converClass;
    }
    @Transient
    public String getName() {
        return name;
    }
    public void setName(String name) {
        this.name = name;
    }
}

common/common-rest-model/src/main/java/com/yihu/jw/restmodel/web/MixEnvelop.java

@@ -192,4 +192,17 @@ public class MixEnvelop<T, J> extends Envelop {
        envelop.setStatus(200);
        return envelop;
    }
    public static MixEnvelop getSuccess(String message,Object obj, List detailModelList, int page, int size, Long count) {
        MixEnvelop envelop = new MixEnvelop();
        envelop.setMessage(message);
        envelop.setPageSize(size);
        envelop.setObj(obj);
        envelop.setDetailModelList(detailModelList);
        envelop.setCurrPage(page);
        envelop.setStatus(200);
        envelop.setTotalCount(count.intValue());
        return envelop;
    }
}