楚江ERP：延期发货-按钮显示判断

@@ -64,6 +64,20 @@ public class GetDelayedShipmentBo extends BaseBo<DelayedShipment> {
     @ApiModelProperty("延期发货详情")
     private List<DelayedShipmentDetail> delayedShipmentDetailList;
 
+    /**
+     * 是否展示审核按钮(非持久化字段)
+     */
+    @ApiModelProperty("是否展示审核按钮")
+    private Boolean showExamine;
+
+    /**
+     * 是否是创建人(非持久化字段)
+     */
+    @ApiModelProperty("是否展示审核按钮")
+    private Boolean delayedCreateBy;
+
+
+
     public GetDelayedShipmentBo() {
 
     }

 package com.lframework.xingyun.sc.controller.shipments.delay;
 
 import com.lframework.starter.web.core.annotations.security.HasPermission;
+import com.lframework.starter.web.core.components.security.SecurityUtil;
 import com.lframework.starter.web.core.controller.DefaultBaseController;
 import com.lframework.starter.web.core.utils.PageResultUtil;
 import com.lframework.starter.web.core.components.resp.PageResult;
 import com.lframework.starter.web.core.components.resp.InvokeResult;
 import javax.validation.constraints.NotBlank;
+
+import com.lframework.xingyun.sc.bo.shipments.car.GetDraftRequestCarTicketBo;
 import com.lframework.xingyun.sc.bo.shipments.delay.GetDelayedShipmentBo;
 import com.lframework.xingyun.sc.entity.DelayedShipment;
 import com.lframework.xingyun.sc.entity.DelayedShipmentDetail;
@@ -58,7 +61,18 @@ public class DelayedShipmentController extends DefaultBaseController {
         List<GetDelayedShipmentBo> results = null;
 
         if (!CollectionUtil.isEmpty(datas)) {
-            results = datas.stream().map(GetDelayedShipmentBo::new).collect(Collectors.toList());
+            String currentUserId = SecurityUtil.getCurrentUser().getId();
+
+            results = datas.stream().map(delayedShipment -> {
+                GetDelayedShipmentBo bo = new GetDelayedShipmentBo(delayedShipment);
+                // 判断 createById 是否等于当前用户 ID
+                boolean isCreateBy = false;
+                if (currentUserId.equals(delayedShipment.getCreateById())) {
+                    isCreateBy = true;
+                }
+                bo.setDelayedCreateBy(isCreateBy);
+                return bo;
+            }).collect(Collectors.toList());
         }
 
         return InvokeResultBuilder.success(PageResultUtil.rebuild(pageResult, results));

@@ -66,6 +66,12 @@ public class DelayedShipment extends BaseEntity implements BaseDto {
     private List<DelayedShipmentDetail> delayedShipmentDetailList;
 
     /**
+     * 是否展示审核按钮(非持久化字段)
+     */
+    @TableField(exist = false)
+    private Boolean showExamine = false;
+
+    /**
      * 创建人ID
      */
     @TableField(fill = FieldFill.INSERT)

@@ -3,7 +3,10 @@ package com.lframework.xingyun.sc.impl.shipments.delay;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.github.pagehelper.PageInfo;
+import com.lframework.starter.bpm.dto.FlowTaskDto;
+import com.lframework.starter.bpm.mappers.FlowTaskWrapperMapper;
 import com.lframework.starter.bpm.service.FlowInstanceWrapperService;
+import com.lframework.starter.bpm.vo.flow.task.QueryTodoTaskListVo;
 import com.lframework.starter.common.utils.CollectionUtil;
 import com.lframework.starter.common.utils.StringUtil;
 import com.lframework.starter.mq.core.service.MqProducerService;
@@ -23,8 +26,6 @@ import com.lframework.starter.web.inner.bo.usercenter.UserInfoBo;
 import com.lframework.starter.web.inner.components.oplog.OtherOpLogType;
 import com.lframework.starter.web.inner.dto.message.SysSiteMessageDto;
 import com.lframework.starter.web.inner.dto.system.UserInfoDto;
-import com.lframework.starter.web.inner.entity.SysRole;
-import com.lframework.starter.web.inner.service.system.SysRoleService;
 import com.lframework.starter.web.inner.service.system.SysUserRoleService;
 import com.lframework.starter.web.inner.service.system.SysUserService;
 import com.lframework.xingyun.sc.entity.DelayedShipment;
@@ -44,6 +45,7 @@ import java.time.LocalDate;
 import java.time.temporal.ChronoUnit;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.stream.Collectors;
 
 @Service
 public class DelayedShipmentServiceImpl extends BaseMpServiceImpl<DelayedShipmentMapper, DelayedShipment> implements DelayedShipmentService {
@@ -64,6 +66,8 @@ public class DelayedShipmentServiceImpl extends BaseMpServiceImpl<DelayedShipmen
     private SysUserRoleService sysUserRoleService;
     @Resource
     private TransactorHandler transactorHandler;
+    @Resource
+    private FlowTaskWrapperMapper flowTaskWrapperMapper;
 
     @Override
     public PageResult<DelayedShipment> query(Integer pageIndex, Integer pageSize, QueryDelayedShipmentVo vo) {
@@ -73,6 +77,21 @@ public class DelayedShipmentServiceImpl extends BaseMpServiceImpl<DelayedShipmen
 
         PageHelperUtil.startPage(pageIndex, pageSize);
         List<DelayedShipment> datas = this.query(vo);
+        if (CollectionUtils.isNotEmpty(datas)) {
+            // 获取当前人员的待办任务数据
+            List<FlowTaskDto> flowTaskList = flowTaskWrapperMapper.queryTodoList(new QueryTodoTaskListVo(), SecurityUtil.getCurrentUser().getId());
+            if (org.apache.commons.collections4.CollectionUtils.isEmpty(flowTaskList)) {
+                return PageResultUtil.convert(new PageInfo<>(datas));
+            }
+            List<String> ids = flowTaskList.stream().map(FlowTaskDto::getBusinessId).collect(Collectors.toList());
+            for (DelayedShipment delayedShipment : datas) {
+                if (ids.contains(delayedShipment.getId())) {
+                    delayedShipment.setShowExamine(true);
+                } else {
+                    delayedShipment.setShowExamine(false);
+                }
+            }
+        }
 
         return PageResultUtil.convert(new PageInfo<>(datas));
     }