Merge remote-tracking branch 'origin/dev_New' into dev_New

zss

8 天以前 5ea995912d4134f2027a3ddb566718f56d979261

Merge remote-tracking branch 'origin/dev_New' into dev_New

 doc/20260306_craete_purchase_return_orders.sql

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,33 @@
#产品退货单表
drop table if exists purchase_return_orders;
create table purchase_return_orders
(
    id                 bigint auto_increment primary key,
    no                 varchar(255) null comment '退货单编号',
    return_type        tinyint not null default 0 comment '退货方式 0退货退款 1拒收',
    supplier_id        bigint  not null default 0 comment '供应商id',
    project_id         bigint  not null default 0 comment '项目id',
    project_phase      tinyint not null default 0 comment '项目阶段',
    prepared_at        datetime null comment '制单日期',
    prepared_user_id   bigint  not null default 0 comment '制单人id',
    return_user_id     bigint  not null default 0 comment '退料人id',
    purchase_ledger_id bigint  not null default 0 comment '采购订单id',
    remark             text null comment '备注',
    create_time        datetime null comment '录入时间',
    update_time        datetime null comment '更新时间',
    index              idx_purchase_ledger_id (purchase_ledger_id),
    index              idx_project_id (project_id)
);

#产品退货单与采购产品关联表
drop table if exists purchase_return_order_products;
create table purchase_return_order_products
(
    id                       bigint auto_increment primary key,
    purchase_return_order_id bigint not null default 0 comment '退货单id',
    sales_ledger_product_id  bigint not null default 0 comment '采购产品id',
    create_time              datetime null comment '录入时间',
    update_time              datetime null comment '更新时间',
    index                    idx_purchase_return_order_id (purchase_return_order_id),
    index                    idx_sales_ledger_product_id (sales_ledger_product_id)
);

 pom.xml

@@ -323,6 +323,13 @@
            <version>${hutool.version}</version>

        </dependency>



        <dependency>

            <groupId>cn.hutool</groupId>

            <artifactId>hutool-all</artifactId>

            <version>5.8.43</version>

        </dependency>





    </dependencies>



    <build>


 src/main/java/com/ruoyi/aftersalesservice/controller/AfterSalesServiceController.java

@@ -49,8 +49,8 @@
    @GetMapping("/listPage")
    @ApiOperation("售后服务-分页查询")
    @Log(title = "售后服务-分页查询", businessType = BusinessType.OTHER)
    public AjaxResult listPage(Page page, AfterSalesService afterSalesService) {
        IPage<AfterSalesService> listPage = afterSalesServiceService.listPage(page, afterSalesService);
    public AjaxResult listPage(Page page, AfterSalesServiceNewDto afterSalesService) {
        IPage<AfterSalesServiceNewDto> listPage = afterSalesServiceService.listPage(page, afterSalesService);
        return AjaxResult.success(listPage);
    }

@@ -59,8 +59,8 @@
    @ApiOperation("售后服务-反馈登记")
    public void export(HttpServletResponse response) {
        Page page = new Page(-1,-1);
        AfterSalesService afterSalesService = new AfterSalesService();
        IPage<AfterSalesService> listPage = afterSalesServiceService.listPage(page, afterSalesService);
        AfterSalesServiceNewDto afterSalesService = new AfterSalesServiceNewDto();
        IPage<AfterSalesServiceNewDto> listPage = afterSalesServiceService.listPage(page, afterSalesService);
        List<AfterSalesServiceExeclDto> list = new ArrayList<>();
        listPage.getRecords().forEach(item -> {
            AfterSalesServiceExeclDto dto = new AfterSalesServiceExeclDto();
@@ -77,12 +77,12 @@
    @ApiOperation("售后服务-售后处理")
    public void exportTwo(HttpServletResponse response) {
        Page page = new Page(-1,-1);
        AfterSalesService afterSalesService = new AfterSalesService();
        IPage<AfterSalesService> listPage = afterSalesServiceService.listPage(page, afterSalesService);
        AfterSalesServiceNewDto afterSalesService = new AfterSalesServiceNewDto();
        IPage<AfterSalesServiceNewDto> listPage = afterSalesServiceService.listPage(page, afterSalesService);
        listPage.getRecords().forEach(item -> {
            item.setStatusName(item.getStatus().toString());
        });
        ExcelUtil<AfterSalesService> util = new ExcelUtil<AfterSalesService>(AfterSalesService.class);
        ExcelUtil<AfterSalesServiceNewDto> util = new ExcelUtil<AfterSalesServiceNewDto>(AfterSalesServiceNewDto.class);
        util.exportExcel(response, listPage.getRecords() , "售后处理");
    }

@@ -148,4 +148,10 @@
        return AjaxResult.success(afterSalesServiceService.getAfterSalesServiceNewDtoById(id));
    }

    @ApiOperation("售后服务-统计工单情况")
    @GetMapping("count")
    public AjaxResult count() {
        return AjaxResult.success(afterSalesServiceService.countAfterSalesService());
    }

}

 src/main/java/com/ruoyi/aftersalesservice/dto/AfterSalesServiceNewDto.java

@@ -16,4 +16,6 @@
    private List<Long> productModelIdList;

    private SalesLedgerDto salesLedgerDto;

    private String salesContractNo;
}

 src/main/java/com/ruoyi/aftersalesservice/dto/CountDto.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,11 @@
package com.ruoyi.aftersalesservice.dto;

import lombok.Data;

@Data
public class CountDto {

    private Integer status ;

    private Integer count ;
}

 src/main/java/com/ruoyi/aftersalesservice/mapper/AfterSalesServiceMapper.java

@@ -3,8 +3,13 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.aftersalesservice.dto.AfterSalesServiceNewDto;
import com.ruoyi.aftersalesservice.dto.CountDto;
import com.ruoyi.aftersalesservice.pojo.AfterSalesService;
import org.apache.ibatis.annotations.Param;

import java.util.HashMap;
import java.util.List;

/**
 * @author :yys
@@ -18,5 +23,7 @@
     * @param afterSalesService
     * @return
     */
    IPage<AfterSalesService> listPage(Page page,@Param("req") AfterSalesService afterSalesService);
    IPage<AfterSalesServiceNewDto> listPage(Page page, @Param("req") AfterSalesServiceNewDto afterSalesService);

    List<CountDto> countAfterSalesService();
}

 src/main/java/com/ruoyi/aftersalesservice/pojo/AfterSalesService.java

@@ -33,8 +33,12 @@
    @ApiModelProperty("状态 1-待处理 2-已处理")
    private Integer status;

    @ApiModelProperty("售后单号")
    private String afterSalesServiceNo;


    @Excel(name = "状态", readConverterExp = "1=待处理,2=已处理")
    @TableField(exist = false)
    private String statusName;

    /**
@@ -138,20 +142,20 @@
    private String deptName;


    @TableField("售后类型")
    @ApiModelProperty("售后类型")
    private String serviceType;

    @TableField("紧急程度")
    @ApiModelProperty("紧急程度")
    private String urgency;

    @TableField("销售台账ID")
    @ApiModelProperty("销售台账ID")
    private Long salesLedgerId;

    @TableField("分配人ID")
    @ApiModelProperty("分配人ID")
    private Long distributionUserId;


    @TableField("产品型号IDs")
    @ApiModelProperty("产品型号IDs")
    private String productModelIds;



 src/main/java/com/ruoyi/aftersalesservice/service/AfterSalesServiceService.java

@@ -4,7 +4,10 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.aftersalesservice.dto.AfterSalesServiceNewDto;
import com.ruoyi.aftersalesservice.dto.CountDto;
import com.ruoyi.aftersalesservice.pojo.AfterSalesService;

import java.util.List;

/**
 * @author :yys
@@ -19,9 +22,12 @@
     * @param afterSalesService
     * @return
     */
    IPage<AfterSalesService> listPage(Page page, AfterSalesService afterSalesService);
    IPage<AfterSalesServiceNewDto> listPage(Page page, AfterSalesServiceNewDto afterSalesService);

    boolean addAfterSalesServiceDto(AfterSalesServiceNewDto afterSalesServiceNewDto);

    AfterSalesServiceNewDto getAfterSalesServiceNewDtoById(Long id);

    List<CountDto> countAfterSalesService();

}

 src/main/java/com/ruoyi/aftersalesservice/service/impl/AfterSalesServiceServiceImpl.java

@@ -5,9 +5,11 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.aftersalesservice.dto.AfterSalesServiceNewDto;
import com.ruoyi.aftersalesservice.dto.CountDto;
import com.ruoyi.aftersalesservice.mapper.AfterSalesServiceMapper;
import com.ruoyi.aftersalesservice.pojo.AfterSalesService;
import com.ruoyi.aftersalesservice.service.AfterSalesServiceService;
import com.ruoyi.common.utils.OrderUtils;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.project.system.domain.SysDept;
@@ -19,8 +21,6 @@
import com.ruoyi.sales.pojo.SalesLedgerProduct;
import com.ruoyi.sales.service.ISalesLedgerProductService;
import com.ruoyi.sales.service.ISalesLedgerService;
import com.ruoyi.sales.service.impl.SalesLedgerProductServiceImpl;
import com.ruoyi.sales.service.impl.SalesLedgerServiceImpl;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -52,10 +52,10 @@
    private ISalesLedgerService salesLedgerService;

    @Override
    public IPage<AfterSalesService> listPage(Page page, AfterSalesService afterSalesService) {
    public IPage<AfterSalesServiceNewDto> listPage(Page page, AfterSalesServiceNewDto afterSalesService) {
        Long tenantId = SecurityUtils.getLoginUser().getTenantId();
        SysDept sysDept = sysDeptMapper.selectDeptById(tenantId);
        IPage<AfterSalesService> afterSalesServiceIPage = afterSalesServiceMapper.listPage(page, afterSalesService);
        IPage<AfterSalesServiceNewDto> afterSalesServiceIPage = afterSalesServiceMapper.listPage(page, afterSalesService);
        afterSalesServiceIPage.getRecords().forEach(item -> {
            item.setDeptName(sysDept.getDeptName());
        });
@@ -74,6 +74,10 @@
        SysUser sysUser = sysUserMapper.selectUserById(afterSalesServiceNewDto.getCheckUserId());
        if(sysUser == null) throw new RuntimeException("审核人不存在");
        afterSalesServiceNewDto.setCheckNickName(sysUser.getNickName());
        if (StringUtils.isEmpty(afterSalesServiceNewDto.getAfterSalesServiceNo())) {
            String string = OrderUtils.countAfterServiceTodayByCreateTime(afterSalesServiceMapper, "SH_");
            afterSalesServiceNewDto.setAfterSalesServiceNo(string);
        }
        return this.save(afterSalesServiceNewDto);
    }

@@ -82,7 +86,7 @@
        AfterSalesService afterSalesService = afterSalesServiceMapper.selectById(id);
        SalesLedger byId = salesLedgerService.getById(afterSalesService.getSalesLedgerId());
        List<Long> collect = Arrays.stream(afterSalesService.getProductModelIds().split(",")).map(Long::valueOf).collect(Collectors.toList());
        List<SalesLedgerProduct> list = salesLedgerProductService.list(new QueryWrapper<SalesLedgerProduct>().lambda().in(SalesLedgerProduct::getProductModelId, collect));
        List<SalesLedgerProduct> list = salesLedgerProductService.list(new QueryWrapper<SalesLedgerProduct>().lambda().in(SalesLedgerProduct::getId, collect));
        AfterSalesServiceNewDto afterSalesServiceNewDto = new AfterSalesServiceNewDto();
        BeanUtils.copyProperties(afterSalesService, afterSalesServiceNewDto);
        SalesLedgerDto salesLedgerDto = new SalesLedgerDto();
@@ -91,4 +95,20 @@
        afterSalesServiceNewDto.setSalesLedgerDto(salesLedgerDto);
        return afterSalesServiceNewDto;
    }

    @Override
    public List<CountDto> countAfterSalesService() {
        List<CountDto> stringIntegerHashMap = afterSalesServiceMapper.countAfterSalesService();
        Integer total = 0;
        for (CountDto countDto : stringIntegerHashMap) {
            total += countDto.getCount();
        }
        CountDto countDto = new CountDto();
        countDto.setStatus(3);
        countDto.setCount(total);
        stringIntegerHashMap.add(countDto);

        return stringIntegerHashMap;

    }
}

 src/main/java/com/ruoyi/basic/controller/CustomerFollowUpController.java

@@ -15,6 +15,8 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import com.ruoyi.basic.dto.CustomerFollowUpFileDto;
import com.ruoyi.common.utils.SecurityUtils;

import java.util.List;

@@ -86,8 +88,27 @@
    @PostMapping("/upload/{followUpId}")
    @Log(title = "客户跟进-上传附件", businessType = BusinessType.INSERT)
    public AjaxResult uploadFiles(@RequestParam("files") List<MultipartFile> files, @PathVariable Integer followUpId) {
        customerFollowUpService.addFollowUpFiles(files, followUpId);
        return AjaxResult.success();
        return AjaxResult.success(customerFollowUpService.addFollowUpFiles(files, followUpId));
    }

    /**
     * ä¸Šä¼ è·Ÿè¿›é™„件（复用，无ID）
     */
    @ApiOperation("上传附件(复用)")
    @PostMapping("/upload")
    @Log(title = "上传附件(复用)", businessType = BusinessType.INSERT)
    public AjaxResult uploadFiles(@RequestParam("files") List<MultipartFile> files, @RequestParam(required = false) String name) {
        List<CustomerFollowUpFileDto> uploadedFiles = customerFollowUpService.addFollowUpFiles(files, null);
        return AjaxResult.success(uploadedFiles);
    }

    /**
     * æ‰¹é‡æŸ¥è¯¢é™„件列表
     */
    @ApiOperation("批量查询附件列表")
    @PostMapping("/file/list")
    public AjaxResult getFileList(@RequestBody List<Long> ids) {
        return AjaxResult.success(customerFollowUpService.getFollowUpFilesByIds(ids));
    }

    /**

 src/main/java/com/ruoyi/basic/dto/CustomerFollowUpFileDto.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,26 @@
package com.ruoyi.basic.dto;

import com.ruoyi.basic.pojo.CustomerFollowUpFile;
import lombok.Data;
import lombok.EqualsAndHashCode;

/**
 * å®¢æˆ·è·Ÿè¿›é™„件DTO
 * 
 * @author deslrey
 */
@Data
@EqualsAndHashCode(callSuper = true)
public class CustomerFollowUpFileDto extends CustomerFollowUpFile {
    private static final long serialVersionUID = 1L;

    /**
     * ä¸Šä¼ è€…姓名
     */
    private String createUserName;

    /**
     * ä¿®æ”¹è€…姓名
     */
    private String updateUserName;
}

 src/main/java/com/ruoyi/basic/service/CustomerFollowUpFileService.java

@@ -2,6 +2,13 @@

import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.basic.pojo.CustomerFollowUpFile;
import com.ruoyi.common.vo.SimpleFileVo;

import javax.validation.constraints.NotNull;
import javax.validation.constraints.Null;
import java.util.List;
import java.util.function.BiConsumer;
import java.util.function.Function;

/**
 * <br>
@@ -13,4 +20,18 @@
 * @since 2026/03/04 14:52
 */
public interface CustomerFollowUpFileService extends IService<CustomerFollowUpFile> {

    /**
     * æ ¹æ® xx,xxx,xx批量查询并且出插入SimpleFileVo进入
     * @param list
     * @param getAttachmentIds
     * @param setAttachmentList
     * @param <T>
     */
    <T> void fillAttachment(
           @Null List<T> list,
           @NotNull Function<T, String> getAttachmentIds,
           @NotNull BiConsumer<T, List<SimpleFileVo>> setAttachmentList
    );

}

 src/main/java/com/ruoyi/basic/service/CustomerFollowUpService.java

@@ -3,9 +3,11 @@
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.basic.dto.CustomerFollowUpDto;
import com.ruoyi.basic.pojo.CustomerFollowUp;
import org.springframework.transaction.annotation.Transactional;
import com.ruoyi.basic.dto.CustomerFollowUpFileDto;
import com.ruoyi.basic.pojo.CustomerFollowUpFile;
import org.springframework.web.multipart.MultipartFile;

import java.util.Collection;
import java.util.List;

/**
@@ -41,7 +43,7 @@
    /**
     * æ·»åŠ è·Ÿè¿›é™„件
     */
    void addFollowUpFiles(List<MultipartFile> files, Integer followUpId);
    List<CustomerFollowUpFileDto> addFollowUpFiles(List<MultipartFile> files, Integer followUpId);

    /**
     * åˆ é™¤è·Ÿè¿›é™„件
@@ -49,6 +51,11 @@
    void deleteFollowUpFile(Integer fileId);

    /**
     * æ ¹æ®é™„件ID集合获取附件列表
     */
    List<CustomerFollowUpFile> getFollowUpFilesByIds(Collection<Long> fileIds);

    /**
     * èŽ·å–跟进详情
     */
    CustomerFollowUpDto getFollowUpWithFiles(Integer id);

 src/main/java/com/ruoyi/basic/service/impl/CustomerFollowUpFileServiceImpl.java

@@ -1,10 +1,21 @@
package com.ruoyi.basic.service.impl;

import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.stream.CollectorUtil;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.basic.mapper.CustomerFollowUpFileMapper;
import com.ruoyi.basic.pojo.CustomerFollowUpFile;
import com.ruoyi.basic.service.CustomerFollowUpFileService;
import com.ruoyi.basic.service.CustomerFollowUpService;
import com.ruoyi.common.vo.SimpleFileVo;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;

import java.util.*;
import java.util.function.BiConsumer;
import java.util.function.Function;
import java.util.stream.Collectors;

/**
 * <br>
@@ -16,5 +27,42 @@
 * @since 2026/03/04 14:53
 */
@Service
@RequiredArgsConstructor
public class CustomerFollowUpFileServiceImpl extends ServiceImpl<CustomerFollowUpFileMapper, CustomerFollowUpFile> implements CustomerFollowUpFileService {

    private final CustomerFollowUpService customerFollowUpService;


    @Override
    public <T> void fillAttachment(List<T> list, Function<T, String> getAttachmentIds, BiConsumer<T, List<SimpleFileVo>> setAttachmentList) {
        if (CollUtil.isEmpty(list)) {
            return;
        }
        // æ”¶é›†æ‰€æœ‰æ–‡ä»¶ID
        Set<Long> ids = list.stream()
                .map(getAttachmentIds)
                .filter(StrUtil::isNotBlank)
                .flatMap(s -> Arrays.stream(s.split(",")))
                .map(Long::valueOf)
                .collect(Collectors.toSet());

        List<CustomerFollowUpFile> followUpFilesByIds = customerFollowUpService.getFollowUpFilesByIds(ids);
        if (CollUtil.isEmpty(followUpFilesByIds)) {
            return;
        }
        Map<Long, SimpleFileVo> collectMap = followUpFilesByIds.stream().map(SimpleFileVo::convert).collect(Collectors.toMap(
                SimpleFileVo::getId,
                Function.identity()
        ));
        list.forEach(t -> {
            String attachmentIds = getAttachmentIds.apply(t);
            if (StrUtil.isNotBlank(attachmentIds)) {
                List<SimpleFileVo> fileVos = Arrays.stream(attachmentIds.split(","))
                        .map(Long::valueOf)
                        .map(it->collectMap.getOrDefault(it, (SimpleFileVo) Collections.emptyList()))
                        .collect(Collectors.toList());
                setAttachmentList.accept(t, fileVos);
            }
        });
    }
}

 src/main/java/com/ruoyi/basic/service/impl/CustomerFollowUpServiceImpl.java

@@ -8,10 +8,12 @@
import com.ruoyi.basic.pojo.CustomerFollowUpFile;
import com.ruoyi.basic.service.CustomerFollowUpFileService;
import com.ruoyi.basic.service.CustomerFollowUpService;
import com.ruoyi.basic.service.ICustomerService;
import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.basic.dto.CustomerFollowUpFileDto;
import com.ruoyi.project.system.domain.SysUser;
import com.ruoyi.project.system.service.ISysUserService;

import org.apache.commons.io.FilenameUtils;
import org.springframework.beans.BeanUtils;
@@ -28,7 +30,7 @@
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.List;
import java.util.UUID;

@@ -49,6 +51,9 @@

    @Value("${file.upload-dir}")
    private String uploadDir;

    @Autowired
    private ISysUserService sysUserService;

    @Override
    @Transactional(rollbackFor = Exception.class)
@@ -78,8 +83,8 @@

    @Override
    @Transactional(rollbackFor = Exception.class)
    public void addFollowUpFiles(List<MultipartFile> files, Integer followUpId) {
        handleFollowUpFiles(files, followUpId);
    public List<CustomerFollowUpFileDto> addFollowUpFiles(List<MultipartFile> files, Integer followUpId) {
        return handleFollowUpFiles(files, followUpId);
    }

    @Override
@@ -136,14 +141,27 @@
        }
    }

    private void handleFollowUpFiles(List<MultipartFile> multipartFiles, Integer followUpId) {
    @Override
    public List<CustomerFollowUpFile> getFollowUpFilesByIds(Collection<Long> fileIds) {
        if (fileIds == null || fileIds.isEmpty()) {
            return new ArrayList<>(0);
        }

        LambdaQueryWrapper<CustomerFollowUpFile> queryWrapper = new LambdaQueryWrapper<>();
        queryWrapper.in(CustomerFollowUpFile::getId, fileIds)
                .select(CustomerFollowUpFile::getId, CustomerFollowUpFile::getFileUrl, CustomerFollowUpFile::getFileName);
        return customerFollowUpFileService.list(queryWrapper);
    }

    private List<CustomerFollowUpFileDto> handleFollowUpFiles(List<MultipartFile> multipartFiles, Integer followUpId) {
        List<CustomerFollowUpFile> fileList = new ArrayList<>();
        List<CustomerFollowUpFileDto> dtoList = new ArrayList<>();
        if (multipartFiles == null || multipartFiles.isEmpty()) {
            return;
            return dtoList;
        }

        Long currentUserId = SecurityUtils.getUserId();
        Long currentTenantId = SecurityUtils.getLoginUser().getTenantId();
        List<CustomerFollowUpFile> fileList = new ArrayList<>();

        for (MultipartFile file : multipartFiles) {
            if (file == null || file.isEmpty()) {
@@ -159,7 +177,8 @@

                String originalFilename = file.getOriginalFilename();
                String fileExtension = FilenameUtils.getExtension(originalFilename);
                String formalFilename = followUpId + "_" +
                String prefix = (followUpId != null) ? followUpId.toString() : "temp";
                String formalFilename = prefix + "_" +
                        System.currentTimeMillis() + "_" +
                        UUID.randomUUID().toString().substring(0, 8) +
                        (StringUtils.hasText(fileExtension) ? "." + fileExtension : "");
@@ -184,7 +203,35 @@
        }
        if (!fileList.isEmpty()) {
            customerFollowUpFileService.saveBatch(fileList);
            return convertToDtoList(fileList);
        }
        return dtoList;
    }

    private List<CustomerFollowUpFileDto> convertToDtoList(List<CustomerFollowUpFile> fileList) {
        List<CustomerFollowUpFileDto> dtoList = new ArrayList<>();
        if (fileList == null || fileList.isEmpty()) {
            return dtoList;
        }
        for (CustomerFollowUpFile entity : fileList) {
            CustomerFollowUpFileDto dto = new CustomerFollowUpFileDto();
            BeanUtils.copyProperties(entity, dto);

            if (entity.getCreateUser() != null) {
                SysUser createUser = sysUserService.selectUserById(entity.getCreateUser());
                if (createUser != null) {
                    dto.setCreateUserName(createUser.getNickName());
                }
            }
            if (entity.getUpdateUser() != null) {
                SysUser updateUser = sysUserService.selectUserById(entity.getUpdateUser());
                if (updateUser != null) {
                    dto.setUpdateUserName(updateUser.getNickName());
                }
            }
            dtoList.add(dto);
        }
        return dtoList;
    }

    private void validateFollowUp(CustomerFollowUp followUp) {

 src/main/java/com/ruoyi/common/utils/OrderUtils.java

@@ -13,6 +13,7 @@
import java.time.format.DateTimeFormatter;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;

/**
@@ -20,6 +21,50 @@
 * @date : 2025/9/15 15:31
 */
public class OrderUtils {

    /**
     * List<Integer> è½¬æ¢ä¸º Long[] æ•°ç»„
     * @param ids
     * @return
     */
    public static Long[] listIntegerToLongArray(List<Integer> ids) {
        return ids.stream()
                // å¤„理null值：如果元素为null，转换为0L（可根据业务调整，比如抛异常）
                .map(id -> id != null ? id.longValue() : -1L)
                // å°†Stream<Long>转换为Long[]数组
                .toArray(Long[]::new);
    }

    /**
     * åˆ¤æ–­ç›®æ ‡id是否在逗号分隔的字符串中
     * @param targetId
     * @param str
     * @return
     */
    public boolean isStaffIdExist(Object targetId,String str) {
        // ç©ºå€¼æ ¡éªŒï¼Œé¿å…ç©ºæŒ‡é’ˆ
        if (str == null || str.trim().isEmpty() || targetId == null) {
            return false;
        }
        // æŒ‰é€—号分割成数组
        String[] idArray = str.split(",");
        // éåŽ†æ•°ç»„判断是否包含目标id
        for (String id : idArray) {
            // åŽ»é™¤ç©ºæ ¼ï¼ˆé˜²æ­¢å­—符串中有多余空格，如"1, 121"）
            String cleanId = id.trim();
            // è½¬æ¢ä¸ºæ•°å­—并比较
            try {
                if (cleanId.equals(String.valueOf(targetId))) {
                    return true;
                }
            } catch (NumberFormatException e) {
                // è‹¥å­˜åœ¨éžæ•°å­—ID，直接返回false
                return false;
            }
        }
        return false;
    }



    /**
@@ -54,4 +99,38 @@
        // æ‹¼æŽ¥è®¢å•ç¼–号 preFix + æ—¶é—´ï¼ˆyyyyMMdd） + è®¢å•æ•°é‡(001)
        return preFix + LocalDate.now().format(DateTimeFormatter.ISO_LOCAL_DATE).replaceAll("-", "") + String.format("%03d", (aLong + 1)) + "-" + new Date().getTime();
    }


    /**
     * æŸ¥è¯¢å½“天（基于createTime字段）的记录数量
     * @param mapper å®žä½“类对应的BaseMapper
     * @param <T> å®žä½“类泛型
     * @return å½“天记录数量
     */
    public static <T> String countAfterServiceTodayByCreateTime(BaseMapper<T> mapper,String preFix) {
        // èŽ·å–当天开始时间（00:00:00）
        LocalDateTime todayStart = LocalDateTime.of(
                LocalDateTime.now().toLocalDate(),
                LocalTime.MIN
        );
        // èŽ·å–当天结束时间（23:59:59.999）
        LocalDateTime todayEnd = LocalDateTime.of(
                LocalDateTime.now().toLocalDate(),
                LocalTime.MAX
        );

        // è½¬æ¢ä¸ºDate类型（如果实体类中createTime是LocalDateTime可直接使用）
        Date startDate = Date.from(todayStart.atZone(ZoneId.systemDefault()).toInstant());
        Date endDate = Date.from(todayEnd.atZone(ZoneId.systemDefault()).toInstant());

        // æž„建查询条件
        QueryWrapper<T> queryWrapper = new QueryWrapper<>();
        queryWrapper.ge("create_time", startDate)  // å¤§äºŽç­‰äºŽå½“天开始
                .lt("create_time", endDate);   // å°äºŽå½“天结束（避免毫秒精度问题）

        // æ‰§è¡ŒæŸ¥è¯¢
        Long aLong = mapper.selectCount(queryWrapper);
        // æ‹¼æŽ¥è®¢å•ç¼–号 preFix + æ—¶é—´ï¼ˆyyyyMMdd） + è®¢å•æ•°é‡(001)
        return preFix + LocalDate.now().format(DateTimeFormatter.ISO_LOCAL_DATE).replaceAll("-", "") + String.format("%03d", (aLong + 1));
    }
}

 src/main/java/com/ruoyi/common/vo/SimpleFileVo.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,28 @@
package com.ruoyi.common.vo;

import com.ruoyi.basic.pojo.CustomerFollowUpFile;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;

import javax.validation.constraints.NotNull;
import java.io.Serializable;

/**
 * @author buhuazhen
 * @date 2026/3/6
 * @email 3038525872@qq.com
 */
@Data
@AllArgsConstructor
@NoArgsConstructor
public class SimpleFileVo implements Serializable {
    private Long id;
    private String fileName;
    private String fileUrl;

    public static SimpleFileVo convert(@NotNull CustomerFollowUpFile file){
        return new SimpleFileVo(file.getId(), file.getFileName(), file.getFileUrl());
    }

}

 src/main/java/com/ruoyi/framework/web/domain/BaseEntity.java

@@ -39,6 +39,7 @@
    private Date updateTime;



    /** å¤‡æ³¨ */

    @TableField(exist = false)

    private String remark;



    /** è¯·æ±‚参数 */


 src/main/java/com/ruoyi/procurementrecord/controller/ReturnManagementController.java

@@ -1,14 +1,20 @@
package com.ruoyi.procurementrecord.controller;

import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.utils.OrderUtils;
import com.ruoyi.framework.web.controller.BaseController;
import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.procurementrecord.dto.ReturnManagementDto;
import com.ruoyi.procurementrecord.mapper.ReturnManagementMapper;
import com.ruoyi.procurementrecord.pojo.ReturnManagement;
import com.ruoyi.procurementrecord.pojo.ReturnSaleProduct;
import com.ruoyi.procurementrecord.service.ReturnManagementService;
import com.ruoyi.procurementrecord.service.ReturnSaleProductService;
import com.ruoyi.procurementrecord.service.impl.ReturnSaleProductServiceImpl;
import com.ruoyi.sales.dto.SalesLedgerDto;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
@@ -22,48 +28,69 @@
 * @date : 2025/9/17 10:34
 */
@RestController
@Api(tags = "到货管理")
@Api(tags = "销售退货")
@RequestMapping("/returnManagement")
public class ReturnManagementController extends BaseController {

    @Autowired
    private ReturnManagementService returnManagementService;

    @Autowired
    private ReturnManagementMapper returnManagementMapper;
    private ReturnSaleProductService returnSaleProductService;

    @GetMapping("/listPage")
    @ApiOperation("到货管理-查询")
    public AjaxResult listPage(Page page, ReturnManagement returnManagement) {
        IPage<ReturnManagement> result = returnManagementService.listPage(page, returnManagement);
    @ApiOperation("销售退货-查询")
    public AjaxResult listPage(Page page, ReturnManagementDto returnManagement) {
        IPage<ReturnManagementDto> result = returnManagementService.listPage(page, returnManagement);
        return AjaxResult.success(result);
    }

    @PostMapping("/add")
    @ApiOperation("到货管理-添加")
    @ApiOperation("销售退货-添加")
    @Transactional(rollbackFor = Exception.class)
    public AjaxResult add(@RequestBody ReturnManagement returnManagement) {
        String rt = OrderUtils.countTodayByCreateTime(returnManagementMapper, "RT");
        returnManagement.setReturnNo(rt);
        boolean result = returnManagementService.save(returnManagement);
        return result ? success() : error();
    public AjaxResult add(@RequestBody ReturnManagementDto returnManagementDto) {
        return returnManagementService.addReturnManagementDto(returnManagementDto) ? success() : error();
    }

    @PostMapping("/update")
    @ApiOperation("到货管理-修改")
    @ApiOperation("销售退货-修改")
    @Transactional(rollbackFor = Exception.class)
    public AjaxResult update(@RequestBody ReturnManagement returnManagement) {
        boolean result = returnManagementService.updateById(returnManagement);
        return result ? success() : error();
    public AjaxResult update(@RequestBody ReturnManagementDto returnManagementDto) {
        return returnManagementService.updateReturnManagementDto(returnManagementDto) ? success() : error();
    }


    @ApiOperation("销售退货-处理退货单")
    @GetMapping("/handle")
    @Transactional(rollbackFor = Exception.class)
    public AjaxResult handle(Long returnManagementId) {
        return returnManagementService.handle(returnManagementId) ? success() : error();
    }


    @DeleteMapping("/del")
    @ApiOperation("到货管理-删除")
    @ApiOperation("销售退货-删除")
    @Transactional(rollbackFor = Exception.class)
    public AjaxResult del(@RequestBody List<Long> ids) {
        if (CollectionUtils.isEmpty(ids)) return error("请选择至少一条数据");
        returnSaleProductService.remove(new QueryWrapper<ReturnSaleProduct>()
                .lambda()
                .in(ReturnSaleProduct::getReturnManagementId, ids));
        boolean result = returnManagementService.removeByIds(ids);
        return result ? success() : error();
    }

    @GetMapping("/getById")
    @ApiOperation("销售退货-根据id查询")
    public AjaxResult getById(Long returnManagementId) {
        ReturnManagementDto returnManagementDto = returnManagementService.getReturnManagementDtoById(returnManagementId);
        return success(returnManagementDto);
    }

    @GetMapping("/getByShippingId")
    @ApiOperation("销售退货-根据出库单查询销售订单以及产品信息")
    public AjaxResult getByShippingId(Long shippingId) {
        SalesLedgerDto salesLedgerDto = returnManagementService.getReturnManagementDtoByShippingIdId(shippingId);
        return success(salesLedgerDto);
    }

}

 src/main/java/com/ruoyi/procurementrecord/controller/ReturnSaleProductController.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,18 @@
package com.ruoyi.procurementrecord.controller;

import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;

/**
 * <p>
 * é€€è´§äº§å“è¡¨ å‰ç«¯æŽ§åˆ¶å™¨
 * </p>
 *
 * @author èŠ¯å¯¼è½¯ä»¶ï¼ˆæ±Ÿè‹ï¼‰æœ‰é™å…¬å¸
 * @since 2026-03-05 03:57:42
 */
@RestController
@RequestMapping("/returnSaleProduct")
public class ReturnSaleProductController {

}

 src/main/java/com/ruoyi/procurementrecord/dto/ReturnManagementDto.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,48 @@
package com.ruoyi.procurementrecord.dto;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.procurementrecord.pojo.ReturnManagement;
import com.ruoyi.procurementrecord.pojo.ReturnSaleProduct;
import com.ruoyi.sales.pojo.SalesLedgerProduct;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;

import java.time.LocalDateTime;
import java.util.List;

/**
 * @author :yys
 * @date : 2025/9/17 10:28
 */
@Data
public class ReturnManagementDto extends ReturnManagement {


    @ApiModelProperty(value = "客户名称")
    private String customerName;

    @ApiModelProperty(value = "销售单号")
    private String salesContractNo;

    @ApiModelProperty(value = "业务员")
    private String salesman;


    @ApiModelProperty("关联出库单号")
    private String shippingNo;

    @ApiModelProperty(value = "项目名称")
    private String projectName;

    @ApiModelProperty(value = "销售台账id")
    private Long salesLedgerId;

    @ApiModelProperty(value = "销售产品对象数组")
    private List<ReturnSaleProductDto> returnSaleProducts;

}

 src/main/java/com/ruoyi/procurementrecord/dto/ReturnSaleProductDto.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,19 @@
package com.ruoyi.procurementrecord.dto;

import com.ruoyi.procurementrecord.pojo.ReturnSaleProduct;
import lombok.Data;

import java.math.BigDecimal;

@Data
public class ReturnSaleProductDto extends ReturnSaleProduct {

    private String productName;

    private String model;

    private String unit;

    //未退货数量
    private BigDecimal unReturn;
}

 src/main/java/com/ruoyi/procurementrecord/mapper/ReturnManagementMapper.java

@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.procurementrecord.dto.ReturnManagementDto;
import com.ruoyi.procurementrecord.pojo.ReturnManagement;
import org.apache.ibatis.annotations.Param;

@@ -18,5 +19,7 @@
     * @param page
     * @return
     */
    IPage<ReturnManagement> listPage(Page page,@Param("req") ReturnManagement returnManagement);
    IPage<ReturnManagementDto> listPage(Page page, @Param("req") ReturnManagementDto returnManagement);

    ReturnManagementDto getReturnManagementDtoById(Long id);
}

 src/main/java/com/ruoyi/procurementrecord/mapper/ReturnSaleProductMapper.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,23 @@
package com.ruoyi.procurementrecord.mapper;

import com.ruoyi.procurementrecord.dto.ReturnSaleProductDto;
import com.ruoyi.procurementrecord.pojo.ReturnSaleProduct;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;

import java.util.List;

/**
 * <p>
 * é€€è´§äº§å“è¡¨ Mapper æŽ¥å£
 * </p>
 *
 * @author èŠ¯å¯¼è½¯ä»¶ï¼ˆæ±Ÿè‹ï¼‰æœ‰é™å…¬å¸
 * @since 2026-03-05 03:57:42
 */
@Mapper
public interface ReturnSaleProductMapper extends BaseMapper<ReturnSaleProduct> {

    List<ReturnSaleProductDto> listReturnSaleProductDto(@Param("returnManagementId") Long returnManagementId);
}

 src/main/java/com/ruoyi/procurementrecord/pojo/ReturnManagement.java

@@ -29,44 +29,39 @@
    @ApiModelProperty(value = "退货单号")
    private String returnNo;

    @ApiModelProperty(value = "关联单号")
    private String relatedNo;
    @ApiModelProperty("客户id")
    private Long customerId;

    @ApiModelProperty(value = "退货类型")
    private String returnType;
    @ApiModelProperty("关联出库单号Id")
    private Long shippingId;

    @ApiModelProperty(value = "供应商名称")
    private String supplierName;
    @ApiModelProperty("项目id")
    private Long projectId;

    @ApiModelProperty(value = "退货原因")
    private String returnReason;
    @ApiModelProperty("项目阶段")
    private String projectStage;

    @ApiModelProperty(value = "退货状态")
    private String status;
    @ApiModelProperty("制单人")
    private String maker;

    @ApiModelProperty(value = "备注")
    private String remark;

    @ApiModelProperty(value = "创建时间")
    @TableField(fill = FieldFill.INSERT)
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @ApiModelProperty("制单时间")
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private LocalDateTime makeTime;

    @ApiModelProperty("结算人")
    private String settler;

    @ApiModelProperty("状态")
    private Integer status;

    @ApiModelProperty("创建时间")
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private LocalDateTime createTime;

    @ApiModelProperty(value = "创建用户")
    @TableField(fill = FieldFill.INSERT)
    private Integer createUser;

    @ApiModelProperty(value = "修改时间")
    @TableField(fill = FieldFill.INSERT_UPDATE)
    @ApiModelProperty("更新时间")
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private LocalDateTime updateTime;

    @ApiModelProperty(value = "修改用户")
    @TableField(fill = FieldFill.INSERT_UPDATE)
    private Integer updateUser;

    @ApiModelProperty(value = "租户ID")
    @TableField(fill = FieldFill.INSERT)
    private Long tenantId;

}

 src/main/java/com/ruoyi/procurementrecord/pojo/ReturnSaleProduct.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,44 @@
package com.ruoyi.procurementrecord.pojo;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
import java.math.BigDecimal;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
import lombok.Setter;

/**
 * <p>
 * é€€è´§äº§å“è¡¨
 * </p>
 *
 * @author èŠ¯å¯¼è½¯ä»¶ï¼ˆæ±Ÿè‹ï¼‰æœ‰é™å…¬å¸
 * @since 2026-03-05 03:57:42
 */
@Getter
@Setter
@TableName("return_sale_product")
@ApiModel(value = "ReturnSaleProduct对象", description = "退货产品表")
public class ReturnSaleProduct implements Serializable {

    private static final long serialVersionUID = 1L;

    @ApiModelProperty("主键id")
    @TableId(value = "id", type = IdType.AUTO)
    private Long id;

    @ApiModelProperty("退货单id")
    private Long returnManagementId;

    @ApiModelProperty("退货产品id")
    private Long returnSaleLedgerProductId;

    @ApiModelProperty("退货产品数量")
    private BigDecimal num;

    @ApiModelProperty("退货状态 0 æœªé€€å›ž 1已退货")
    private Integer status;
}

 src/main/java/com/ruoyi/procurementrecord/service/ReturnManagementService.java

@@ -3,7 +3,9 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.procurementrecord.dto.ReturnManagementDto;
import com.ruoyi.procurementrecord.pojo.ReturnManagement;
import com.ruoyi.sales.dto.SalesLedgerDto;

/**
 * @author :yys
@@ -18,5 +20,15 @@
     * @param returnManagement
     * @return
     */
    IPage<ReturnManagement> listPage(Page page, ReturnManagement returnManagement);
    IPage<ReturnManagementDto> listPage(Page page, ReturnManagementDto returnManagement);

    boolean addReturnManagementDto(ReturnManagementDto returnManagementDto);

    boolean updateReturnManagementDto(ReturnManagementDto returnManagementDto);

    SalesLedgerDto getReturnManagementDtoByShippingIdId(Long shippingId);

    boolean handle(Long returnManagementId);

    ReturnManagementDto getReturnManagementDtoById(Long returnManagementId);
}

 src/main/java/com/ruoyi/procurementrecord/service/ReturnSaleProductService.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,20 @@
package com.ruoyi.procurementrecord.service;

import com.ruoyi.procurementrecord.dto.ReturnSaleProductDto;
import com.ruoyi.procurementrecord.pojo.ReturnSaleProduct;
import com.baomidou.mybatisplus.extension.service.IService;

import java.util.List;

/**
 * <p>
 * é€€è´§äº§å“è¡¨ æœåŠ¡ç±»
 * </p>
 *
 * @author èŠ¯å¯¼è½¯ä»¶ï¼ˆæ±Ÿè‹ï¼‰æœ‰é™å…¬å¸
 * @since 2026-03-05 03:57:42
 */
public interface ReturnSaleProductService extends IService<ReturnSaleProduct> {

    List<ReturnSaleProductDto> listReturnSaleProductDto(Long returnManagementId);
}

 src/main/java/com/ruoyi/procurementrecord/service/impl/ReturnManagementServiceImpl.java

@@ -1,14 +1,38 @@
package com.ruoyi.procurementrecord.service.impl;

import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.utils.OrderUtils;
import com.ruoyi.procurementrecord.dto.ReturnManagementDto;
import com.ruoyi.procurementrecord.dto.ReturnSaleProductDto;
import com.ruoyi.procurementrecord.mapper.ReturnManagementMapper;
import com.ruoyi.procurementrecord.mapper.ReturnSaleProductMapper;
import com.ruoyi.procurementrecord.pojo.ReturnManagement;
import com.ruoyi.procurementrecord.pojo.ReturnSaleProduct;
import com.ruoyi.procurementrecord.service.ReturnManagementService;
import com.ruoyi.procurementrecord.service.ReturnSaleProductService;
import com.ruoyi.sales.dto.SalesLedgerDto;
import com.ruoyi.sales.dto.SalesLedgerProductDto;
import com.ruoyi.sales.mapper.SalesLedgerMapper;
import com.ruoyi.sales.pojo.SalesLedger;
import com.ruoyi.sales.pojo.SalesLedgerProduct;
import com.ruoyi.sales.pojo.ShippingInfo;
import com.ruoyi.sales.service.ISalesLedgerProductService;
import com.ruoyi.sales.service.ShippingInfoService;
import com.ruoyi.sales.service.impl.ShippingInfoServiceImpl;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Bean;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;

import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.stream.Collectors;

/**
 * @author :yys
@@ -21,9 +45,74 @@
    @Autowired
    private ReturnManagementMapper returnManagementMapper;

    @Autowired
    private ReturnSaleProductService returnSaleProductService;
    @Autowired
    private ShippingInfoService shippingInfoService;
    @Autowired
    private SalesLedgerMapper salesLedgerMapper;

    @Override
    public IPage<ReturnManagement> listPage(Page page, ReturnManagement returnManagement) {
        IPage<ReturnManagement> returnManagementIPage =  returnManagementMapper.listPage(page, returnManagement);
    public IPage<ReturnManagementDto> listPage(Page page, ReturnManagementDto returnManagement) {
        IPage<ReturnManagementDto> returnManagementIPage = returnManagementMapper.listPage(page, returnManagement);
        for (ReturnManagementDto returnManagementDto : returnManagementIPage.getRecords()) {
            List<ReturnSaleProductDto> returnSaleProducts = returnSaleProductService.listReturnSaleProductDto(returnManagementDto.getId());
            returnManagementDto.setReturnSaleProducts(returnSaleProducts);
        }
        return returnManagementIPage;
    }

    @Override
    public boolean addReturnManagementDto(ReturnManagementDto returnManagementDto) {
        String rt = OrderUtils.countTodayByCreateTime(returnManagementMapper, "RT");
        returnManagementDto.setReturnNo(rt);
        save(returnManagementDto);
        for (ReturnSaleProduct returnSaleProduct : returnManagementDto.getReturnSaleProducts()) {
            returnSaleProduct.setReturnManagementId(returnManagementDto.getId());
            returnSaleProduct.setStatus(0);
            returnSaleProductService.save(returnSaleProduct);
        }
        return true;
    }

    @Override
    public boolean updateReturnManagementDto(ReturnManagementDto returnManagementDto) {
        List<ReturnSaleProduct> returnSaleProducts = new ArrayList<>();
        if (!CollectionUtils.isEmpty(returnManagementDto.getReturnSaleProducts())) {
            returnManagementDto.getReturnSaleProducts().stream().forEach(returnSaleProductDto -> {
                ReturnSaleProduct returnSaleProduct = new ReturnSaleProduct();
                BeanUtils.copyProperties(returnSaleProductDto, returnSaleProduct);
                returnSaleProducts.add(returnSaleProduct);
            });
        }
        returnSaleProductService.updateBatchById(returnSaleProducts);
        return updateById(returnManagementDto);
    }

    @Override
    public SalesLedgerDto getReturnManagementDtoByShippingIdId(Long shippingId) {
        ShippingInfo byId = shippingInfoService.getById(shippingId);
        SalesLedger salesLedger = salesLedgerMapper.selectById(byId.getSalesLedgerId());
        SalesLedgerDto salesLedgerDto = new SalesLedgerDto();
        BeanUtils.copyProperties(salesLedger, salesLedgerDto);

        List<SalesLedgerProductDto> salesLedgerProductDtos = shippingInfoService.getReturnManagementDtoById(shippingId);
        salesLedgerDto.setProductDtoData(salesLedgerProductDtos);
         return salesLedgerDto;
    }

    @Override
    public boolean handle(Long returnManagementId) {
        ReturnManagement byId = this.getById(returnManagementId);
        byId.setStatus(1);
        return false;
    }

    @Override
    public ReturnManagementDto getReturnManagementDtoById(Long returnManagementId) {
        ReturnManagementDto returnManagementDtoById = returnManagementMapper.getReturnManagementDtoById(returnManagementId);
        returnManagementDtoById.setReturnSaleProducts(returnSaleProductService.listReturnSaleProductDto(returnManagementId));
        return returnManagementDtoById;
    }

}

 src/main/java/com/ruoyi/procurementrecord/service/impl/ReturnSaleProductServiceImpl.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,32 @@
package com.ruoyi.procurementrecord.service.impl;

import com.ruoyi.procurementrecord.dto.ReturnSaleProductDto;
import com.ruoyi.procurementrecord.pojo.ReturnSaleProduct;
import com.ruoyi.procurementrecord.mapper.ReturnSaleProductMapper;
import com.ruoyi.procurementrecord.service.ReturnSaleProductService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

import java.util.Collections;
import java.util.List;

/**
 * <p>
 * é€€è´§äº§å“è¡¨ æœåŠ¡å®žçŽ°ç±»
 * </p>
 *
 * @author èŠ¯å¯¼è½¯ä»¶ï¼ˆæ±Ÿè‹ï¼‰æœ‰é™å…¬å¸
 * @since 2026-03-05 03:57:42
 */
@Service
public class ReturnSaleProductServiceImpl extends ServiceImpl<ReturnSaleProductMapper, ReturnSaleProduct> implements ReturnSaleProductService {

    @Autowired
    private ReturnSaleProductMapper returnSaleProductMapper;
    @Override
    public List<ReturnSaleProductDto> listReturnSaleProductDto(Long returnManagementId) {

        return returnSaleProductMapper.listReturnSaleProductDto(returnManagementId);
    }
}

 src/main/java/com/ruoyi/project/system/domain/SysDept.java

@@ -6,6 +6,8 @@
import javax.validation.constraints.NotBlank;

import javax.validation.constraints.NotNull;

import javax.validation.constraints.Size;



import com.baomidou.mybatisplus.annotation.TableField;

import org.apache.commons.lang3.builder.ToStringBuilder;

import org.apache.commons.lang3.builder.ToStringStyle;

import com.ruoyi.framework.web.domain.BaseEntity;

@@ -50,15 +52,18 @@
    private String delFlag;



    /** çˆ¶éƒ¨é—¨åç§° */

    @TableField(exist = false)

    private String parentName;



    /** éƒ¨é—¨ç¼–号 */

    private String deptNick;



    /** å‘˜å·¥æ•°é‡ */

    @TableField(exist = false)

    private Integer staffCount;

    

    /** å­éƒ¨é—¨ */

    @TableField(exist = false)

    private List<SysDept> children = new ArrayList<SysDept>();



    public Long getDeptId()


 src/main/java/com/ruoyi/project/system/mapper/SysDeptMapper.java

@@ -2,6 +2,7 @@


import java.util.List;



import com.baomidou.mybatisplus.core.mapper.BaseMapper;

import org.apache.ibatis.annotations.Mapper;

import org.apache.ibatis.annotations.Param;

import com.ruoyi.project.system.domain.SysDept;

@@ -12,7 +13,7 @@
 * @author ruoyi

 */

@Mapper

public interface SysDeptMapper

public interface SysDeptMapper extends BaseMapper<SysDept>

{

    /**

     * æŸ¥è¯¢éƒ¨é—¨ç®¡ç†æ•°æ®


 src/main/java/com/ruoyi/project/system/service/impl/SysUserServiceImpl.java

@@ -456,7 +456,7 @@


    /**

     * æ‰¹é‡åˆ é™¤ç”¨æˆ·ä¿¡æ¯

     * 
     *

     * @param userIds éœ€è¦åˆ é™¤çš„用户ID

     * @return ç»“æžœ

     */

@@ -473,6 +473,9 @@
        userRoleMapper.deleteUserRole(userIds);

        // åˆ é™¤ç”¨æˆ·ä¸Žå²—位关联

        userPostMapper.deleteUserPost(userIds);

        // åˆ é™¤ç”¨æˆ·ä¸Žéƒ¨é—¨æ•°æ®

        sysUserDeptMapper.delete(new LambdaQueryWrapper<SysUserDept>()

                .in(SysUserDept::getUserId, userIds));

        return userMapper.deleteUserByIds(userIds);

    }




 src/main/java/com/ruoyi/projectManagement/controller/RolesController.java

@@ -5,6 +5,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.utils.OrderUtils;
import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.projectManagement.dto.RoleDto;
import com.ruoyi.projectManagement.mapper.RolesMapper;
import com.ruoyi.projectManagement.pojo.Roles;
import com.ruoyi.projectManagement.service.RolesService;
@@ -17,7 +18,7 @@

@RestController
@AllArgsConstructor
@RequestMapping("/roles")
@RequestMapping("/projectManagement/roles")
@Api(value = "Roles", tags = "")
public class RolesController {

@@ -32,9 +33,11 @@

    @PostMapping("/add")
    @ApiOperation("新增")
    public AjaxResult add(@RequestBody Roles role) {
        role.setNo(OrderUtils.countTodayByCreateTime(rolesMapper, "XMJS"));
        return AjaxResult.success(rolesservice.save(role));
    public AjaxResult add(@RequestBody RoleDto roleDto) {
        if (roleDto.getIsDefaultNo()) {
            roleDto.setNo(OrderUtils.countTodayByCreateTime(rolesMapper, "XMJS"));
        }
        return AjaxResult.success(rolesservice.save(roleDto));
    }

    @PostMapping("/update")

 src/main/java/com/ruoyi/projectManagement/dto/RoleDto.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,12 @@
package com.ruoyi.projectManagement.dto;

import com.ruoyi.projectManagement.pojo.Roles;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

@Data
public class RoleDto extends Roles {
    // æ˜¯å¦ä½¿ç”¨ç³»ç»Ÿç¼–号
    @ApiModelProperty("是否使用系统编号")
    private Boolean isDefaultNo;
}

 src/main/java/com/ruoyi/projectManagement/mapper/PlanMapper.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,21 @@
package com.ruoyi.projectManagement.mapper;

import com.baomidou.mybatisplus.core.metadata.IPage;
import com.ruoyi.projectManagement.pojo.Plan;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.projectManagement.vo.SearchPlanVo;

/**
* @author buhuazhen
* @description é’ˆå¯¹è¡¨ã€project_management_plan(项目管理计划表(项目管理类型))】的数据库操作Mapper
* @createDate 2026-03-06 15:29:26
* @Entity generator.domain.ProjectManagementPlan
*/
public interface PlanMapper extends BaseMapper<Plan> {

    IPage<Plan> selectPlanPage(SearchPlanVo searchPlanVo);
}





 src/main/java/com/ruoyi/projectManagement/pojo/Plan.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,84 @@
package com.ruoyi.projectManagement.pojo;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import java.time.LocalDateTime;

import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

/**
 * é¡¹ç›®ç®¡ç†è®¡åˆ’表(项目管理类型)
 * @TableName project_management_plan
 */
@TableName(value ="project_management_plan")
@Data
@ApiModel(description="项目管理计划表(项目管理类型)")
public class Plan {
    /**
     * 
     */
    @TableId(value = "id", type = IdType.AUTO)
    @ApiModelProperty(value="主键ID")
    private Long id;

    /**
     * è®¡åˆ’名称
     */
    @TableField(value = "name")
    @ApiModelProperty(value="计划名称")
    private String name;

    /**
     * è®¡åˆ’描述
     */
    @TableField(value = "describe")
    @ApiModelProperty(value="计划描述")
    private String describe;

    /**
     * é™„件 ,进行分割
     */
    @TableField(value = "attachment")
    @ApiModelProperty(value="附件")
    private String attachment;

    /**
     * 
     */
    @TableField(value = "is_delete")
    @ApiModelProperty(value="是否删除")
    private Integer isDelete;

    /**
     * 
     */
    @TableField(value = "create_time",fill = FieldFill.INSERT)
    @ApiModelProperty(value="创建时间")
    private LocalDateTime createTime;

    /**
     * 
     */
    @TableField(value = "update_time",fill = FieldFill.INSERT_UPDATE)
    @ApiModelProperty(value="更新时间")
    private LocalDateTime updateTime;

    /**
     * 
     */
    @TableField(value = "create_user",fill = FieldFill.INSERT)
    @ApiModelProperty(value="创建人")
    private String createUser;

    /**
     * 
     */
    @TableField(value = "update_user",fill = FieldFill.INSERT_UPDATE)
    @ApiModelProperty(value="更新人")
    private String updateUser;
}

 src/main/java/com/ruoyi/projectManagement/pojo/Roles.java

@@ -38,10 +38,6 @@
    @ApiModelProperty(value="状态(1:启用, 0:禁用)")
    private Integer status;

    @ApiModelProperty(value = "租户ID")
    @TableField(fill = FieldFill.INSERT)
    private Long tenantId;

    @ApiModelProperty(value = "创建时间")
    @TableField(fill = FieldFill.INSERT)
    private LocalDateTime createTime;

 src/main/java/com/ruoyi/projectManagement/service/PlanService.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,34 @@
package com.ruoyi.projectManagement.service;

import com.baomidou.mybatisplus.core.metadata.IPage;
import com.ruoyi.projectManagement.pojo.Plan;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.projectManagement.vo.PlanVo;
import com.ruoyi.projectManagement.vo.SavePlanVo;
import com.ruoyi.projectManagement.vo.SearchPlanVo;

import javax.validation.constraints.NotNull;
import java.util.List;

/**
* @author buhuazhen
* @description é’ˆå¯¹è¡¨ã€project_management_plan(项目管理计划表(项目管理类型))】的数据库操作Service
* @createDate 2026-03-06 15:29:26
*/
public interface PlanService{

    /**
     * ä¿å­˜é¡¹ç›®ç®¡ç†è®¡åˆ’
     * @param savePlanVo
     */
    void savePlan(@NotNull SavePlanVo savePlanVo);

    /**
     * åˆ é™¤é¡¹ç›®ç®¡ç†è®¡åˆ’
     * @param id
     */
    void deletePlan(@NotNull Long id);


    IPage<PlanVo> searchPlan(@NotNull SearchPlanVo searchPlanVo);
}

 src/main/java/com/ruoyi/projectManagement/service/impl/PlanServiceImpl.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,81 @@
package com.ruoyi.projectManagement.service.impl;

import cn.hutool.core.bean.BeanUtil;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.ruoyi.basic.service.CustomerFollowUpFileService;
import com.ruoyi.projectManagement.mapper.PlanMapper;
import com.ruoyi.projectManagement.pojo.Plan;
import com.ruoyi.projectManagement.service.PlanService;
import com.ruoyi.projectManagement.vo.PlanVo;
import com.ruoyi.projectManagement.vo.SavePlanVo;
import com.ruoyi.projectManagement.vo.SearchPlanVo;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

import java.util.Collections;
import java.util.Optional;

/**
 * @author buhuazhen
 * @description é¡¹ç›®ç®¡ç†è®¡åˆ’的实现
 * @createDate 2026-03-06 15:29:26
 */
@Service
@RequiredArgsConstructor
@Transactional(readOnly = true)
public class PlanServiceImpl implements PlanService {

    private final PlanMapper planMapper;

    private final CustomerFollowUpFileService customerFollowUpFileService;

    @Override
    @Transactional(rollbackFor = Exception.class)
    public void savePlan(SavePlanVo savePlanVo) {
        Plan plan = BeanUtil.copyProperties(savePlanVo, Plan.class);
        // é™„件处理 , æ‹¼æŽ¥
        String attachments = String.join(",", Optional.ofNullable(savePlanVo.getAttachmentIds()).orElse(Collections.emptyList()));
        plan.setAttachment(attachments);


        if (savePlanVo.getId() == null) {
            planMapper.insert(plan);
        } else {
            planMapper.updateById(plan);
        }

        // todo@ èŠ‚点保存


    }

    @Override
    @Transactional(rollbackFor = Exception.class)
    public void deletePlan(Long id) {
        planMapper.update(null,
                new LambdaUpdateWrapper<Plan>()
                        .eq(Plan::getId, id)
                        .set(Plan::getIsDelete, 1));
        // todo@ å¯¹åº”节点全部删除


    }

    @Override
    public IPage<PlanVo> searchPlan(SearchPlanVo searchPlanVo) {
        IPage<Plan> planIPage = planMapper.selectPlanPage(searchPlanVo);
        IPage<PlanVo> resultPage = planIPage.convert(plan -> BeanUtil.copyProperties(plan, PlanVo.class));
        // æ–‡ä»¶èŽ·å–
        customerFollowUpFileService.fillAttachment(resultPage.getRecords(), PlanVo::getAttachment, PlanVo::setAttachmentList);
        // todo@ node èŠ‚点获取

        return resultPage;
    }

}





 src/main/java/com/ruoyi/projectManagement/service/impl/RolesServiceImpl.java

@@ -1,24 +1,32 @@
package com.ruoyi.projectManagement.service.impl;

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.projectManagement.mapper.RolesMapper;
import com.ruoyi.projectManagement.pojo.Roles;
import com.ruoyi.projectManagement.service.RolesService;
import lombok.AllArgsConstructor;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

@AllArgsConstructor
@Service
@RequiredArgsConstructor
@Transactional(rollbackFor = Exception.class)
public class RolesServiceImpl extends ServiceImpl<RolesMapper, Roles> implements RolesService {

    private final RolesMapper rolesmapper;

    @Override
    public IPage<Roles> listPage(Page<Roles> page, Roles roles) {
        return rolesmapper.selectPage(page, null);
        LambdaQueryWrapper<Roles> queryWrapper = new LambdaQueryWrapper<>();
        if (roles.getName() != null) {
            queryWrapper.like(Roles::getName, roles.getName());
        }
        if (roles.getStatus() != null) {
            queryWrapper.eq(Roles::getStatus, roles.getStatus());
        }
        return rolesmapper.selectPage(page, queryWrapper);
    }
}

 src/main/java/com/ruoyi/projectManagement/vo/PlanVo.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,40 @@
package com.ruoyi.projectManagement.vo;

import com.fasterxml.jackson.annotation.JsonIgnore;
import com.ruoyi.common.vo.SimpleFileVo;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;

import java.io.Serializable;
import java.time.LocalDateTime;
import java.util.List;

/**
 * è®¡åˆ’VO
 * @author buhuazhen
 * @date 2026/3/6
 * @email 3038525872@qq.com
 */
@Data
@AllArgsConstructor
@NoArgsConstructor
public class PlanVo implements Serializable {

    private Long id;

    private String name;

    private String describe;

    // é™„件
    private List<SimpleFileVo> attachmentList;

    @JsonIgnore
    private String attachment;

    private LocalDateTime createTime;

    private LocalDateTime updateTime;

}

 src/main/java/com/ruoyi/projectManagement/vo/SavePlanVo.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,31 @@
package com.ruoyi.projectManagement.vo;

import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;

import javax.validation.constraints.NotBlank;
import java.io.Serializable;
import java.util.List;

/**
 * @author buhuazhen
 * @date 2026/3/6
 * @email 3038525872@qq.com
 */
@Data
@AllArgsConstructor
@NoArgsConstructor
public class SavePlanVo implements Serializable {

    private Long id;
    @NotBlank
    private String name;
    @NotBlank
    private String describe;

    private List<String> attachmentIds;



}

 src/main/java/com/ruoyi/projectManagement/vo/SearchPlanVo.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,21 @@
package com.ruoyi.projectManagement.vo;

import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;

import java.io.Serializable;

/**
 * @author buhuazhen
 * @date 2026/3/6
 * @email 3038525872@qq.com
 */
@Data
@AllArgsConstructor
@NoArgsConstructor
public class SearchPlanVo extends Page implements Serializable {


}

 src/main/java/com/ruoyi/purchase/controller/PurchaseReturnOrdersController.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,18 @@
package com.ruoyi.purchase.controller;

import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;

/**
 * <p>
 *  å‰ç«¯æŽ§åˆ¶å™¨
 * </p>
 *
 * @author èŠ¯å¯¼è½¯ä»¶ï¼ˆæ±Ÿè‹ï¼‰æœ‰é™å…¬å¸
 * @since 2026-03-06 11:44:38
 */
@RestController
@RequestMapping("/purchaseReturnOrders")
public class PurchaseReturnOrdersController {

}

 src/main/java/com/ruoyi/purchase/mapper/PurchaseReturnOrdersMapper.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,18 @@
package com.ruoyi.purchase.mapper;

import com.ruoyi.purchase.pojo.PurchaseReturnOrders;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper;

/**
 * <p>
 *  Mapper æŽ¥å£
 * </p>
 *
 * @author èŠ¯å¯¼è½¯ä»¶ï¼ˆæ±Ÿè‹ï¼‰æœ‰é™å…¬å¸
 * @since 2026-03-06 11:44:38
 */
@Mapper
public interface PurchaseReturnOrdersMapper extends BaseMapper<PurchaseReturnOrders> {

}

 src/main/java/com/ruoyi/purchase/pojo/PurchaseReturnOrders.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,71 @@
package com.ruoyi.purchase.pojo;

import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
import java.time.LocalDateTime;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
import lombok.Setter;

/**
 * <p>
 * 
 * </p>
 *
 * @author èŠ¯å¯¼è½¯ä»¶ï¼ˆæ±Ÿè‹ï¼‰æœ‰é™å…¬å¸
 * @since 2026-03-06 11:44:38
 */
@Getter
@Setter
@TableName("purchase_return_orders")
@ApiModel(value = "PurchaseReturnOrders对象", description = "采购退货单")
public class PurchaseReturnOrders implements Serializable {

    private static final long serialVersionUID = 1L;

    @TableId(value = "id", type = IdType.AUTO)
    private Long id;

    @ApiModelProperty("退货单编号")
    private String no;

    @ApiModelProperty("退货方式 0退货退款 1拒收")
    private Integer returnType;

    @ApiModelProperty("供应商id")
    private Long supplierId;

    @ApiModelProperty("项目id")
    private Long projectId;

    @ApiModelProperty("项目阶段")
    private Integer projectPhase;

    @ApiModelProperty("制单日期")
    private LocalDateTime preparedAt;

    @ApiModelProperty("制单人id")
    private Long preparedUserId;

    @ApiModelProperty("退料人id")
    private Long returnUserId;

    @ApiModelProperty("采购订单id")
    private Long purchaseLedgerId;

    @ApiModelProperty("备注")
    private String remark;

    @ApiModelProperty("录入时间")
    @TableField(fill = FieldFill.INSERT)
    private LocalDateTime createTime;

    @ApiModelProperty("更新时间")
    @TableField(fill = FieldFill.INSERT_UPDATE)
    private LocalDateTime updateTime;
}

 src/main/java/com/ruoyi/purchase/service/PurchaseReturnOrdersService.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,16 @@
package com.ruoyi.purchase.service;

import com.ruoyi.purchase.pojo.PurchaseReturnOrders;
import com.baomidou.mybatisplus.extension.service.IService;

/**
 * <p>
 *  æœåŠ¡ç±»
 * </p>
 *
 * @author èŠ¯å¯¼è½¯ä»¶ï¼ˆæ±Ÿè‹ï¼‰æœ‰é™å…¬å¸
 * @since 2026-03-06 11:44:38
 */
public interface PurchaseReturnOrdersService extends IService<PurchaseReturnOrders> {

}

 src/main/java/com/ruoyi/purchase/service/impl/PurchaseReturnOrdersServiceImpl.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,20 @@
package com.ruoyi.purchase.service.impl;

import com.ruoyi.purchase.pojo.PurchaseReturnOrders;
import com.ruoyi.purchase.mapper.PurchaseReturnOrdersMapper;
import com.ruoyi.purchase.service.PurchaseReturnOrdersService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;

/**
 * <p>
 *  æœåŠ¡å®žçŽ°ç±»
 * </p>
 *
 * @author èŠ¯å¯¼è½¯ä»¶ï¼ˆæ±Ÿè‹ï¼‰æœ‰é™å…¬å¸
 * @since 2026-03-06 11:44:38
 */
@Service
public class PurchaseReturnOrdersServiceImpl extends ServiceImpl<PurchaseReturnOrdersMapper, PurchaseReturnOrders> implements PurchaseReturnOrdersService {

}

 src/main/java/com/ruoyi/sales/controller/ShippingInfoController.java

@@ -135,4 +135,10 @@
        util.exportExcel(response, list, "发货信息");
    }


    @GetMapping("/getByCustomerName")
    @ApiOperation("通过客户名称查询")
    public AjaxResult getByCustomerName(String customerName) {
        return AjaxResult.success(shippingInfoService.getShippingInfoByCustomerName(customerName));
    }
}

 src/main/java/com/ruoyi/sales/dto/SalesLedgerDto.java

@@ -43,6 +43,7 @@

    private Boolean hasChildren = false;
    private List<SalesLedgerProduct> productData;
    private List<SalesLedgerProductDto> productDtoData;
    private List<String> tempFileIds;
    private List<CommonFile> SalesLedgerFiles;


 src/main/java/com/ruoyi/sales/dto/SalesLedgerProductDto.java

@@ -3,6 +3,7 @@
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
import com.ruoyi.sales.pojo.SalesLedgerProduct;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;


@@ -57,4 +58,11 @@

    private Integer approvalStatus;


    @ApiModelProperty(value = "未退货数")
    private BigDecimal unQuantity;

    @ApiModelProperty(value = "退货总数")
    private BigDecimal totalReturnNum;

}

 src/main/java/com/ruoyi/sales/mapper/ShippingInfoMapper.java

@@ -3,7 +3,10 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.procurementrecord.dto.ReturnSaleProductDto;
import com.ruoyi.sales.dto.SalesLedgerProductDto;
import com.ruoyi.sales.dto.ShippingInfoDto;
import com.ruoyi.sales.pojo.SalesLedgerProduct;
import com.ruoyi.sales.pojo.ShippingInfo;
import org.apache.ibatis.annotations.Param;

@@ -17,4 +20,9 @@
    IPage<ShippingInfoDto> listPage(Page page, @Param("req") ShippingInfo req);

    List<ShippingInfo> listAll();

    List<SalesLedgerProductDto> getReturnManagementDtoById(Long shippingId);

    List<ShippingInfo> getShippingInfoByCustomerName(String customerName);

}

 src/main/java/com/ruoyi/sales/service/ShippingInfoService.java

@@ -3,6 +3,8 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.procurementrecord.dto.ReturnSaleProductDto;
import com.ruoyi.sales.dto.SalesLedgerProductDto;
import com.ruoyi.sales.dto.ShippingInfoDto;
import com.ruoyi.sales.pojo.ShippingInfo;

@@ -19,4 +21,8 @@
    boolean deductStock(ShippingInfoDto req) throws IOException;

    boolean delete(List<Long> ids);

    List<SalesLedgerProductDto> getReturnManagementDtoById(Long shippingId);

    List<ShippingInfo> getShippingInfoByCustomerName(String customerName);
}

 src/main/java/com/ruoyi/sales/service/impl/ShippingInfoServiceImpl.java

@@ -9,7 +9,9 @@
import com.ruoyi.common.enums.FileNameType;
import com.ruoyi.common.enums.StockOutQualifiedRecordTypeEnum;
import com.ruoyi.other.service.impl.TempFileServiceImpl;
import com.ruoyi.procurementrecord.dto.ReturnSaleProductDto;
import com.ruoyi.procurementrecord.utils.StockUtils;
import com.ruoyi.sales.dto.SalesLedgerProductDto;
import com.ruoyi.sales.dto.ShippingInfoDto;
import com.ruoyi.sales.mapper.SalesLedgerProductMapper;
import com.ruoyi.sales.mapper.ShippingInfoMapper;
@@ -107,4 +109,15 @@

        return this.removeBatchByIds(ids);
    }

    @Override
    public List<SalesLedgerProductDto> getReturnManagementDtoById(Long shippingId) {
        return shippingInfoMapper.getReturnManagementDtoById(shippingId);

    }

    @Override
    public List<ShippingInfo> getShippingInfoByCustomerName(String customerName) {
        return shippingInfoMapper.getShippingInfoByCustomerName(customerName);
    }
}

 src/main/java/com/ruoyi/staff/controller/SchemeApplicableStaffController.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,69 @@
package com.ruoyi.staff.controller;

import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.utils.OrderUtils;
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.controller.BaseController;
import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.staff.pojo.SchemeApplicableStaff;
import com.ruoyi.staff.service.SchemeApplicableStaffService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;

import java.util.List;

/**
 * <p>
 * ç¤¾ä¿æ–¹æ¡ˆé€‚用人员表 å‰ç«¯æŽ§åˆ¶å™¨
 * </p>
 *
 * @author èŠ¯å¯¼è½¯ä»¶ï¼ˆæ±Ÿè‹ï¼‰æœ‰é™å…¬å¸
 * @since 2026-03-05 11:50:17
 */
@Api(tags = "社保方案适用人员表")
@RestController
@RequestMapping("/schemeApplicableStaff")
public class SchemeApplicableStaffController extends BaseController {


    @Autowired
    private SchemeApplicableStaffService schemeApplicableStaffService;


    @GetMapping("/listPage")
    @ApiOperation(value = "分页查询")
    public AjaxResult listPage(Page page, SchemeApplicableStaff schemeApplicableStaff) {
        return schemeApplicableStaffService.listPage(page,schemeApplicableStaff);
    }

    @PostMapping("/add")
    @ApiOperation(value = "添加")
    @Transactional(rollbackFor = Exception.class)
    @Log(title = "社保方案适用人员表", businessType = BusinessType.INSERT)
    public AjaxResult add(@RequestBody SchemeApplicableStaff schemeApplicableStaff) {
        return schemeApplicableStaffService.add(schemeApplicableStaff);
    }

    @PostMapping("/updateSchemeApplicableStaff")
    @ApiOperation(value = "修改")
    @Transactional(rollbackFor = Exception.class)
    @Log(title = "社保方案适用人员表", businessType = BusinessType.UPDATE)
    public AjaxResult updateSchemeApplicableStaff(@RequestBody SchemeApplicableStaff schemeApplicableStaff) {
        return schemeApplicableStaffService.updateSchemeApplicableStaff(schemeApplicableStaff);
    }

    @DeleteMapping("/delete")
    @ApiOperation(value = "删除")
    @Transactional(rollbackFor = Exception.class)
    @Log(title = "社保方案适用人员表", businessType = BusinessType.DELETE)
    public AjaxResult delete(@RequestBody List<Long> ids) {
        return schemeApplicableStaffService.delete(ids);
    }



}

 src/main/java/com/ruoyi/staff/controller/SchemeInsuranceDetailController.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,18 @@
package com.ruoyi.staff.controller;

import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;

/**
 * <p>
 * ç¤¾ä¿æ–¹æ¡ˆä¿é™©ç¦åˆ©æ˜Žç»†è¡¨ å‰ç«¯æŽ§åˆ¶å™¨
 * </p>
 *
 * @author èŠ¯å¯¼è½¯ä»¶ï¼ˆæ±Ÿè‹ï¼‰æœ‰é™å…¬å¸
 * @since 2026-03-05 11:52:23
 */
@RestController
@RequestMapping("/schemeInsuranceDetail")
public class SchemeInsuranceDetailController {

}

 src/main/java/com/ruoyi/staff/controller/StaffEducationController.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,18 @@
package com.ruoyi.staff.controller;

import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;

/**
 * <p>
 * å‘˜å·¥æ•™è‚²ç»åŽ†è¡¨ å‰ç«¯æŽ§åˆ¶å™¨
 * </p>
 *
 * @author èŠ¯å¯¼è½¯ä»¶ï¼ˆæ±Ÿè‹ï¼‰æœ‰é™å…¬å¸
 * @since 2026-03-05 04:33:08
 */
@RestController
@RequestMapping("/staffEducation")
public class StaffEducationController {

}

 src/main/java/com/ruoyi/staff/controller/StaffEmergencyContactController.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,18 @@
package com.ruoyi.staff.controller;

import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;

/**
 * <p>
 * å‘˜å·¥ç´§æ€¥è”系人表 å‰ç«¯æŽ§åˆ¶å™¨
 * </p>
 *
 * @author èŠ¯å¯¼è½¯ä»¶ï¼ˆæ±Ÿè‹ï¼‰æœ‰é™å…¬å¸
 * @since 2026-03-05 04:34:17
 */
@RestController
@RequestMapping("/staffEmergencyContact")
public class StaffEmergencyContactController {

}

 src/main/java/com/ruoyi/staff/controller/StaffWorkExperienceController.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,18 @@
package com.ruoyi.staff.controller;

import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;

/**
 * <p>
 * å‘˜å·¥å·¥ä½œç»åŽ†è¡¨ å‰ç«¯æŽ§åˆ¶å™¨
 * </p>
 *
 * @author èŠ¯å¯¼è½¯ä»¶ï¼ˆæ±Ÿè‹ï¼‰æœ‰é™å…¬å¸
 * @since 2026-03-05 04:33:36
 */
@RestController
@RequestMapping("/staffWorkExperience")
public class StaffWorkExperienceController {

}

 src/main/java/com/ruoyi/staff/dto/StaffOnJobDto.java

@@ -4,6 +4,7 @@
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
import com.ruoyi.staff.pojo.StaffOnJob;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;

import java.util.Date;

@@ -18,8 +19,10 @@
    private String contractTerm;

    @JsonFormat(pattern = "yyyy-MM-dd")
    @DateTimeFormat(pattern = "yyyy-MM-dd")
    private Date contractStartTime;

    @JsonFormat(pattern = "yyyy-MM-dd")
    @DateTimeFormat(pattern = "yyyy-MM-dd")
    private Date contractEndTime;
}

 src/main/java/com/ruoyi/staff/mapper/SchemeApplicableStaffMapper.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,18 @@
package com.ruoyi.staff.mapper;

import com.ruoyi.staff.pojo.SchemeApplicableStaff;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper;

/**
 * <p>
 * ç¤¾ä¿æ–¹æ¡ˆé€‚用人员表 Mapper æŽ¥å£
 * </p>
 *
 * @author èŠ¯å¯¼è½¯ä»¶ï¼ˆæ±Ÿè‹ï¼‰æœ‰é™å…¬å¸
 * @since 2026-03-05 11:50:17
 */
@Mapper
public interface SchemeApplicableStaffMapper extends BaseMapper<SchemeApplicableStaff> {

}

 src/main/java/com/ruoyi/staff/mapper/SchemeInsuranceDetailMapper.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,18 @@
package com.ruoyi.staff.mapper;

import com.ruoyi.staff.pojo.SchemeInsuranceDetail;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper;

/**
 * <p>
 * ç¤¾ä¿æ–¹æ¡ˆä¿é™©ç¦åˆ©æ˜Žç»†è¡¨ Mapper æŽ¥å£
 * </p>
 *
 * @author èŠ¯å¯¼è½¯ä»¶ï¼ˆæ±Ÿè‹ï¼‰æœ‰é™å…¬å¸
 * @since 2026-03-05 11:52:23
 */
@Mapper
public interface SchemeInsuranceDetailMapper extends BaseMapper<SchemeInsuranceDetail> {

}

 src/main/java/com/ruoyi/staff/mapper/StaffEducationMapper.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,18 @@
package com.ruoyi.staff.mapper;

import com.ruoyi.staff.pojo.StaffEducation;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper;

/**
 * <p>
 * å‘˜å·¥æ•™è‚²ç»åŽ†è¡¨ Mapper æŽ¥å£
 * </p>
 *
 * @author èŠ¯å¯¼è½¯ä»¶ï¼ˆæ±Ÿè‹ï¼‰æœ‰é™å…¬å¸
 * @since 2026-03-05 04:33:08
 */
@Mapper
public interface StaffEducationMapper extends BaseMapper<StaffEducation> {

}

 src/main/java/com/ruoyi/staff/mapper/StaffEmergencyContactMapper.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,18 @@
package com.ruoyi.staff.mapper;

import com.ruoyi.staff.pojo.StaffEmergencyContact;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper;

/**
 * <p>
 * å‘˜å·¥ç´§æ€¥è”系人表 Mapper æŽ¥å£
 * </p>
 *
 * @author èŠ¯å¯¼è½¯ä»¶ï¼ˆæ±Ÿè‹ï¼‰æœ‰é™å…¬å¸
 * @since 2026-03-05 04:34:17
 */
@Mapper
public interface StaffEmergencyContactMapper extends BaseMapper<StaffEmergencyContact> {

}

 src/main/java/com/ruoyi/staff/mapper/StaffWorkExperienceMapper.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,18 @@
package com.ruoyi.staff.mapper;

import com.ruoyi.staff.pojo.StaffWorkExperience;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper;

/**
 * <p>
 * å‘˜å·¥å·¥ä½œç»åŽ†è¡¨ Mapper æŽ¥å£
 * </p>
 *
 * @author èŠ¯å¯¼è½¯ä»¶ï¼ˆæ±Ÿè‹ï¼‰æœ‰é™å…¬å¸
 * @since 2026-03-05 04:33:36
 */
@Mapper
public interface StaffWorkExperienceMapper extends BaseMapper<StaffWorkExperience> {

}

 src/main/java/com/ruoyi/staff/pojo/SchemeApplicableStaff.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,84 @@
package com.ruoyi.staff.pojo;

import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
import java.time.LocalDateTime;
import java.util.List;

import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
import lombok.Setter;

/**
 * <p>
 * ç¤¾ä¿æ–¹æ¡ˆé€‚用人员表
 * </p>
 *
 * @author èŠ¯å¯¼è½¯ä»¶ï¼ˆæ±Ÿè‹ï¼‰æœ‰é™å…¬å¸
 * @since 2026-03-05 11:50:17
 */
@Getter
@Setter
@TableName("scheme_applicable_staff")
@ApiModel(value = "SchemeApplicableStaff对象", description = "社保方案适用人员表")
public class SchemeApplicableStaff implements Serializable {

    private static final long serialVersionUID = 1L;

    @ApiModelProperty("社保方案保险福利明细")
    @TableField(exist = false)
    private List<SchemeInsuranceDetail> schemeInsuranceDetailList;

    @ApiModelProperty("主键ID")
    @TableId(value = "id", type = IdType.AUTO)
    private Long id;

    @ApiModelProperty("标题")
    private String title;

    @ApiModelProperty("部门ids,多个使用,隔开")
    private String deptIds;

    @ApiModelProperty("部门名称,多个使用,隔开")
    @TableField(exist = false)
    private String deptNames;

    @ApiModelProperty("人员名称,多个使用,隔开")
    private String staffNames;

    @ApiModelProperty("人员id,多个使用,隔开")
    private String staffIds;

    @ApiModelProperty("保险类型名称多个使用,隔开")
    private String insuranceTypes;

    @ApiModelProperty("备注")
    private String remark;

    @TableField(exist = false)
    @ApiModelProperty("创建人名称")
    private String createUserName;

    @ApiModelProperty("创建时间")
    @TableField(fill = FieldFill.INSERT)
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8", shape = JsonFormat.Shape.STRING)
    private LocalDateTime createTime;

    @ApiModelProperty("更新时间")
    @TableField(fill = FieldFill.INSERT_UPDATE)
    private LocalDateTime updateTime;

    @ApiModelProperty("创建人")
    @TableField(fill = FieldFill.INSERT)
    private Integer createUser;

    @ApiModelProperty("更新人")
    @TableField(fill = FieldFill.INSERT_UPDATE)
    private Integer updateUser;
}

 src/main/java/com/ruoyi/staff/pojo/SchemeInsuranceDetail.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,69 @@
package com.ruoyi.staff.pojo;

import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
import java.math.BigDecimal;
import java.time.LocalDateTime;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
import lombok.Setter;

/**
 * <p>
 * ç¤¾ä¿æ–¹æ¡ˆä¿é™©ç¦åˆ©æ˜Žç»†è¡¨
 * </p>
 *
 * @author èŠ¯å¯¼è½¯ä»¶ï¼ˆæ±Ÿè‹ï¼‰æœ‰é™å…¬å¸
 * @since 2026-03-05 11:52:23
 */
@Getter
@Setter
@TableName("scheme_insurance_detail")
@ApiModel(value = "SchemeInsuranceDetail对象", description = "社保方案保险福利明细表")
public class SchemeInsuranceDetail implements Serializable {

    private static final long serialVersionUID = 1L;

    @ApiModelProperty("明细ID（主键）")
    @TableId(value = "id", type = IdType.AUTO)
    private Long id;

    @ApiModelProperty("关联的社保方案ID")
    private Long schemeId;

    @ApiModelProperty("保险类型（如医疗保险、养老保险等）")
    private String insuranceType;

    @ApiModelProperty("缴费基数")
    private BigDecimal paymentBase;

    @ApiModelProperty("是否调用基本工资：1-否，2-是")
    private Integer useBasicSalary;

    @ApiModelProperty("个人缴费比例（%）")
    private BigDecimal personalRatio;

    @ApiModelProperty("个人固定缴费金额")
    private BigDecimal personalFixed;

    @ApiModelProperty("创建时间")
    @TableField(fill = FieldFill.INSERT)
    private LocalDateTime createTime;

    @ApiModelProperty("更新时间")
    @TableField(fill = FieldFill.INSERT_UPDATE)
    private LocalDateTime updateTime;

    @ApiModelProperty("创建人")
    @TableField(fill = FieldFill.INSERT)
    private Integer createUser;

    @ApiModelProperty("更新人")
    @TableField(fill = FieldFill.INSERT_UPDATE)
    private Integer updateUser;
}

 src/main/java/com/ruoyi/staff/pojo/StaffEducation.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,79 @@
package com.ruoyi.staff.pojo;

import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
import java.time.LocalDate;
import java.time.LocalDateTime;

import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
import lombok.Setter;
import org.springframework.format.annotation.DateTimeFormat;

/**
 * <p>
 * å‘˜å·¥æ•™è‚²ç»åŽ†è¡¨
 * </p>
 *
 * @author èŠ¯å¯¼è½¯ä»¶ï¼ˆæ±Ÿè‹ï¼‰æœ‰é™å…¬å¸
 * @since 2026-03-05 04:33:08
 */
@Getter
@Setter
@TableName("staff_education")
@ApiModel(value = "StaffEducation对象", description = "员工教育经历表")
public class StaffEducation implements Serializable {

    private static final long serialVersionUID = 1L;

    @ApiModelProperty("主键ID")
    @TableId(value = "id", type = IdType.AUTO)
    private Long id;

    @ApiModelProperty("关联staff_on_job表主键ID")
    private Long staffOnJobId;

    @ApiModelProperty("学历")
    private String education;

    @ApiModelProperty("毕业院校")
    private String schoolName;

    @ApiModelProperty("入学时间")
    @JsonFormat(pattern = "yyyy-MM-dd")
    @DateTimeFormat(pattern = "yyyy-MM-dd")
    private LocalDate enrollTime;

    @ApiModelProperty("毕业时间")
    @JsonFormat(pattern = "yyyy-MM-dd")
    @DateTimeFormat(pattern = "yyyy-MM-dd")
    private LocalDate graduateTime;

    @ApiModelProperty("专业")
    private String major;

    @ApiModelProperty("学位")
    private String degree;

    @ApiModelProperty("创建时间")
    @TableField(fill = FieldFill.INSERT)
    private LocalDateTime createTime;

    @ApiModelProperty("创建用户")
    @TableField(fill = FieldFill.INSERT)
    private Long createUser;

    @ApiModelProperty("修改时间")
    @TableField(fill = FieldFill.INSERT_UPDATE)
    private LocalDateTime updateTime;

    @ApiModelProperty("修改用户")
    @TableField(fill = FieldFill.INSERT_UPDATE)
    private Long updateUser;
}

 src/main/java/com/ruoyi/staff/pojo/StaffEmergencyContact.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,65 @@
package com.ruoyi.staff.pojo;

import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
import java.time.LocalDateTime;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
import lombok.Setter;

/**
 * <p>
 * å‘˜å·¥ç´§æ€¥è”系人表
 * </p>
 *
 * @author èŠ¯å¯¼è½¯ä»¶ï¼ˆæ±Ÿè‹ï¼‰æœ‰é™å…¬å¸
 * @since 2026-03-05 04:34:17
 */
@Getter
@Setter
@TableName("staff_emergency_contact")
@ApiModel(value = "StaffEmergencyContact对象", description = "员工紧急联系人表")
public class StaffEmergencyContact implements Serializable {

    private static final long serialVersionUID = 1L;

    @ApiModelProperty("主键ID")
    @TableId(value = "id", type = IdType.AUTO)
    private Long id;

    @ApiModelProperty("关联staff_on_job表主键ID")
    private Long staffOnJobId;

    @ApiModelProperty("紧急联系人姓名")
    private String contactName;

    @ApiModelProperty("紧急联系人关系")
    private String contactRelation;

    @ApiModelProperty("紧急联系人手机")
    private String contactPhone;

    @ApiModelProperty("紧急联系人住址")
    private String contactAddress;

    @ApiModelProperty("创建时间")
    @TableField(fill = FieldFill.INSERT)
    private LocalDateTime createTime;

    @ApiModelProperty("创建用户")
    @TableField(fill = FieldFill.INSERT)
    private Long createUser;

    @ApiModelProperty("修改时间")
    @TableField(fill = FieldFill.INSERT_UPDATE)
    private LocalDateTime updateTime;

    @ApiModelProperty("修改用户")
    @TableField(fill = FieldFill.INSERT_UPDATE)
    private Long updateUser;
}

 src/main/java/com/ruoyi/staff/pojo/StaffOnJob.java

@@ -12,6 +12,7 @@
import java.math.BigDecimal;
import java.time.LocalDateTime;
import java.util.Date;
import java.util.List;

/**
 * äººå‘˜ç®¡ç†--员工台账/合同管理
@@ -67,6 +68,11 @@
     * éƒ¨é—¨
     */
    private Long sysDeptId;

    /**
     * è§’色
     */
    private Long roleId;

    /**
     * å®¶åº­ä½å€
@@ -203,5 +209,42 @@
    @TableField(fill = FieldFill.INSERT)
    private Long tenantId;

    @ApiModelProperty(value = "别名")
    private String alias;

    @ApiModelProperty(value = "出生日期")
    @JsonFormat(pattern = "yyyy-MM-dd")
    @DateTimeFormat(pattern = "yyyy-MM-dd")
    private Date birthDate;

    @ApiModelProperty(value = "民族")
    private String nation;

    @ApiModelProperty(value = "婚姻状况")
    private String maritalStatus;

    @ApiModelProperty(value = "试用期（月）")
    private Integer proTerm;

    @ApiModelProperty(value = "转正日期")
    @JsonFormat(pattern = "yyyy-MM-dd")
    @DateTimeFormat(pattern = "yyyy-MM-dd")
    private Date positiveDate;

    @ApiModelProperty(value = "基本工资")
    private BigDecimal basicSalary;

    @ApiModelProperty(value = "员工教育经历集合")
    @TableField(exist = false)
    private List<StaffEducation> staffEducationList;

    @ApiModelProperty(value = "员工工作经历集合")
    @TableField(exist = false)
    private List<StaffWorkExperience> staffWorkExperienceList;

    @ApiModelProperty(value = "员工紧急联系人集合")
    @TableField(exist = false)
    private List<StaffEmergencyContact> staffEmergencyContactList;


}

 src/main/java/com/ruoyi/staff/pojo/StaffWorkExperience.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,79 @@
package com.ruoyi.staff.pojo;

import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
import java.time.LocalDate;
import java.time.LocalDateTime;

import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
import lombok.Setter;
import org.springframework.format.annotation.DateTimeFormat;

/**
 * <p>
 * å‘˜å·¥å·¥ä½œç»åŽ†è¡¨
 * </p>
 *
 * @author èŠ¯å¯¼è½¯ä»¶ï¼ˆæ±Ÿè‹ï¼‰æœ‰é™å…¬å¸
 * @since 2026-03-05 04:33:36
 */
@Getter
@Setter
@TableName("staff_work_experience")
@ApiModel(value = "StaffWorkExperience对象", description = "员工工作经历表")
public class StaffWorkExperience implements Serializable {

    private static final long serialVersionUID = 1L;

    @ApiModelProperty("主键ID")
    @TableId(value = "id", type = IdType.AUTO)
    private Long id;

    @ApiModelProperty("关联staff_on_job表主键ID")
    private Long staffOnJobId;

    @ApiModelProperty("前公司")
    private String formerCompany;

    @ApiModelProperty("前公司部门")
    private String formerDept;

    @ApiModelProperty("前公司职位")
    private String formerPosition;

    @ApiModelProperty("开始日期")
    @JsonFormat(pattern = "yyyy-MM-dd")
    @DateTimeFormat(pattern = "yyyy-MM-dd")
    private LocalDate startDate;

    @ApiModelProperty("结束日期")
    @JsonFormat(pattern = "yyyy-MM-dd")
    @DateTimeFormat(pattern = "yyyy-MM-dd")
    private LocalDate endDate;

    @ApiModelProperty("工作描述")
    private String workDesc;

    @ApiModelProperty("创建时间")
    @TableField(fill = FieldFill.INSERT)
    private LocalDateTime createTime;

    @ApiModelProperty("创建用户")
    @TableField(fill = FieldFill.INSERT)
    private Long createUser;

    @ApiModelProperty("修改时间")
    @TableField(fill = FieldFill.INSERT_UPDATE)
    private LocalDateTime updateTime;

    @ApiModelProperty("修改用户")
    @TableField(fill = FieldFill.INSERT_UPDATE)
    private Long updateUser;
}

 src/main/java/com/ruoyi/staff/service/SchemeApplicableStaffService.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,27 @@
package com.ruoyi.staff.service;

import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.staff.pojo.SchemeApplicableStaff;
import com.baomidou.mybatisplus.extension.service.IService;

import java.util.List;

/**
 * <p>
 * ç¤¾ä¿æ–¹æ¡ˆé€‚用人员表 æœåŠ¡ç±»
 * </p>
 *
 * @author èŠ¯å¯¼è½¯ä»¶ï¼ˆæ±Ÿè‹ï¼‰æœ‰é™å…¬å¸
 * @since 2026-03-05 11:50:17
 */
public interface SchemeApplicableStaffService extends IService<SchemeApplicableStaff> {

    AjaxResult listPage(Page page, SchemeApplicableStaff schemeApplicableStaff);

    AjaxResult add(SchemeApplicableStaff schemeApplicableStaff);

    AjaxResult updateSchemeApplicableStaff(SchemeApplicableStaff schemeApplicableStaff);

    AjaxResult delete(List<Long> ids);
}

 src/main/java/com/ruoyi/staff/service/SchemeInsuranceDetailService.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,16 @@
package com.ruoyi.staff.service;

import com.ruoyi.staff.pojo.SchemeInsuranceDetail;
import com.baomidou.mybatisplus.extension.service.IService;

/**
 * <p>
 * ç¤¾ä¿æ–¹æ¡ˆä¿é™©ç¦åˆ©æ˜Žç»†è¡¨ æœåŠ¡ç±»
 * </p>
 *
 * @author èŠ¯å¯¼è½¯ä»¶ï¼ˆæ±Ÿè‹ï¼‰æœ‰é™å…¬å¸
 * @since 2026-03-05 11:52:23
 */
public interface SchemeInsuranceDetailService extends IService<SchemeInsuranceDetail> {

}

 src/main/java/com/ruoyi/staff/service/StaffEducationService.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,16 @@
package com.ruoyi.staff.service;

import com.ruoyi.staff.pojo.StaffEducation;
import com.baomidou.mybatisplus.extension.service.IService;

/**
 * <p>
 * å‘˜å·¥æ•™è‚²ç»åŽ†è¡¨ æœåŠ¡ç±»
 * </p>
 *
 * @author èŠ¯å¯¼è½¯ä»¶ï¼ˆæ±Ÿè‹ï¼‰æœ‰é™å…¬å¸
 * @since 2026-03-05 04:33:08
 */
public interface StaffEducationService extends IService<StaffEducation> {

}

 src/main/java/com/ruoyi/staff/service/StaffEmergencyContactService.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,16 @@
package com.ruoyi.staff.service;

import com.ruoyi.staff.pojo.StaffEmergencyContact;
import com.baomidou.mybatisplus.extension.service.IService;

/**
 * <p>
 * å‘˜å·¥ç´§æ€¥è”系人表 æœåŠ¡ç±»
 * </p>
 *
 * @author èŠ¯å¯¼è½¯ä»¶ï¼ˆæ±Ÿè‹ï¼‰æœ‰é™å…¬å¸
 * @since 2026-03-05 04:34:17
 */
public interface StaffEmergencyContactService extends IService<StaffEmergencyContact> {

}

 src/main/java/com/ruoyi/staff/service/StaffWorkExperienceService.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,16 @@
package com.ruoyi.staff.service;

import com.ruoyi.staff.pojo.StaffWorkExperience;
import com.baomidou.mybatisplus.extension.service.IService;

/**
 * <p>
 * å‘˜å·¥å·¥ä½œç»åŽ†è¡¨ æœåŠ¡ç±»
 * </p>
 *
 * @author èŠ¯å¯¼è½¯ä»¶ï¼ˆæ±Ÿè‹ï¼‰æœ‰é™å…¬å¸
 * @since 2026-03-05 04:33:36
 */
public interface StaffWorkExperienceService extends IService<StaffWorkExperience> {

}

 src/main/java/com/ruoyi/staff/service/impl/SchemeApplicableStaffServiceImpl.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,153 @@
package com.ruoyi.staff.service.impl;

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.project.system.domain.SysDept;
import com.ruoyi.project.system.domain.SysUser;
import com.ruoyi.project.system.domain.SysUserDept;
import com.ruoyi.project.system.mapper.SysDeptMapper;
import com.ruoyi.project.system.mapper.SysUserDeptMapper;
import com.ruoyi.project.system.mapper.SysUserMapper;
import com.ruoyi.staff.mapper.SchemeInsuranceDetailMapper;
import com.ruoyi.staff.pojo.SchemeApplicableStaff;
import com.ruoyi.staff.mapper.SchemeApplicableStaffMapper;
import com.ruoyi.staff.pojo.SchemeInsuranceDetail;
import com.ruoyi.staff.service.SchemeApplicableStaffService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;

import java.util.Arrays;
import java.util.List;
import java.util.Objects;
import java.util.stream.Collectors;

/**
 * <p>
 * ç¤¾ä¿æ–¹æ¡ˆé€‚用人员表 æœåŠ¡å®žçŽ°ç±»
 * </p>
 *
 * @author èŠ¯å¯¼è½¯ä»¶ï¼ˆæ±Ÿè‹ï¼‰æœ‰é™å…¬å¸
 * @since 2026-03-05 11:50:17
 */
@Service
public class SchemeApplicableStaffServiceImpl extends ServiceImpl<SchemeApplicableStaffMapper, SchemeApplicableStaff> implements SchemeApplicableStaffService {

    @Autowired
    private SchemeApplicableStaffMapper schemeApplicableStaffMapper;

    @Autowired
    private SchemeInsuranceDetailMapper schemeInsuranceDetailMapper;

    @Autowired
    private SysUserDeptMapper sysUserDeptMapper;

    @Autowired
    private SysUserMapper sysUserMapper;

    @Autowired
    private SysDeptMapper sysDeptMapper;


    @Override
    public AjaxResult listPage(Page page, SchemeApplicableStaff schemeApplicableStaff) {
        LambdaQueryWrapper<SchemeApplicableStaff> schemeApplicableStaffLambdaQueryWrapper = new LambdaQueryWrapper<>();
        if(schemeApplicableStaff != null){
            if(StringUtils.isNotEmpty(schemeApplicableStaff.getTitle())){
                schemeApplicableStaffLambdaQueryWrapper.like(SchemeApplicableStaff::getTitle, schemeApplicableStaff.getTitle());
            }
        }
        Page<SchemeApplicableStaff> page1 = schemeApplicableStaffMapper.selectPage(page, schemeApplicableStaffLambdaQueryWrapper);
        List<Long> collect = page1.getRecords().stream().map(SchemeApplicableStaff::getId).collect(Collectors.toList());
        if(CollectionUtils.isEmpty(collect)){
            return AjaxResult.success(page1);
        }
        List<SchemeInsuranceDetail> schemeInsuranceDetails = schemeInsuranceDetailMapper
                .selectList(new LambdaQueryWrapper<SchemeInsuranceDetail>()
                        .in(SchemeInsuranceDetail::getSchemeId, collect));
        page1.getRecords().forEach(item -> {
            item.setSchemeInsuranceDetailList(schemeInsuranceDetails
                    .stream()
                    .filter(detail -> detail.getSchemeId().equals(item.getId()))
                    .collect(Collectors.toList()));
            SysUser sysUser = sysUserMapper.selectUserById(item.getCreateUser().longValue());
            item.setCreateUserName(sysUser == null ? "未知" : sysUser.getNickName());
            // èŽ·å–部门信息
            String[] split = item.getDeptIds().split(",");
            List<SysDept> sysDepts = sysDeptMapper.selectList(new LambdaQueryWrapper<SysDept>()
                    .in(SysDept::getDeptId, Arrays.stream(split).map(Long::valueOf).collect(Collectors.toList())));
            if(!CollectionUtils.isEmpty(sysDepts)){
                item.setDeptNames(sysDepts.stream().map(SysDept::getDeptName).collect(Collectors.joining(",")));
            }
        });
        return AjaxResult.success(page1);
    }

    public void setSchemeApplicableStaffUserInfo(SchemeApplicableStaff schemeApplicableStaff) {
        // é€šè¿‡éƒ¨é—¨èŽ·å–人员id
        List<SysUserDept> sysUserDepts = sysUserDeptMapper.selectList(new LambdaQueryWrapper<SysUserDept>()
                .in(SysUserDept::getDeptId, schemeApplicableStaff.getDeptIds()));
        if(CollectionUtils.isEmpty(sysUserDepts)){
            throw new IllegalArgumentException("部门下无员工");
        }
        List<SysUser> sysUsers = sysUserMapper.selectUserByIds(sysUserDepts.stream().map(SysUserDept::getUserId).collect(Collectors.toList()));
        if(CollectionUtils.isEmpty(sysUsers)){
            throw new IllegalArgumentException("部门下无员工");
        }
        schemeApplicableStaff.setStaffIds(sysUsers
                .stream()
                .map(SysUser::getUserId)
                .filter(Objects::nonNull)         // è¿‡æ»¤æŽ‰ null å€¼
                .map(String::valueOf)
                .collect(Collectors.joining( ",")));
        schemeApplicableStaff.setStaffNames(sysUsers.stream().map(SysUser::getNickName).collect(Collectors.joining(",")));
    }

    @Override
    public AjaxResult add(SchemeApplicableStaff schemeApplicableStaff) {
        if(schemeApplicableStaff == null){
            return AjaxResult.error("参数错误");
        }
        if(CollectionUtils.isEmpty(schemeApplicableStaff.getSchemeInsuranceDetailList())){
            return AjaxResult.error("请选择方案明细");
        }
        setSchemeApplicableStaffUserInfo(schemeApplicableStaff); //根据部门设置用户信息
        int insert = schemeApplicableStaffMapper.insert(schemeApplicableStaff);
        schemeApplicableStaff.getSchemeInsuranceDetailList().forEach(item -> {
            item.setSchemeId(schemeApplicableStaff.getId());
            schemeInsuranceDetailMapper.insert(item);
        });
        return AjaxResult.success(insert);
    }

    @Override
    public AjaxResult updateSchemeApplicableStaff(SchemeApplicableStaff schemeApplicableStaff) {
        if(schemeApplicableStaff == null){
            return AjaxResult.error("参数错误");
        }
        setSchemeApplicableStaffUserInfo(schemeApplicableStaff); //根据部门设置用户信息
        int update = schemeApplicableStaffMapper.updateById(schemeApplicableStaff);
        // å…ˆåˆ ï¼Œé‡æ–°ç»‘定
        schemeInsuranceDetailMapper.delete(new LambdaQueryWrapper<SchemeInsuranceDetail>()
                .eq(SchemeInsuranceDetail::getSchemeId, schemeApplicableStaff.getId()));
        schemeApplicableStaff.getSchemeInsuranceDetailList().forEach(item -> {
            item.setSchemeId(schemeApplicableStaff.getId());
            schemeInsuranceDetailMapper.insert(item);
        });
        return AjaxResult.success(update);
    }

    @Override
    public AjaxResult delete(List<Long> ids) {
        if (CollectionUtils.isEmpty(ids)) {
            return AjaxResult.error("参数错误");
        }
        int delete = schemeApplicableStaffMapper.deleteBatchIds(ids);
        schemeInsuranceDetailMapper.delete(new LambdaQueryWrapper<SchemeInsuranceDetail>()
                .in(SchemeInsuranceDetail::getSchemeId, ids));
        return AjaxResult.success(delete);
    }
}

 src/main/java/com/ruoyi/staff/service/impl/SchemeInsuranceDetailServiceImpl.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,20 @@
package com.ruoyi.staff.service.impl;

import com.ruoyi.staff.pojo.SchemeInsuranceDetail;
import com.ruoyi.staff.mapper.SchemeInsuranceDetailMapper;
import com.ruoyi.staff.service.SchemeInsuranceDetailService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;

/**
 * <p>
 * ç¤¾ä¿æ–¹æ¡ˆä¿é™©ç¦åˆ©æ˜Žç»†è¡¨ æœåŠ¡å®žçŽ°ç±»
 * </p>
 *
 * @author èŠ¯å¯¼è½¯ä»¶ï¼ˆæ±Ÿè‹ï¼‰æœ‰é™å…¬å¸
 * @since 2026-03-05 11:52:23
 */
@Service
public class SchemeInsuranceDetailServiceImpl extends ServiceImpl<SchemeInsuranceDetailMapper, SchemeInsuranceDetail> implements SchemeInsuranceDetailService {

}

 src/main/java/com/ruoyi/staff/service/impl/StaffEducationServiceImpl.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,20 @@
package com.ruoyi.staff.service.impl;

import com.ruoyi.staff.pojo.StaffEducation;
import com.ruoyi.staff.mapper.StaffEducationMapper;
import com.ruoyi.staff.service.StaffEducationService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;

/**
 * <p>
 * å‘˜å·¥æ•™è‚²ç»åŽ†è¡¨ æœåŠ¡å®žçŽ°ç±»
 * </p>
 *
 * @author èŠ¯å¯¼è½¯ä»¶ï¼ˆæ±Ÿè‹ï¼‰æœ‰é™å…¬å¸
 * @since 2026-03-05 04:33:08
 */
@Service
public class StaffEducationServiceImpl extends ServiceImpl<StaffEducationMapper, StaffEducation> implements StaffEducationService {

}

 src/main/java/com/ruoyi/staff/service/impl/StaffEmergencyContactServiceImpl.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,20 @@
package com.ruoyi.staff.service.impl;

import com.ruoyi.staff.pojo.StaffEmergencyContact;
import com.ruoyi.staff.mapper.StaffEmergencyContactMapper;
import com.ruoyi.staff.service.StaffEmergencyContactService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;

/**
 * <p>
 * å‘˜å·¥ç´§æ€¥è”系人表 æœåŠ¡å®žçŽ°ç±»
 * </p>
 *
 * @author èŠ¯å¯¼è½¯ä»¶ï¼ˆæ±Ÿè‹ï¼‰æœ‰é™å…¬å¸
 * @since 2026-03-05 04:34:17
 */
@Service
public class StaffEmergencyContactServiceImpl extends ServiceImpl<StaffEmergencyContactMapper, StaffEmergencyContact> implements StaffEmergencyContactService {

}

 src/main/java/com/ruoyi/staff/service/impl/StaffOnJobServiceImpl.java

@@ -6,22 +6,25 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.exception.base.BaseException;
import com.ruoyi.common.utils.OrderUtils;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.dto.WordDateDto;
import com.ruoyi.project.system.domain.SysPost;
import com.ruoyi.project.system.domain.SysUser;
import com.ruoyi.project.system.mapper.SysPostMapper;
import com.ruoyi.project.system.mapper.SysUserMapper;
import com.ruoyi.project.system.service.impl.SysUserServiceImpl;
import com.ruoyi.staff.dto.StaffOnJobDto;
import com.ruoyi.staff.mapper.StaffContractMapper;
import com.ruoyi.staff.mapper.StaffLeaveMapper;
import com.ruoyi.staff.mapper.StaffOnJobMapper;
import com.ruoyi.staff.pojo.StaffContract;
import com.ruoyi.staff.pojo.StaffLeave;
import com.ruoyi.staff.pojo.StaffOnJob;
import com.ruoyi.staff.mapper.*;
import com.ruoyi.staff.pojo.*;
import com.ruoyi.staff.service.IStaffOnJobService;
import freemarker.template.Configuration;
import freemarker.template.Template;
import lombok.AllArgsConstructor;

import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.collections4.ListUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -35,6 +38,7 @@
import java.time.LocalDate;
import java.time.ZoneId;
import java.util.*;
import java.util.stream.Collectors;

@AllArgsConstructor
@Service
@@ -50,6 +54,30 @@
    @Autowired
    private StaffLeaveMapper staffLeaveMapper;

    @Autowired
    private SysUserServiceImpl sysUserService;

    @Autowired
    private SysUserMapper sysUserMapper;

    @Autowired
    private StaffEducationServiceImpl staffEducationService;

    @Autowired
    private StaffEducationMapper staffEducationMapper;

    @Autowired
    private StaffWorkExperienceMapper staffWorkExperienceMapper;

    @Autowired
    private StaffWorkExperienceServiceImpl staffWorkExperienceServiceImpl;

    @Autowired
    private StaffEmergencyContactMapper staffEmergencyContactMapper;

    @Autowired
    private StaffEmergencyContactServiceImpl staffEmergencyContactServiceImpl;


    //在职员工台账分页查询
    @Override
@@ -64,14 +92,33 @@
        String[] ignoreProperties = {"id"};//排除id属性
        // åˆ¤æ–­ç¼–号是否存在
        List<StaffOnJob> staffOnJobs = staffOnJobMapper.selectList(Wrappers.<StaffOnJob>lambdaQuery().eq(StaffOnJob::getStaffNo, staffOnJobPrams.getStaffNo()));
        if (staffOnJobs.size()>0){
        if (staffOnJobs != null && !staffOnJobs.isEmpty()){
            throw new BaseException("编号为"+staffOnJobPrams.getStaffNo()+"的员工已经存在,无法新增!!!");
        }

        // åˆ›å»ºå…¥èŒæ•°æ®
        staffOnJobPrams.setContractExpireTime(staffOnJobPrams.getContractEndTime());
        staffOnJobPrams.setStaffState(1);
        staffOnJobMapper.insert(staffOnJobPrams);

        // æŸ¥è¯¢ç”¨æˆ·æ˜¯å¦å·²ç»æ–°å¢ž
        SysUser sysUser = sysUserService.selectUserById(staffOnJobPrams.getId());
        if(sysUser == null){
            SysUser sysUser1 = new SysUser();
            sysUser1.setUserName(staffOnJobPrams.getStaffNo());
            sysUser1.setNickName(staffOnJobPrams.getStaffName());
            String s = SecurityUtils.encryptPassword("123456");
            sysUser1.setPassword(s);
            if(staffOnJobPrams.getSysPostId() != null){
                Long[] posts = new Long[]{staffOnJobPrams.getSysPostId().longValue()};
                sysUser1.setPostIds(posts);
            }
            sysUser1.setRoleIds(new Long[]{staffOnJobPrams.getRoleId()});
            sysUser1.setDeptIds(new  Long[]{staffOnJobPrams.getSysDeptId()});
            sysUser1.setStatus("0");
            sysUserService.insertUser(sysUser1);
        }
        // ç»‘定子表数据
        bingingStaffOnJobExtra(staffOnJobPrams.getId(),staffOnJobPrams);
        // åˆ›å»ºåˆåŒè®°å½•
        StaffContract staffContract = new StaffContract();
        staffContract.setStaffOnJobId(staffOnJobPrams.getId());
@@ -103,19 +150,81 @@
            staffContractMapper.updateById(contract);
        }

        // åˆ é™¤æ‰€æœ‰å­è¡¨æ•°æ®
        delStaffOnJobExtra(Arrays.asList(id));
        // ç»‘定子表数据
        bingingStaffOnJobExtra(id,staffOnJobParams);
        // æ›´æ–°å‘˜å·¥æ•°æ®
        staffOnJobParams.setContractExpireTime(staffOnJobParams.getContractEndTime());
        return staffOnJobMapper.updateById(staffOnJobParams);
    }

    /**
     * ç»‘定员工子表数据
     * @param staffOnJobPrams
     * @param id
     */
    public void bingingStaffOnJobExtra(Long id,StaffOnJob staffOnJobPrams) {
        // æ–°å¢žæ•™è‚²ç»åŽ†
        if(CollectionUtils.isNotEmpty(staffOnJobPrams.getStaffEducationList())){
            staffOnJobPrams.getStaffEducationList().stream()
                    .filter(Objects::nonNull) // è¿‡æ»¤null对象，避免空指针
                    .forEach(staff -> staff.setStaffOnJobId(id)); // èµ‹å€¼
            staffEducationService.saveBatch(staffOnJobPrams.getStaffEducationList());
        }
        // æ–°å¢žå·¥ä½œç»åŽ†
        if(CollectionUtils.isNotEmpty(staffOnJobPrams.getStaffWorkExperienceList())){
            staffOnJobPrams.getStaffWorkExperienceList().stream()
                    .filter(Objects::nonNull) // è¿‡æ»¤null对象，避免空指针
                    .forEach(staff -> staff.setStaffOnJobId(id)); // èµ‹å€¼
            staffWorkExperienceServiceImpl.saveBatch(staffOnJobPrams.getStaffWorkExperienceList());
        }
        // æ–°å¢žç´§æ€¥è”系人
        if(CollectionUtils.isNotEmpty(staffOnJobPrams.getStaffEmergencyContactList())){
            staffOnJobPrams.getStaffEmergencyContactList().stream()
                    .filter(Objects::nonNull) // è¿‡æ»¤null对象，避免空指针
                    .forEach(staff -> staff.setStaffOnJobId(id)); // èµ‹å€¼
            staffEmergencyContactServiceImpl.saveBatch(staffOnJobPrams.getStaffEmergencyContactList());
        }
    }


    /**
     * é€šè¿‡å‘˜å·¥id删除教育经历，工作经历，紧急联系人
     * @param ids
     * @return
     */
    public void delStaffOnJobExtra(List<Long> ids) {
        // åˆ é™¤æ•™è‚²ç»åŽ†
        staffEducationService.remove(Wrappers.<StaffEducation>lambdaQuery().in(StaffEducation::getStaffOnJobId,ids));
        // åˆ é™¤å·¥ä½œç»åŽ†
        staffWorkExperienceServiceImpl.remove(Wrappers.<StaffWorkExperience>lambdaQuery().in(StaffWorkExperience::getStaffOnJobId,ids));
        // åˆ é™¤ç´§æ€¥è”系人
        staffEmergencyContactServiceImpl.remove(Wrappers.<StaffEmergencyContact>lambdaQuery().in(StaffEmergencyContact::getStaffOnJobId,ids));
    }

    //删除入职
    @Override
    @Transactional(rollbackFor = Exception.class)
    public int delStaffOnJobs(List<Integer> ids) {
        List<StaffOnJob> staffOnJobs = staffOnJobMapper.selectList(Wrappers.<StaffOnJob>lambdaQuery().in(StaffOnJob::getId, ids));
        if(CollectionUtils.isEmpty(staffOnJobs)){
            throw new BaseException("该员工不存在,无法删除!!!");
        }
        // åˆ é™¤å…¥èŒæ•°æ®
        staffOnJobMapper.deleteBatchIds(ids);
        // åˆ é™¤ç¦»èŒæ•°æ®
        staffLeaveMapper.delete(Wrappers.<StaffLeave>lambdaQuery().in(StaffLeave::getStaffOnJobId, ids));
        // åˆ é™¤ç”¨æˆ·æ•°æ®
        List<SysUser> sysUsers = sysUserMapper.selectList(Wrappers.<SysUser>lambdaQuery()
                .in(SysUser::getUserName, staffOnJobs.stream().map(StaffOnJob::getStaffNo).collect(Collectors.toList())));
        if(CollectionUtils.isNotEmpty(sysUsers)){
            Long[] longs = sysUsers.stream().map(SysUser::getUserId).toArray(Long[]::new);
            sysUserService.deleteUserByIds(longs);
        }
        // åˆ é™¤å­è¡¨æ•°æ®
        delStaffOnJobExtra(ids.stream().map(Integer::longValue).collect(Collectors.toList()));

        // åˆ é™¤åˆåŒæ•°æ®
        return staffContractMapper.delete(Wrappers.<StaffContract>lambdaQuery().in(StaffContract::getStaffOnJobId, ids));
    }
@@ -172,6 +281,13 @@
            staffOnJobDto.setContractStartTime(contract.getContractStartTime());
            staffOnJobDto.setContractEndTime(contract.getContractEndTime());
        }
        // èŽ·å–子表数据
        staffOnJobDto.setStaffEducationList(staffEducationMapper.selectList(Wrappers.<StaffEducation>lambdaQuery()
                .eq(StaffEducation::getStaffOnJobId, staffOnJob.getId())));
        staffOnJobDto.setStaffWorkExperienceList(staffWorkExperienceMapper.selectList(Wrappers.<StaffWorkExperience>lambdaQuery()
                .eq(StaffWorkExperience::getStaffOnJobId, staffOnJob.getId())));
        staffOnJobDto.setStaffEmergencyContactList(staffEmergencyContactMapper.selectList(Wrappers.<StaffEmergencyContact>lambdaQuery()
                .eq(StaffEmergencyContact::getStaffOnJobId, staffOnJob.getId())));
        return staffOnJobDto;
    }


 src/main/java/com/ruoyi/staff/service/impl/StaffWorkExperienceServiceImpl.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,20 @@
package com.ruoyi.staff.service.impl;

import com.ruoyi.staff.pojo.StaffWorkExperience;
import com.ruoyi.staff.mapper.StaffWorkExperienceMapper;
import com.ruoyi.staff.service.StaffWorkExperienceService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;

/**
 * <p>
 * å‘˜å·¥å·¥ä½œç»åŽ†è¡¨ æœåŠ¡å®žçŽ°ç±»
 * </p>
 *
 * @author èŠ¯å¯¼è½¯ä»¶ï¼ˆæ±Ÿè‹ï¼‰æœ‰é™å…¬å¸
 * @since 2026-03-05 04:33:36
 */
@Service
public class StaffWorkExperienceServiceImpl extends ServiceImpl<StaffWorkExperienceMapper, StaffWorkExperience> implements StaffWorkExperienceService {

}

 src/main/resources/application-dev.yml

@@ -74,9 +74,9 @@
    druid:
      # ä¸»åº“数据源
      master:
        url: jdbc:mysql://localhost:3306/product-inventory-management-new?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
        url: jdbc:mysql://1.15.17.182:9999/product-inventory-management-new?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
        username: root
        password: 123456
        password: xd@123456..
      # ä»Žåº“数据源
      slave:
        # ä»Žæ•°æ®æºå¼€å…³/默认关闭

 src/main/resources/mapper/aftersalesservice/AfterSalesServiceMapper.xml

@@ -2,8 +2,11 @@
        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.aftersalesservice.mapper.AfterSalesServiceMapper">

    <select id="listPage" resultType="com.ruoyi.aftersalesservice.pojo.AfterSalesService">
        select * from after_sales_service
    <select id="listPage" resultType="com.ruoyi.aftersalesservice.dto.AfterSalesServiceNewDto">
        select ass.*,
        sl.sales_contract_no
        from after_sales_service ass
        left join sales_ledger sl  on ass.sales_ledger_id = sl.id
        where 1 = 1
        <if test="req.feedbackDate != null">
            AND feedback_date BETWEEN #{req.feedbackDate} AND #{req.feedbackDate}
@@ -17,6 +20,20 @@
        <if test="req.status != null and req.status != ''">
            and status = #{req.status}
        </if>
        <if test="req.urgency != null">
            and urgency = #{req.urgency}
        </if>
        <if test="req.serviceType != null">
            and service_type = #{req.serviceType}
        </if>
        order by update_time desc
    </select>
    <select id="countAfterSalesService" resultType="com.ruoyi.aftersalesservice.dto.CountDto">
        select
            status,
            count(1) as count
        from after_sales_service
        group by status
    </select>

</mapper>

 src/main/resources/mapper/procurementrecord/ReturnManagementMapper.xml

@@ -2,15 +2,55 @@
        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.procurementrecord.mapper.ReturnManagementMapper">

    <select id="listPage" resultType="com.ruoyi.procurementrecord.pojo.ReturnManagement">
        select * from return_management
    <select id="listPage" resultType="com.ruoyi.procurementrecord.dto.ReturnManagementDto">
        select rm.*,
               c.customer_name,
               si.shipping_no,
               sl.project_name,
               sl.sales_contract_no,
               sl.salesman
        from return_management rm
                 left join shipping_info si on rm.shipping_id = si.id
                 left join customer c on rm.customer_id = c.id
                 left join sales_ledger sl on si.sales_ledger_id = sl.id
        <where>
            <if test="req.returnNo != null and req.returnNo != ''">
                and return_no like concat('%',#{req.returnNo},'%')
                and rm.return_no like concat('%',#{req.returnNo},'%')
            </if>
            <if test="req.returnType != null and req.returnType != ''">
                and return_type = #{req.returnType}
            <if test="req.customerName != null and req.customerName != ''">
                and c.customer_name like concat('%',#{req.customerName},'%')
            </if>
            <if test="req.projectName != null and req.projectName != ''">
                and sl.project_name like concat('%',#{req.projectName},'%')
            </if>
            <if test="req.salesman != null and req.salesman != ''">
                and sl.salesman like concat('%',#{req.salesman},'%')
            </if>
            <if test="req.shippingNo != null and req.shippingNo != ''">
                and rm.shipping_no like concat('%',#{req.shippingNo},'%')
            </if>
            <if test="req.projectStage != null and req.projectStage != ''">
                and rm.project_stage like concat('%',#{req.projectStage},'%')
            </if>
            <if test="req.maker != null and req.maker != ''">
                and rm.maker like concat('%',#{req.maker},'%')
            </if>
            <if test="req.salesContractNo != null and req.salesContractNo != ''">
                and sl.sales_contract_no like concat('%',#{req.salesContractNo},'%')
            </if>
        </where>
    </select>
    <select id="getReturnManagementDtoById" resultType="com.ruoyi.procurementrecord.dto.ReturnManagementDto">
     select rm.*,
               c.customer_name,
               si.shipping_no,
               sl.project_name,
               sl.sales_contract_no,
               sl.salesman
        from return_management rm
                 left join shipping_info si on rm.shipping_id = si.id
                 left join customer c on rm.customer_id = c.id
                 left join sales_ledger sl on si.sales_ledger_id = sl.id
        where rm.id = #{id}
    </select>
</mapper>

 src/main/resources/mapper/procurementrecord/ReturnSaleProductMapper.xml

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.procurementrecord.mapper.ReturnSaleProductMapper">

    <!-- é€šç”¨æŸ¥è¯¢æ˜ å°„结果 -->
    <resultMap id="BaseResultMap" type="com.ruoyi.procurementrecord.pojo.ReturnSaleProduct">
        <id column="id" property="id" />
        <result column="return_management_id" property="returnManagementId" />
        <result column="return_sale_ledger_product_id" property="returnSaleLedgerProductId" />
        <result column="num" property="num" />
        <result column="status" property="status" />
    </resultMap>
    <select id="listReturnSaleProductDto" resultType="com.ruoyi.procurementrecord.dto.ReturnSaleProductDto">
        select rsp.*,
               slp.product_category as product_name,
               slp.specification_model as model
        from return_sale_product rsp
                 left join sales_ledger_product slp on rsp.return_sale_ledger_product_id = slp.id
        where rsp.return_management_id = #{returnManagementId}

    </select>

</mapper>

 src/main/resources/mapper/projectManagement/PlanMapper.xml

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,30 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper
        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.projectManagement.mapper.PlanMapper">

    <resultMap id="BaseResultMap" type="com.ruoyi.projectManagement.pojo.Plan">
            <id property="id" column="id" jdbcType="BIGINT"/>
            <result property="name" column="name" jdbcType="VARCHAR"/>
            <result property="describe" column="describe" jdbcType="VARCHAR"/>
            <result property="attachment" column="attachment" jdbcType="VARCHAR"/>
            <result property="is_delete" column="is_delete" jdbcType="INTEGER"/>
            <result property="create_time" column="create_time" jdbcType="TIMESTAMP"/>
            <result property="update_time" column="update_time" jdbcType="TIMESTAMP"/>
            <result property="create_user" column="create_user" jdbcType="VARCHAR"/>
            <result property="update_user" column="update_user" jdbcType="VARCHAR"/>
    </resultMap>

    <sql id="Base_Column_List">
        id,name,describe,
        attachment,is_delete,create_time,
        update_time,create_user,update_user
    </sql>

    <select id="selectPlanPage" resultMap="BaseResultMap">
        select t1.*
        from project_management_plan as t1
        order by t1.create_time desc
    </select>
</mapper>

 src/main/resources/mapper/purchase/PurchaseReturnOrdersMapper.xml

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.purchase.mapper.PurchaseReturnOrdersMapper">

    <!-- é€šç”¨æŸ¥è¯¢æ˜ å°„结果 -->
    <resultMap id="BaseResultMap" type="com.ruoyi.purchase.pojo.PurchaseReturnOrders">
        <id column="id" property="id" />
        <result column="no" property="no" />
        <result column="return_type" property="returnType" />
        <result column="supplier_id" property="supplierId" />
        <result column="project_id" property="projectId" />
        <result column="project_phase" property="projectPhase" />
        <result column="prepared_at" property="preparedAt" />
        <result column="prepared_user_id" property="preparedUserId" />
        <result column="return_user_id" property="returnUserId" />
        <result column="purchase_ledger_id" property="purchaseLedgerId" />
        <result column="remark" property="remark" />
        <result column="create_time" property="createTime" />
        <result column="update_time" property="updateTime" />
    </resultMap>

</mapper>

 src/main/resources/mapper/sales/ShippingInfoMapper.xml

@@ -58,4 +58,29 @@
        FROM shipping_info s
                 LEFT JOIN sales_ledger sl ON s.sales_ledger_id = sl.id
    </select>
    <select id="getReturnManagementDtoById" resultType="com.ruoyi.sales.dto.SalesLedgerProductDto">
        SELECT
        slp.*,
        slp.quantity - COALESCE(rs.total_return_num, 0) AS un_quantity,
        COALESCE(rs.total_return_num, 0) AS total_return_num
        FROM shipping_info si
        LEFT JOIN sales_ledger_product slp ON si.sales_ledger_product_id = slp.id
        LEFT JOIN (
        SELECT
        return_sale_ledger_product_id,
        SUM(num) AS total_return_num
        FROM return_sale_product
        <where>
            <if test="productId != null">
                AND return_sale_ledger_product_id = #{productId}
            </if>
        </where>
        GROUP BY return_sale_ledger_product_id
        ) rs ON rs.return_sale_ledger_product_id = slp.id
    </select>
    <select id="getShippingInfoByCustomerName" resultType="com.ruoyi.sales.pojo.ShippingInfo">
        select * from shipping_info si
        left join sales_ledger sl on si.sales_ledger_id = sl.id
        where sl.customer_name = #{customerName}
    </select>
</mapper>

 src/main/resources/mapper/staff/SchemeApplicableStaffMapper.xml

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.staff.mapper.SchemeApplicableStaffMapper">

    <!-- é€šç”¨æŸ¥è¯¢æ˜ å°„结果 -->
    <resultMap id="BaseResultMap" type="com.ruoyi.staff.pojo.SchemeApplicableStaff">
        <id column="id" property="id" />
        <result column="title" property="title" />
        <result column="dept_ids" property="deptIds" />
        <result column="staff_names" property="staffNames" />
        <result column="staff_ids" property="staffIds" />
        <result column="insurance_types" property="insuranceTypes" />
        <result column="remark" property="remark" />
        <result column="create_time" property="createTime" />
        <result column="update_time" property="updateTime" />
        <result column="create_user" property="createUser" />
        <result column="update_user" property="updateUser" />
    </resultMap>

</mapper>

 src/main/resources/mapper/staff/SchemeInsuranceDetailMapper.xml

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.staff.mapper.SchemeInsuranceDetailMapper">

    <!-- é€šç”¨æŸ¥è¯¢æ˜ å°„结果 -->
    <resultMap id="BaseResultMap" type="com.ruoyi.staff.pojo.SchemeInsuranceDetail">
        <id column="id" property="id" />
        <result column="scheme_id" property="schemeId" />
        <result column="insurance_type" property="insuranceType" />
        <result column="payment_base" property="paymentBase" />
        <result column="use_basic_salary" property="useBasicSalary" />
        <result column="personal_ratio" property="personalRatio" />
        <result column="personal_fixed" property="personalFixed" />
        <result column="create_time" property="createTime" />
        <result column="update_time" property="updateTime" />
        <result column="create_user" property="createUser" />
        <result column="update_user" property="updateUser" />
    </resultMap>

</mapper>

 src/main/resources/mapper/staff/StaffEducationMapper.xml

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,21 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.staff.mapper.StaffEducationMapper">

    <!-- é€šç”¨æŸ¥è¯¢æ˜ å°„结果 -->
    <resultMap id="BaseResultMap" type="com.ruoyi.staff.pojo.StaffEducation">
        <id column="id" property="id" />
        <result column="staff_on_job_id" property="staffOnJobId" />
        <result column="education" property="education" />
        <result column="school_name" property="schoolName" />
        <result column="enroll_time" property="enrollTime" />
        <result column="graduate_time" property="graduateTime" />
        <result column="major" property="major" />
        <result column="degree" property="degree" />
        <result column="create_time" property="createTime" />
        <result column="create_user" property="createUser" />
        <result column="update_time" property="updateTime" />
        <result column="update_user" property="updateUser" />
    </resultMap>

</mapper>

 src/main/resources/mapper/staff/StaffEmergencyContactMapper.xml

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.staff.mapper.StaffEmergencyContactMapper">

    <!-- é€šç”¨æŸ¥è¯¢æ˜ å°„结果 -->
    <resultMap id="BaseResultMap" type="com.ruoyi.staff.pojo.StaffEmergencyContact">
        <id column="id" property="id" />
        <result column="staff_on_job_id" property="staffOnJobId" />
        <result column="contact_name" property="contactName" />
        <result column="contact_relation" property="contactRelation" />
        <result column="contact_phone" property="contactPhone" />
        <result column="contact_address" property="contactAddress" />
        <result column="create_time" property="createTime" />
        <result column="create_user" property="createUser" />
        <result column="update_time" property="updateTime" />
        <result column="update_user" property="updateUser" />
    </resultMap>

</mapper>

 src/main/resources/mapper/staff/StaffWorkExperienceMapper.xml

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,21 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.staff.mapper.StaffWorkExperienceMapper">

    <!-- é€šç”¨æŸ¥è¯¢æ˜ å°„结果 -->
    <resultMap id="BaseResultMap" type="com.ruoyi.staff.pojo.StaffWorkExperience">
        <id column="id" property="id" />
        <result column="staff_on_job_id" property="staffOnJobId" />
        <result column="former_company" property="formerCompany" />
        <result column="former_dept" property="formerDept" />
        <result column="former_position" property="formerPosition" />
        <result column="start_date" property="startDate" />
        <result column="end_date" property="endDate" />
        <result column="work_desc" property="workDesc" />
        <result column="create_time" property="createTime" />
        <result column="create_user" property="createUser" />
        <result column="update_time" property="updateTime" />
        <result column="update_user" property="updateUser" />
    </resultMap>

</mapper>

 src/main/resources/mapper/system/SysDeptMapper.xml

@@ -52,7 +52,7 @@
        order by d.parent_id, d.order_num
    </select>
    
    <select id="selectDeptListByRoleId" resultType="Long">
    <select id="selectDeptListByRoleId" resultType="java.lang.Long">
        select d.dept_id
        from sys_dept d
            left join sys_role_dept rd on d.dept_id = rd.dept_id
@@ -165,7 +165,7 @@
        update sys_dept set del_flag = '2' where dept_id = #{deptId}
    </delete>

    <select id="maxLevelDeptId">
    <select id="maxLevelDeptId" resultType="java.lang.Long">
        WITH RECURSIVE DepartmentHierarchy AS (
            SELECT dept_id, parent_id
            FROM sys_dept

 src/main/resources/mapper/system/SysUserMapper.xml

@@ -139,6 +139,7 @@
    <select id="selectUserById" parameterType="Long" resultMap="SysUserResult">
        <include refid="selectUserVo"/>
        where u.user_id = #{userId}
        and u.del_flag = '0'
    </select>

    <select id="checkUserNameUnique" parameterType="String" resultMap="SysUserResult">
@@ -157,6 +158,7 @@
        where u.user_id in <foreach collection="userIds" item="item" open="(" separator="," close=")">
             #{item}
        </foreach>
        and u.del_flag = '0'
    </select>
    <select id="selectRegistrantIds" resultType="com.ruoyi.project.system.domain.SysUser">
        SELECT user_id, nick_name FROM sys_user
@@ -179,6 +181,7 @@
        <foreach collection="userIds" item="id" open="(" separator="," close=")">
            #{id}
        </foreach>
        and del_flag = '0'
    </select>
    <select id="selectUserByNickName" resultType="com.ruoyi.project.system.domain.SysUser"
            parameterType="java.lang.String">