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

refactor(oa): 仓库主表相关重构

Browse Source 
- 移除了 ISysOaWarehouseMasterService 中的 updateReturnType 和 updateWithdrawLock 方法
- 更新了 SysOaWarehouseMaster、SysOaWarehouseMasterBo 和 SysOaWarehouseMasterVo 中的 withdrawlock 字段，改为 withdrawLock
- 删除了 SysOaWarehouseMasterController 中的 updateReturnType 和 updateWithdrawLock 接口
- 更新了 SysOaWarehouseMasterMapper.xml 中的相关 SQL 语句- 移除了 SysOaWarehouseMasterServiceImpl 中的 updateReturnType 和 updateWithdrawLock 方法
This commit is contained in:
Joshi
2025-08-19 16:50:44 +08:00
parent 268a7a3117
commit e2500e06df
7 changed files with 9 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -72,7 +72,6 @@ public interface ISysOaWarehouseMasterService {
* @return
*/
int redoMaster(Long masterId);
boolean updateReturnType(Long masterId, Integer returnType);
boolean returnDetail(List<ReturnDetailBo> returnDetails);
/**
@@ -88,5 +87,4 @@ public interface ISysOaWarehouseMasterService {
*/
Boolean updateRemark(Long masterId, String remark);
int updateWithdrawLock(Long masterId, Integer withdrawlock);
}

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

@@ -88,7 +88,7 @@ public class SysOaWarehouseMasterServiceImpl implements ISysOaWarehouseMasterSer
lqw.eq(bo.getType()!= null, "sowm.type",bo.getType())
.eq(bo.getProjectId()!= null, "sowm.project_id", bo.getProjectId())
.eq(bo.getReturnType() != null, "sowm.return_type", bo.getReturnType())
.eq(bo.getWithdrawlock()!= null, "sowm.withdrawlock", bo.getWithdrawlock())
.eq(bo.getWithdrawLock()!= null, "sowm.withdraw_lock", bo.getWithdrawLock())
// 其他过滤……
.eq("sowm.del_flag",0)
.orderByDesc("sowm.update_time");
@@ -304,14 +304,7 @@ public class SysOaWarehouseMasterServiceImpl implements ISysOaWarehouseMasterSer
return baseMapper.deleteById(masterId);
}
// 2. 修改returnType
@Override
public boolean updateReturnType(Long masterId, Integer returnType) {
SysOaWarehouseMaster update = new SysOaWarehouseMaster();
update.setMasterId(masterId);
update.setReturnType(returnType);
return baseMapper.updateById(update) > 0;
}
@Override
public boolean updateIsLike(Long masterId, Integer isLike) {
@@ -331,11 +324,4 @@ public class SysOaWarehouseMasterServiceImpl implements ISysOaWarehouseMasterSer
return baseMapper.updateById(update) > 0;
}
@Override
public int updateWithdrawLock(Long masterId, Integer withdrawlock) {
SysOaWarehouseMaster update = new SysOaWarehouseMaster();
update.setMasterId(masterId);
update.setReturnType(withdrawlock);
return baseMapper.updateById(update);
}
}