yzx 1 mēnesi atpakaļ
vecāks
revīzija
f0eed46229

+ 5 - 1
yudao-module-museums/yudao-module-museums-biz/src/main/java/cn/iocoder/yudao/module/museums/controller/admin/specimenoutbound/SpecimenOutboundController.java

@@ -133,7 +133,11 @@ public class SpecimenOutboundController {
     @PreAuthorize("@ss.hasPermission('museums:specimen-outbound:query')")
     public CommonResult<PageResult<SpecimenOutboundRespVO>> getSpecimenOutboundPage(@Valid SpecimenOutboundPageReqVO pageReqVO) {
         PageResult<SpecimenOutboundDO> pageResult = specimenOutboundService.getSpecimenOutboundPage(pageReqVO);
-        return success(BeanUtils.toBean(pageResult, SpecimenOutboundRespVO.class));
+        PageResult<SpecimenOutboundRespVO> result = BeanUtils.toBean(pageResult, SpecimenOutboundRespVO.class);
+        result.getList().forEach(item -> {
+            item.setIsFirstOut(Objects.equals(item.getOperator(), getLoginUserId()));
+        });
+        return success(result);
     }
 
     @GetMapping("/export-excel")

+ 2 - 0
yudao-module-museums/yudao-module-museums-biz/src/main/java/cn/iocoder/yudao/module/museums/controller/admin/specimenoutbound/vo/SpecimenOutboundPageReqVO.java

@@ -101,4 +101,6 @@ public class SpecimenOutboundPageReqVO extends PageParam {
 
     @Schema(description = "二审批员")
     private String twoApproveUsers;
+
+
 }

+ 2 - 0
yudao-module-museums/yudao-module-museums-biz/src/main/java/cn/iocoder/yudao/module/museums/controller/admin/specimenoutbound/vo/SpecimenOutboundRespVO.java

@@ -125,4 +125,6 @@ public class SpecimenOutboundRespVO {
     @Schema(description = "二审批员")
     @ExcelProperty("二审批员")
     private String twoApproveUsers;
+
+    private Boolean isFirstOut;
 }

+ 1 - 1
yudao-module-museums/yudao-module-museums-biz/src/main/java/cn/iocoder/yudao/module/museums/dal/mysql/specimenoutbound/SpecimenOutboundMapper.java

@@ -40,7 +40,7 @@ public interface SpecimenOutboundMapper extends BaseMapperX<SpecimenOutboundDO>
                 .likeIfPresent(SpecimenOutboundDO::getProcessInstanceId, reqVO.getProcessInstanceId())
                 .likeIfPresent(SpecimenOutboundDO::getRejectionReasons, reqVO.getRejectionReasons())
                 .eqIfPresent(SpecimenOutboundDO::getOperator, reqVO.getOperator())
-                .eqIfPresent(SpecimenOutboundDO::getOperator, reqVO.getTwoOperator())
+                .eqIfPresent(SpecimenOutboundDO::getTwoOperator, reqVO.getTwoOperator())
                 .eqIfPresent(SpecimenOutboundDO::getReturner, reqVO.getReturner())
                 .eqIfPresent(SpecimenOutboundDO::getReceiver, reqVO.getReceiver())
                 .betweenIfPresent(SpecimenOutboundDO::getReturnDate, reqVO.getReturnDate())