作废教材申领

src/main/java/com/xjrsoft/module/textbook/dto/DistributePageDto.java

@@ -24,6 +24,9 @@ public class DistributePageDto extends PageInput {
     @ApiModelProperty("是否有过发放（1：未发放，2：部分发放，3：全部发放，4：有发放）")
     private Integer distributeStatus;
 
+    @ApiModelProperty("流程状态（0：未结束，1：已结束，正常通过，2：已结束，未通过），3：作废")
+    private Integer workflowStatus;
+
     @ApiModelProperty("姓名")
     private String name;
 }

src/main/java/com/xjrsoft/module/textbook/service/impl/WfTextbookClaimServiceImpl.java

@@ -96,7 +96,6 @@ public class WfTextbookClaimServiceImpl extends MPJBaseServiceImpl<WfTextbookCla
                         wrapper -> wrapper
                                 .selectAs(XjrUser::getName, DistributePageVo::getStudentUserIdCn)
                 )
-                .eq(WfTextbookClaim::getWorkflowStatus, 1)
                 .eq(WfTextbookClaim::getBaseSemesterId, dto.getBaseSemesterId())
                 .eq(StringUtils.isNotEmpty(dto.getClaimType()), WfTextbookClaim::getClaimType, dto.getClaimType())
                 .and(StringUtils.isNotEmpty(dto.getName()),
@@ -106,18 +105,31 @@ public class WfTextbookClaimServiceImpl extends MPJBaseServiceImpl<WfTextbookCla
                                 .like(BaseClass::getName, dto.getName())
                 )
         ;
-        if(ObjectUtils.isNotEmpty(dto.getDistributeStatus())){
-            if(dto.getDistributeStatus() == 4){
+        if (ObjectUtils.isNotEmpty(dto.getDistributeStatus())) {
+            if (dto.getDistributeStatus() == 4) {
                 wfTextbookClaimMPJLambdaWrapper
                         .ne(WfTextbookClaim::getStatus, 1)
                 ;
-            }else {
+            } else {
                 wfTextbookClaimMPJLambdaWrapper
                         .eq(WfTextbookClaim::getStatus, dto.getDistributeStatus())
                 ;
             }
 
         }
+        if (ObjectUtils.isNotEmpty(dto.getWorkflowStatus())) {
+            wfTextbookClaimMPJLambdaWrapper
+                    .eq(WfTextbookClaim::getWorkflowStatus, dto.getWorkflowStatus())
+            ;
+        } else {
+            wfTextbookClaimMPJLambdaWrapper
+                    .and(wrapper -> wrapper
+                            .eq(WfTextbookClaim::getWorkflowStatus, 1)
+                            .or()
+                            .eq(WfTextbookClaim::getWorkflowStatus, 3)
+                    )
+            ;
+        }
         IPage<DistributePageVo> page = this.selectJoinListPage(ConventPage.getPage(dto), DistributePageVo.class, wfTextbookClaimMPJLambdaWrapper);
 
         List<DistributePageVo> distributePageVos = page.getRecords();
@@ -497,7 +509,7 @@ public class WfTextbookClaimServiceImpl extends MPJBaseServiceImpl<WfTextbookCla
                 textbookIssueRecordMapper.insert(textbookIssueRecord);
 
                 // 如果申领项是个人申领，发放的时候应该直接帮助学生确认领取
-                if(ClaimTypeEnum.ClaimStudent.getCode().equals(wfTextbookClaim.getClaimType())){
+                if (ClaimTypeEnum.ClaimStudent.getCode().equals(wfTextbookClaim.getClaimType())) {
                     oldTextbookStudentClaim = byUserIdAndTextbookId.get("" + wfTextbookClaim.getApplicantUserId() + wfTextbookClaimItem.getTextbookId());
                     if (ObjectUtils.isNotEmpty(oldTextbookStudentClaim) && (ObjectUtils.isEmpty(oldTextbookStudentClaim.getClaimSource()) || oldTextbookStudentClaim.getClaimSource() != 1)) {
                         updateTextbookStudentClaim = new TextbookStudentClaim();
@@ -578,7 +590,7 @@ public class WfTextbookClaimServiceImpl extends MPJBaseServiceImpl<WfTextbookCla
         LambdaUpdateWrapper<TextbookClaimUser> textbookClaimUserLambdaUpdateWrapper = new LambdaUpdateWrapper<>();
         textbookClaimUserLambdaUpdateWrapper
                 .eq(TextbookClaimUser::getWfTextbookClaimId, dto.getId())
-                ;
+        ;
         textbookClaimUserMapper.delete(textbookClaimUserLambdaUpdateWrapper);
 
         WfTextbookClaim wfTextbookClaim = new WfTextbookClaim();

src/main/java/com/xjrsoft/module/textbook/vo/DistributePageVo.java

@@ -1,8 +1,13 @@
 package com.xjrsoft.module.textbook.vo;
 
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.time.LocalDateTime;
+import java.util.Date;
+
 @Data
 public class DistributePageVo {
 
@@ -50,4 +55,10 @@ public class DistributePageVo {
 
     @ApiModelProperty("状态（）")
     private Integer status;
+
+    @ApiModelProperty("流程状态（0：未结束，1：已结束，正常通过，2：已结束，未通过），3：作废")
+    private Integer workflowStatus;
+
+    @ApiModelProperty("创建时间")
+    private LocalDateTime createDate;
 }