DeXun/fad_oa
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改下载附件后缀问题

Browse Source
This commit is contained in:
Joshi
2025-07-16 18:30:19 +08:00
parent 08791ac5a5
commit 2772ed5a16
6 changed files with 22 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ruoyi-oa/src/main/java/com/ruoyi/oa/controller/SysOaWarehouseMasterController.java
View File

@@ -161,4 +161,11 @@ public class SysOaWarehouseMasterController extends BaseController {
return toAjax(iSysOaWarehouseMasterService.redoMaster(masterId));
}
/**
* 单独修改remark
*/
@PutMapping("/updateRemark")
public R<Void> updateRemark(@RequestParam Long masterId, @RequestParam String remark) {
return toAjax(iSysOaWarehouseMasterService.updateRemark(masterId, remark));
}
}

8
ruoyi-oa/src/main/java/com/ruoyi/oa/controller/SysOaWarehouseTaskController.java
View File

@@ -144,14 +144,6 @@ public class SysOaWarehouseTaskController extends BaseController {
return toAjax(1);
}
/**
* 单独修改remark
*/
@PutMapping("/updateRemark")
public R<Void> updateRemark(@RequestParam Long taskId, @RequestParam String remark) {
return toAjax(iSysOaWarehouseTaskService.updateRemark(taskId, remark));
}
/**
* 删除采购计划

4
ruoyi-oa/src/main/java/com/ruoyi/oa/service/ISysOaWarehouseMasterService.java
View File

@@ -83,4 +83,8 @@ public interface ISysOaWarehouseMasterService {
*/
boolean updateIsLike(Long masterId, Integer isLike);
/**
* 单独修改remark
*/
Boolean updateRemark(Long masterId, String remark);
}

5
ruoyi-oa/src/main/java/com/ruoyi/oa/service/ISysOaWarehouseTaskService.java
View File

@@ -61,9 +61,6 @@ public interface ISysOaWarehouseTaskService {
int updateToWare(SysOaWarehouseTaskBo bo);
/**
* 单独修改remark
*/
Boolean updateRemark(Long taskId, String remark);
}

9
ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/SysOaWarehouseMasterServiceImpl.java
View File

@@ -309,4 +309,13 @@ public class SysOaWarehouseMasterServiceImpl implements ISysOaWarehouseMasterSer
.eq(SysOaWarehouseMaster::getMasterId, masterId)
) > 0;
}
@Override
public Boolean updateRemark(Long masterId, String remark) {
if (masterId == null) return false;
SysOaWarehouseMaster update = new SysOaWarehouseMaster();
update.setMasterId(masterId);
update.setRemark(remark);
return baseMapper.updateById(update) > 0;
}
}

9
ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/SysOaWarehouseTaskServiceImpl.java
View File

@@ -211,14 +211,7 @@ public class SysOaWarehouseTaskServiceImpl implements ISysOaWarehouseTaskService
return baseMapper.updateById(task);
}
@Override
public Boolean updateRemark(Long taskId, String remark) {
if (taskId == null) return false;
SysOaWarehouseTask update = new SysOaWarehouseTask();
update.setTaskId(taskId);
update.setRemark(remark);
return baseMapper.updateById(update) > 0;
}
private int toWareOne(Long masterId, SysOaWarehouseTaskBo bo , SysOaWarehouseDetailBo sysOaWarehouseDetailBo) {
// 进行入库操作 (因为存在一种情况是此为全新物料是没有物料id的)