2.申领详情记录列表,发放记录

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

@@ -146,26 +146,38 @@ public class WfTextbookClaimServiceImpl extends MPJBaseServiceImpl<WfTextbookCla
             Map<Long, WfTextbookClaimItem> applicantTatolNumberMap = new HashMap<>();
 
             // 处理所有的子项
-            Map<Long, List<WfTextbookClaimItemVo>> wfTextbookClaimItemVoMap = new HashMap<>();
+            Map<Long, List<DistributeRecordVo>> distributeRecordVoMap = new HashMap<>();
 
             WfTextbookClaimItem wfTextbookClaimItem;
-            List<WfTextbookClaimItemVo> wfTextbookClaimItemVoList;
+            List<DistributeRecordVo> distributeRecordVoList;
             if (ObjectUtils.isNotEmpty(textbookClaimIds)) {
                 MPJLambdaWrapper<WfTextbookClaimItem> wfTextbookClaimItemVoLambdaQueryWrapper = new MPJLambdaWrapper<>();
                 wfTextbookClaimItemVoLambdaQueryWrapper
                         .disableSubLogicDel()
                         .select(WfTextbookClaimItem::getId)
-                        .select(WfTextbookClaimItem.class, x -> VoToColumnUtil.fieldsToColumns(WfTextbookClaimItemVo.class).contains(x.getProperty()))
+                        .select(WfTextbookClaimItem.class, x -> VoToColumnUtil.fieldsToColumns(DistributeRecordVo.class).contains(x.getProperty()))
                         .leftJoin(Textbook.class, Textbook::getId, WfTextbookClaimItem::getTextbookId,
                         wrapper -> wrapper
-                                .selectAs(Textbook::getBookName, WfTextbookClaimItemVo::getTextbookIdCN)
+                                .selectAs(Textbook::getBookName, DistributeRecordVo::getTextbookIdCn)
+                                .selectAs(Textbook::getIssn, DistributeRecordVo::getIssn)
+                        )
+                        .leftJoin(TextbookIssueRecord.class, TextbookIssueRecord::getDataItemId, WfTextbookClaimItem::getId,
+                                wrapper -> wrapper
+                                        .selectAs(TextbookIssueRecord::getCreateDate, DistributeRecordVo::getIssueDate)
+                                        .selectAs(TextbookIssueRecord::getIssueNumber, DistributeRecordVo::getIssueNumber)
+                                        .selectAs(TextbookIssueRecord::getOrderNumber, DistributeRecordVo::getOrderNumber)
+                                        .selectAs(TextbookIssueRecord::getRemark, DistributeRecordVo::getRemark)
+                                        .leftJoin(XjrUser.class, XjrUser::getId, TextbookIssueRecord::getIssueUserId,
+                                                wrap -> wrap
+                                                        .selectAs(XjrUser::getName, DistributeRecordVo::getIssueUser)
+                                        )
                         )
                         .in(WfTextbookClaimItem::getWfTextbookClaimId, textbookClaimIds)
                 ;
-                List<WfTextbookClaimItemVo> wfTextbookClaimItemVos = wfTextbookClaimWfTextbookClaimItemMapper.selectJoinList(WfTextbookClaimItemVo.class, wfTextbookClaimItemVoLambdaQueryWrapper);
-                if (ObjectUtils.isNotEmpty(wfTextbookClaimItemVos)) {
-                    wfTextbookClaimItemVoMap = wfTextbookClaimItemVos.stream()
-                            .collect(Collectors.groupingBy(WfTextbookClaimItemVo::getWfTextbookClaimId))
+                List<DistributeRecordVo> distributeRecordVos = wfTextbookClaimWfTextbookClaimItemMapper.selectJoinList(DistributeRecordVo.class, wfTextbookClaimItemVoLambdaQueryWrapper);
+                if (ObjectUtils.isNotEmpty(distributeRecordVos)) {
+                    distributeRecordVoMap = distributeRecordVos.stream()
+                            .collect(Collectors.groupingBy(DistributeRecordVo::getWfTextbookClaimId))
                     ;
                 }
 
@@ -192,11 +204,11 @@ public class WfTextbookClaimServiceImpl extends MPJBaseServiceImpl<WfTextbookCla
                     }
                 }
             }
-            if (MapUtils.isNotEmpty(wfTextbookClaimItemVoMap)) {
+            if (MapUtils.isNotEmpty(distributeRecordVoMap)) {
                 for (DistributePageVo distributePageVo : page.getRecords()) {
-                    wfTextbookClaimItemVoList = wfTextbookClaimItemVoMap.get(distributePageVo.getId());
-                    if(CollectionUtils.isNotEmpty(wfTextbookClaimItemVoList)){
-                        distributePageVo.setWfTextbookClaimItemVoList(wfTextbookClaimItemVoList);
+                    distributeRecordVoList = distributeRecordVoMap.get(distributePageVo.getId());
+                    if(CollectionUtils.isNotEmpty(distributeRecordVoList)){
+                        distributePageVo.setDistributeRecordVos(distributeRecordVoList);
                     }
                 }
             }

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

@@ -65,4 +65,7 @@ public class DistributePageVo {
 
     @ApiModelProperty("申领子项集合")
     List<WfTextbookClaimItemVo> wfTextbookClaimItemVoList;
+
+    @ApiModelProperty("申领子项集合（附带领取情况）")
+    List<DistributeRecordVo> distributeRecordVos;
 }

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

@@ -13,7 +13,11 @@ import java.util.Date;
  */
 @Data
 public class DistributeRecordVo {
-
+    /**
+     * 教材申领编号
+     */
+    @ApiModelProperty("教材申领编号")
+    private Long wfTextbookClaimId;
     /**
      * 出库时间
      */
@@ -32,6 +36,12 @@ public class DistributeRecordVo {
     @ApiModelProperty("教材管理编号")
     private String textbookIdCn;
 
+    /**
+     * 国际标准刊号
+     */
+    @ApiModelProperty("国际标准刊号")
+    private String issn;
+
     /**
      * 出库单号（标识+当前时间（YYYYMMDDHHmmss）+三位序号+当前申领项出库次数（-n））
      */