wangli/nanopart
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(REQ-3300): 编辑状态下调用选择器需要返回不可选数据2

Browse Source
This commit is contained in:
chenwenjian 2025-02-21 16:24:03 +08:00
parent 97226e8706
commit a58ba5e883
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/service/impl/ChangeRecordServiceImpl.java
View File

@ -103,7 +103,6 @@ import cn.axzo.workflow.common.model.request.bpmn.task.BpmnTaskDelegateAssigner;
import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.date.DateUtil; import cn.hutool.core.date.DateUtil;
import cn.hutool.core.lang.Assert;
import cn.hutool.core.lang.Pair; import cn.hutool.core.lang.Pair;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
@ -1202,11 +1201,9 @@ public class ChangeRecordServiceImpl extends ServiceImpl<ChangeRecordDao, Change
"WHEN STATUS = 'FORBIDED' THEN FALSE " + "WHEN STATUS = 'FORBIDED' THEN FALSE " +
"ELSE TRUE " + "ELSE TRUE " +
"END"); "END");
// 编辑状态下调用单据选择器需要将已选的可能作废的单据返回 // 需要将已选的可能作废的单据返回
if (Objects.nonNull(filter.getVisaType())) { queryChainWrapper.or().in(CollectionUtils.isNotEmpty(filter.getVisaIds()), ChangeRecord::getId, filter.getVisaIds());
queryChainWrapper.or().in(CollectionUtils.isNotEmpty(filter.getVisaIds()), ChangeRecord::getId, filter.getVisaIds()); return queryChainWrapper;
return queryChainWrapper;
}
} }
queryChainWrapper.in(CollectionUtils.isNotEmpty(filter.getVisaIds()), ChangeRecord::getId, filter.getVisaIds()); queryChainWrapper.in(CollectionUtils.isNotEmpty(filter.getVisaIds()), ChangeRecord::getId, filter.getVisaIds());
return queryChainWrapper; return queryChainWrapper;
@ -1498,7 +1495,7 @@ public class ChangeRecordServiceImpl extends ServiceImpl<ChangeRecordDao, Change
AssertUtil.notEmpty(relationVisa, "关联的单据不存在"); AssertUtil.notEmpty(relationVisa, "关联的单据不存在");
relationVisa.forEach(r -> { relationVisa.forEach(r -> {
AssertUtil.isTrue(Objects.equals(r.getRelationWorkspaceId(), req.getRelationWorkspaceId()), "关联的单据所属项目不匹配"); AssertUtil.isTrue(Objects.equals(r.getRelationWorkspaceId(), req.getRelationWorkspaceId()), "关联的单据所属项目不匹配");
AssertUtil.isFalse(Objects.equals(r.getStatus(), VisaStatusEnum.TO_REPORT) || Objects.equals(r.getStatus(), VisaStatusEnum.FORBIDED), String.format("单据%s状态为%s，不允许被关联", r.getNo(), r.getStatus().getDesc())); AssertUtil.isFalse(Objects.equals(r.getStatus(), VisaStatusEnum.TO_REPORT) || Objects.equals(r.getStatus(), VisaStatusEnum.FORBIDED), String.format("%s单据%s状态为%s，不允许被关联", VisaBillTypeEnum.DESIGN_VISA.getDesc(), r.getNo(), r.getStatus().getDesc()));
}); });
validBillIfRelated(VisaBillTypeEnum.DESIGN_VISA, billIds, req.getType()); validBillIfRelated(VisaBillTypeEnum.DESIGN_VISA, billIds, req.getType());
} else { } else {
@ -1633,6 +1630,7 @@ public class ChangeRecordServiceImpl extends ServiceImpl<ChangeRecordDao, Change
/** /**
* 获取变更签证单关联的图纸 * 获取变更签证单关联的图纸
*
* @param visaId 变更签证Id * @param visaId 变更签证Id
* @return 签证单关联的图纸批注 * @return 签证单关联的图纸批注
*/ */