学校列表配置数据回显

service-manager/src/main/java/com/winsun/controller/SchoolManagementController.java

@@ -8,8 +8,10 @@ import com.baomidou.mybatisplus.plugins.Page;
 import com.winsun.auth.core.annotion.Permission;
 import com.winsun.auth.core.annotion.Permission;
 import com.winsun.auth.core.base.controller.BaseController;
 import com.winsun.auth.core.base.controller.BaseController;
 import com.winsun.auth.core.shiro.ShiroUser;
 import com.winsun.auth.core.shiro.ShiroUser;
+import com.winsun.bean.Package;
 import com.winsun.bean.School;
 import com.winsun.bean.School;
 import com.winsun.bean.SchoolPackage;
 import com.winsun.bean.SchoolPackage;
+import com.winsun.mapper.PackageMapper;
 import com.winsun.mapper.SchoolMapper;
 import com.winsun.mapper.SchoolMapper;
 import com.winsun.mapper.SchoolPackageMapper;
 import com.winsun.mapper.SchoolPackageMapper;
 import com.winsun.utils.MyBatisPlusUpdateUtils;
 import com.winsun.utils.MyBatisPlusUpdateUtils;
@@ -22,6 +24,7 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.bind.annotation.RestController;
 import com.winsun.auth.core.common.model.ResponseData;
 import com.winsun.auth.core.common.model.ResponseData;
 
 
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.HashMap;
 import java.util.List;
 import java.util.List;
 import java.util.Map;
 import java.util.Map;
@@ -40,10 +43,13 @@ public class SchoolManagementController extends BaseController {
 
 
     private static SchoolPackageMapper schoolPackageMapper;
     private static SchoolPackageMapper schoolPackageMapper;
 
 
+    private static PackageMapper packageMapper;
+
     @Autowired
     @Autowired
-    public SchoolManagementController(SchoolMapper schoolMapper, SchoolPackageMapper schoolPackageMapper) {
+    public SchoolManagementController(SchoolMapper schoolMapper, SchoolPackageMapper schoolPackageMapper,PackageMapper packageMapper) {
         SchoolManagementController.schoolMapper = schoolMapper;
         SchoolManagementController.schoolMapper = schoolMapper;
         SchoolManagementController.schoolPackageMapper = schoolPackageMapper;
         SchoolManagementController.schoolPackageMapper = schoolPackageMapper;
+        SchoolManagementController.packageMapper = packageMapper;
     }
     }
 
 
     @Permission(menuname = "添加学校信息", value = "insert", method = RequestMethod.POST)
     @Permission(menuname = "添加学校信息", value = "insert", method = RequestMethod.POST)
@@ -106,7 +112,7 @@ public class SchoolManagementController extends BaseController {
      * @return
      * @return
      */
      */
     @Permission(menuname = "查询学校信息", value = "findByList", method = RequestMethod.POST)
     @Permission(menuname = "查询学校信息", value = "findByList", method = RequestMethod.POST)
-    public ResponseData<Page<School>> listSchool(@RequestParam("subName") String subName, @RequestParam("status") String status,
+    public ResponseData<Page<Map<String,Object>>> listSchool(@RequestParam("subName") String subName, @RequestParam("status") String status,
                                                  @RequestParam("schoolName") String schoolName, @RequestParam("netType") String netType, @RequestParam(name = "pageNo", required = false) int pageIndex,
                                                  @RequestParam("schoolName") String schoolName, @RequestParam("netType") String netType, @RequestParam(name = "pageNo", required = false) int pageIndex,
                                                  @RequestParam(name = "pageSize", required = false) int pageSize) {
                                                  @RequestParam(name = "pageSize", required = false) int pageSize) {
         ShiroUser user = getShiroUser();
         ShiroUser user = getShiroUser();
@@ -118,11 +124,24 @@ public class SchoolManagementController extends BaseController {
         wrapper.eq(StringUtils.isNotBlank(subName), "sub_name", subName);
         wrapper.eq(StringUtils.isNotBlank(subName), "sub_name", subName);
         wrapper.eq(StringUtils.isNotBlank(status), "status", status);
         wrapper.eq(StringUtils.isNotBlank(status), "status", status);
         wrapper.eq(StringUtils.isNotBlank(netType), "net_type", netType);
         wrapper.eq(StringUtils.isNotBlank(netType), "net_type", netType);
-        Page<School> page = new Page<>(pageIndex, pageSize);
-        List<School> schools = schoolMapper.selectPage(page, wrapper);
-        page.setRecords(schools);
+        Page<Map<String,Object>> page = new Page<>(pageIndex, pageSize);
+        List<Map<String, Object>> maps = schoolMapper.selectMapsPage(page, wrapper);
+        Wrapper<School> wrapperSubName = new EntityWrapper();
+        wrapperSubName.setSqlSelect("sub_name as subNameList").groupBy("sub_name");
+        List<Map<String, Object>> selectMaps = schoolMapper.selectMaps(wrapperSubName);
+        EntityWrapper<Package> packagewrapper = new EntityWrapper<>();
+        packagewrapper.setSqlSelect("id,package_name as packageName, name").groupBy("name");
+        List<Map<String, Object>> packageselectMaps = packageMapper.selectMaps(packagewrapper);
+        maps.forEach(val->{
+            val.put("subNameList",selectMaps);
+            val.put("packageName",packageselectMaps);
+        });
+        page.setRecords(maps);
         return ResponseData.success(page, "查询完毕！");
         return ResponseData.success(page, "查询完毕！");
     }
     }
 
 
-
+//    @Permission(menuname = "编辑套餐选择回显数据", value = "findByList", method = RequestMethod.POST)
+//    public ResponseData<Page<Map<String,Object>>> packageOne(@RequestParam("subName") String subName) {
+//        return ResponseData.success(page, "查询完毕！");
+//    }
 }
 }