Compare commits
2 Commits
5457d15793
...
708775f6dc
Author | SHA1 | Date | |
---|---|---|---|
![]() |
708775f6dc | ||
![]() |
2f869ded4c |
@ -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.Operation;
|
||||||
import io.swagger.v3.oas.annotations.Parameter;
|
import io.swagger.v3.oas.annotations.Parameter;
|
||||||
import io.swagger.v3.oas.annotations.tags.Tag;
|
import io.swagger.v3.oas.annotations.tags.Tag;
|
||||||
|
import org.apache.commons.lang3.StringUtils;
|
||||||
import org.apache.logging.log4j.util.Strings;
|
import org.apache.logging.log4j.util.Strings;
|
||||||
import org.springframework.validation.annotation.Validated;
|
import org.springframework.validation.annotation.Validated;
|
||||||
import org.springframework.web.bind.annotation.*;
|
import org.springframework.web.bind.annotation.*;
|
||||||
@ -88,7 +89,7 @@ public class BpmOAPaymentController {
|
|||||||
item.setFactoryName(dtoMap.get(item.getDeptId()).getName());
|
item.setFactoryName(dtoMap.get(item.getDeptId()).getName());
|
||||||
});
|
});
|
||||||
|
|
||||||
if (Strings.isNotEmpty(payment.getProjectNo())) {
|
if (StringUtils.isNotEmpty(payment.getProjectNo())) {
|
||||||
// 获取项目信息
|
// 获取项目信息
|
||||||
ProjectDTO project = projectApi.getProject(payment.getProjectNo()).getCheckedData();
|
ProjectDTO project = projectApi.getProject(payment.getProjectNo()).getCheckedData();
|
||||||
// 设置项目名称
|
// 设置项目名称
|
||||||
|
@ -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.Operation;
|
||||||
import io.swagger.v3.oas.annotations.Parameter;
|
import io.swagger.v3.oas.annotations.Parameter;
|
||||||
import io.swagger.v3.oas.annotations.tags.Tag;
|
import io.swagger.v3.oas.annotations.tags.Tag;
|
||||||
|
import org.apache.commons.lang3.StringUtils;
|
||||||
import org.apache.logging.log4j.util.Strings;
|
import org.apache.logging.log4j.util.Strings;
|
||||||
import org.springframework.validation.annotation.Validated;
|
import org.springframework.validation.annotation.Validated;
|
||||||
import org.springframework.web.bind.annotation.*;
|
import org.springframework.web.bind.annotation.*;
|
||||||
@ -64,7 +65,7 @@ public class BpmOAProcureController {
|
|||||||
public CommonResult<BpmOAProcureRespVO> getOaProcure(@RequestParam("id") Long id) {
|
public CommonResult<BpmOAProcureRespVO> getOaProcure(@RequestParam("id") Long id) {
|
||||||
BpmOAProcureDO oaProcure = bpmOaProcureService.getOaProcure(id);
|
BpmOAProcureDO oaProcure = bpmOaProcureService.getOaProcure(id);
|
||||||
BpmOAProcureRespVO respVO = BpmOAProcureConvert.INSTANCE.convert(oaProcure);
|
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();
|
ProjectDTO projectDTO = projectApi.getProject(respVO.getProjectNo()).getCheckedData();
|
||||||
respVO.setProjectName(projectDTO.getName());
|
respVO.setProjectName(projectDTO.getName());
|
||||||
}
|
}
|
||||||
@ -87,7 +88,7 @@ public class BpmOAProcureController {
|
|||||||
|
|
||||||
BpmOAProcureDO oaProcure = bpmOaProcureService.getByProcessInstanceId(processInstanceId);
|
BpmOAProcureDO oaProcure = bpmOaProcureService.getByProcessInstanceId(processInstanceId);
|
||||||
BpmOAProcureRespVO respVO = BpmOAProcureConvert.INSTANCE.convert(oaProcure);
|
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();
|
ProjectDTO projectDTO = projectApi.getProject(respVO.getProjectNo()).getCheckedData();
|
||||||
respVO.setProjectName(projectDTO.getName());
|
respVO.setProjectName(projectDTO.getName());
|
||||||
}
|
}
|
||||||
|
@ -10,6 +10,7 @@ import cn.iocoder.yudao.module.bpm.dal.dataobject.task.BpmTaskExtDO;
|
|||||||
import cn.iocoder.yudao.module.bpm.enums.task.BpmProcessInstanceResultEnum;
|
import cn.iocoder.yudao.module.bpm.enums.task.BpmProcessInstanceResultEnum;
|
||||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||||
import com.baomidou.mybatisplus.core.metadata.IPage;
|
import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||||
|
import org.apache.commons.lang3.StringUtils;
|
||||||
import org.apache.ibatis.annotations.Mapper;
|
import org.apache.ibatis.annotations.Mapper;
|
||||||
import org.apache.ibatis.annotations.Param;
|
import org.apache.ibatis.annotations.Param;
|
||||||
import org.mapstruct.ap.internal.util.Strings;
|
import org.mapstruct.ap.internal.util.Strings;
|
||||||
@ -96,7 +97,7 @@ public interface BpmTaskExtMapper extends BaseMapperX<BpmTaskExtDO> {
|
|||||||
queryWrapperX.innerJoin(BpmProcessInstanceExtDO.class, on -> on
|
queryWrapperX.innerJoin(BpmProcessInstanceExtDO.class, on -> on
|
||||||
.eq(BpmTaskExtDO::getProcessInstanceId, BpmProcessInstanceExtDO::getProcessInstanceId)
|
.eq(BpmTaskExtDO::getProcessInstanceId, BpmProcessInstanceExtDO::getProcessInstanceId)
|
||||||
.in(Objects.nonNull(userIds), BpmProcessInstanceExtDO::getStartUserId, userIds)
|
.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.likeRight(BpmProcessInstanceExtDO::getProcessDefinitionId, "oa_");
|
||||||
queryWrapperX.eq(BpmTaskExtDO::getAssigneeUserId, userId);
|
queryWrapperX.eq(BpmTaskExtDO::getAssigneeUserId, userId);
|
||||||
queryWrapperX.betweenIfPresent(BpmTaskExtDO::getCreateTime, pageVO.getCreateTime());
|
queryWrapperX.betweenIfPresent(BpmTaskExtDO::getCreateTime, pageVO.getCreateTime());
|
||||||
|
@ -1,5 +1,6 @@
|
|||||||
package cn.iocoder.yudao.module.smartfactory.framework.util;
|
package cn.iocoder.yudao.module.smartfactory.framework.util;
|
||||||
|
|
||||||
|
import org.apache.commons.lang3.StringUtils;
|
||||||
import org.apache.logging.log4j.util.Strings;
|
import org.apache.logging.log4j.util.Strings;
|
||||||
|
|
||||||
import java.util.regex.Matcher;
|
import java.util.regex.Matcher;
|
||||||
@ -17,7 +18,7 @@ public class StringUtil {
|
|||||||
*/
|
*/
|
||||||
public static Integer sizeNameAnalysis(String sizeName) {
|
public static Integer sizeNameAnalysis(String sizeName) {
|
||||||
|
|
||||||
if (Strings.isEmpty(sizeName)) {
|
if (StringUtils.isEmpty(sizeName)) {
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user