入库记录搜索

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

@@ -5,6 +5,8 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.time.LocalDateTime;
+
 
 /**
 * @title: 教材入库分页查询入参
@@ -19,12 +21,39 @@ public class TextbookWarehouseRecordPageDto extends PageInput {
     @ApiModelProperty("学期id")
     public Long baseSemesterId;
 
-    @ApiModelProperty("学科组id")
-    public Long subjectGroupId;
-
-    @ApiModelProperty("课程id")
-    public Long courseSubjectId;
+    @ApiModelProperty("入库方式")
+    public String warehouseMode;
 
-    @ApiModelProperty("书名")
+    @ApiModelProperty("教材名称")
     public String bookName;
+
+    @ApiModelProperty("教材类型")
+    public String textbookType;
+
+    @ApiModelProperty("入库单号")
+    public String orderNumber;
+
+    @ApiModelProperty("issn")
+    public String issn;
+
+    @ApiModelProperty("所属学科组")
+    public String groupName;
+
+    @ApiModelProperty("使用学期")
+    public Integer useType;
+
+    @ApiModelProperty("入库人员")
+    public String warehouseUser;
+
+    @ApiModelProperty("入库开始时间")
+    public LocalDateTime startCreateDate;
+
+    @ApiModelProperty("入库结束时间")
+    public LocalDateTime endCreateDate;
+
+    @ApiModelProperty("退还书店")
+    public Integer returnBookstore;
+
+    @ApiModelProperty("退还教务处")
+    public Integer returnState;
 }

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

@@ -93,11 +93,19 @@ public class TextbookWarehouseRecordServiceImpl extends MPJBaseServiceImpl<Textb
                 .leftJoin(XjrUser.class, XjrUser::getId, TextbookWarehouseRecord::getCreateUserId,
                         wrapper -> wrapper
                                 .selectAs(XjrUser::getName, TextbookWarehouseRecordPageVo::getWarehouseUser)
+                                .like(StringUtils.isNotEmpty(dto.getWarehouseUser()), XjrUser::getName, dto.getWarehouseUser())
                 )
-                .eq(ObjectUtils.isNotEmpty(dto.getBaseSemesterId()), TextbookSubscription::getBaseSemesterId, dto.getBaseSemesterId())
-                .eq(ObjectUtils.isNotEmpty(dto.getSubjectGroupId()), Textbook::getSubjectGroupId, dto.getSubjectGroupId())
-                .eq(ObjectUtils.isNotEmpty(dto.getCourseSubjectId()), Textbook::getCourseSubjectId, dto.getCourseSubjectId())
+                .eq(ObjectUtils.isNotEmpty(dto.getBaseSemesterId()), TextbookWarehouseRecord::getBaseSemesterId, dto.getBaseSemesterId())
+                .eq(StringUtils.isNotEmpty(dto.getWarehouseMode()), TextbookWarehouseRecord::getWarehouseMode, dto.getWarehouseMode())
                 .like(StringUtils.isNotEmpty(dto.getBookName()), Textbook::getBookName, dto.getBookName())
+                .eq(StringUtils.isNotEmpty(dto.getTextbookType()), Textbook::getTextbookType, dto.getTextbookType())
+                .eq(StringUtils.isNotEmpty(dto.getOrderNumber()), TextbookWarehouseRecord::getOrderNumber, dto.getOrderNumber())
+                .eq(StringUtils.isNotEmpty(dto.getIssn()), Textbook::getIssn, dto.getIssn())
+                .like(StringUtils.isNotEmpty(dto.getGroupName()), SubjectGroup::getGroupName, dto.getGroupName())
+                .eq(ObjectUtils.isNotEmpty(dto.getUseType()), Textbook::getUseType, dto.getUseType())
+                .between(ObjectUtils.isNotEmpty(dto.getStartCreateDate()) && ObjectUtils.isNotEmpty(dto.getEndCreateDate()), TextbookWarehouseRecord::getCreateDate, dto.getStartCreateDate(), dto.getEndCreateDate())
+                .gt(ObjectUtils.isNotEmpty(dto.getReturnBookstore()) && dto.getReturnBookstore() == 1, TextbookWarehouseRecord::getReturnBookstoreNumber, 0)
+                .gt(ObjectUtils.isNotEmpty(dto.getReturnState()) && dto.getReturnState() == 1, TextbookWarehouseRecord::getRecedeNumber, 0)
                 .orderByDesc(TextbookWarehouseRecord::getCreateDate)
                 ;
         return this.selectJoinListPage(ConventPage.getPage(dto), TextbookWarehouseRecordPageVo.class, textbookWarehouseRecordMPJLambdaWrapper);

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

@@ -355,7 +355,7 @@ public class WfTextbookClaimServiceImpl extends MPJBaseServiceImpl<WfTextbookCla
                     throw new MyException("未找到入库详细数据");
                 }
 
-                if(textbookWarehouseRecord.getRemainNumber() > textbookWarehouseRecords.getConfirmNumber()){
+                if(textbookWarehouseRecord.getRemainNumber() < textbookWarehouseRecords.getConfirmNumber()){
                     throw new MyException("发放数量大于库存数量");
                 }