weizhiqiang1995/erp-pro
1
1
Fork 0
mirror of https://github.com/weizhiqiang1995/erp-pro.git synced 2025-01-15 11:48:21 +08:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'company_server' of https://gitee.com/doc_wei01/skyeye into company_server

Browse source
This commit is contained in:
wst 2024-11-24 15:18:43 +08:00
commit 697487ccf7
3 changed files with 17 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
skyeye-school/school-pro/src/main/java/com/skyeye/eve/entity/School.java
View file

@ -42,19 +42,19 @@ public class School extends AreaGeneralInfo {
@TableField(value = "ne_longitude")
@ApiModelProperty(value = "东北经度")
private Float neLongitude;
private String neLongitude;
@TableField(value = "ne_latitude")
@ApiModelProperty(value = "东北纬度")
private Float neLatitude;
private String neLatitude;
@TableField(value = "sw_longitude")
@ApiModelProperty(value = "西南经度")
private Float swLongitude;
private String swLongitude;
@TableField(value = "sw_latitude")
@ApiModelProperty(value = "西南纬度")
private Float swLatitude;
private String swLatitude;
@TableField(value = "background")
@ApiModelProperty(value = "学校背景图")

19
skyeye-school/school-pro/src/main/java/com/skyeye/eve/service/impl/SchoolServiceImpl.java
View file

@ -14,7 +14,6 @@ import com.skyeye.common.util.mybatisplus.MybatisPlusUtil;
import com.skyeye.eve.dao.SchoolDao;
import com.skyeye.eve.entity.School;
import com.skyeye.eve.service.SchoolService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
@ -32,12 +31,16 @@ import java.util.Map;
@SkyeyeService(name = "学校管理", groupName = "学校管理")
public class SchoolServiceImpl extends SkyeyeBusinessServiceImpl<SchoolDao, School> implements SchoolService {
/**
* 获取所有学校列表展示为下拉选择框
*
* @param inputObject 入参以及用户信息等获取对象
* @param outputObject 出参以及提示信息的返回值对象
*/
@Override
public void updatePrepose(School entity) {
School school = selectById(entity.getId());
entity.setBackground(school.getBackground());
entity.setNeLongitude(school.getNeLongitude());
entity.setNeLatitude(school.getNeLatitude());
entity.setSwLongitude(school.getSwLongitude());
entity.setSwLatitude(school.getSwLatitude());
}
@Override
public void queryAllSchoolList(InputObject inputObject, OutputObject outputObject) {
List<School> schoolList = list();
@ -51,7 +54,7 @@ public class SchoolServiceImpl extends SkyeyeBusinessServiceImpl<SchoolDao, Scho
UpdateWrapper<School> updateWrapper = new UpdateWrapper<>();
updateWrapper.eq(CommonConstants.ID, map.get("id").toString());
updateWrapper.set(MybatisPlusUtil.toColumns(School::getBackground), map.get("background").toString());
updateWrapper.set(MybatisPlusUtil.toColumns(School::getNeLongitude),map.get("neLongitude").toString());
updateWrapper.set(MybatisPlusUtil.toColumns(School::getNeLongitude), map.get("neLongitude").toString());
updateWrapper.set(MybatisPlusUtil.toColumns(School::getNeLatitude), map.get("neLatitude").toString());
updateWrapper.set(MybatisPlusUtil.toColumns(School::getSwLongitude), map.get("swLongitude").toString());
updateWrapper.set(MybatisPlusUtil.toColumns(School::getSwLatitude), map.get("swLatitude").toString());

4
skyeye-school/school-pro/src/main/java/com/skyeye/school/building/entity/TeachBuilding.java
View file

@ -49,11 +49,11 @@ public class TeachBuilding extends AreaGeneralInfo {
@TableField("longitude")
@ApiModelProperty(value = "经度",required = "required")
private Float longitude;
private String longitude;
@TableField("latitude")
@ApiModelProperty(value = "纬度",required = "required")
private Float latitude;
private String latitude;
@TableField("logo")
@ApiModelProperty(value = "地点logo" ,required = "required")