wuzhen 更新页面修复
This commit is contained in:
1 parent
c992f192b2
commit
ff261194e3
14 files changed
+1131
-898
No files matched your search
+10
@@ -189,6 +189,16 @@ public class ZsjyGraduateInfo extends TenantEntity implements Serializable {
|
||||
*/
|
||||
private String workCity;
|
||||
|
||||
/**
|
||||
* 工作地点
|
||||
*/
|
||||
private String workLocation;
|
||||
|
||||
/**
|
||||
* 完整地址
|
||||
*/
|
||||
private String fullAddress;
|
||||
|
||||
/**
|
||||
* 月薪范围 (1-3000以下 2-3000-5000 3-5000-8000 4-8000-12000 5-12000以上)
|
||||
*/
|
||||
|
||||
+10
@@ -220,6 +220,16 @@ public class ZsjyGraduateInfoBo extends BaseEntity {
|
||||
*/
|
||||
private String workCity;
|
||||
|
||||
/**
|
||||
* 工作地点
|
||||
*/
|
||||
private String workLocation;
|
||||
|
||||
/**
|
||||
* 完整地址
|
||||
*/
|
||||
private String fullAddress;
|
||||
|
||||
/**
|
||||
* 月薪范围 (1-3000以下 2-3000-5000 3-5000-8000 4-8000-12000 5-12000以上)
|
||||
*/
|
||||
|
||||
+25
-5
@@ -43,7 +43,10 @@ public class ZsjyGraduateInfoServiceImpl implements IZsjyGraduateInfoService {
|
||||
*/
|
||||
@Override
|
||||
public ZsjyGraduateInfoVo queryById(Long id) {
|
||||
return baseMapper.selectVoById(id);
|
||||
ZsjyGraduateInfoBo bo = new ZsjyGraduateInfoBo();
|
||||
bo.setId(id);
|
||||
List<ZsjyGraduateInfoVo> list = baseMapper.selectGraduateInfoVoList(bo);
|
||||
return list.isEmpty() ? null : list.get(0);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -55,8 +58,8 @@ public class ZsjyGraduateInfoServiceImpl implements IZsjyGraduateInfoService {
|
||||
*/
|
||||
@Override
|
||||
public TableDataInfo<ZsjyGraduateInfoVo> queryPageList(ZsjyGraduateInfoBo bo, PageQuery pageQuery) {
|
||||
LambdaQueryWrapper<ZsjyGraduateInfo> lqw = buildQueryWrapper(bo);
|
||||
Page<ZsjyGraduateInfoVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
|
||||
Page<ZsjyGraduateInfoVo> page = pageQuery.build();
|
||||
IPage<ZsjyGraduateInfoVo> result = baseMapper.selectGraduateInfoPageList(page, bo);
|
||||
return TableDataInfo.build(result);
|
||||
}
|
||||
|
||||
@@ -68,8 +71,7 @@ public class ZsjyGraduateInfoServiceImpl implements IZsjyGraduateInfoService {
|
||||
*/
|
||||
@Override
|
||||
public List<ZsjyGraduateInfoVo> queryList(ZsjyGraduateInfoBo bo) {
|
||||
LambdaQueryWrapper<ZsjyGraduateInfo> lqw = buildQueryWrapper(bo);
|
||||
return baseMapper.selectVoList(lqw);
|
||||
return baseMapper.selectGraduateInfoVoList(bo);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -211,6 +213,24 @@ public class ZsjyGraduateInfoServiceImpl implements IZsjyGraduateInfoService {
|
||||
throw new RuntimeException("升学状态下,升学院校不能为空");
|
||||
}
|
||||
}
|
||||
|
||||
// 自动设置组合字段
|
||||
// 设置工作地点(工作省份 + 工作城市)
|
||||
if (StringUtils.isNotBlank(entity.getWorkProvince()) || StringUtils.isNotBlank(entity.getWorkCity())) {
|
||||
String workLocation = StringUtils.defaultString(entity.getWorkProvince(), "") +
|
||||
StringUtils.defaultString(entity.getWorkCity(), "");
|
||||
entity.setWorkLocation(workLocation);
|
||||
}
|
||||
|
||||
// 设置完整地址(省份 + 城市 + 区县 + 详细地址)
|
||||
if (StringUtils.isNotBlank(entity.getProvince()) || StringUtils.isNotBlank(entity.getCity()) ||
|
||||
StringUtils.isNotBlank(entity.getDistrict()) || StringUtils.isNotBlank(entity.getDetailAddress())) {
|
||||
String fullAddress = StringUtils.defaultString(entity.getProvince(), "") +
|
||||
StringUtils.defaultString(entity.getCity(), "") +
|
||||
StringUtils.defaultString(entity.getDistrict(), "") +
|
||||
StringUtils.defaultString(entity.getDetailAddress(), "");
|
||||
entity.setFullAddress(fullAddress);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@@ -139,6 +139,9 @@
|
||||
<select id="selectGraduateInfoPageList" resultMap="ZsjyGraduateInfoVoResult">
|
||||
<include refid="selectZsjyGraduateInfoVo"/>
|
||||
<if test="bo != null">
|
||||
<if test="bo.id != null">
|
||||
and g.id = #{bo.id}
|
||||
</if>
|
||||
<if test="bo.studentNo != null and bo.studentNo != ''">
|
||||
and g.student_no like concat('%', #{bo.studentNo}, '%')
|
||||
</if>
|
||||
@@ -239,6 +242,9 @@
|
||||
<!-- 查询毕业生信息列表(非分页) -->
|
||||
<select id="selectGraduateInfoVoList" parameterType="org.dromara.zsjy.domain.bo.ZsjyGraduateInfoBo" resultMap="ZsjyGraduateInfoVoResult">
|
||||
<include refid="selectZsjyGraduateInfoVo"/>
|
||||
<if test="id != null">
|
||||
and g.id = #{id}
|
||||
</if>
|
||||
<if test="studentNo != null and studentNo != ''">
|
||||
and g.student_no like concat('%', #{studentNo}, '%')
|
||||
</if>
|
||||
|
||||
Reference in new issue
Block a user