中医药小程序代码提交

src/main/java/com/tcm/common/service/impl/AreaServiceImpl.java

@@ -143,6 +143,13 @@ public class AreaServiceImpl implements AreaService {
     @Override
     public PageSizeData<FloorResVo> floorLoadPage(FloorLoadPageReqVo req) {
         PageSizeData<FloorResVo> page = floorDao.loadByPage(req);
+        for (FloorResVo floorResVo : page.getList()) {
+            FloorExtendVo floorExtendVo = new FloorExtendVo();
+            floorExtendVo.setFloorId(floorResVo.getFloorId());
+            floorExtendVo.setLanguageType(req.getLanguageType() == null ? CommonConstant.LANGUAGE_TYPE_CHINESE : req.getLanguageType());
+            floorResVo.setFloorExtendVo(floorExtendDao.load(floorExtendVo, FloorExtendVo.class));
+        }
+
         return page;
     }
 
@@ -296,6 +303,12 @@ public class AreaServiceImpl implements AreaService {
     @Override
     public PageSizeData<FloorAreaResVo> areaLoadPage(FloorAreaLoadPageReqVo req) {
         PageSizeData<FloorAreaResVo> page = floorAreaDao.loadByPage(req);
+        for (FloorAreaResVo floorAreaResVo : page.getList()) {
+            FloorAreaExtendVo areaExtendVo = new FloorAreaExtendVo();
+            areaExtendVo.setAreaId(floorAreaResVo.getAreaId());
+            areaExtendVo.setLanguageType(req.getLanguageType() == null ? CommonConstant.LANGUAGE_TYPE_CHINESE : req.getLanguageType());
+            floorAreaResVo.setAreaExtendVo(floorAreaExtendDao.load(areaExtendVo, FloorAreaExtendVo.class));
+        }
         return page;
     }
 

src/main/java/com/tcm/util/area/req/FloorLoadPageReqVo.java

@@ -3,4 +3,22 @@ package com.tcm.util.area.req;
 import com.yanzuoguang.util.vo.PageSizeReqVo;
 
 public class FloorLoadPageReqVo extends PageSizeReqVo {
+    private Integer languageType;
+    private Integer floorStatus;
+
+    public Integer getLanguageType() {
+        return languageType;
+    }
+
+    public void setLanguageType(Integer languageType) {
+        this.languageType = languageType;
+    }
+
+    public Integer getFloorStatus() {
+        return floorStatus;
+    }
+
+    public void setFloorStatus(Integer floorStatus) {
+        this.floorStatus = floorStatus;
+    }
 }