From 9709fc39a1cc14ec4a30acb7349f8b1a63511d50 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=A9=AC=E4=B8=89=E7=82=AE?= <15856818120@163.com> Date: Fri, 19 Sep 2025 10:31:59 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=89=E8=A1=A8=E4=B8=80=E5=86=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bmw/controller/PmProjectController.java | 117 ++++++++++++++++- .../bonus/bmw/domain/vo/ProMonthTable.java | 113 ++++++++++++++++ .../bmw/domain/vo/ProMonthTableRosterVo.java | 121 ++++++++++++++++++ .../bonus/bmw/domain/vo/UserAttendanceVo.java | 96 ++++++++++++++ .../bmw/domain/vo/UserSalaryApprovalVo.java | 118 +++++++++++++++++ .../com/bonus/bmw/mapper/PmProjectMapper.java | 28 ++++ .../bonus/bmw/service/PmProjectService.java | 30 +++++ .../service/impl/PmProjectServiceImpl.java | 49 ++++++- .../resources/mapper/bmw/PmProjectMapper.xml | 63 +++++++++ .../file/controller/SysFileController.java | 4 +- 10 files changed, 728 insertions(+), 11 deletions(-) create mode 100644 bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/domain/vo/ProMonthTable.java create mode 100644 bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/domain/vo/ProMonthTableRosterVo.java create mode 100644 bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/domain/vo/UserAttendanceVo.java create mode 100644 bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/domain/vo/UserSalaryApprovalVo.java diff --git a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/PmProjectController.java b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/PmProjectController.java index d5247be..ce4af03 100644 --- a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/PmProjectController.java +++ b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/PmProjectController.java @@ -3,6 +3,9 @@ package com.bonus.bmw.controller; import com.bonus.bmw.domain.po.BmSubContract; import com.bonus.bmw.domain.po.PmProject; import com.bonus.bmw.domain.vo.PmProjectVo; +import com.bonus.bmw.domain.vo.ProMonthTable; +import com.bonus.bmw.domain.vo.ProMonthTableRosterVo; +import com.bonus.bmw.domain.vo.UserSalaryApprovalVo; import com.bonus.bmw.service.PmProjectService; import com.bonus.common.core.utils.poi.ExcelUtil; import com.bonus.common.core.web.controller.BaseController; @@ -44,7 +47,7 @@ public class PmProjectController extends BaseController { */ @RequiresPermissionsOrInnerAuth(innerAuth = @InnerAuth, requiresPermissions = @RequiresPermissions("pm:project:list")) @GetMapping("/list") - @SysLog(title = "标段工程", businessType = OperaType.QUERY, logType = 0, module = "标段工程->标段工程列表") + @SysLog(title = "标段工程", businessType = OperaType.QUERY, module = "标段工程->标段工程列表") public TableDataInfo list(PmProject pmProject) { try { Map map = dealWithPermission(); @@ -66,7 +69,7 @@ public class PmProjectController extends BaseController { */ /* @RequiresPermissionsOrInnerAuth(innerAuth = @InnerAuth, requiresPermissions = @RequiresPermissions("pm:company:edit"))*/ @PostMapping("/addOrUpdateProject") - @SysLog(title = "标段工程", businessType = OperaType.UPDATE, logType = 0, module = "标段工程->新增和修改标段工程") + @SysLog(title = "标段工程", businessType = OperaType.UPDATE, module = "标段工程->新增和修改标段工程") public AjaxResult addOrUpdateProject(@Validated @RequestBody PmProject pmProject) { try { int res = pmProjectService.addOrUpdateProject(pmProject); @@ -87,7 +90,7 @@ public class PmProjectController extends BaseController { */ /*@RequiresPermissionsOrInnerAuth(innerAuth = @InnerAuth, requiresPermissions = @RequiresPermissions("pm:company:del"))*/ @PostMapping("/delProject") - @SysLog(title = "标段工程", businessType = OperaType.UPDATE, logType = 0, module = "标段工程->删除标段工程") + @SysLog(title = "标段工程", businessType = OperaType.UPDATE, module = "标段工程->删除标段工程") public AjaxResult delProject(@Validated @RequestBody PmProject pmProject) { try { int res = pmProjectService.delProject(pmProject); @@ -107,7 +110,7 @@ public class PmProjectController extends BaseController { * 导出标段工程 */ @PostMapping("/export") - @SysLog(title = "标段工程", businessType = OperaType.EXPORT, logType = 0, module = "标段工程->导出标段工程") + @SysLog(title = "标段工程", businessType = OperaType.EXPORT, module = "标段工程->导出标段工程") public void export(HttpServletResponse response, PmProject pmProject) { try { List list = pmProjectService.selectProjectList(pmProject); @@ -122,7 +125,7 @@ public class PmProjectController extends BaseController { * 标段工程下拉框 */ @GetMapping("/listAll") - @SysLog(title = "标段工程", businessType = OperaType.QUERY, logType = 0, module = "标段工程->标段工程列表") + @SysLog(title = "标段工程", businessType = OperaType.QUERY, module = "标段工程->标段工程列表") public TableDataInfo listAll(PmProject pmProject) { try { List list = pmProjectService.selectProjectListAll(pmProject); @@ -137,7 +140,7 @@ public class PmProjectController extends BaseController { * 根据分包商id获取标段工程列表 */ @GetMapping("/listAllBySubId") - @SysLog(title = "标段工程", businessType = OperaType.QUERY, logType = 0, module = "标段工程->标段工程列表") + @SysLog(title = "标段工程", businessType = OperaType.QUERY, module = "标段工程->标段工程列表") public TableDataInfo listAllBySubId(BmSubContract bmSubContract) { try { List list = pmProjectService.listAllBySubId(bmSubContract); @@ -153,7 +156,7 @@ public class PmProjectController extends BaseController { */ /*@RequiresPermissionsOrInnerAuth(innerAuth = @InnerAuth, requiresPermissions = @RequiresPermissions("pm:company:del"))*/ @PostMapping("/getPeoNum") - @SysLog(title = "标段工程", businessType = OperaType.UPDATE, logType = 0, module = "标段工程->获取班组人员出入场信息") + @SysLog(title = "标段工程", businessType = OperaType.UPDATE, module = "标段工程->获取班组人员出入场信息") public AjaxResult getPeoNum(@Validated @RequestBody BmSubContract bmSubContract) { try { Map res = pmProjectService.getPeoNum(bmSubContract); @@ -163,4 +166,104 @@ public class PmProjectController extends BaseController { } return error("系统异常,请联系管理员"); } + + /** + * 三表一册 + */ + @RequiresPermissionsOrInnerAuth(innerAuth = @InnerAuth, requiresPermissions = @RequiresPermissions("pro:month:list")) + @GetMapping("/getThreeForms") + @SysLog(title = "三表一册", businessType = OperaType.UPDATE, module = "三表一册->三表一册列表") + public AjaxResult getThreeForms(ProMonthTable proMonthTable) { + try { + startPage(); + List res = pmProjectService.getThreeForms(proMonthTable); + return success(res); + } catch (Exception e) { + logger.error(e.toString(), e); + } + return error("系统异常,请联系管理员"); + } + + /** + * 每月数据 + */ + // @RequiresPermissionsOrInnerAuth(innerAuth = @InnerAuth, requiresPermissions = @RequiresPermissions("pro:month:list")) + @GetMapping("/getProMonthTableList") + @SysLog(title = "三表一册", businessType = OperaType.UPDATE, module = "三表一册->每月数据") + public AjaxResult getProMonthTableList(BmSubContract bmSubContract) { + try { + startPage(); + List res = pmProjectService.getProMonthTableList(bmSubContract); + return success(res); + } catch (Exception e) { + logger.error(e.toString(), e); + } + return error("系统异常,请联系管理员"); + } + + /** + * 获取项目详情 + */ + // @RequiresPermissionsOrInnerAuth(innerAuth = @InnerAuth, requiresPermissions = @RequiresPermissions("pro:month:list")) + @GetMapping("/getProjectById") + @SysLog(title = "三表一册", businessType = OperaType.UPDATE, module = "三表一册->获取项目详情") + public AjaxResult getProjectById(BmSubContract bmSubContract) { + try { + PmProjectVo res = pmProjectService.getProjectById(bmSubContract); + return success(res); + } catch (Exception e) { + logger.error(e.toString(), e); + } + return error("系统异常,请联系管理员"); + } + + /** + * 农民工花名册 + */ + // @RequiresPermissionsOrInnerAuth(innerAuth = @InnerAuth, requiresPermissions = @RequiresPermissions("pro:month:list")) + @GetMapping("/getProMonthTableRosterList") + @SysLog(title = "三表一册", businessType = OperaType.UPDATE, module = "三表一册->农民工花名册") + public AjaxResult getProMonthTableRosterList(ProMonthTableRosterVo proMonthTableRosterVo) { + try { + List res = pmProjectService.getProMonthTableRosterList(proMonthTableRosterVo); + return success(res); + } catch (Exception e) { + logger.error(e.toString(), e); + } + return error("系统异常,请联系管理员"); + } + + /** + * 农民工实名制工资信息报审 + */ + // @RequiresPermissionsOrInnerAuth(innerAuth = @InnerAuth, requiresPermissions = @RequiresPermissions("pro:month:list")) + @GetMapping("/getUserSalaryApprovalList") + @SysLog(title = "三表一册", businessType = OperaType.UPDATE, module = "三表一册->农民工实名制工资信息报审") + public AjaxResult getUserSalaryApprovalList(UserSalaryApprovalVo userSalaryApprovalVo) { + try { + List res = pmProjectService.getUserSalaryApprovalList(userSalaryApprovalVo); + return success(res); + } catch (Exception e) { + logger.error(e.toString(), e); + } + return error("系统异常,请联系管理员"); + } + + /** + * 分包人员考勤明细 + */ + // @RequiresPermissionsOrInnerAuth(innerAuth = @InnerAuth, requiresPermissions = @RequiresPermissions("pro:month:list")) + @GetMapping("/getUserAttendanceList") + @SysLog(title = "三表一册", businessType = OperaType.UPDATE, module = "三表一册->分包人员考勤明细") + public AjaxResult getUserAttendanceList(UserSalaryApprovalVo userSalaryApprovalVo) { + try { + List res = pmProjectService.getUserAttendanceList(userSalaryApprovalVo); + return success(res); + } catch (Exception e) { + logger.error(e.toString(), e); + } + return error("系统异常,请联系管理员"); + } + + } diff --git a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/domain/vo/ProMonthTable.java b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/domain/vo/ProMonthTable.java new file mode 100644 index 0000000..14690bb --- /dev/null +++ b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/domain/vo/ProMonthTable.java @@ -0,0 +1,113 @@ +package com.bonus.bmw.domain.vo; + +import lombok.Data; + +import java.math.BigDecimal; + +/** + * @author 马三炮 + * @date 2025/9/18 + */ +@Data +public class ProMonthTable { + + /** + * 主键 + */ + private Long id; + + /** + * 工程id + */ + private Long proId; + + /** + * 工程名称 + */ + private String proName; + + /** + * 分公司名称 + */ + private String subComName; + + /** + * 月份 + */ + private String tableMonth; + + /** + * 花名册人数 + */ + private Integer rosterNum; + + /** + * 考勤打卡天数 + */ + private Integer attendanceNum; + + /** + * 考勤补卡天数 + */ + private Integer repairNum; + + /** + * 工资填报人数 + */ + private Integer salaryNum; + + /** + * 分包单位数量 + */ + private Integer subNum; + + /** + * 应发工资 + */ + private BigDecimal grossSalary; + + /** + * 实发工资 + */ + private BigDecimal netSalary; + + /** + * 状态 0进行中 1待封档 2已封档 + */ + private String status; + + /** + * 封单时间 + */ + private String blockTime; + + /** + * 回传单上传状态 0未上传 1已上传 + */ + private String refundStatus; + + /** + * 班组数量 + */ + private Integer teamNum; + + /** + * 上传人 + */ + private Integer refundUser; + + /** + * 上传时间 + */ + private String refundTime; + + /** + * 是否有数据需要更新 + */ + private String isUpdate; + + /** + * 发放人员人次 + */ + private Integer payNum; +} diff --git a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/domain/vo/ProMonthTableRosterVo.java b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/domain/vo/ProMonthTableRosterVo.java new file mode 100644 index 0000000..cda7b58 --- /dev/null +++ b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/domain/vo/ProMonthTableRosterVo.java @@ -0,0 +1,121 @@ +package com.bonus.bmw.domain.vo; + +import lombok.Data; + +/** + * @author 马三炮 + * @date 2025/9/19 + */ +@Data +public class ProMonthTableRosterVo { + + /** + *主键 + */ + private Long id; + + /** + *工程id + */ + private Long proId; + + /** + *月份 + */ + private String proMonth; + + /** + *月度id + */ + private Long monthId; + + /** + *分包单位id + */ + private Long subId; + + /** + *分包单位名称 + */ + private String subName; + + /** + *班组id + */ + private Long teamId; + + /** + *班组名称 + */ + private String teamName; + + /** + *用户id + */ + private Long userId; + + /** + *用户名称 + */ + private String userName; + + /** + *性别 0 女 1男 + */ + private String sex; + + /** + *工种 + */ + private String workId; + + /** + *工种名称 + */ + private String workName; + + /** + *发证单位及编号 + */ + private String unitAndCode; + + /** + *有效期 + */ + private String period; + + /** + *身份证号码 + */ + private String idCard; + + /** + *户籍所在地 + */ + private String residence; + + /** + *手机号 + */ + private String phone; + + /** + *备注 + */ + private String remark; + + /** + *出场时间 + */ + private String outTime; + + /** + *在岗情况 + */ + private String onDuty; + + /** + *入场时间 + */ + private String inTime; +} diff --git a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/domain/vo/UserAttendanceVo.java b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/domain/vo/UserAttendanceVo.java new file mode 100644 index 0000000..4756e46 --- /dev/null +++ b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/domain/vo/UserAttendanceVo.java @@ -0,0 +1,96 @@ +package com.bonus.bmw.domain.vo; + +import lombok.Data; + +/** + * @author 马三炮 + * @date 2025/9/19 + */ +@Data +public class UserAttendanceVo { + + /** + * 主键 + */ + private Long id; + + /** + * 月度id + */ + private Long monthId; + + /** + * 工程id + */ + private Long proId; + + /** + * 月份 + */ + private String month; + + /** + * 工程名称 + */ + private String proName; + + /** + * 月天数 + */ + private Integer monthDay; + + /** + * 花名册id + */ + private Long rosterId; + + /** + * 分包id + */ + private Long subId; + + /** + * 分包名称 + */ + private String subName; + + /** + * 姓名 + */ + private String userName; + + /** + * 身份证号码 + */ + private String idCard; + + /** + * 工种名称 + */ + private String workName; + + /** + * 工种id + */ + private String workId; + + /** + * 考勤信息(json)[{status:1,type:0}](主要存储 是否补卡 和是否考勤 + */ + private String attendanceDay; + + /** + * 打卡天数 + */ + private int checkDay; + + /** + * 补卡天数 + */ + private int repairNum; + + /** + * 考勤天数=打卡+补卡天数 + */ + private int attendanceNum; +} diff --git a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/domain/vo/UserSalaryApprovalVo.java b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/domain/vo/UserSalaryApprovalVo.java new file mode 100644 index 0000000..922e5b8 --- /dev/null +++ b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/domain/vo/UserSalaryApprovalVo.java @@ -0,0 +1,118 @@ +package com.bonus.bmw.domain.vo; + +import lombok.Data; + +import java.math.BigDecimal; + +/** + * @author 马三炮 + * @date 2025/9/19 + */ +@Data +public class UserSalaryApprovalVo { + + /** + * 主键 + */ + private Long id; + + /** + * 花名册id + */ + private Long rosterId; + + /** + * 工程id + */ + private Long proId; + + /** + * 月度id + */ + private Long monthId; + + /** + * 月份 + */ + private String month; + + /** + * 班组id + */ + private Long teamId; + + /** + * 班组名称 + */ + private String teamName; + + /** + * 姓名 + */ + private String userName; + + /** + * 用户id + */ + private Long userId; + + /** + * 身份证号码 + */ + private String idCard; + + /** + * 联系方式 + */ + private String phone; + + /** + * 分包id + */ + private Long subId; + + /** + * 分包名称 + */ + private String subName; + + /** + * 开户银行 + */ + private String bankName; + + /** + * 银行卡号 + */ + private String bankCode; + + /** + * 收款银行联行号 + */ + private String bankNum; + + /** + * 收款银行联行号 + */ + private Long consId; + + /** + * 工资标准 + */ + private BigDecimal priceWage; + + /** + * 支付周期 + */ + private String payment; + + /** + * 支付日期 + */ + private String payDay; + + /** + * 备注 + */ + private String remark; +} diff --git a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/mapper/PmProjectMapper.java b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/mapper/PmProjectMapper.java index e3ecbc4..4abebaf 100644 --- a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/mapper/PmProjectMapper.java +++ b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/mapper/PmProjectMapper.java @@ -4,6 +4,9 @@ import com.bonus.bmw.domain.po.BmSubContract; import com.bonus.bmw.domain.po.PmProject; import com.bonus.bmw.domain.po.PmSubCompany; import com.bonus.bmw.domain.vo.PmProjectVo; +import com.bonus.bmw.domain.vo.ProMonthTable; +import com.bonus.bmw.domain.vo.ProMonthTableRosterVo; +import com.bonus.bmw.domain.vo.UserSalaryApprovalVo; import org.apache.ibatis.annotations.Param; import java.util.List; @@ -73,4 +76,29 @@ public interface PmProjectMapper { * @return */ Integer getPeoNum(BmSubContract bmSubContract); + + /** + * 三表一册 + */ + List getThreeForms(ProMonthTable proMonthTable); + + /** + * 获取项目详情 + */ + PmProjectVo getProjectById(BmSubContract bmSubContract); + + /** + * 每月数据 + */ + List getProMonthTableList(BmSubContract bmSubContract); + + /** + * 农民工花名册 + */ + List getProMonthTableRosterList(ProMonthTableRosterVo proMonthTableRosterVo); + + /** + * 农民工实名制工资信息报审 + */ + List getUserSalaryApprovalList(UserSalaryApprovalVo userSalaryApprovalVo); } diff --git a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/PmProjectService.java b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/PmProjectService.java index fc4c667..49a7c32 100644 --- a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/PmProjectService.java +++ b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/PmProjectService.java @@ -3,6 +3,9 @@ package com.bonus.bmw.service; import com.bonus.bmw.domain.po.BmSubContract; import com.bonus.bmw.domain.po.PmProject; import com.bonus.bmw.domain.vo.PmProjectVo; +import com.bonus.bmw.domain.vo.ProMonthTable; +import com.bonus.bmw.domain.vo.ProMonthTableRosterVo; +import com.bonus.bmw.domain.vo.UserSalaryApprovalVo; import java.util.List; import java.util.Map; @@ -43,4 +46,31 @@ public interface PmProjectService { * @return */ Map getPeoNum(BmSubContract bmSubContract); + + /** + * 三表一册 + */ + List getThreeForms(ProMonthTable proMonthTable); + + /** + * 获取项目详情 + */ + PmProjectVo getProjectById(BmSubContract bmSubContract); + + /** + * 每月数据 + */ + List getProMonthTableList(BmSubContract bmSubContract); + + /** + * 农民工花名册 + */ + List getProMonthTableRosterList(ProMonthTableRosterVo proMonthTableRosterVo); + + /** + * 农民工实名制工资信息报审 + */ + List getUserSalaryApprovalList(UserSalaryApprovalVo userSalaryApprovalVo); + + List getUserAttendanceList(UserSalaryApprovalVo userSalaryApprovalVo); } diff --git a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/impl/PmProjectServiceImpl.java b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/impl/PmProjectServiceImpl.java index bf8aa30..8c969e3 100644 --- a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/impl/PmProjectServiceImpl.java +++ b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/impl/PmProjectServiceImpl.java @@ -3,8 +3,7 @@ package com.bonus.bmw.service.impl; import com.bonus.bmw.domain.po.BmSubContract; import com.bonus.bmw.domain.po.PmProject; import com.bonus.bmw.domain.po.PmSubCompany; -import com.bonus.bmw.domain.vo.BmSubContractVo; -import com.bonus.bmw.domain.vo.PmProjectVo; +import com.bonus.bmw.domain.vo.*; import com.bonus.bmw.mapper.BmSubContractMapper; import com.bonus.bmw.mapper.PmProjectMapper; import com.bonus.bmw.service.PmProjectService; @@ -147,4 +146,50 @@ public class PmProjectServiceImpl implements PmProjectService { map.put("perNum",perNum); return map; } + + /** + * 三表一册 + */ + @Override + public List getThreeForms(ProMonthTable proMonthTable) { + + return pmProjectMapper.getThreeForms(proMonthTable); + } + + /** + * 获取项目详情 + */ + @Override + public PmProjectVo getProjectById(BmSubContract bmSubContract) { + return pmProjectMapper.getProjectById(bmSubContract); + } + + /** + * 每月数据 + */ + @Override + public List getProMonthTableList(BmSubContract bmSubContract) { + return pmProjectMapper.getProMonthTableList(bmSubContract); + } + + /** + * 农民工花名册 + */ + @Override + public List getProMonthTableRosterList(ProMonthTableRosterVo proMonthTableRosterVo) { + return pmProjectMapper.getProMonthTableRosterList(proMonthTableRosterVo); + } + + /** + * 农民工实名制工资信息报审 + */ + @Override + public List getUserSalaryApprovalList(UserSalaryApprovalVo userSalaryApprovalVo) { + return pmProjectMapper.getUserSalaryApprovalList(userSalaryApprovalVo); + } + + @Override + public List getUserAttendanceList(UserSalaryApprovalVo userSalaryApprovalVo) { + return null; + } } diff --git a/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/PmProjectMapper.xml b/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/PmProjectMapper.xml index b806f82..35aa081 100644 --- a/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/PmProjectMapper.xml +++ b/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/PmProjectMapper.xml @@ -179,4 +179,67 @@ + + + + + diff --git a/bonus-modules/bonus-file/src/main/java/com/bonus/file/controller/SysFileController.java b/bonus-modules/bonus-file/src/main/java/com/bonus/file/controller/SysFileController.java index 63f40f8..a74accf 100644 --- a/bonus-modules/bonus-file/src/main/java/com/bonus/file/controller/SysFileController.java +++ b/bonus-modules/bonus-file/src/main/java/com/bonus/file/controller/SysFileController.java @@ -83,7 +83,7 @@ public class SysFileController * @param objectKey，除mongodb 存fileid之外，其他均存上传文件的网络路径 */ @GetMapping("/download") - public void downloadFile(HttpServletResponse response, @RequestParam String objectKey) throws IOException { + public void downloadFile(HttpServletResponse response, @RequestParam("objectKey") String objectKey) throws IOException { try { String fileUrl = Base64Utils.decodeUrl(URLDecoder.decode(objectKey)); sysFileService.downloadFile(response, fileUrl); @@ -165,4 +165,4 @@ public class SysFileController return AjaxResult.success("文件夹删除成功"); } -} \ No newline at end of file +}