Merge remote-tracking branch 'origin/dev' into dev

src/main/java/com/xjrsoft/module/textbook/controller/TextbookWarehouseRecordDetailController.java

@@ -69,8 +69,8 @@ public class TextbookWarehouseRecordDetailController {
                                 .selectAs(DictionaryDetail::getName, TextbookWarehouseRecordDetailPageVo::getWarehouseModeCn)
                 )
                 .eq(ObjectUtils.isNotEmpty(dto.getTextbookWarehouseRecordId()), TextbookWarehouseRecordDetail::getTextbookWarehouseRecordId, dto.getTextbookWarehouseRecordId())
-                .eq(ObjectUtils.isNotEmpty(dto.getWarehouseModeInt()) && dto.getWarehouseModeInt() == 1, TextbookWarehouseRecordDetail::getWarehouseMode, WarehouseModeEnum.WmRecede)
-                .ne(ObjectUtils.isNotEmpty(dto.getWarehouseModeInt()) && dto.getWarehouseModeInt() != 1, TextbookWarehouseRecordDetail::getWarehouseMode, WarehouseModeEnum.WmRecede)
+                .eq(ObjectUtils.isNotEmpty(dto.getWarehouseModeInt()) && dto.getWarehouseModeInt() == 1, TextbookWarehouseRecordDetail::getWarehouseMode, WarehouseModeEnum.WmRecede.getCode())
+                .ne(ObjectUtils.isNotEmpty(dto.getWarehouseModeInt()) && dto.getWarehouseModeInt() != 1, TextbookWarehouseRecordDetail::getWarehouseMode, WarehouseModeEnum.WmRecede.getCode())
                 .eq(StringUtils.isNotEmpty(dto.getWarehouseMode()), TextbookWarehouseRecordDetail::getWarehouseMode, dto.getWarehouseMode())
                 .ge(ObjectUtils.isNotEmpty(dto.getStartCreateDate()), TextbookWarehouseRecordDetail::getCreateDate, dto.getStartCreateDate())
                 .le(ObjectUtils.isNotEmpty(dto.getEndCreateDate()), TextbookWarehouseRecordDetail::getCreateDate, dto.getEndCreateDate())
@@ -92,7 +92,6 @@ public class TextbookWarehouseRecordDetailController {
         return RT.ok(BeanUtil.toBean(textbookWarehouseRecordDetail, TextbookWarehouseRecordDetailVo.class));
     }
 
-
     @PostMapping
     @ApiOperation(value = "新增教材入库记录详细入库记录")
     @SaCheckPermission("textbookwarehouserecorddetail:add")

src/main/java/com/xjrsoft/module/textbook/controller/WfTextbookClaimController.java

@@ -14,10 +14,7 @@ import com.xjrsoft.module.base.entity.BaseSemester;
 import com.xjrsoft.module.textbook.dto.*;
 import com.xjrsoft.module.textbook.entity.WfTextbookClaim;
 import com.xjrsoft.module.textbook.service.IWfTextbookClaimService;
-import com.xjrsoft.module.textbook.vo.DistributePageVo;
-import com.xjrsoft.module.textbook.vo.DistributeSemesterVo;
-import com.xjrsoft.module.textbook.vo.WfTextbookClaimPageVo;
-import com.xjrsoft.module.textbook.vo.WfTextbookClaimVo;
+import com.xjrsoft.module.textbook.vo.*;
 import com.xjrsoft.module.workflow.entity.WorkflowFormRelation;
 import com.xjrsoft.module.workflow.entity.XjrWorkflowOperateRecord;
 import io.swagger.annotations.Api;
@@ -76,7 +73,7 @@ public class WfTextbookClaimController {
     @ApiOperation(value="教材发放列表(移动端)")
     @SaCheckPermission("wftextbookclaim:detail")
     public RT<PageOutput<DistributePageVo>> distributePage(@Valid DistributePageDto dto){
-        IPage<DistributePageVo> page = wfTextbookClaimService.distributePageVo(dto);;
+        IPage<DistributePageVo> page = wfTextbookClaimService.distributePage(dto);;
         PageOutput<DistributePageVo> pageOutput = ConventPage.getPageOutput(page, DistributePageVo.class);
         return RT.ok(pageOutput);
     }
@@ -113,6 +110,14 @@ public class WfTextbookClaimController {
         return RT.ok(BeanUtil.toBean(wfTextbookClaimVo, WfTextbookClaimVo.class));
     }
 
+    @GetMapping(value = "/distribute-record")
+    @ApiOperation(value = "pc端教材发放记录")
+    @SaCheckPermission("wftextbookclaim:detail")
+    public RT<List<DistributeRecordVo>> distributeRecord(@RequestParam Long id) {
+        List<DistributeRecordVo> distributeRecordVos = wfTextbookClaimService.distributeRecord(id);
+        return RT.ok(distributeRecordVos);
+    }
+
     @PostMapping
     @ApiOperation(value = "新增教材申领")
     @SaCheckPermission("wftextbookclaim:add")

src/main/java/com/xjrsoft/module/textbook/service/IWfTextbookClaimService.java

@@ -7,6 +7,7 @@ import com.xjrsoft.module.textbook.dto.DistributePageDto;
 import com.xjrsoft.module.textbook.dto.WfTextbookClaimPageDto;
 import com.xjrsoft.module.textbook.entity.WfTextbookClaim;
 import com.xjrsoft.module.textbook.vo.DistributePageVo;
+import com.xjrsoft.module.textbook.vo.DistributeRecordVo;
 import com.xjrsoft.module.textbook.vo.WfTextbookClaimPageVo;
 import com.xjrsoft.module.textbook.vo.WfTextbookClaimVo;
 
@@ -21,7 +22,7 @@ import java.util.List;
 
 public interface IWfTextbookClaimService extends MPJBaseService<WfTextbookClaim> {
 
-    IPage<DistributePageVo> distributePageVo(DistributePageDto dto);
+    IPage<DistributePageVo> distributePage(DistributePageDto dto);
 
     /**
     * 新增
@@ -61,6 +62,8 @@ public interface IWfTextbookClaimService extends MPJBaseService<WfTextbookClaim>
      */
     WfTextbookClaimVo infoDistribute(Long id);
 
+    List<DistributeRecordVo> distributeRecord(Long id);
+
     /**
      * 确认发放
      * @param dto

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

@@ -15,6 +15,7 @@ import com.xjrsoft.common.page.ConventPage;
 import com.xjrsoft.common.utils.SortCodeUtil;
 import com.xjrsoft.common.utils.VoToColumnUtil;
 import com.xjrsoft.module.base.entity.BaseClass;
+import com.xjrsoft.module.base.entity.BaseSemester;
 import com.xjrsoft.module.organization.entity.Role;
 import com.xjrsoft.module.organization.entity.UserRoleRelation;
 import com.xjrsoft.module.organization.mapper.RoleMapper;
@@ -52,6 +53,7 @@ import java.util.stream.Collectors;
 @Service
 @AllArgsConstructor
 public class WfTextbookClaimServiceImpl extends MPJBaseServiceImpl<WfTextbookClaimMapper, WfTextbookClaim> implements IWfTextbookClaimService {
+
     private final WfTextbookClaimMapper wfTextbookClaimWfTextbookClaimMapper;
 
     private final WfTextbookClaimItemMapper wfTextbookClaimWfTextbookClaimItemMapper;
@@ -67,7 +69,7 @@ public class WfTextbookClaimServiceImpl extends MPJBaseServiceImpl<WfTextbookCla
     private final TextbookWarehouseRecordMapper textbookWarehouseRecordMapper;
 
     @Override
-    public IPage<DistributePageVo> distributePageVo(DistributePageDto dto) {
+    public IPage<DistributePageVo> distributePage(DistributePageDto dto) {
         MPJLambdaWrapper<WfTextbookClaim> wfTextbookClaimMPJLambdaWrapper = new MPJLambdaWrapper<>();
         wfTextbookClaimMPJLambdaWrapper
                 .disableSubLogicDel()
@@ -86,6 +88,14 @@ public class WfTextbookClaimServiceImpl extends MPJBaseServiceImpl<WfTextbookCla
                         wrapper -> wrapper
                                 .selectAs(BaseClass::getName, DistributePageVo::getClassIdCn)
                 )
+                .leftJoin(BaseSemester.class, BaseSemester::getId, WfTextbookClaim::getBaseSemesterId,
+                        wrapper -> wrapper
+                                .selectAs(BaseSemester::getName, DistributePageVo::getBaseSemesterIdCn)
+                )
+                .leftJoin(XjrUser.class, XjrUser::getId, WfTextbookClaim::getStudentUserId,
+                        wrapper -> wrapper
+                                .selectAs(XjrUser::getName, DistributePageVo::getStudentUserIdCn)
+                )
                 .eq(WorkflowFormRelation::getCurrentState, HistoricProcessInstance.STATE_COMPLETED)
                 .eq(WfTextbookClaim::getBaseSemesterId, dto.getBaseSemesterId())
                 .eq(StringUtils.isNotEmpty(dto.getClaimType()), WfTextbookClaim::getClaimType, dto.getClaimType())
@@ -268,6 +278,29 @@ public class WfTextbookClaimServiceImpl extends MPJBaseServiceImpl<WfTextbookCla
         return wfTextbookClaimVo;
     }
 
+    @Override
+    public List<DistributeRecordVo> distributeRecord(Long id) {
+        MPJLambdaWrapper<TextbookIssueRecord> textbookIssueRecordMPJLambdaWrapper = new MPJLambdaWrapper<>();
+        textbookIssueRecordMPJLambdaWrapper
+                .disableSubLogicDel()
+                .selectAs(TextbookIssueRecord::getCreateDate, DistributeRecordVo::getIssueDate)
+                .selectAs(TextbookIssueRecord::getIssueNumber, DistributeRecordVo::getIssueNumber)
+                .selectAs(TextbookIssueRecord::getOrderNumber, DistributeRecordVo::getOrderNumber)
+                .selectAs(TextbookIssueRecord::getRemark, DistributeRecordVo::getRemark)
+                .leftJoin(Textbook.class, Textbook::getId, TextbookIssueRecord::getTextbookId,
+                        wrapper -> wrapper
+                                .selectAs(Textbook::getBookName, DistributeRecordVo::getTextbookIdCn)
+                        )
+                .leftJoin(XjrUser.class, XjrUser::getId, TextbookIssueRecord::getIssueUserId,
+                        wrapper -> wrapper
+                                .selectAs(XjrUser::getName, DistributeRecordVo::getIssueUser)
+                )
+                .eq(TextbookIssueRecord::getDataId, id)
+                ;
+
+        return textbookIssueRecordMapper.selectJoinList(DistributeRecordVo.class, textbookIssueRecordMPJLambdaWrapper);
+    }
+
     @Override
     @Transactional(rollbackFor = Exception.class)
     public Boolean confirmDistribute(ConfirmDistributeDto dto) {

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

@@ -21,6 +21,12 @@ public class DistributePageVo {
     @ApiModelProperty("申请人")
     private String applicantUserIdCn;
 
+    @ApiModelProperty("学期ID(base_semester)")
+    private Long baseSemesterId;
+
+    @ApiModelProperty("学期ID(base_semester)")
+    private String baseSemesterIdCn;
+
     @ApiModelProperty("班级编号")
     private Long classId;
 
@@ -32,4 +38,16 @@ public class DistributePageVo {
 
     @ApiModelProperty("已经发放总数量")
     private Integer issueTatolNumber;
+
+    @ApiModelProperty("学生编号")
+    private Long studentUserId;
+
+    @ApiModelProperty("学生编号")
+    private String studentUserIdCn;
+
+    @ApiModelProperty("领取地点")
+    private String claimAddress;
+
+    @ApiModelProperty("状态（）")
+    private Integer status;
 }

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

@@ -0,0 +1,52 @@
+package com.xjrsoft.module.textbook.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+* @title: 教材入库表单出参
+* @Author dzx
+* @Date: 2023-12-26
+* @Version 1.0
+*/
+@Data
+public class DistributeRecordVo {
+
+    /**
+    * 出库时间
+    */
+    @ApiModelProperty("出库时间")
+    private Date issueDate;
+
+    /**
+    * 出库人员
+    */
+    @ApiModelProperty("出库人员")
+    private String issueUser;
+
+    /**
+     * 教材管理编号
+     */
+    @ApiModelProperty("教材管理编号")
+    private String textbookIdCn;
+
+    /**
+     * 出库单号（标识+当前时间（YYYYMMDDHHmmss）+三位序号+当前申领项出库次数（-n））
+     */
+    @ApiModelProperty("出库单号（标识+当前时间（YYYYMMDDHHmmss）+三位序号+当前申领项出库次数（-n））")
+    private String orderNumber;
+
+    /**
+    * 出库数量
+    */
+    @ApiModelProperty("出库数量")
+    private Integer issueNumber;
+
+    /**
+     * 备注
+     */
+    @ApiModelProperty("备注")
+    private String remark;
+}

src/test/java/com/xjrsoft/module/textbook/service/impl/WfTextbookRecedeServiceImplTest.java

@@ -19,6 +19,6 @@ class WfTextbookRecedeServiceImplTest {
 
     @Test
     void dataHandle() {
-        wfTextbookRecedeService.dataHandle(1894552632448589824L);
+        wfTextbookRecedeService.dataHandle(1895468330793390080L);
     }
 }