Commit 94cf1001 by 高晓磊

中间表依旧关联场站

parent 82f7792c
...@@ -73,11 +73,6 @@ public class DinasTypeDaoImpl extends AbstractBaseDao implements DinasTypeDao, D ...@@ -73,11 +73,6 @@ public class DinasTypeDaoImpl extends AbstractBaseDao implements DinasTypeDao, D
page.setTotal(template.findByCriteria(detachedCriteria).size()); page.setTotal(template.findByCriteria(detachedCriteria).size());
int offset = page.getPageSize() * (page.getPageNo() - 1); int offset = page.getPageSize() * (page.getPageNo() - 1);
List<KObject> list = (List<KObject>) template.findByCriteria(detachedCriteria, offset, page.getPageSize()); List<KObject> list = (List<KObject>) template.findByCriteria(detachedCriteria, offset, page.getPageSize());
for (KObject kObject : list) {
KObject kObject1 = detailBean.newInstance();
kObject1.set("dinasType",kObject);
kObject.set("stations",template.findByExample(STATION_DINAS_TYPE_DETAIL_ENTITY,kObject1));
}
page.setDatas(list); page.setDatas(list);
return page; return page;
} }
......
...@@ -32,7 +32,8 @@ public class DinasTypeController { ...@@ -32,7 +32,8 @@ public class DinasTypeController {
Page<KObject> objectPage = new Page<>(); Page<KObject> objectPage = new Page<>();
objectPage.setPageNo(pageNo); objectPage.setPageNo(pageNo);
objectPage.setPageSize(pageSize); objectPage.setPageSize(pageSize);
return ResponseObj.success("操作成功",dinasTypeService.queryByPaging(objectPage)); Page<KObject> kObjectPage = dinasTypeService.queryByPaging(objectPage);
return ResponseObj.success("操作成功",kObjectPage);
} }
/** /**
......
...@@ -17,6 +17,7 @@ ...@@ -17,6 +17,7 @@
</m:parents> </m:parents>
<m:attributes> <m:attributes>
<m:attribute> <m:attribute>
<m:annotations>
<m:id>aed98349-40f0-4e9a-944b-43f01646978b</m:id> <m:id>aed98349-40f0-4e9a-944b-43f01646978b</m:id>
<m:name>station</m:name> <m:name>station</m:name>
<m:title>所属场站</m:title> <m:title>所属场站</m:title>
...@@ -26,6 +27,9 @@ ...@@ -26,6 +27,9 @@
</m:attribute> </m:attribute>
<m:attribute> <m:attribute>
<m:annotations> <m:annotations>
<m:annotation>
<m:type>bcp.type.json.JsonIgnore</m:type>
</m:annotation>
</m:annotations> </m:annotations>
<m:id>61699557-6afc-43c2-adeb-fecfeb844536</m:id> <m:id>61699557-6afc-43c2-adeb-fecfeb844536</m:id>
<m:name>dinasType</m:name> <m:name>dinasType</m:name>
......
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