Compare commits

...

2 Commits

Author SHA1 Message Date
furongxin
708775f6dc refactor(bpm): 用 StringUtils 替代 Strings 进行字符串操作
- 在 BpmOAPaymentController 和 BpmOAProcureController 中,将 Strings.isNotEmpty()
2024-12-27 11:56:59 +08:00
furongxin
2f869ded4c refactor(bpm): 优化任务查询条件
- 使用 StringUtils.isNotEmpty() 替代 Strings.isNotEmpty() 进行字符串非空判断
- 在 BpmTaskExtMapper 中优化了任务查询条件,提高查询准确性
2024-12-27 11:54:53 +08:00
4 changed files with 9 additions and 5 deletions

View File

@ -17,6 +17,7 @@ import cn.iocoder.yudao.module.system.api.project.dto.ProjectDTO;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.tags.Tag;
import org.apache.commons.lang3.StringUtils;
import org.apache.logging.log4j.util.Strings;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
@ -88,7 +89,7 @@ public class BpmOAPaymentController {
item.setFactoryName(dtoMap.get(item.getDeptId()).getName());
});
if (Strings.isNotEmpty(payment.getProjectNo())) {
if (StringUtils.isNotEmpty(payment.getProjectNo())) {
// 获取项目信息
ProjectDTO project = projectApi.getProject(payment.getProjectNo()).getCheckedData();
// 设置项目名称

View File

@ -12,6 +12,7 @@ import cn.iocoder.yudao.module.system.api.project.dto.ProjectDTO;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.tags.Tag;
import org.apache.commons.lang3.StringUtils;
import org.apache.logging.log4j.util.Strings;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
@ -64,7 +65,7 @@ public class BpmOAProcureController {
public CommonResult<BpmOAProcureRespVO> getOaProcure(@RequestParam("id") Long id) {
BpmOAProcureDO oaProcure = bpmOaProcureService.getOaProcure(id);
BpmOAProcureRespVO respVO = BpmOAProcureConvert.INSTANCE.convert(oaProcure);
if (respVO != null && Strings.isNotEmpty(respVO.getProjectNo())) {
if (respVO != null && StringUtils.isNotEmpty(respVO.getProjectNo())) {
ProjectDTO projectDTO = projectApi.getProject(respVO.getProjectNo()).getCheckedData();
respVO.setProjectName(projectDTO.getName());
}
@ -87,7 +88,7 @@ public class BpmOAProcureController {
BpmOAProcureDO oaProcure = bpmOaProcureService.getByProcessInstanceId(processInstanceId);
BpmOAProcureRespVO respVO = BpmOAProcureConvert.INSTANCE.convert(oaProcure);
if (respVO != null && Strings.isNotEmpty(respVO.getProjectNo())) {
if (respVO != null && StringUtils.isNotEmpty(respVO.getProjectNo())) {
ProjectDTO projectDTO = projectApi.getProject(respVO.getProjectNo()).getCheckedData();
respVO.setProjectName(projectDTO.getName());
}

View File

@ -10,6 +10,7 @@ import cn.iocoder.yudao.module.bpm.dal.dataobject.task.BpmTaskExtDO;
import cn.iocoder.yudao.module.bpm.enums.task.BpmProcessInstanceResultEnum;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.apache.commons.lang3.StringUtils;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.mapstruct.ap.internal.util.Strings;
@ -96,7 +97,7 @@ public interface BpmTaskExtMapper extends BaseMapperX<BpmTaskExtDO> {
queryWrapperX.innerJoin(BpmProcessInstanceExtDO.class, on -> on
.eq(BpmTaskExtDO::getProcessInstanceId, BpmProcessInstanceExtDO::getProcessInstanceId)
.in(Objects.nonNull(userIds), BpmProcessInstanceExtDO::getStartUserId, userIds)
.eq(Strings.isNotEmpty(pageVO.getName()), BpmProcessInstanceExtDO::getName, pageVO.getName()));
.eq(StringUtils.isNotEmpty(pageVO.getName()), BpmProcessInstanceExtDO::getName, pageVO.getName()));
queryWrapperX.likeRight(BpmProcessInstanceExtDO::getProcessDefinitionId, "oa_");
queryWrapperX.eq(BpmTaskExtDO::getAssigneeUserId, userId);
queryWrapperX.betweenIfPresent(BpmTaskExtDO::getCreateTime, pageVO.getCreateTime());

View File

@ -1,5 +1,6 @@
package cn.iocoder.yudao.module.smartfactory.framework.util;
import org.apache.commons.lang3.StringUtils;
import org.apache.logging.log4j.util.Strings;
import java.util.regex.Matcher;
@ -17,7 +18,7 @@ public class StringUtil {
*/
public static Integer sizeNameAnalysis(String sizeName) {
if (Strings.isEmpty(sizeName)) {
if (StringUtils.isEmpty(sizeName)) {
return 1;
}