yaowanxin
7 天以前 dd121344f607216a46c2d3836bb4ba47943b9981
在入职管理、离职管理和用印管理中新增附件上传功能
已添加10个文件
已修改2个文件
327 ■■■■■ 文件已修改
src/main/java/com/ruoyi/collaborativeApproval/controller/SealApplicationManagementController.java 43 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/ruoyi/collaborativeApproval/mapper/SealApplicationManagementFileMapper.java 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/ruoyi/collaborativeApproval/pojo/SealApplicationManagementFile.java 56 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/ruoyi/collaborativeApproval/service/SealApplicationManagementFileService.java 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/ruoyi/collaborativeApproval/service/impl/SealApplicationManagementFileServiceImpl.java 25 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/ruoyi/staff/controller/StaffJoinLeaveRecordController.java 38 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/ruoyi/staff/mapper/StaffJoinLeaveRecordFileMapper.java 17 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/ruoyi/staff/pojo/StaffJoinLeaveRecordFile.java 56 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/ruoyi/staff/service/StaffJoinLeaveRecordFileService.java 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/ruoyi/staff/service/impl/StaffJoinLeaveRecordFileServiceImpl.java 24 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/mapper/collaborativeApproval/SealApplicationManagementFileMapper.xml 15 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/mapper/staff/StaffJoinLeaveRecordFileMapper.xml 15 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/ruoyi/collaborativeApproval/controller/SealApplicationManagementController.java
@@ -1,8 +1,13 @@
package com.ruoyi.collaborativeApproval.controller;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.account.pojo.AccountFile;
import com.ruoyi.account.service.AccountFileService;
import com.ruoyi.approve.pojo.KnowledgeBase;
import com.ruoyi.collaborativeApproval.mapper.SealApplicationManagementFileMapper;
import com.ruoyi.collaborativeApproval.pojo.SealApplicationManagement;
import com.ruoyi.collaborativeApproval.pojo.SealApplicationManagementFile;
import com.ruoyi.collaborativeApproval.service.SealApplicationManagementFileService;
import com.ruoyi.collaborativeApproval.service.SealApplicationManagementService;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
@@ -14,6 +19,7 @@
import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
import java.util.List;
@@ -24,7 +30,10 @@
public class SealApplicationManagementController {
    @Autowired
    private SealApplicationManagementService sealApplicationManagementService;
    @Resource
    private SealApplicationManagementFileMapper sealApplicationManagementFileMapper;
    @Resource
    private SealApplicationManagementFileService sealApplicationManagementFileService;
    @GetMapping("/getList")
    @ApiOperation("分页查询")
    public AjaxResult listPage(Page page, SealApplicationManagement sealApplicationManagement){
@@ -60,4 +69,36 @@
        util.exportExcel(response, accountExpenses, "用印申请管理导出");
    }
    /**
     * æ–°å¢žç”¨å°ç®¡ç†é™„ä»¶
     */
    @PostMapping("/addSealApplicationManagementFile")
    @ApiOperation("新增")
    public AjaxResult add(@RequestBody SealApplicationManagementFile sealApplicationManagementFile) {
        return AjaxResult.success(sealApplicationManagementFileMapper.insert(sealApplicationManagementFile));
    }
    /**
     * åˆ é™¤ç”¨å°ç®¡ç†é™„ä»¶
     */
    @DeleteMapping("/delSealApplicationManagementFile")
    @ApiOperation("删除")
    public AjaxResult delSealApplicationManagementFile(@RequestBody List<Integer> ids) {
        if(CollectionUtils.isEmpty(ids)){
            return AjaxResult.error("请选择至少一条数据");
        }
        //删除检验附件
        return AjaxResult.success(sealApplicationManagementFileMapper.deleteBatchIds(ids));
    }
    /**
     *分页查询用印管理附件
     */
    @GetMapping("/listPageSealApplicationManagementFile")
    @ApiOperation("分页查询")
    public AjaxResult sealApplicationManagementFileListPage(Page page, SealApplicationManagementFile sealApplicationManagementFile) {
        return AjaxResult.success(sealApplicationManagementFileService.listPage(page, sealApplicationManagementFile));
    }
}
src/main/java/com/ruoyi/collaborativeApproval/mapper/SealApplicationManagementFileMapper.java
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,16 @@
package com.ruoyi.collaborativeApproval.mapper;
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.collaborativeApproval.dto.SealApplicationManagementDTO;
import com.ruoyi.collaborativeApproval.pojo.SealApplicationManagement;
import com.ruoyi.collaborativeApproval.pojo.SealApplicationManagementFile;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@Mapper
public interface SealApplicationManagementFileMapper extends BaseMapper<SealApplicationManagementFile> {
    IPage<SealApplicationManagementFile> listPage(Page page, @Param("ew") SealApplicationManagementFile sealApplicationManagementFile);
}
src/main/java/com/ruoyi/collaborativeApproval/pojo/SealApplicationManagementFile.java
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,56 @@
package com.ruoyi.collaborativeApproval.pojo;
import com.baomidou.mybatisplus.annotation.*;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.NotBlank;
import java.io.Serializable;
import java.time.LocalDateTime;
@TableName(value = "seal_application_management_file")
@Data
public class SealApplicationManagementFile implements Serializable {
    private static final long serialVersionUID = 1L;
    /**
     * åºå·
     */
    @TableId(type = IdType.AUTO)
    private Long id;
    @ApiModelProperty(value = "文件名称")
    private String name;
    @ApiModelProperty(value = "文件路径")
    private String url;
    @ApiModelProperty(value = "文件大小")
    private int fileSize;
    @ApiModelProperty(value = "用印申请ID")
    @NotBlank(message = "用印申请id不能为空!")
    private Long sealApplicationManagementId;
    @ApiModelProperty(value = "创建时间")
    @TableField(fill = FieldFill.INSERT)
    private LocalDateTime createTime;
    @ApiModelProperty(value = "修改时间")
    @TableField(fill = FieldFill.INSERT_UPDATE)
    private LocalDateTime updateTime;
    @ApiModelProperty(value = "创建用户")
    @TableField(fill = FieldFill.INSERT)
    private Integer createUser;
    @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/collaborativeApproval/service/SealApplicationManagementFileService.java
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,11 @@
package com.ruoyi.collaborativeApproval.service;
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.collaborativeApproval.pojo.SealApplicationManagement;
import com.ruoyi.collaborativeApproval.pojo.SealApplicationManagementFile;
public interface SealApplicationManagementFileService extends IService<SealApplicationManagementFile> {
    IPage listPage(Page page, SealApplicationManagementFile sealApplicationManagementFile);
}
src/main/java/com/ruoyi/collaborativeApproval/service/impl/SealApplicationManagementFileServiceImpl.java
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,25 @@
package com.ruoyi.collaborativeApproval.service.impl;
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.collaborativeApproval.dto.SealApplicationManagementDTO;
import com.ruoyi.collaborativeApproval.mapper.SealApplicationManagementFileMapper;
import com.ruoyi.collaborativeApproval.mapper.SealApplicationManagementMapper;
import com.ruoyi.collaborativeApproval.pojo.SealApplicationManagement;
import com.ruoyi.collaborativeApproval.pojo.SealApplicationManagementFile;
import com.ruoyi.collaborativeApproval.service.SealApplicationManagementFileService;
import com.ruoyi.collaborativeApproval.service.SealApplicationManagementService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@Service
public class SealApplicationManagementFileServiceImpl extends ServiceImpl<SealApplicationManagementFileMapper, SealApplicationManagementFile> implements SealApplicationManagementFileService {
    @Autowired
    private SealApplicationManagementFileMapper sealApplicationManagementFileMapper;
    @Override
    public IPage<SealApplicationManagementFile> listPage(Page page, SealApplicationManagementFile sealApplicationManagementFile) {
        return sealApplicationManagementFileMapper.listPage(page, sealApplicationManagementFile);
    }
}
src/main/java/com/ruoyi/staff/controller/StaffJoinLeaveRecordController.java
@@ -4,11 +4,15 @@
import com.ruoyi.basic.dto.SupplierManageDto;
import com.ruoyi.basic.pojo.SupplierManage;
import com.ruoyi.basic.service.ISupplierService;
import com.ruoyi.collaborativeApproval.pojo.SealApplicationManagementFile;
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.staff.pojo.StaffJoinLeaveRecord;
import com.ruoyi.staff.pojo.StaffJoinLeaveRecordFile;
import com.ruoyi.staff.service.IStaffJoinLeaveRecordService;
import com.ruoyi.staff.service.StaffJoinLeaveRecordFileService;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;
@@ -27,6 +31,9 @@
    @Resource
    private IStaffJoinLeaveRecordService staffJoinLeaveRecordService;
    @Autowired
    private StaffJoinLeaveRecordFileService staffJoinLeaveRecordFileService;
    /**
     * æ–°å¢žå…¥èŒ/离职
@@ -93,4 +100,35 @@
    }
    /**
     * æ–°å¢žå…¥èŒ/离职附件
     */
    @PostMapping("/addFile")
    @ApiOperation("新增")
    public AjaxResult addFile(@RequestBody StaffJoinLeaveRecordFile staffJoinLeaveRecordFile) {
        return AjaxResult.success(staffJoinLeaveRecordFileService.save(staffJoinLeaveRecordFile));
    }
    /**
     * åˆ é™¤å…¥èŒ/离职附件
     */
    @DeleteMapping("/delFile")
    @ApiOperation("删除")
    public AjaxResult delFile(@RequestBody List<Integer> ids) {
        if(CollectionUtils.isEmpty(ids)){
            return AjaxResult.error("请选择至少一条数据");
        }
        //删除检验附件
        return AjaxResult.success(staffJoinLeaveRecordFileService.removeByIds(ids));
    }
    /**
     *分页查询入职/离职附件
     */
    @GetMapping("/listPageFile")
    @ApiOperation("分页查询")
    public AjaxResult staffJoinLeaveRecordFileListPage(Page page, StaffJoinLeaveRecordFile staffJoinLeaveRecordFile) {
        return AjaxResult.success(staffJoinLeaveRecordFileService.listPage(page, staffJoinLeaveRecordFile));
    }
}
src/main/java/com/ruoyi/staff/mapper/StaffJoinLeaveRecordFileMapper.java
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,17 @@
package com.ruoyi.staff.mapper;
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.collaborativeApproval.pojo.SealApplicationManagementFile;
import com.ruoyi.staff.pojo.StaffJoinLeaveRecordFile;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@Mapper
public interface StaffJoinLeaveRecordFileMapper extends BaseMapper<StaffJoinLeaveRecordFile> {
    IPage<StaffJoinLeaveRecordFile> listPage(Page page, @Param("ew") StaffJoinLeaveRecordFile staffJoinLeaveRecordFile);
}
src/main/java/com/ruoyi/staff/pojo/StaffJoinLeaveRecordFile.java
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,56 @@
package com.ruoyi.staff.pojo;
import com.baomidou.mybatisplus.annotation.*;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.NotBlank;
import java.io.Serializable;
import java.time.LocalDateTime;
@TableName(value = "staff_join_leave_record_file")
@Data
public class StaffJoinLeaveRecordFile implements Serializable {
    private static final long serialVersionUID = 1L;
    /**
     * åºå·
     */
    @TableId(type = IdType.AUTO)
    private Long id;
    @ApiModelProperty(value = "文件名称")
    private String name;
    @ApiModelProperty(value = "文件路径")
    private String url;
    @ApiModelProperty(value = "文件大小")
    private int fileSize;
    @ApiModelProperty(value = "入职/离职记录ID")
    @NotBlank(message = "入职/离职记录id不能为空!")
    private Long staffJoinLeaveRecordId;
    @ApiModelProperty(value = "创建时间")
    @TableField(fill = FieldFill.INSERT)
    private LocalDateTime createTime;
    @ApiModelProperty(value = "修改时间")
    @TableField(fill = FieldFill.INSERT_UPDATE)
    private LocalDateTime updateTime;
    @ApiModelProperty(value = "创建用户")
    @TableField(fill = FieldFill.INSERT)
    private Integer createUser;
    @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/staff/service/StaffJoinLeaveRecordFileService.java
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,11 @@
package com.ruoyi.staff.service;
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.collaborativeApproval.pojo.SealApplicationManagementFile;
import com.ruoyi.staff.pojo.StaffJoinLeaveRecordFile;
public interface StaffJoinLeaveRecordFileService extends IService<StaffJoinLeaveRecordFile> {
    IPage listPage(Page page, StaffJoinLeaveRecordFile staffJoinLeaveRecordFile);
}
src/main/java/com/ruoyi/staff/service/impl/StaffJoinLeaveRecordFileServiceImpl.java
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,24 @@
package com.ruoyi.staff.service.impl;
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.collaborativeApproval.mapper.SealApplicationManagementFileMapper;
import com.ruoyi.collaborativeApproval.pojo.SealApplicationManagementFile;
import com.ruoyi.collaborativeApproval.service.SealApplicationManagementFileService;
import com.ruoyi.staff.mapper.StaffJoinLeaveRecordFileMapper;
import com.ruoyi.staff.pojo.StaffJoinLeaveRecordFile;
import com.ruoyi.staff.service.StaffJoinLeaveRecordFileService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@Service
public class StaffJoinLeaveRecordFileServiceImpl extends ServiceImpl<StaffJoinLeaveRecordFileMapper, StaffJoinLeaveRecordFile> implements StaffJoinLeaveRecordFileService {
    @Autowired
    private StaffJoinLeaveRecordFileMapper staffJoinLeaveRecordFileMapper;
    @Override
    public IPage<StaffJoinLeaveRecordFile> listPage(Page page, StaffJoinLeaveRecordFile staffJoinLeaveRecordFile) {
        return staffJoinLeaveRecordFileMapper.listPage(page, staffJoinLeaveRecordFile);
    }
}
src/main/resources/mapper/collaborativeApproval/SealApplicationManagementFileMapper.xml
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,15 @@
<?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.collaborativeApproval.mapper.SealApplicationManagementFileMapper">
    <select id="listPage" resultType="com.ruoyi.collaborativeApproval.pojo.SealApplicationManagementFile">
        select * from seal_application_management_file
        <where>
        1=1
            <if test="ew.sealApplicationManagementId != null">
                and seal_application_management_id = #{ew.sealApplicationManagementId}
            </if>
        </where>
    </select>
</mapper>
src/main/resources/mapper/staff/StaffJoinLeaveRecordFileMapper.xml
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,15 @@
<?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.StaffJoinLeaveRecordFileMapper">
    <select id="listPage" resultType="com.ruoyi.staff.pojo.StaffJoinLeaveRecordFile">
        select * from staff_join_leave_record_file
        <where>
        1=1
            <if test="ew.staffJoinLeaveRecordId != null">
                and staff_join_leave_record_id = #{ew.staffJoinLeaveRecordId}
            </if>
        </where>
    </select>
</mapper>