feat(oa): 更新仓库主表remark修改接口及关联需求字段
- 修改 updateRemark 接口,增加 requirementId 和 masterNum 参数 - 在 SysOaWarehouseMaster 实体中新增 requirementId 字段- 在 SysOaWarehouseMasterBo 业务对象中新增 requirementId 字段 - 在 SysOaWarehouseMasterVo 视图对象中新增 requirementId 和 requirementName 字段- 更新 Mapper XML 文件,增加 requirement_id 和 requirementName 的映射 - 在查询条件中增加对 requirementId 的过滤支持 - 关联 oa_requirements 表以获取 requirementName 数据
This commit is contained in:
@@ -85,7 +85,7 @@ public interface ISysOaWarehouseMasterService {
|
||||
/**
|
||||
* 单独修改remark
|
||||
*/
|
||||
Boolean updateRemark(Long masterId, String remark);
|
||||
Boolean updateRemark(Long masterId, String remark, Long requirementId,String masterNum);
|
||||
|
||||
int updateReturnType(Long masterId, Integer returnType);
|
||||
|
||||
|
||||
@@ -89,6 +89,7 @@ public class SysOaWarehouseMasterServiceImpl implements ISysOaWarehouseMasterSer
|
||||
.eq(bo.getProjectId()!= null, "sowm.project_id", bo.getProjectId())
|
||||
.eq(bo.getReturnType() != null, "sowm.return_type", bo.getReturnType())
|
||||
.eq(bo.getWithdrawLock()!= null, "sowm.withdraw_lock", bo.getWithdrawLock())
|
||||
.eq(bo.getRequirementId() != null, "sowm.requirement_id", bo.getRequirementId())
|
||||
// 其他过滤……
|
||||
.eq("sowm.del_flag",0)
|
||||
.orderByDesc("sowm.update_time");
|
||||
@@ -317,11 +318,13 @@ public class SysOaWarehouseMasterServiceImpl implements ISysOaWarehouseMasterSer
|
||||
}
|
||||
|
||||
@Override
|
||||
public Boolean updateRemark(Long masterId, String remark) {
|
||||
public Boolean updateRemark(Long masterId, String remark,Long requirementId,String masterNum) {
|
||||
if (masterId == null) return false;
|
||||
SysOaWarehouseMaster update = new SysOaWarehouseMaster();
|
||||
update.setMasterId(masterId);
|
||||
update.setRemark(remark);
|
||||
update.setRequirementId(requirementId);
|
||||
update.setMasterNum(masterNum);
|
||||
return baseMapper.updateById(update) > 0;
|
||||
}
|
||||
// 2. 修改returnType
|
||||
|
||||
Reference in New Issue
Block a user