From 3acdace06b13aa595c8f5f23db0bb3d2e42aea52 Mon Sep 17 00:00:00 2001 From: Aug <17674666882@163.com> Date: Mon, 7 Jul 2025 09:26:08 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E5=9C=B0=E5=9D=80=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E4=B8=BA=E4=B8=89=E7=BA=A7=E8=81=94=E5=8A=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/EmployAddressController.java | 80 ++++- .../employAddress/entity/EmployAddress.java | 17 +- .../employAddress/mapper/EmployAddressMapper.java | 11 +- .../mapper/xml/EmployAddressMapper.xml | 4 + .../service/IEmployAddressService.java | 26 +- .../service/impl/EmployAddressServiceImpl.java | 174 +++++++++- .../employAddress/vue/EmployAddressList.vue | 242 +++++++++++-- .../vue/modules/EmployAddressModal.vue | 137 ++++++-- .../employAddress/vue3/EmployAddress.api.ts | 39 ++- .../employAddress/vue3/EmployAddress.data.ts | 7 +- .../employAddress/vue3/EmployAddressList.vue | 378 +++++++++++++-------- .../vue3/components/EmployAddressModal.vue | 129 ++++--- .../modules/api/controller2/ConfigController.java | 4 +- .../api/employController/CommonApiController.java | 4 +- .../jeecg/modules/apiService/CommonApiService.java | 2 +- .../jeecg/modules/apiService/ConfigService.java | 2 +- .../apiService/impl/CommonApiServiceImpl.java | 22 +- .../modules/apiService/impl/ConfigServiceImpl.java | 8 +- .../modules/apiService/impl/JobServiceImpl.java | 4 + .../modules/apiService/impl/ResumeServiceImpl.java | 8 +- 20 files changed, 1010 insertions(+), 288 deletions(-) diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employAddress/controller/EmployAddressController.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employAddress/controller/EmployAddressController.java index 77d50bc..54acbc2 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employAddress/controller/EmployAddressController.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employAddress/controller/EmployAddressController.java @@ -39,14 +39,14 @@ import org.jeecg.common.aspect.annotation.AutoLog; /** * @Description: 地址表 * @Author: jeecg-boot - * @Date: 2024-12-22 + * @Date: 2025-07-01 * @Version: V1.0 */ @Api(tags="地址表") @RestController @RequestMapping("/employAddress/employAddress") @Slf4j -public class EmployAddressController extends JeecgController { +public class EmployAddressController extends JeecgController{ @Autowired private IEmployAddressService employAddressService; @@ -61,16 +61,74 @@ public class EmployAddressController extends JeecgController> queryPageList(EmployAddress employAddress, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, HttpServletRequest req) { + String hasQuery = req.getParameter("hasQuery"); + if(hasQuery != null && "true".equals(hasQuery)){ + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(employAddress, req.getParameterMap()); + List list = employAddressService.queryTreeListNoPage(queryWrapper); + IPage pageList = new Page<>(1, 10, list.size()); + pageList.setRecords(list); + return Result.OK(pageList); + }else{ + String parentId = employAddress.getPid(); + if (oConvertUtils.isEmpty(parentId)) { + parentId = "0"; + } + employAddress.setPid(null); + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(employAddress, req.getParameterMap()); + // 使用 eq 防止模糊查询 + queryWrapper.eq("pid", parentId); + Page page = new Page(pageNo, pageSize); + IPage pageList = employAddressService.page(page, queryWrapper); + return Result.OK(pageList); + } + } + + /** + * 获取子数据 + * @param employAddress + * @param req + * @return + */ + //@AutoLog(value = "地址表-获取子数据") + @ApiOperation(value="地址表-获取子数据", notes="地址表-获取子数据") + @GetMapping(value = "/childList") + public Result> queryPageList(EmployAddress employAddress,HttpServletRequest req) { QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(employAddress, req.getParameterMap()); - Page page = new Page(pageNo, pageSize); - IPage pageList = employAddressService.page(page, queryWrapper); + List list = employAddressService.list(queryWrapper); + IPage pageList = new Page<>(1, 10, list.size()); + pageList.setRecords(list); return Result.OK(pageList); } + + /** + * 批量查询子节点 + * @param parentIds 父ID（多个采用半角逗号分割） + * @return 返回 IPage + * @param parentIds + * @return + */ + //@AutoLog(value = "地址表-批量获取子数据") + @ApiOperation(value="地址表-批量获取子数据", notes="地址表-批量获取子数据") + @GetMapping("/getChildListBatch") + public Result getChildListBatch(@RequestParam("parentIds") String parentIds) { + try { + QueryWrapper queryWrapper = new QueryWrapper<>(); + List parentIdList = Arrays.asList(parentIds.split(",")); + queryWrapper.in("pid", parentIdList); + List list = employAddressService.list(queryWrapper); + IPage pageList = new Page<>(1, 10, list.size()); + pageList.setRecords(list); + return Result.OK(pageList); + } catch (Exception e) { + log.error(e.getMessage(), e); + return Result.error("批量查询子节点失败：" + e.getMessage()); + } + } /** * 添加 @@ -82,7 +140,7 @@ public class EmployAddressController extends JeecgController add(@RequestBody EmployAddress employAddress) { - employAddressService.save(employAddress); + employAddressService.addEmployAddress(employAddress); return Result.OK("添加成功！"); } @@ -96,7 +154,7 @@ public class EmployAddressController extends JeecgController edit(@RequestBody EmployAddress employAddress) { - employAddressService.updateById(employAddress); + employAddressService.updateEmployAddress(employAddress); return Result.OK("编辑成功!"); } @@ -110,7 +168,7 @@ public class EmployAddressController extends JeecgController delete(@RequestParam(name="id",required=true) String id) { - employAddressService.removeById(id); + employAddressService.deleteEmployAddress(id); return Result.OK("删除成功!"); } @@ -125,7 +183,7 @@ public class EmployAddressController extends JeecgController deleteBatch(@RequestParam(name="ids",required=true) String ids) { this.employAddressService.removeByIds(Arrays.asList(ids.split(","))); - return Result.OK("批量删除成功!"); + return Result.OK("批量删除成功！"); } /** @@ -153,7 +211,7 @@ public class EmployAddressController extends JeecgController importExcel(HttpServletRequest request, HttpServletResponse response) { - return super.importExcel(request, response, EmployAddress.class); + return super.importExcel(request, response, EmployAddress.class); } } diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employAddress/entity/EmployAddress.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employAddress/entity/EmployAddress.java index bfdbd82..6fc24d7 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employAddress/entity/EmployAddress.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employAddress/entity/EmployAddress.java @@ -1,7 +1,6 @@ package org.jeecg.modules.employAddress.entity; import java.io.Serializable; -import java.io.UnsupportedEncodingException; import java.util.Date; import java.math.BigDecimal; import com.baomidou.mybatisplus.annotation.IdType; @@ -14,19 +13,16 @@ import org.jeecgframework.poi.excel.annotation.Excel; import org.jeecg.common.aspect.annotation.Dict; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; +import java.io.UnsupportedEncodingException; /** * @Description: 地址表 * @Author: jeecg-boot - * @Date: 2024-12-22 + * @Date: 2025-07-01 * @Version: V1.0 */ @Data @TableName("employ_address") -@Accessors(chain = true) -@EqualsAndHashCode(callSuper = false) @ApiModel(value="employ_address对象", description="地址表") public class EmployAddress implements Serializable { private static final long serialVersionUID = 1L; @@ -51,4 +47,13 @@ public class EmployAddress implements Serializable { @Excel(name = "地址", width = 15) @ApiModelProperty(value = "地址") private java.lang.String adress; + /**父级节点*/ + @Excel(name = "父级节点", width = 15) + @ApiModelProperty(value = "父级节点") + private java.lang.String pid; + /**是否有子节点*/ + @Excel(name = "是否有子节点", width = 15, dicCode = "yn") + @Dict(dicCode = "yn") + @ApiModelProperty(value = "是否有子节点") + private java.lang.String hasChild; } diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employAddress/mapper/EmployAddressMapper.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employAddress/mapper/EmployAddressMapper.java index b196c31..c06f911 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employAddress/mapper/EmployAddressMapper.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employAddress/mapper/EmployAddressMapper.java @@ -1,7 +1,5 @@ package org.jeecg.modules.employAddress.mapper; -import java.util.List; - import org.apache.ibatis.annotations.Param; import org.jeecg.modules.employAddress.entity.EmployAddress; import com.baomidou.mybatisplus.core.mapper.BaseMapper; @@ -9,9 +7,16 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** * @Description: 地址表 * @Author: jeecg-boot - * @Date: 2024-12-22 + * @Date: 2025-07-01 * @Version: V1.0 */ public interface EmployAddressMapper extends BaseMapper { + /** + * 编辑节点状态 + * @param id + * @param status + */ + void updateTreeNodeStatus(@Param("id") String id,@Param("status") String status); + } diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employAddress/mapper/xml/EmployAddressMapper.xml b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employAddress/mapper/xml/EmployAddressMapper.xml index 046a420..af997be 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employAddress/mapper/xml/EmployAddressMapper.xml +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employAddress/mapper/xml/EmployAddressMapper.xml @@ -2,4 +2,8 @@ + + update employ_address set has_child = #{status} where id = #{id} + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employAddress/service/IEmployAddressService.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employAddress/service/IEmployAddressService.java index 0951e98..6f7a1bb 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employAddress/service/IEmployAddressService.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employAddress/service/IEmployAddressService.java @@ -2,13 +2,37 @@ package org.jeecg.modules.employAddress.service; import org.jeecg.modules.employAddress.entity.EmployAddress; import com.baomidou.mybatisplus.extension.service.IService; +import org.jeecg.common.exception.JeecgBootException; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import java.util.List; /** * @Description: 地址表 * @Author: jeecg-boot - * @Date: 2024-12-22 + * @Date: 2025-07-01 * @Version: V1.0 */ public interface IEmployAddressService extends IService { + /**根节点父ID的值*/ + public static final String ROOT_PID_VALUE = "0"; + + /**树节点有子节点状态值*/ + public static final String HASCHILD = "1"; + + /**树节点无子节点状态值*/ + public static final String NOCHILD = "0"; + + /**新增节点*/ + void addEmployAddress(EmployAddress employAddress); + + /**修改节点*/ + void updateEmployAddress(EmployAddress employAddress) throws JeecgBootException; + + /**删除节点*/ + void deleteEmployAddress(String id) throws JeecgBootException; + + /**查询所有数据，无分页*/ + List queryTreeListNoPage(QueryWrapper queryWrapper); + } diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employAddress/service/impl/EmployAddressServiceImpl.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employAddress/service/impl/EmployAddressServiceImpl.java index 2a85258..b43ea20 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employAddress/service/impl/EmployAddressServiceImpl.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employAddress/service/impl/EmployAddressServiceImpl.java @@ -1,19 +1,191 @@ package org.jeecg.modules.employAddress.service.impl; +import org.jeecg.common.exception.JeecgBootException; +import org.jeecg.common.util.oConvertUtils; import org.jeecg.modules.employAddress.entity.EmployAddress; import org.jeecg.modules.employAddress.mapper.EmployAddressMapper; import org.jeecg.modules.employAddress.service.IEmployAddressService; import org.springframework.stereotype.Service; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import org.springframework.transaction.annotation.Transactional; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; /** * @Description: 地址表 * @Author: jeecg-boot - * @Date: 2024-12-22 + * @Date: 2025-07-01 * @Version: V1.0 */ @Service public class EmployAddressServiceImpl extends ServiceImpl implements IEmployAddressService { + @Override + public void addEmployAddress(EmployAddress employAddress) { + //新增时设置hasChild为0 + employAddress.setHasChild(IEmployAddressService.NOCHILD); + if(oConvertUtils.isEmpty(employAddress.getPid())){ + employAddress.setPid(IEmployAddressService.ROOT_PID_VALUE); + }else{ + //如果当前节点父ID不为空 则设置父节点的hasChildren 为1 + EmployAddress parent = baseMapper.selectById(employAddress.getPid()); + if(parent!=null && !"1".equals(parent.getHasChild())){ + parent.setHasChild("1"); + baseMapper.updateById(parent); + } + } + baseMapper.insert(employAddress); + } + + @Override + public void updateEmployAddress(EmployAddress employAddress) { + EmployAddress entity = this.getById(employAddress.getId()); + if(entity==null) { + throw new JeecgBootException("未找到对应实体"); + } + String old_pid = entity.getPid(); + String new_pid = employAddress.getPid(); + if(!old_pid.equals(new_pid)) { + updateOldParentNode(old_pid); + if(oConvertUtils.isEmpty(new_pid)){ + employAddress.setPid(IEmployAddressService.ROOT_PID_VALUE); + } + if(!IEmployAddressService.ROOT_PID_VALUE.equals(employAddress.getPid())) { + baseMapper.updateTreeNodeStatus(employAddress.getPid(), IEmployAddressService.HASCHILD); + } + } + baseMapper.updateById(employAddress); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void deleteEmployAddress(String id) throws JeecgBootException { + //查询选中节点下所有子节点一并删除 + id = this.queryTreeChildIds(id); + if(id.indexOf(",")>0) { + StringBuffer sb = new StringBuffer(); + String[] idArr = id.split(","); + for (String idVal : idArr) { + if(idVal != null){ + EmployAddress employAddress = this.getById(idVal); + String pidVal = employAddress.getPid(); + //查询此节点上一级是否还有其他子节点 + List dataList = baseMapper.selectList(new QueryWrapper().eq("pid", pidVal).notIn("id",Arrays.asList(idArr))); + if((dataList == null || dataList.size()==0) && !Arrays.asList(idArr).contains(pidVal) + && !sb.toString().contains(pidVal)){ + //如果当前节点原本有子节点 现在木有了，更新状态 + sb.append(pidVal).append(","); + } + } + } + //批量删除节点 + baseMapper.deleteBatchIds(Arrays.asList(idArr)); + //修改已无子节点的标识 + String[] pidArr = sb.toString().split(","); + for(String pid : pidArr){ + this.updateOldParentNode(pid); + } + }else{ + EmployAddress employAddress = this.getById(id); + if(employAddress==null) { + throw new JeecgBootException("未找到对应实体"); + } + updateOldParentNode(employAddress.getPid()); + baseMapper.deleteById(id); + } + } + + @Override + public List queryTreeListNoPage(QueryWrapper queryWrapper) { + List dataList = baseMapper.selectList(queryWrapper); + List mapList = new ArrayList<>(); + for(EmployAddress data : dataList){ + String pidVal = data.getPid(); + //递归查询子节点的根节点 + if(pidVal != null && !"0".equals(pidVal)){ + EmployAddress rootVal = this.getTreeRoot(pidVal); + if(rootVal != null && !mapList.contains(rootVal)){ + mapList.add(rootVal); + } + }else{ + if(!mapList.contains(data)){ + mapList.add(data); + } + } + } + return mapList; + } + + /** + * 根据所传pid查询旧的父级节点的子节点并修改相应状态值 + * @param pid + */ + private void updateOldParentNode(String pid) { + if(!IEmployAddressService.ROOT_PID_VALUE.equals(pid)) { + Integer count = Math.toIntExact(baseMapper.selectCount(new QueryWrapper().eq("pid", pid))); + if(count==null || count<=1) { + baseMapper.updateTreeNodeStatus(pid, IEmployAddressService.NOCHILD); + } + } + } + + /** + * 递归查询节点的根节点 + * @param pidVal + * @return + */ + private EmployAddress getTreeRoot(String pidVal){ + EmployAddress data = baseMapper.selectById(pidVal); + if(data != null && !"0".equals(data.getPid())){ + return this.getTreeRoot(data.getPid()); + }else{ + return data; + } + } + + /** + * 根据id查询所有子节点id + * @param ids + * @return + */ + private String queryTreeChildIds(String ids) { + //获取id数组 + String[] idArr = ids.split(","); + StringBuffer sb = new StringBuffer(); + for (String pidVal : idArr) { + if(pidVal != null){ + if(!sb.toString().contains(pidVal)){ + if(sb.toString().length() > 0){ + sb.append(","); + } + sb.append(pidVal); + this.getTreeChildIds(pidVal,sb); + } + } + } + return sb.toString(); + } + + /** + * 递归查询所有子节点 + * @param pidVal + * @param sb + * @return + */ + private StringBuffer getTreeChildIds(String pidVal,StringBuffer sb){ + List dataList = baseMapper.selectList(new QueryWrapper().eq("pid", pidVal)); + if(dataList != null && dataList.size()>0){ + for(EmployAddress tree : dataList) { + if(!sb.toString().contains(tree.getId())){ + sb.append(",").append(tree.getId()); + } + this.getTreeChildIds(tree.getId(),sb); + } + } + return sb; + } + } diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employAddress/vue/EmployAddressList.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employAddress/vue/EmployAddressList.vue index 4ffb0e7..e622b2f 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employAddress/vue/EmployAddressList.vue +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employAddress/vue/EmployAddressList.vue @@ -51,20 +51,18 @@ + :expandedRowKeys="expandedRowKeys" + @change="handleTableChange" + @expand="handleExpand" + v-bind="tableProps"> - \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employAddress/vue3/EmployAddress.api.ts b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employAddress/vue3/EmployAddress.api.ts index 2483024..d7072e7 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employAddress/vue3/EmployAddress.api.ts +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employAddress/vue3/EmployAddress.api.ts @@ -1,14 +1,17 @@ -import {defHttp} from '/@/utils/http/axios'; +import {defHttp} from "/@/utils/http/axios"; import {Modal} from 'ant-design-vue'; enum Api { - list = '/employAddress/employAddress/list', + list = '/employAddress/employAddress/rootList', save='/employAddress/employAddress/add', edit='/employAddress/employAddress/edit', - deleteOne = '/employAddress/employAddress/delete', + deleteEmployAddress = '/sys/employAddress/delete', deleteBatch = '/employAddress/employAddress/deleteBatch', importExcel = '/employAddress/employAddress/importExcel', exportXls = '/employAddress/employAddress/exportXls', + loadTreeData = '/employAddress/employAddress/loadTreeRoot', + getChildList = '/employAddress/employAddress/childList', + getChildListBatch = '/employAddress/employAddress/getChildListBatch', } /** * 导出api @@ -17,6 +20,7 @@ enum Api { export const getExportUrl = Api.exportXls; /** * 导入api + * @param params */ export const getImportUrl = Api.importExcel; /** @@ -25,12 +29,11 @@ export const getImportUrl = Api.importExcel; */ export const list = (params) => defHttp.get({url: Api.list, params}); - /** - * 删除单个 + * 删除 */ -export const deleteOne = (params,handleSuccess) => { - return defHttp.delete({url: Api.deleteOne, params}, {joinParamsToUrl: true}).then(() => { +export const deleteEmployAddress = (params,handleSuccess) => { + return defHttp.delete({url: Api.deleteEmployAddress, params}, {joinParamsToUrl: true}).then(() => { handleSuccess(); }); } @@ -38,7 +41,7 @@ export const deleteOne = (params,handleSuccess) => { * 批量删除 * @param params */ -export const batchDelete = (params, handleSuccess) => { +export const batchDeleteEmployAddress = (params, handleSuccess) => { Modal.confirm({ title: '确认删除', content: '是否删除选中数据', @@ -55,7 +58,25 @@ export const batchDelete = (params, handleSuccess) => { * 保存或者更新 * @param params */ -export const saveOrUpdate = (params, isUpdate) => { +export const saveOrUpdateDict = (params, isUpdate) => { let url = isUpdate ? Api.edit : Api.save; return defHttp.post({url: url, params}); } +/** + * 查询全部树形节点数据 + * @param params + */ +export const loadTreeData = (params) => + defHttp.get({url: Api.loadTreeData,params}); +/** + * 查询子节点数据 + * @param params + */ +export const getChildList = (params) => + defHttp.get({url: Api.getChildList, params}); +/** + * 批量查询子节点数据 + * @param params + */ +export const getChildListBatch = (params) => + defHttp.get({url: Api.getChildListBatch, params},{isTransformResponse:false}); diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employAddress/vue3/EmployAddress.data.ts b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employAddress/vue3/EmployAddress.data.ts index bd4d3f4..1ec7c4e 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employAddress/vue3/EmployAddress.data.ts +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employAddress/vue3/EmployAddress.data.ts @@ -17,7 +17,7 @@ export const searchFormSchema: FormSchema[] = [ field: "adress", component: 'Input', colProps: {span: 6}, - }, + }, ]; //表单数据 export const formSchema: FormSchema[] = [ @@ -26,4 +26,9 @@ export const formSchema: FormSchema[] = [ field: 'adress', component: 'Input', }, + { + label: '父级节点', + field: 'pid', + component: 'Input', + }, ]; diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employAddress/vue3/EmployAddressList.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employAddress/vue3/EmployAddressList.vue index 2caacf9..3f941db 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employAddress/vue3/EmployAddressList.vue +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employAddress/vue3/EmployAddressList.vue @@ -1,162 +1,272 @@ \ No newline at end of file + diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employAddress/vue3/components/EmployAddressModal.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employAddress/vue3/components/EmployAddressModal.vue index 73bdee4..4cfb09e 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employAddress/vue3/components/EmployAddressModal.vue +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employAddress/vue3/components/EmployAddressModal.vue @@ -1,58 +1,87 @@ - - - \ No newline at end of file diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/controller2/ConfigController.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/controller2/ConfigController.java index 053b8c1..d4e2967 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/controller2/ConfigController.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/controller2/ConfigController.java @@ -60,8 +60,8 @@ public class ConfigController { //获取地址列表 @ApiOperation(value="首页-获取地址列表", notes="首页-获取地址列表") @RequestMapping(value = "/queryAddressList", method = {RequestMethod.GET}) - public Result queryAddressList(PageBean pageBean){ - return configService.queryAddressList(pageBean); + public Result queryAddressList(String pid, PageBean pageBean){ + return configService.queryAddressList(pid, pageBean); } } diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/employController/CommonApiController.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/employController/CommonApiController.java index 4412495..5f4be69 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/employController/CommonApiController.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/employController/CommonApiController.java @@ -59,8 +59,8 @@ public class CommonApiController { //获取地址列表 @ApiOperation(value="首页-获取地址列表", notes="首页-获取地址列表") @RequestMapping(value = "/queryAddressList", method = {RequestMethod.GET}) - public Result queryAddressList(PageBean pageBean){ - return commonApiService.queryAddressList(pageBean); + public Result queryAddressList(String pid, PageBean pageBean){ + return commonApiService.queryAddressList(pid, pageBean); } /***************记工记账***************/ diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/CommonApiService.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/CommonApiService.java index 992080f..4c6bdf5 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/CommonApiService.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/CommonApiService.java @@ -23,7 +23,7 @@ public interface CommonApiService { public Result queryJobNatureList(PageBean pageBean); //获取地址列表带分页 - public Result queryAddressList(PageBean pageBean); + public Result queryAddressList(String pid, PageBean pageBean); /***************记工记账***************/ //个人记工-新建账本 diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/ConfigService.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/ConfigService.java index 476df6b..c4dd141 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/ConfigService.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/ConfigService.java @@ -45,7 +45,7 @@ public interface ConfigService { * @param pageBean * @return */ - public Result queryAddressList(PageBean pageBean); + public Result queryAddressList(String pid, PageBean pageBean); } diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/CommonApiServiceImpl.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/CommonApiServiceImpl.java index 7396e3d..a569645 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/CommonApiServiceImpl.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/CommonApiServiceImpl.java @@ -2,6 +2,7 @@ package org.jeecg.modules.apiService.impl; import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import org.apache.commons.lang.StringUtils; import org.jeecg.common.api.vo.Result; import org.jeecg.config.shiro.ShiroRealm; import org.jeecg.modules.apiBean.PageBean; @@ -161,13 +162,22 @@ public class CommonApiServiceImpl implements CommonApiService { //获取地址列表带分页 @Override - public Result queryAddressList(PageBean pageBean) { - Page page = new Page(pageBean.getPageNo(), pageBean.getPageSize()); - Page pageList = employAddressService - .lambdaQuery() - .page(page); + public Result queryAddressList(String pid, PageBean pageBean) { + try{ + if(StringUtils.isEmpty(pid)){ + pid = "0"; + } + Page page = new Page(pageBean.getPageNo(), pageBean.getPageSize()); + Page pageList = employAddressService + .lambdaQuery() + .eq(EmployAddress::getPid, pid) + .page(page); - return Result.OK("地址列表", pageList); + return Result.OK("地址列表", pageList); + }catch (Exception e){ + e.printStackTrace(); + return Result.error("地址列表查询失败"); + } } /***************记工记账***************/ diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/ConfigServiceImpl.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/ConfigServiceImpl.java index 39d1c2a..4c0dc52 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/ConfigServiceImpl.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/ConfigServiceImpl.java @@ -1,6 +1,7 @@ package org.jeecg.modules.apiService.impl; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import org.apache.commons.lang.StringUtils; import org.jeecg.common.api.vo.Result; import org.jeecg.modules.apiBean.PageBean; import org.jeecg.modules.apiService.ConfigService; @@ -101,6 +102,7 @@ public class ConfigServiceImpl implements ConfigService { Page page = new Page(pageBean.getPageNo(), pageBean.getPageSize()); Page pageList = employJobTypeService .lambdaQuery() + .orderByAsc(EmployJobType::getTypeOrder) .page(page); return Result.OK("工种列表", pageList); @@ -129,11 +131,15 @@ public class ConfigServiceImpl implements ConfigService { //获取地址列表带分页 @Override - public Result queryAddressList(PageBean pageBean) { + public Result queryAddressList(String pid, PageBean pageBean) { try{ + if(StringUtils.isEmpty(pid)){ + pid = "0"; + } Page page = new Page(pageBean.getPageNo(), pageBean.getPageSize()); Page pageList = employAddressService .lambdaQuery() + .eq(EmployAddress::getPid, pid) .page(page); return Result.OK("地址列表", pageList); diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/JobServiceImpl.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/JobServiceImpl.java index 9199498..bf48f05 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/JobServiceImpl.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/JobServiceImpl.java @@ -87,6 +87,10 @@ public class JobServiceImpl implements JobService { //工作地域 query.eq(EmployJob::getAreaId, employJob.getAreaId()); } + if(null != employJob.getWorkAddress()){ + //工作地址 + query.like(EmployJob::getWorkAddress, employJob.getWorkAddress()); + } if(null != employJob.getTypeId()){ //工作类型 query.eq(EmployJob::getTypeId, employJob.getTypeId()); diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/ResumeServiceImpl.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/ResumeServiceImpl.java index 87cfa41..c303a54 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/ResumeServiceImpl.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/ResumeServiceImpl.java @@ -82,7 +82,7 @@ public class ResumeServiceImpl implements ResumeService { } if(null != employResume.getExpectAddress()){ //期望工作地点 - query.eq(EmployResume::getExpectAddress, employResume.getExpectAddress()); + query.like(EmployResume::getExpectAddress, employResume.getExpectAddress()); } if(null != employResume.getTitle()){ //简历名称 @@ -139,9 +139,9 @@ public class ResumeServiceImpl implements ResumeService { EmployResume resume = employResumeService.getById(resumeId); map.put("resume", resume); - //简历期望工作地 - EmployAddress address = employAddressService.getById(resume.getExpectAddress()); - resume.setExpectAddressName(address.getAdress()); +// //简历期望工作地 +// EmployAddress address = employAddressService.getById(resume.getExpectAddress()); +// resume.setExpectAddressName(address.getAdress()); //2、获取个人实名认证信息 EmployAuthenticationPerson person = employAuthenticationPersonService