|
@@ -7,14 +7,12 @@ import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
|
|
|
import com.template.api.WelcomeBuildControllerAPI;
|
|
import com.template.api.WelcomeBuildControllerAPI;
|
|
|
import com.template.common.utils.ExcelUtils;
|
|
import com.template.common.utils.ExcelUtils;
|
|
|
import com.template.model.enumModel.eFileType;
|
|
import com.template.model.enumModel.eFileType;
|
|
|
-import com.template.model.pojo.WelcomeBuild;
|
|
|
|
|
-import com.template.model.pojo.WelcomeCity;
|
|
|
|
|
-import com.template.model.pojo.WelcomeOrg;
|
|
|
|
|
-import com.template.model.pojo.WelcomeStudent;
|
|
|
|
|
|
|
+import com.template.model.pojo.*;
|
|
|
import com.template.model.result.CommonResult;
|
|
import com.template.model.result.CommonResult;
|
|
|
import com.template.model.result.PageUtils;
|
|
import com.template.model.result.PageUtils;
|
|
|
import com.template.model.vo.StudentPageVo;
|
|
import com.template.model.vo.StudentPageVo;
|
|
|
import com.template.services.WelcomeBuildService;
|
|
import com.template.services.WelcomeBuildService;
|
|
|
|
|
+import com.template.services.WelcomeSchoolService;
|
|
|
import org.apache.poi.hssf.usermodel.HSSFRow;
|
|
import org.apache.poi.hssf.usermodel.HSSFRow;
|
|
|
import org.apache.poi.hssf.usermodel.HSSFSheet;
|
|
import org.apache.poi.hssf.usermodel.HSSFSheet;
|
|
|
import org.apache.poi.hssf.usermodel.HSSFWorkbook;
|
|
import org.apache.poi.hssf.usermodel.HSSFWorkbook;
|
|
@@ -54,6 +52,9 @@ public class WelcomeBuildController implements WelcomeBuildControllerAPI {
|
|
|
@Autowired
|
|
@Autowired
|
|
|
private WelcomeBuildService welcomeBuildService;
|
|
private WelcomeBuildService welcomeBuildService;
|
|
|
|
|
|
|
|
|
|
+ @Autowired
|
|
|
|
|
+ WelcomeSchoolService welcomeSchoolService;
|
|
|
|
|
+
|
|
|
@Override
|
|
@Override
|
|
|
public CommonResult saveBuild(WelcomeBuild welcomeBuild) {
|
|
public CommonResult saveBuild(WelcomeBuild welcomeBuild) {
|
|
|
String build = welcomeBuild.getBuild();
|
|
String build = welcomeBuild.getBuild();
|
|
@@ -110,9 +111,7 @@ public class WelcomeBuildController implements WelcomeBuildControllerAPI {
|
|
|
|
|
|
|
|
@Override
|
|
@Override
|
|
|
public CommonResult schoolGroup() {
|
|
public CommonResult schoolGroup() {
|
|
|
- LambdaQueryWrapper<WelcomeBuild> wrapper=new LambdaQueryWrapper<>();
|
|
|
|
|
- wrapper.groupBy(WelcomeBuild::getSchool);
|
|
|
|
|
- List<WelcomeBuild> schoolGroup = welcomeBuildService.list(wrapper);
|
|
|
|
|
|
|
+ List<WelcomeSchool> schoolGroup = welcomeSchoolService.schoolGroup();
|
|
|
|
|
|
|
|
return CommonResult.ok(schoolGroup);
|
|
return CommonResult.ok(schoolGroup);
|
|
|
}
|
|
}
|