添加维护人、维护人工号检索查询

src/main/java/com/ydtech/modules/admin/controller/SysDictController.java

@@ -5,15 +5,16 @@ import com.ydtech.config.DictEnumConfig;
 import com.ydtech.constants.enums.dict.DictionaryManagement;
 import com.ydtech.core.page.HttpResult;
 import com.ydtech.core.page.PageRequest;
+import com.ydtech.exception.SystemException;
 import com.ydtech.modules.admin.model.SysAccount;
 import com.ydtech.modules.admin.model.SysDict;
 import com.ydtech.modules.admin.model.SysDictType;
 import com.ydtech.modules.admin.model.SysUser;
+import com.ydtech.modules.admin.model.vo.TreeSysDeptVO;
 import com.ydtech.modules.admin.service.SysAccountService;
 import com.ydtech.modules.admin.service.SysDeptService;
 import com.ydtech.modules.admin.service.SysDictService;
 import com.ydtech.modules.admin.service.SysDictTypeService;
-import com.ydtech.modules.admin.model.vo.TreeSysDeptVO;
 import com.ydtech.modules.base.controller.BaseController;
 import com.ydtech.modules.esm.model.EsmInsCompany;
 import com.ydtech.modules.esm.model.EsmProduct;
@@ -325,4 +326,13 @@ public class SysDictController extends BaseController {
 
         return dictList;
     }
+
+    @ApiOperation(value = "获取单个字典列表")
+    @GetMapping("/dictListByType")
+    public HttpResult<List<SysDict>> dictListByType(String type) {
+        if(StringUtils.isBlank(type)){
+            throw new SystemException("类型为空");
+        }
+        return HttpResult.ok(sysDictService.findByLable(type));
+    }
 }

src/main/java/com/ydtech/modules/admin/controller/SysUserLinkFrontLineDeptController.java

@@ -0,0 +1,113 @@
+package com.ydtech.modules.admin.controller;
+
+
+import com.ydtech.core.page.HttpResult;
+import com.ydtech.modules.admin.model.SysDept;
+import com.ydtech.modules.admin.model.dto.SysUserDto;
+import com.ydtech.modules.admin.model.dto.SysUserLinkFrontLineDeptDto;
+import com.ydtech.modules.admin.model.vo.SysUserBaseVO;
+import com.ydtech.modules.admin.model.vo.SysUserLinkFrontLineDeptAddVo;
+import com.ydtech.modules.admin.model.vo.SysUserLinkFrontLineDeptIdsVo;
+import com.ydtech.modules.admin.model.vo.SysUserLinkFrontLineDeptQueryVo;
+import com.ydtech.modules.admin.service.SysUserLinkFrontLineDeptService;
+import com.ydtech.modules.base.controller.BaseController;
+import com.ydtech.modules.order.entity.BasePageResult;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ *  @version
+ *  @author: hxl
+ *  @Date: 2024/4/26 11:09
+ *  @Description:  后线人员区域配置
+ */
+@Api(tags = "后线人员配置前线机构")
+@RequestMapping("/sysUserLinkFrontLineDept")
+@RestController
+public class SysUserLinkFrontLineDeptController extends BaseController {
+
+
+    @Autowired
+    private SysUserLinkFrontLineDeptService sysUserLinkFrontLineDeptService;
+
+    @GetMapping("queryQxOrgTree")
+    @ApiOperation(value = "获取前线机构树")
+    public HttpResult<List<SysDept>> queryQxOrgTree(String userId) {
+
+        try{
+            List<SysDept> result = sysUserLinkFrontLineDeptService.queryQxOrgTree(userId);
+            return HttpResult.ok("查询数据成功", result);
+        }catch (Exception e){
+            return HttpResult.error("查询错误"+e.getMessage());
+        }
+    }
+
+    @PostMapping("addOrUpdate")
+    @ApiOperation("后线人员配置前线机构添加修改")
+    public HttpResult<Object> addOrUpdate(@RequestBody SysUserLinkFrontLineDeptAddVo sysUserLinkFrontLineDeptAddVo) {
+        if(sysUserLinkFrontLineDeptAddVo.getUserId()==null || "".equals(sysUserLinkFrontLineDeptAddVo.getUserId())) {
+            return HttpResult.error("后线人员id不能为空");
+        }
+        if(sysUserLinkFrontLineDeptAddVo.getDeptIds()==null || sysUserLinkFrontLineDeptAddVo.getDeptIds().size()==0) {
+            return HttpResult.error("机构id不能为空");
+        }
+        try{
+            sysUserLinkFrontLineDeptService.addOrUpdate(sysUserLinkFrontLineDeptAddVo);
+            return HttpResult.ok("操作成功");
+        }catch (Exception e){
+            return HttpResult.error("操作失败"+e.getMessage());
+        }
+
+    }
+
+    @PostMapping("delete")
+    @ApiOperation("后线人员配置前线机构删除")
+    public HttpResult<Object> delete(@RequestBody SysUserLinkFrontLineDeptIdsVo idsVo) {
+        if(idsVo.getIds()==null || idsVo.getIds().size()==0){
+            return HttpResult.error("后线人员配置前线机构ids不能为空");
+        }
+        try{
+            sysUserLinkFrontLineDeptService.deleteByIds(idsVo.getIds());
+            return HttpResult.ok("删除成功");
+        }catch (Exception e){
+            return HttpResult.error("删除失败"+e.getMessage());
+        }
+    }
+    /**
+     *  @version
+     *  @author: hxl
+     *  @Date: 2024/4/26 17:44
+     *  @Description: 查询所有的后线人员配置前线机构列表+分页
+     */
+    @PostMapping("queryPage")
+    @ApiOperation("查询所有的后线人员配置前线机构列表+分页")
+    public HttpResult<BasePageResult<SysUserLinkFrontLineDeptDto>> queryPage(@RequestBody SysUserLinkFrontLineDeptQueryVo sysUserLinkFrontLineDeptQueryVo) {
+        try{
+            BasePageResult<SysUserLinkFrontLineDeptDto> result = sysUserLinkFrontLineDeptService.queryPage(sysUserLinkFrontLineDeptQueryVo);
+            return HttpResult.ok("查询数据成功", result);
+        }catch (Exception e){
+            return HttpResult.error("查询错误"+e.getMessage());
+        }
+    }
+
+    /**
+     *  @version
+     *  @author: hxl
+     *  @Date: 2024/4/26 17:44
+     *  @Description: 查询所有的后线人员列表+分页
+     */
+    @PostMapping("findAllUserList")
+    @ApiOperation("查询所有的后线人员列表+分页+标红显示")
+    public HttpResult<BasePageResult<SysUserBaseVO>> findUserList(@RequestBody SysUserDto sysUserDto) {
+        try{
+            BasePageResult<SysUserBaseVO> result = sysUserLinkFrontLineDeptService.findUserListByPage(sysUserDto);
+            return HttpResult.ok("查询数据成功", result);
+        }catch (Exception e){
+            return HttpResult.error("查询错误"+e.getMessage());
+        }
+    }
+}

src/main/java/com/ydtech/modules/admin/dao/SysUserLinkFrontLineDeptMapper.java

@@ -0,0 +1,54 @@
+package com.ydtech.modules.admin.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ydtech.modules.admin.model.SysDept;
+import com.ydtech.modules.admin.model.dto.SysUserDto;
+import com.ydtech.modules.admin.model.dto.SysUserLinkFrontLineDeptDto;
+import com.ydtech.modules.admin.model.po.SysUserLinkFrontLineDept;
+import com.ydtech.modules.admin.model.vo.SysUserBaseVO;
+import com.ydtech.modules.admin.model.vo.SysUserLinkFrontLineDeptQueryVo;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+* @author Administrator
+* @description 针对表【sys_user_link_front_line_dept(后线人员配置内部机构表)】的数据库操作Mapper
+* @createDate 2024-06-26 17:28:18
+* @Entity generator.domain.SysUserLinkFrontLineDept
+*/
+public interface SysUserLinkFrontLineDeptMapper extends BaseMapper<SysUserLinkFrontLineDept> {
+    /**
+     *  @version
+     *  @author: hxl
+     *  @Date: 2024/6/26 19:26
+     *  @Description: 通过用户id删除的绑定的数据
+     */
+    void deleteByUserId(@Param("userId") String userId);
+    /**
+     *  @version
+     *  @author: hxl
+     *  @Date: 2024/6/26 19:30
+     *  @Description: 分页查询
+     */
+    Page<SysUserLinkFrontLineDeptDto> queryPage(@Param("page") Page<SysUserLinkFrontLineDeptDto> page,@Param("vo")  SysUserLinkFrontLineDeptQueryVo sysUserLinkFrontLineDeptQueryVo);
+    /**
+     *  @version
+     *  @author: hxl
+     *  @Date: 2024/6/27 11:00
+     *  @Description: 通过用户id查询绑定的数据
+     */
+    List<SysDept> findDeptListByUserId(@Param("userId") String userId);
+    /**
+     *  @version
+     *  @author: hxl
+     *  @Date: 2024/6/27 11:27
+     *  @Description: 查询用户数据
+     */
+    Page<SysUserBaseVO> findUserListByDeptPage(@Param("page") Page<SysUserBaseVO> page,@Param("user")  SysUserDto sysUserDto);
+}
+
+
+
+

src/main/java/com/ydtech/modules/admin/model/dto/SysUserLinkFrontLineDeptDto.java

@@ -0,0 +1,57 @@
+package com.ydtech.modules.admin.model.dto;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 后线人员配置内部机构表
+ */
+@Data
+@ApiModel("后线人员配置内部机构列表数据")
+public class SysUserLinkFrontLineDeptDto implements Serializable {
+    /**
+     * 主键
+     */
+    @ApiModelProperty(value = "id")
+    private Long id;
+
+    /**
+     * 后线人员id
+     */
+    @ApiModelProperty(value = "后线人员id")
+    private String userId;
+    /**
+     * 后线人员id
+     */
+    @ApiModelProperty(value = "后线人员名称")
+    private String userName;
+
+    /**
+     * 内部机构id
+     */
+    @ApiModelProperty(value = "机构id")
+    private String deptId;
+
+
+    /**
+     * 内部机构id
+     */
+    @ApiModelProperty(value = "机构名称")
+    private String deptName;
+
+    /**
+     * 创建时间
+     */
+    @ApiModelProperty(value = "创建时间")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date createTime;
+
+
+
+
+}

src/main/java/com/ydtech/modules/admin/model/po/SysAmountAuditingEntity.java

@@ -159,9 +159,15 @@ public class SysAmountAuditingEntity implements Serializable {
     @TableField(value = "reject_reason")
     private String  rejectReason;
     /***
-     *   审核人
+     *   维护人
      */
     @TableField(exist = false)
     private String  leaderName;
+    /***
+     *   维护人名称
+     */
+    @TableField(exist = false)
+    private String  leaderId;
+
 
 }

src/main/java/com/ydtech/modules/admin/model/vo/SysAmountAuditingVo.java

@@ -1,6 +1,7 @@
 package com.ydtech.modules.admin.model.vo;
 
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -94,7 +95,6 @@ public class SysAmountAuditingVo {
     private Date auditingTime;
 
     @ApiModelProperty("审核人")
-    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
     private String auditingUserId;
     @ApiModelProperty(value = "审核人名称")
     private String auditingUserName;
@@ -107,6 +107,16 @@ public class SysAmountAuditingVo {
     private String  withdrawalTime;
 
 
+    @ApiModelProperty("维护人名称")
+    private String  leaderName;
+    /***
+     *   维护人名称
+     */
+    @ApiModelProperty("维护人工号")
+    @TableField(exist = false)
+    private String  leaderId;
+
+
 
 
 

src/main/java/com/ydtech/modules/admin/model/vo/SysUserLinkFrontLineDeptAddVo.java

@@ -0,0 +1,31 @@
+package com.ydtech.modules.admin.model.vo;
+
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ *  @version
+ *  @author: hxl
+ *  @Date: 2024/6/26 18:04
+ *  @Description: 后线人员配置前线机构添加对象
+ */
+@Data
+@ApiModel("后线人员配置前线机构添加对象")
+public class SysUserLinkFrontLineDeptAddVo implements Serializable {
+    /**
+     *  前线机构ids
+     */
+
+    private List<String> deptIds =new ArrayList<String>();
+
+    /**
+     *  后线人员用户ids
+     */
+    private String userId;
+
+
+}

src/main/java/com/ydtech/modules/admin/model/vo/SysUserLinkFrontLineDeptIdsVo.java

@@ -0,0 +1,24 @@
+package com.ydtech.modules.admin.model.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ *  @version
+ *  @author: hxl
+ *  @Date: 2024/6/26 17:59
+ *  @Description: 后线人员配置前线机构删除Vo
+ */
+@Data
+@ApiModel("后线人员配置前线机构删除Vo")
+public class SysUserLinkFrontLineDeptIdsVo {
+
+    /***
+     * 后线人员配置前线机构关联Ids
+     */
+    @ApiModelProperty("后线人员配置前线机构关联Ids")
+    private List<String> ids;
+}

src/main/java/com/ydtech/modules/admin/model/vo/SysUserLinkFrontLineDeptQueryVo.java

@@ -0,0 +1,26 @@
+package com.ydtech.modules.admin.model.vo;
+
+import com.ydtech.core.page.BasePageVO;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ *  @version
+ *  @author: hxl
+ *  @Date: 2024/6/26 18:02
+ *  @Description: 后线人员配置前线机构查询vo
+ */
+@Data
+@ApiModel("后线人员配置前线机构的查询vo")
+public class SysUserLinkFrontLineDeptQueryVo extends BasePageVO {
+
+    @ApiModelProperty("后线机构id")
+    private String orgId;
+
+    @ApiModelProperty("后线人员名称")
+    private String userName;
+
+    @ApiModelProperty("后线人员工号")
+    private String userId;
+}

src/main/java/com/ydtech/modules/admin/service/SysDictService.java

@@ -1,10 +1,10 @@
 package com.ydtech.modules.admin.service;
 
 
-import com.ydtech.modules.admin.dao.SysDictDao;
-import com.ydtech.modules.admin.model.SysDict;
 import com.ydtech.core.page.PageRequest;
 import com.ydtech.core.page.PageResult;
+import com.ydtech.modules.admin.dao.SysDictDao;
+import com.ydtech.modules.admin.model.SysDict;
 
 import java.util.List;
 

src/main/java/com/ydtech/modules/admin/service/SysUserLinkFrontLineDeptService.java

@@ -0,0 +1,65 @@
+package com.ydtech.modules.admin.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ydtech.modules.admin.model.SysDept;
+import com.ydtech.modules.admin.model.dto.SysUserDto;
+import com.ydtech.modules.admin.model.dto.SysUserLinkFrontLineDeptDto;
+import com.ydtech.modules.admin.model.po.SysUserLinkFrontLineDept;
+import com.ydtech.modules.admin.model.vo.SysAreaVo;
+import com.ydtech.modules.admin.model.vo.SysUserBaseVO;
+import com.ydtech.modules.admin.model.vo.SysUserLinkFrontLineDeptAddVo;
+import com.ydtech.modules.admin.model.vo.SysUserLinkFrontLineDeptQueryVo;
+import com.ydtech.modules.order.entity.BasePageResult;
+
+import java.util.List;
+
+/**
+* @author Administrator
+* @description 针对表【sys_user_link_front_line_dept(后线人员配置内部机构表)】的数据库操作Service
+* @createDate 2024-06-26 17:28:18
+*/
+public interface SysUserLinkFrontLineDeptService extends IService<SysUserLinkFrontLineDept> {
+    /**
+     *  @version
+     *  @author: hxl
+     *  @Date: 2024/6/26 18:46
+     *  @Description: 查询后线机构树
+     */
+    List<SysDept> queryQxOrgTree(String userId);
+    /**
+     *  @version
+     *  @author: hxl
+     *  @Date: 2024/6/26 18:48
+     *  @Description: 添加或修改
+     */
+    void addOrUpdate(SysUserLinkFrontLineDeptAddVo sysUserLinkFrontLineDeptAddVo);
+    /**
+     *  @version
+     *  @author: hxl
+     *  @Date: 2024/6/26 18:49
+     *  @Description: 删除数据
+     */
+    void deleteByIds(List<String> ids);
+
+    /**
+     *  @version
+     *  @author: hxl
+     *  @Date: 2024/6/26 18:51
+     *  @Description: 查询对象id
+     */
+    List<SysAreaVo> findSysUserLinkFrontLineDeptById(String id);
+    /**
+     *  @version
+     *  @author: hxl
+     *  @Date: 2024/6/26 18:52
+     *  @Description: 分页
+     */
+    BasePageResult<SysUserLinkFrontLineDeptDto> queryPage(SysUserLinkFrontLineDeptQueryVo sysUserLinkFrontLineDeptQueryVo);
+    /**
+     *  @version
+     *  @author: hxl
+     *  @Date: 2024/6/27 11:24
+     *  @Description: 查询后线人员加标红
+     */
+    BasePageResult<SysUserBaseVO> findUserListByPage(SysUserDto sysUserDto);
+}

src/main/java/com/ydtech/modules/admin/service/impl/SysAmountAuditingServiceImpl.java

@@ -158,6 +158,13 @@ public class SysAmountAuditingServiceImpl extends ServiceImpl<SysAmountAuditingM
             if(StringUtils.isNotEmpty(sysAmountAuditingVo.getUserName())){
                 params.put("userName",sysAmountAuditingVo.getUserName());
             }
+            if(StringUtils.isNotEmpty(sysAmountAuditingVo.getLeaderId())){
+                params.put("leaderId",sysAmountAuditingVo.getLeaderId());
+            }
+
+            if(StringUtils.isNotEmpty(sysAmountAuditingVo.getLeaderName())){
+                params.put("leaderName",sysAmountAuditingVo.getLeaderName());
+            }
 
             List<SysAmountAuditingEntity> list = baseMapper.queryPageOrderNew(params);
             pageHelper=new PageInfo(list);

src/main/java/com/ydtech/modules/admin/service/impl/SysDictServiceImpl.java

@@ -17,7 +17,7 @@ public class SysDictServiceImpl extends SysDictDaoImpl
 
     @Override
     public List<SysDict> findByLable(String lable) {
-        List<SysDict> lsSysDict = selectList(" where itemname=?", new Object[]{lable.trim()});
+        List<SysDict> lsSysDict = selectList(" where itemname=? order by sort", new Object[]{lable.trim()});
 
         return lsSysDict;
     }

src/main/java/com/ydtech/modules/admin/service/impl/SysUserLinkFrontLineDeptServiceImpl.java

@@ -0,0 +1,156 @@
+package com.ydtech.modules.admin.service.impl;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ydtech.modules.admin.dao.SysDeptMapper;
+import com.ydtech.modules.admin.dao.SysUserLinkFrontLineDeptMapper;
+import com.ydtech.modules.admin.model.SysDept;
+import com.ydtech.modules.admin.model.dto.SysUserDto;
+import com.ydtech.modules.admin.model.dto.SysUserLinkFrontLineDeptDto;
+import com.ydtech.modules.admin.model.po.SysUserLinkFrontLineDept;
+import com.ydtech.modules.admin.model.vo.SysAreaVo;
+import com.ydtech.modules.admin.model.vo.SysUserBaseVO;
+import com.ydtech.modules.admin.model.vo.SysUserLinkFrontLineDeptAddVo;
+import com.ydtech.modules.admin.model.vo.SysUserLinkFrontLineDeptQueryVo;
+import com.ydtech.modules.admin.service.SysUserLinkFrontLineDeptService;
+import com.ydtech.modules.base.controller.BaseController;
+import com.ydtech.modules.order.entity.BasePageResult;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+* @author Administrator
+* @description 针对表【sys_user_link_front_line_dept(后线人员配置内部机构表)】的数据库操作Service实现
+* @createDate 2024-06-26 17:28:18
+*/
+@Service
+public class SysUserLinkFrontLineDeptServiceImpl extends ServiceImpl<SysUserLinkFrontLineDeptMapper, SysUserLinkFrontLineDept>
+    implements SysUserLinkFrontLineDeptService {
+
+    @Autowired
+    private SysUserLinkFrontLineDeptMapper sysUserLinkFrontLineDeptMapper;
+
+
+    @Autowired
+    private SysDeptMapper sysDeptMapper;
+     /**
+      *  @version
+      *  @author: hxl
+      *  @Date: 2024/6/26 18:55
+      *  @Description:  查看前线机构数据
+      */
+    @Override
+    public List<SysDept> queryQxOrgTree(String userId) {
+        List<SysDept> sysDeptAll =new ArrayList<SysDept>();
+        if(StringUtils.isNotBlank(userId)){
+            //通过用户查询机构树
+            sysDeptAll=sysUserLinkFrontLineDeptMapper.findDeptListByUserId(userId);
+        }else{
+            //查询所有的数据   机构等级 =3 或者  机构等级>2  且机构id 包含M 和D 的机构
+            sysDeptAll = sysDeptMapper.queryListByQXDept();
+        }
+        List<SysDept> resultList =new ArrayList<SysDept>();
+        List<SysDept> sysDeptTop = sysDeptAll.stream().filter(item ->"3".equals(item.getComlevel())).collect(Collectors.toList());
+        for (SysDept dept : sysDeptTop) {
+                resultList.add(buildDeptTree(dept,sysDeptAll));
+        }
+        return resultList;
+    }
+    /**
+     *  @version
+     *  @author: hxl
+     *  @Date: 2024/6/27 8:42
+     *  @Description: 获取顶级机构的数据
+     */
+    /**
+     * 递归构建树形结构
+     */
+    private SysDept buildDeptTree(SysDept dept, List<SysDept> deptList){
+        for (SysDept d : deptList) {
+            if (dept.getId().equals(d.getParentId())) {
+                if (null == dept.getChildren()) {
+                    dept.setChildren(new ArrayList<SysDept>());
+                }
+                //递归调用
+                dept.getChildren().add(buildDeptTree(d, deptList));
+            }
+        }
+        return dept;
+    }
+    /**
+     *  @version
+     *  @author: hxl
+     *  @Date: 2024/6/26 18:55
+     *  @Description: 添加或修改
+     */
+    @Override
+    public void addOrUpdate(SysUserLinkFrontLineDeptAddVo sysUserLinkFrontLineDeptAddVo) {
+        String userId = sysUserLinkFrontLineDeptAddVo.getUserId();
+        List<String> deptIds = sysUserLinkFrontLineDeptAddVo.getDeptIds();
+        //删除数据重新添加
+        sysUserLinkFrontLineDeptMapper.deleteByUserId(userId);
+        List<SysUserLinkFrontLineDept> addList= new ArrayList<>();
+        //重新添加
+        if(deptIds!=null && deptIds.size()>0){
+            for (String deptId : deptIds) {
+                SysUserLinkFrontLineDept add=new SysUserLinkFrontLineDept(userId,deptId,new Date(),
+                        new BaseController().getUser().getId(),new Date(),new BaseController().getUser().getId());
+                addList.add(add);
+            }
+        }
+        this.saveBatch(addList);
+    }
+    /**
+     *  @version
+     *  @author: hxl
+     *  @Date: 2024/6/26 18:56
+     *  @Description:  删除
+     */
+    @Override
+    public void deleteByIds(List<String> ids) {
+        sysUserLinkFrontLineDeptMapper.deleteBatchIds(ids);
+    }
+    /**
+     *  @version
+     *  @author: hxl
+     *  @Date: 2024/6/26 18:56
+     *  @Description:  查询对象
+     */
+    @Override
+    public List<SysAreaVo> findSysUserLinkFrontLineDeptById(String id) {
+        return null;
+    }
+    /**
+     *  @version
+     *  @author: hxl
+     *  @Date: 2024/6/26 18:56
+     *  @Description:  分页
+     */
+    @Override
+    public BasePageResult<SysUserLinkFrontLineDeptDto> queryPage(SysUserLinkFrontLineDeptQueryVo sysUserLinkFrontLineDeptQueryVo) {
+        Page<SysUserLinkFrontLineDeptDto> page = new Page<>(sysUserLinkFrontLineDeptQueryVo.getPageNum(),
+                sysUserLinkFrontLineDeptQueryVo.getPageSize());
+        Page<SysUserLinkFrontLineDeptDto> pageResult = sysUserLinkFrontLineDeptMapper.queryPage(page, sysUserLinkFrontLineDeptQueryVo);
+        return  new BasePageResult<>(sysUserLinkFrontLineDeptQueryVo.getPageNum(), page.getSize(), pageResult.getTotal(), page.getPages(),
+                pageResult.getRecords());
+    }
+
+    @Override
+    public BasePageResult<SysUserBaseVO> findUserListByPage(SysUserDto sysUserDto) {
+        Page<SysUserBaseVO> page = new Page<>(sysUserDto.getPageNum(),
+                sysUserDto.getPageSize());
+        Page<SysUserBaseVO> userPageResult = sysUserLinkFrontLineDeptMapper.findUserListByDeptPage(page, sysUserDto);
+        return  new BasePageResult<>(sysUserDto.getPageNum(), page.getSize(), userPageResult.getTotal(), page.getPages(),
+                userPageResult.getRecords());
+    }
+}
+
+
+
+

src/main/resources/mapper/modules/admin/SysAmountAuditingMapper.xml

@@ -116,7 +116,8 @@
         sd.name as "deptName",
         bc.bank_account as "bankAccount",
         bc.bank_address as "bankAddress",
-        su.leader_name  as  "leaderName"
+        su.leader_name  as  "leaderName",
+        su.leader_id  as  "leaderId"
         from sys_amount_auditing a
         left join sys_user_account_history b on a.id = b.auditiing_id
         left join sys_user su on su.id =a.user_id
@@ -147,6 +148,12 @@
             <if test="startDate !=null and startDate != ''  and  endDate !=null  and  endDate!= '' ">
                 and DATE_FORMAT( a.create_time, '%Y-%m-%d')  between DATE_FORMAT(#{startDate}, '%Y-%m-%d') and DATE_FORMAT(#{endDate}, '%Y-%m-%d')
             </if>
+            <if test="leaderName !=null  and leaderName != ''">
+                and su.leader_name=#{leaderName}
+            </if>
+            <if test="leaderId !=null  and leaderId != ''">
+                and su.leader_id=#{leaderId}
+            </if>
         </where>
         order by a.create_time desc
     </select>
@@ -251,16 +258,22 @@
                 and a.id=#{vo.id}
             </if>
             <if test="vo.mobile !=null  and vo.mobile != ''">
-                and su.mobile=#{mobile}
+                and su.mobile=#{vo.mobile}
             </if>
             <if test="vo.userName !=null  and vo.userName != ''">
-                and su.name=#{userName}
+                and su.name=#{vo.userName}
             </if>
             <if test="vo.userId !=null  and vo.userId != ''">
-                and a.user_id=#{userId}
+                and a.user_id=#{vo.userId}
             </if>
             <if test="vo.startTime !=null and vo.startTime != ''  and  vo.endTime !=null  and  vo.endTime!= '' ">
-                and DATE_FORMAT( a.create_time, '%Y-%m-%d')  between DATE_FORMAT(#{startTime}, '%Y-%m-%d') and DATE_FORMAT(#{endTime}, '%Y-%m-%d')
+                and DATE_FORMAT( a.create_time, '%Y-%m-%d')  between DATE_FORMAT(#{vo.startTime}, '%Y-%m-%d') and DATE_FORMAT(#{vo.endTime}, '%Y-%m-%d')
+            </if>
+            <if test="vo.leaderName !=null  and vo.leaderName != ''">
+                and su.leader_name=#{vo.leaderName}
+            </if>
+            <if test="vo.leaderId !=null  and vo.leaderId != ''">
+                and su.leader_id = #{vo.leaderId}
             </if>
         </where>
     </select>