Commit e3191b72 authored by 莫林毅's avatar 莫林毅

修改bug .

parent c7cfe40d
......@@ -39,8 +39,6 @@ public class AssociateDiagosisConfigurationService {
DimKpiAssociationRelInfo d = dimKpiAssociationRelInfoDao.findOne(1L);
System.out.println(d.getDimAssociationAnaInfo().getAssociationType());
DimAssociationAnaInfo info = dimAssociationAnaInfoDao.findOne(1l);
System.out.println(d.toString());
System.out.println(info.toString());
}
......@@ -131,22 +129,30 @@ public class AssociateDiagosisConfigurationService {
List<Object> objList = businessDao.findBusinessIdListBychannelDataSourceMapId(channelDataSourceMapId);
List<Long> longList = new ArrayList<Long>();
System.out.println(objList == null ? "null" : "size " + objList.size());
if (objList == null || objList.size() < 1) {
return longList;
} else {
for (Object o : objList) {
longList.add((Long) o);
}
return longList;
}
}
public List<Long> findBusinessIdListBychannelDataSourceMapIdList(List<Long> channelDataSourceMapIdList) {
List<Object> objList = businessDao.findBusinessIdListBychannelDataSourceMapIdList(channelDataSourceMapIdList);
List<Long> longList = new ArrayList<Long>();
if (objList == null || objList.size() < 1) {
return longList;
} else {
for (Object o : objList) {
longList.add((Long) o);
}
return longList;
}
}
//
public List<DimKpi> findDimKpiListBybusnameIdList(List<Long> busnameIdList) {
return dimKpiDao.findDimKpiListBybusnameIdList(busnameIdList);
......@@ -162,10 +168,8 @@ public class AssociateDiagosisConfigurationService {
//1 删除 指标表 数据
int n = dimKpiAssociationRelInfoDao.deleteByAssociationId(associationIdL);
System.out.println("n==" + n);
//更新 指标表和 配置表
List<DimKpiAssociationRelInfo> relInfos = (List<DimKpiAssociationRelInfo>) dimKpiAssociationRelInfoDao.save(dimKpiAssociationRelInfoList);
System.out.println("*** " + relInfos.size());
}
......@@ -177,13 +181,11 @@ public class AssociateDiagosisConfigurationService {
// System.out.println("n===="+n);
//更新 指标表和 配置表
DimAssociationAnaInfo info = dimAssociationAnaInfoDao.save(dimAssociationAnaInfo);
System.out.println("_-_ " + info.getAssociationId());
}
public void deleteAssociDigConfig(Long associationId) {
dimAssociationAnaInfoDao.delete(associationId);
System.out.println("delete---");
}
......
......@@ -374,6 +374,8 @@
return;
}
$("#updateAnaInfo").attr("disabled","disabled");
$.ajax({
type: 'GET',
async: true,
......@@ -396,6 +398,7 @@
}
});
//$("#updateAnaInfo").removeAttr("disabled");
/*$.ajax({
type: 'GET',
......
......@@ -25,7 +25,6 @@ function failureDelete(){
function radioChoose(e){
$("#updateIndicatorsBtn").removeAttr("disabled");
$("#anaInfoSelected").val(e.id);
console.log(e.id);
}
......@@ -205,7 +204,6 @@ table_pagging.prototype={
tdContext = context;
} else {
console.log(this.objectlist);
if(k==1){
tdContext = this.getProviceData(this.objectlist[i],this.header[k][1]);
......@@ -227,7 +225,6 @@ table_pagging.prototype={
}
if(k==0) {
tdContext="<input type='radio' name='update'id='"+this.getData(this.objectlist[i],this.header[0][1])+"' onclick='radioChoose(this);'/>";
console.log(tdContext)
}
if(k==4){
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment