教材确认的时候返回发放状态

src/main/java/com/xjrsoft/module/textbook/entity/WfTextbookClaimItem.java

@@ -90,6 +90,4 @@ public class WfTextbookClaimItem implements Serializable {
      */
     @ApiModelProperty("已发放数量")
     private Integer issueNumber;
-
-
 }

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

@@ -231,6 +231,7 @@ public class TextbookStudentClaimServiceImpl extends MPJBaseServiceImpl<Textbook
                 .selectAs(Textbook::getTextbookType, HeadTeaLookClassBookCategoryDetailVo::getTextbookType)
                 .select("1 as claim_num")
                 .select("3 as is_claim")
+                .select("0 as is_issue")
                 .innerJoin(BaseClassCourse.class, BaseClassCourse::getClassId, BaseClassAdminCourse::getId)
                 .innerJoin(Textbook.class, Textbook::getId, BaseClassCourse::getTextbookId)
                 .leftJoin(DictionaryDetail.class, DictionaryDetail::getCode, Textbook::getTextbookType,
@@ -254,6 +255,7 @@ public class TextbookStudentClaimServiceImpl extends MPJBaseServiceImpl<Textbook
                 .selectAs(WfTextbookClaimItem::getCreateDate, HeadTeaLookClassBookCategoryDetailVo::getClaimTime)
                 .selectAs(WfTextbookClaim::getClaimType, HeadTeaLookClassBookCategoryDetailVo::getClaimType)
                 .select("1 as claim_num")
+                .select("if(t.issue_number > 0, 1, 0) as is_issue")
                 .innerJoin(WfTextbookClaim.class, WfTextbookClaim::getId, WfTextbookClaimItem::getWfTextbookClaimId)
                 .innerJoin(WorkflowFormRelation.class, WorkflowFormRelation::getFormKeyValue, WfTextbookClaim::getId)
                 .eq(WorkflowFormRelation::getCurrentState, HistoricProcessInstance.STATE_COMPLETED)
@@ -283,6 +285,7 @@ public class TextbookStudentClaimServiceImpl extends MPJBaseServiceImpl<Textbook
                 .selectAs(WfTextbookClaimItem::getCreateDate, HeadTeaLookClassBookCategoryDetailVo::getClaimTime)
                 .selectAs(WfTextbookClaim::getClaimType, HeadTeaLookClassBookCategoryDetailVo::getClaimType)
                 .select("1 as claim_num")
+                .select("if(t.issue_number > 0, 1, 0) as is_issue")
                 .innerJoin(WfTextbookClaim.class, WfTextbookClaim::getId, WfTextbookClaimItem::getWfTextbookClaimId)
                 .innerJoin(WorkflowFormRelation.class, WorkflowFormRelation::getFormKeyValue, WfTextbookClaim::getId)
                 .eq(WorkflowFormRelation::getCurrentState, HistoricProcessInstance.STATE_COMPLETED)
@@ -573,7 +576,6 @@ public class TextbookStudentClaimServiceImpl extends MPJBaseServiceImpl<Textbook
 //                .groupBy("t.base_semester_id", "t.class_id", "t.textbook_id")
 //                ;
 
-
         return textbookStudentClaimMapper.getTeacherCheckByclassList(ConventPage.getPage(dto), dto);
     }
 
@@ -586,6 +588,7 @@ public class TextbookStudentClaimServiceImpl extends MPJBaseServiceImpl<Textbook
                 .selectAs(WfTextbookClaim::getClassId, TextbookClaimVO::getTextbookStudentClaimId)
                 .selectAs(WfTextbookClaimItem::getTextbookId, TextbookClaimVO::getTextbookId)
                 .selectAs(Textbook::getBookName, TextbookClaimVO::getBookName)
+                .select("if(t.issue_number > 0, 1, 0) as is_issue")
                 .innerJoin(WfTextbookClaim.class, WfTextbookClaim::getId, WfTextbookClaimItem::getWfTextbookClaimId)
                 .leftJoin(Textbook.class, Textbook::getId, WfTextbookClaimItem::getTextbookId)
                 .eq(WfTextbookClaim::getClassId, dto.getClassId())
@@ -1207,6 +1210,7 @@ public class TextbookStudentClaimServiceImpl extends MPJBaseServiceImpl<Textbook
                 .distinct()
                 .selectAs(WfTextbookClaimItem::getTextbookId, TeacherConfirmBatchTextbookListVo::getTextbookId)
                 .selectAs(Textbook::getBookName, TeacherConfirmBatchTextbookListVo::getBookName)
+                .select("if(t.issue_number > 0, 1, 0) as is_issue")
                 .innerJoin(WfTextbookClaim.class, WfTextbookClaim::getId, WfTextbookClaimItem::getWfTextbookClaimId)
                 .leftJoin(Textbook.class, Textbook::getId, WfTextbookClaimItem::getTextbookId)
                 .eq(WfTextbookClaim::getBaseSemesterId, dto.getBaseSemesterId())

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

@@ -101,8 +101,6 @@ public class WfTextbookClaimServiceImpl extends MPJBaseServiceImpl<WfTextbookCla
                 .eq(WorkflowFormRelation::getCurrentState, HistoricProcessInstance.STATE_COMPLETED)
                 .eq(WfTextbookClaim::getBaseSemesterId, dto.getBaseSemesterId())
                 .eq(StringUtils.isNotEmpty(dto.getClaimType()), WfTextbookClaim::getClaimType, dto.getClaimType())
-                .eq(ObjectUtils.isNotEmpty(dto.getDistributeStatus()), WfTextbookClaim::getStatus, dto.getDistributeStatus())
-                .ne(ObjectUtils.isNotEmpty(dto.getDistributeStatus()) && dto.getDistributeStatus() == 4, WfTextbookClaim::getStatus, 1)
                 .and(StringUtils.isNotEmpty(dto.getName()),
                         wrapper -> wrapper
                                 .like(XjrUser::getName, dto.getName())
@@ -110,6 +108,18 @@ public class WfTextbookClaimServiceImpl extends MPJBaseServiceImpl<WfTextbookCla
                                 .like(BaseClass::getName, dto.getName())
                 )
         ;
+        if(ObjectUtils.isNotEmpty(dto.getDistributeStatus())){
+            if(dto.getDistributeStatus() == 4){
+                wfTextbookClaimMPJLambdaWrapper
+                        .ne(WfTextbookClaim::getStatus, 1)
+                ;
+            }else {
+                wfTextbookClaimMPJLambdaWrapper
+                        .eq(WfTextbookClaim::getStatus, dto.getDistributeStatus())
+                ;
+            }
+
+        }
         IPage<DistributePageVo> page = this.selectJoinListPage(ConventPage.getPage(dto), DistributePageVo.class, wfTextbookClaimMPJLambdaWrapper);
 
         List<DistributePageVo> distributePageVos = page.getRecords();

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

@@ -33,6 +33,9 @@ public class HeadTeaLookClassBookCategoryDetailVo {
     @ApiModelProperty("申领数量")
     private Integer claimNum;
 
+    @ApiModelProperty("申领项是否发放领取,0：未有发放；1：已有发放；")
+    private Integer isIssue;
+
     @ApiModelProperty("是否已经领取,0：未领取；1：已领取；2：领取后退还教务处了；3：未申领")
     private Integer isClaim;
 

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

@@ -57,4 +57,7 @@ public class TeacherCheckByclassVo {
      */
     @ApiModelProperty("已经确认领取人数")
     private Long actualClaimNum;
+
+    @ApiModelProperty("申领项是否发放领取,0：未有发放；1：已有发放；")
+    private Integer isIssue;
 }

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

@@ -22,4 +22,7 @@ public class TeacherConfirmBatchTextbookListVo {
      */
     @ApiModelProperty("教材名称")
     private String bookName;
+
+    @ApiModelProperty("申领项是否发放领取,0：未有发放；1：已有发放；")
+    private Integer isIssue;
 }

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

@@ -54,4 +54,7 @@ public class TextbookClaimVO {
      */
     @ApiModelProperty("是否领取（1:已领取 0:未领取）")
     private Integer isClaim;
+
+    @ApiModelProperty("申领项是否发放领取,0：未有发放；1：已有发放；")
+    private Integer isIssue;
 }

src/main/resources/mapper/textbook/TextbookStudentClaimMapper.xml

@@ -80,7 +80,8 @@
         t5.name as baseSemesterIdCN,
         ifnull(t.received_num, 0) AS actualReceivedNum,
         ifnull(t4.total_student, 0) AS classStudentNum,
-        ifnull(t3.claim_num, 0) AS actualClaimNum
+        ifnull(t3.claim_num, 0) AS actualClaimNum,
+        if(t.received_num > 0, 1, 0) as is_issue
         FROM textbook_claim_counts t
         inner join textbook t1 on t1.id = t.textbook_id
         LEFT JOIN base_class t2 ON t2.id = t.class_id