/textbook/wfTextbookClaim/page 申领

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

@@ -1,102 +0,0 @@
-package com.xjrsoft.module.textbook.controller;
-
-import cn.hutool.core.bean.BeanUtil;
-import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.xjrsoft.common.constant.GlobalConstant;
-import com.baomidou.mybatisplus.core.toolkit.StringPool;
-import com.xjrsoft.common.page.ConventPage;
-import com.xjrsoft.common.page.PageOutput;
-import com.xjrsoft.common.model.result.RT;
-import com.xjrsoft.common.utils.VoToColumnUtil;
-import com.xjrsoft.module.textbook.dto.AddWfStudentTextbookClaimDto;
-import com.xjrsoft.module.textbook.dto.UpdateWfStudentTextbookClaimDto;
-import cn.dev33.satoken.annotation.SaCheckPermission;
-
-import com.xjrsoft.module.textbook.dto.WfStudentTextbookClaimPageDto;
-import com.xjrsoft.module.textbook.entity.WfStudentTextbookClaim;
-import com.xjrsoft.module.textbook.service.IWfStudentTextbookClaimService;
-import com.xjrsoft.module.textbook.vo.WfStudentTextbookClaimPageVo;
-
-import com.xjrsoft.module.textbook.vo.WfStudentTextbookClaimVo;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.AllArgsConstructor;
-import org.springframework.web.bind.annotation.*;
-
-import javax.validation.Valid;
-import javax.validation.constraints.NotNull;
-import java.util.List;
-
-/**
-* @title: 教材申领
-* @Author szs
-* @Date: 2023-12-26
-* @Version 1.0
-*/
-@RestController
-@RequestMapping("/textbook" + "/wfStudentTextbookClaim")
-@Api(value = "/textbook"  + "/wfStudentTextbookClaim",tags = "教材申领代码")
-@AllArgsConstructor
-public class WfStudentTextbookClaimController {
-
-
-    private final IWfStudentTextbookClaimService wfStudentTextbookClaimService;
-
-    @GetMapping(value = "/page")
-    @ApiOperation(value="教材申领列表(分页)")
-    @SaCheckPermission("wfstudenttextbookclaim:detail")
-    public RT<PageOutput<WfStudentTextbookClaimPageVo>> page(@Valid WfStudentTextbookClaimPageDto dto){
-
-        LambdaQueryWrapper<WfStudentTextbookClaim> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper
-                    .orderByDesc(WfStudentTextbookClaim::getId)
-                .select(WfStudentTextbookClaim.class,x -> VoToColumnUtil.fieldsToColumns(WfStudentTextbookClaimPageVo.class).contains(x.getProperty()));
-        IPage<WfStudentTextbookClaim> page = wfStudentTextbookClaimService.page(ConventPage.getPage(dto), queryWrapper);
-        PageOutput<WfStudentTextbookClaimPageVo> pageOutput = ConventPage.getPageOutput(page, WfStudentTextbookClaimPageVo.class);
-        return RT.ok(pageOutput);
-    }
-
-    @GetMapping(value = "/info")
-    @ApiOperation(value="根据id查询教材申领信息")
-    @SaCheckPermission("wfstudenttextbookclaim:detail")
-    public RT<WfStudentTextbookClaimVo> info(@RequestParam Long id){
-        WfStudentTextbookClaim wfStudentTextbookClaim = wfStudentTextbookClaimService.getByIdDeep(id);
-        if (wfStudentTextbookClaim == null) {
-           return RT.error("找不到此数据！");
-        }
-        return RT.ok(BeanUtil.toBean(wfStudentTextbookClaim, WfStudentTextbookClaimVo.class));
-    }
-
-
-    @PostMapping
-    @ApiOperation(value = "新增教材申领")
-    @SaCheckPermission("wfstudenttextbookclaim:add")
-    public RT<Boolean> add(@Valid @RequestBody AddWfStudentTextbookClaimDto dto){
-        WfStudentTextbookClaim wfStudentTextbookClaim = BeanUtil.toBean(dto, WfStudentTextbookClaim.class);
-        boolean isSuccess = wfStudentTextbookClaimService.add(wfStudentTextbookClaim);
-    return RT.ok(isSuccess);
-    }
-
-    @PutMapping
-    @ApiOperation(value = "修改教材申领")
-    @SaCheckPermission("wfstudenttextbookclaim:edit")
-    public RT<Boolean> update(@Valid @RequestBody UpdateWfStudentTextbookClaimDto dto){
-
-        WfStudentTextbookClaim wfStudentTextbookClaim = BeanUtil.toBean(dto, WfStudentTextbookClaim.class);
-        return RT.ok(wfStudentTextbookClaimService.update(wfStudentTextbookClaim));
-
-    }
-
-    @DeleteMapping
-    @ApiOperation(value = "删除教材申领")
-    @SaCheckPermission("wfstudenttextbookclaim:delete")
-    public RT<Boolean> delete(@Valid @RequestBody List<Long> ids){
-        return RT.ok(wfStudentTextbookClaimService.delete(ids));
-
-    }
-
-}

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

@@ -0,0 +1,88 @@
+package com.xjrsoft.module.textbook.controller;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.xjrsoft.common.model.result.RT;
+import com.xjrsoft.common.page.ConventPage;
+import com.xjrsoft.common.page.PageOutput;
+import com.xjrsoft.module.textbook.dto.AddWfTextbookClaimDto;
+import com.xjrsoft.module.textbook.dto.UpdateWfTextbookClaimDto;
+import com.xjrsoft.module.textbook.dto.WfTextbookClaimPageDto;
+import com.xjrsoft.module.textbook.entity.WfTextbookClaim;
+import com.xjrsoft.module.textbook.service.IWfTextbookClaimService;
+import com.xjrsoft.module.textbook.vo.WfTextbookClaimPageVo;
+import com.xjrsoft.module.textbook.vo.WfTextbookClaimVo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+import java.util.List;
+
+/**
+* @title: 教材申领
+* @Author szs
+* @Date: 2023-12-26
+* @Version 1.0
+*/
+@RestController
+@RequestMapping("/textbook" + "/wfTextbookClaim")
+@Api(value = "/textbook"  + "/wfTextbookClaim",tags = "教材申领代码")
+@AllArgsConstructor
+public class WfTextbookClaimController {
+
+
+    private final IWfTextbookClaimService wfTextbookClaimService;
+
+    @GetMapping(value = "/page")
+    @ApiOperation(value="教材申领列表(分页)")
+    @SaCheckPermission("wftextbookclaim:detail")
+    public RT<PageOutput<WfTextbookClaimPageVo>> page(@Valid WfTextbookClaimPageDto dto){
+
+        IPage<WfTextbookClaimPageVo> page = wfTextbookClaimService.getPage(dto);
+        PageOutput<WfTextbookClaimPageVo> pageOutput = ConventPage.getPageOutput(page, WfTextbookClaimPageVo.class);
+        return RT.ok(pageOutput);
+    }
+
+    @GetMapping(value = "/info")
+    @ApiOperation(value="根据id查询教材申领信息")
+    @SaCheckPermission("wftextbookclaim:detail")
+    public RT<WfTextbookClaimVo> info(@RequestParam Long id){
+        WfTextbookClaim wfTextbookClaim = wfTextbookClaimService.getByIdDeep(id);
+        if (wfTextbookClaim == null) {
+           return RT.error("找不到此数据！");
+        }
+        return RT.ok(BeanUtil.toBean(wfTextbookClaim, WfTextbookClaimVo.class));
+    }
+
+
+    @PostMapping
+    @ApiOperation(value = "新增教材申领")
+    @SaCheckPermission("wftextbookclaim:add")
+    public RT<Boolean> add(@Valid @RequestBody AddWfTextbookClaimDto dto){
+        WfTextbookClaim wfTextbookClaim = BeanUtil.toBean(dto, WfTextbookClaim.class);
+        boolean isSuccess = wfTextbookClaimService.add(wfTextbookClaim);
+    return RT.ok(isSuccess);
+    }
+
+    @PutMapping
+    @ApiOperation(value = "修改教材申领")
+    @SaCheckPermission("wftextbookclaim:edit")
+    public RT<Boolean> update(@Valid @RequestBody UpdateWfTextbookClaimDto dto){
+
+        WfTextbookClaim wfTextbookClaim = BeanUtil.toBean(dto, WfTextbookClaim.class);
+        return RT.ok(wfTextbookClaimService.update(wfTextbookClaim));
+
+    }
+
+    @DeleteMapping
+    @ApiOperation(value = "删除教材申领")
+    @SaCheckPermission("wftextbookclaim:delete")
+    public RT<Boolean> delete(@Valid @RequestBody List<Long> ids){
+        return RT.ok(wfTextbookClaimService.delete(ids));
+
+    }
+
+}

src/main/java/com/xjrsoft/module/textbook/dto/AddWfStudentTextbookClaimDto.java → src/main/java/com/xjrsoft/module/textbook/dto/AddWfTextbookClaimDto.java

@@ -21,7 +21,7 @@ import com.xjrsoft.module.textbook.entity.WfTextbookClaimItem;
 * @Version 1.0
 */
 @Data
-public class AddWfStudentTextbookClaimDto implements Serializable {
+public class AddWfTextbookClaimDto implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
@@ -66,6 +66,11 @@ public class AddWfStudentTextbookClaimDto implements Serializable {
     @ApiModelProperty("代领取人")
     private String receiveUserId;
     /**
+    * 领取用户编号（申请人帮领取人申请去领取）
+    */
+    @ApiModelProperty("领取用户编号（申请人帮领取人申请去领取）")
+    private Long claimUserId;
+    /**
     * 状态（1:结束 0:未结束）
     */
     @ApiModelProperty("状态（1:结束 0:未结束）")

src/main/java/com/xjrsoft/module/textbook/dto/UpdateWfStudentTextbookClaimDto.java → src/main/java/com/xjrsoft/module/textbook/dto/UpdateWfTextbookClaimDto.java

@@ -21,7 +21,7 @@ import com.xjrsoft.module.textbook.entity.WfTextbookClaimItem;
 * @Version 1.0
 */
 @Data
-public class UpdateWfStudentTextbookClaimDto extends AddWfStudentTextbookClaimDto {
+public class UpdateWfTextbookClaimDto extends AddWfTextbookClaimDto {
 
     private static final long serialVersionUID = 1L;
 

src/main/java/com/xjrsoft/module/textbook/dto/WfStudentTextbookClaimPageDto.java → src/main/java/com/xjrsoft/module/textbook/dto/WfTextbookClaimPageDto.java

@@ -20,7 +20,7 @@ import java.util.Date;
 */
 @Data
 @EqualsAndHashCode(callSuper = false)
-public class WfStudentTextbookClaimPageDto extends PageInput {
+public class WfTextbookClaimPageDto extends PageInput {
 
 
 }

src/main/java/com/xjrsoft/module/textbook/entity/WfStudentTextbookClaim.java → src/main/java/com/xjrsoft/module/textbook/entity/WfTextbookClaim.java

@@ -24,9 +24,9 @@ import java.util.Date;
 * @Version 1.0
 */
 @Data
-@TableName("wf_student_textbook_claim")
-@ApiModel(value = "wf_student_textbook_claim", description = "教材申领")
-public class WfStudentTextbookClaim implements Serializable {
+@TableName("wf_textbook_claim")
+@ApiModel(value = "wf_textbook_claim", description = "教材申领")
+public class WfTextbookClaim implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
@@ -114,6 +114,11 @@ public class WfStudentTextbookClaim implements Serializable {
     @ApiModelProperty("代领取人")
     private String receiveUserId;
     /**
+    * 领取用户编号（申请人帮领取人申请去领取）
+    */
+    @ApiModelProperty("领取用户编号（申请人帮领取人申请去领取）")
+    private Long claimUserId;
+    /**
     * 状态（1:结束 0:未结束）
     */
     @ApiModelProperty("状态（1:结束 0:未结束）")

src/main/java/com/xjrsoft/module/textbook/mapper/WfStudentTextbookClaimMapper.java

@@ -1,17 +0,0 @@
-package com.xjrsoft.module.textbook.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.github.yulichang.base.MPJBaseMapper;
-import com.xjrsoft.module.textbook.entity.WfStudentTextbookClaim;
-import org.apache.ibatis.annotations.Mapper;
-
-/**
-* @title: 教材申领
-* @Author szs
-* @Date: 2023-12-26
-* @Version 1.0
-*/
-@Mapper
-public interface WfStudentTextbookClaimMapper extends MPJBaseMapper<WfStudentTextbookClaim> {
-
-}

src/main/java/com/xjrsoft/module/textbook/mapper/WfTextbookClaimItemMapper.java

@@ -1,10 +1,12 @@
 package com.xjrsoft.module.textbook.mapper;
 
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.github.yulichang.base.MPJBaseMapper;
 import com.xjrsoft.module.textbook.entity.WfTextbookClaimItem;
+import com.xjrsoft.module.textbook.vo.WfTextbookClaimItemVo;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 /**
 * @title: 教材申领项
 * @Author szs
@@ -13,5 +15,5 @@ import org.apache.ibatis.annotations.Mapper;
 */
 @Mapper
 public interface WfTextbookClaimItemMapper extends MPJBaseMapper<WfTextbookClaimItem> {
-
+    List<WfTextbookClaimItemVo> getListByWfTextbookClaimId(Long wfTextbookClaimId);
 }

src/main/java/com/xjrsoft/module/textbook/mapper/WfTextbookClaimMapper.java

@@ -0,0 +1,19 @@
+package com.xjrsoft.module.textbook.mapper;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.github.yulichang.base.MPJBaseMapper;
+import com.xjrsoft.module.textbook.dto.WfTextbookClaimPageDto;
+import com.xjrsoft.module.textbook.entity.WfTextbookClaim;
+import com.xjrsoft.module.textbook.vo.WfTextbookClaimPageVo;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+* @title: 教材申领
+* @Author szs
+* @Date: 2023-12-26
+* @Version 1.0
+*/
+@Mapper
+public interface WfTextbookClaimMapper extends MPJBaseMapper<WfTextbookClaim> {
+    IPage<WfTextbookClaimPageVo> getPage(IPage<WfTextbookClaimPageDto> page, WfTextbookClaimPageDto dt0);
+}

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

@@ -1,40 +0,0 @@
-package com.xjrsoft.module.textbook.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.github.yulichang.base.MPJBaseService;
-import com.xjrsoft.module.textbook.entity.WfStudentTextbookClaim;
-import lombok.Data;
-import java.util.List;
-
-/**
-* @title: 教材申领
-* @Author szs
-* @Date: 2023-12-26
-* @Version 1.0
-*/
-
-public interface IWfStudentTextbookClaimService extends MPJBaseService<WfStudentTextbookClaim> {
-    /**
-    * 新增
-    *
-    * @param wfStudentTextbookClaim
-    * @return
-    */
-    Boolean add(WfStudentTextbookClaim wfStudentTextbookClaim);
-
-    /**
-    * 更新
-    *
-    * @param wfStudentTextbookClaim
-    * @return
-    */
-    Boolean update(WfStudentTextbookClaim wfStudentTextbookClaim);
-
-    /**
-    * 删除
-    *
-    * @param ids
-    * @return
-    */
-    Boolean delete(List<Long> ids);
-}

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

@@ -0,0 +1,45 @@
+package com.xjrsoft.module.textbook.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.github.yulichang.base.MPJBaseService;
+import com.xjrsoft.module.textbook.dto.WfTextbookClaimPageDto;
+import com.xjrsoft.module.textbook.entity.WfTextbookClaim;
+import com.xjrsoft.module.textbook.vo.WfTextbookClaimPageVo;
+
+import java.util.List;
+
+/**
+* @title: 教材申领
+* @Author szs
+* @Date: 2023-12-26
+* @Version 1.0
+*/
+
+public interface IWfTextbookClaimService extends MPJBaseService<WfTextbookClaim> {
+    /**
+    * 新增
+    *
+    * @param wfTextbookClaim
+    * @return
+    */
+    Boolean add(WfTextbookClaim wfTextbookClaim);
+
+    /**
+    * 更新
+    *
+    * @param wfTextbookClaim
+    * @return
+    */
+    Boolean update(WfTextbookClaim wfTextbookClaim);
+
+    /**
+    * 删除
+    *
+    * @param ids
+    * @return
+    */
+    Boolean delete(List<Long> ids);
+
+    IPage<WfTextbookClaimPageVo> getPage(WfTextbookClaimPageDto dto);
+
+}

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

@@ -1,88 +0,0 @@
-package com.xjrsoft.module.textbook.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.github.yulichang.base.MPJBaseServiceImpl;
-import com.xjrsoft.module.textbook.entity.WfTextbookClaimItem;
-import com.xjrsoft.module.textbook.mapper.WfTextbookClaimItemMapper;
-import com.xjrsoft.module.textbook.entity.WfStudentTextbookClaim;
-import com.xjrsoft.module.textbook.mapper.WfStudentTextbookClaimMapper;
-import com.xjrsoft.module.textbook.service.IWfStudentTextbookClaimService;
-import lombok.AllArgsConstructor;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-import java.util.List;
-import java.util.Objects;
-import java.util.stream.Collectors;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-
-/**
-* @title: 教材申领
-* @Author szs
-* @Date: 2023-12-26
-* @Version 1.0
-*/
-@Service
-@AllArgsConstructor
-public class WfStudentTextbookClaimServiceImpl extends MPJBaseServiceImpl<WfStudentTextbookClaimMapper, WfStudentTextbookClaim> implements IWfStudentTextbookClaimService {
-    private final WfStudentTextbookClaimMapper wfStudentTextbookClaimWfStudentTextbookClaimMapper;
-
-    private final WfTextbookClaimItemMapper wfStudentTextbookClaimWfTextbookClaimItemMapper;
-
-
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public Boolean add(WfStudentTextbookClaim wfStudentTextbookClaim) {
-        wfStudentTextbookClaimWfStudentTextbookClaimMapper.insert(wfStudentTextbookClaim);
-        for (WfTextbookClaimItem wfTextbookClaimItem : wfStudentTextbookClaim.getWfTextbookClaimItemList()) {
-            wfTextbookClaimItem.setWfTextbookClaimId(wfStudentTextbookClaim.getId());
-            wfStudentTextbookClaimWfTextbookClaimItemMapper.insert(wfTextbookClaimItem);
-        }
-
-        return true;
-    }
-
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public Boolean update(WfStudentTextbookClaim wfStudentTextbookClaim) {
-        wfStudentTextbookClaimWfStudentTextbookClaimMapper.updateById(wfStudentTextbookClaim);
-        //********************************* WfTextbookClaimItem  增删改  开始 *******************************************/
-        {
-            // 查出所有子级的id
-            List<WfTextbookClaimItem> wfTextbookClaimItemList = wfStudentTextbookClaimWfTextbookClaimItemMapper.selectList(Wrappers.lambdaQuery(WfTextbookClaimItem.class).eq(WfTextbookClaimItem::getWfTextbookClaimId, wfStudentTextbookClaim.getId()).select(WfTextbookClaimItem::getId));
-            List<Long> wfTextbookClaimItemIds = wfTextbookClaimItemList.stream().map(WfTextbookClaimItem::getId).collect(Collectors.toList());
-            //原有子表单 没有被删除的主键
-            List<Long> wfTextbookClaimItemOldIds = wfStudentTextbookClaim.getWfTextbookClaimItemList().stream().map(WfTextbookClaimItem::getId).filter(Objects::nonNull).collect(Collectors.toList());
-            //找到需要删除的id
-            List<Long> wfTextbookClaimItemRemoveIds = wfTextbookClaimItemIds.stream().filter(item -> !wfTextbookClaimItemOldIds.contains(item)).collect(Collectors.toList());
-
-            for (WfTextbookClaimItem wfTextbookClaimItem : wfStudentTextbookClaim.getWfTextbookClaimItemList()) {
-                //如果不等于空则修改
-                if (wfTextbookClaimItem.getId() != null) {
-                    wfStudentTextbookClaimWfTextbookClaimItemMapper.updateById(wfTextbookClaimItem);
-                }
-                //如果等于空 则新增
-                else {
-                    //已经不存在的id 删除
-                    wfTextbookClaimItem.setWfTextbookClaimId(wfStudentTextbookClaim.getId());
-                    wfStudentTextbookClaimWfTextbookClaimItemMapper.insert(wfTextbookClaimItem);
-                }
-            }
-            //已经不存在的id 删除
-            if(wfTextbookClaimItemRemoveIds.size() > 0){
-                wfStudentTextbookClaimWfTextbookClaimItemMapper.deleteBatchIds(wfTextbookClaimItemRemoveIds);
-            }
-        }
-        //********************************* WfTextbookClaimItem  增删改  结束 *******************************************/
-
-        return true;
-    }
-
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public Boolean delete(List<Long> ids) {
-        wfStudentTextbookClaimWfStudentTextbookClaimMapper.deleteBatchIds(ids);
-        wfStudentTextbookClaimWfTextbookClaimItemMapper.delete(Wrappers.lambdaQuery(WfTextbookClaimItem.class).in(WfTextbookClaimItem::getWfTextbookClaimId, ids));
-
-        return true;
-    }
-}

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

@@ -0,0 +1,130 @@
+package com.xjrsoft.module.textbook.service.impl;
+
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.github.yulichang.base.MPJBaseServiceImpl;
+import com.xjrsoft.common.page.ConventPage;
+import com.xjrsoft.module.teacher.entity.XjrUser;
+import com.xjrsoft.module.teacher.mapper.XjrUserMapper;
+import com.xjrsoft.module.textbook.dto.WfTextbookClaimPageDto;
+import com.xjrsoft.module.textbook.entity.WfTextbookClaim;
+import com.xjrsoft.module.textbook.entity.WfTextbookClaimItem;
+import com.xjrsoft.module.textbook.mapper.WfTextbookClaimItemMapper;
+import com.xjrsoft.module.textbook.mapper.WfTextbookClaimMapper;
+import com.xjrsoft.module.textbook.service.IWfTextbookClaimService;
+import com.xjrsoft.module.textbook.vo.WfTextbookClaimItemVo;
+import com.xjrsoft.module.textbook.vo.WfTextbookClaimPageVo;
+import lombok.AllArgsConstructor;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+import java.util.Objects;
+import java.util.stream.Collectors;
+
+/**
+* @title: 教材申领
+* @Author szs
+* @Date: 2023-12-26
+* @Version 1.0
+*/
+@Service
+@AllArgsConstructor
+public class WfTextbookClaimServiceImpl extends MPJBaseServiceImpl<WfTextbookClaimMapper, WfTextbookClaim> implements IWfTextbookClaimService {
+    private final WfTextbookClaimMapper wfTextbookClaimWfTextbookClaimMapper;
+
+    private final WfTextbookClaimItemMapper wfTextbookClaimWfTextbookClaimItemMapper;
+
+    private final XjrUserMapper xjrUserMapper;
+
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean add(WfTextbookClaim wfTextbookClaim) {
+        wfTextbookClaimWfTextbookClaimMapper.insert(wfTextbookClaim);
+        for (WfTextbookClaimItem wfTextbookClaimItem : wfTextbookClaim.getWfTextbookClaimItemList()) {
+            wfTextbookClaimItem.setWfTextbookClaimId(wfTextbookClaim.getId());
+            wfTextbookClaimWfTextbookClaimItemMapper.insert(wfTextbookClaimItem);
+        }
+
+        return true;
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean update(WfTextbookClaim wfTextbookClaim) {
+        wfTextbookClaimWfTextbookClaimMapper.updateById(wfTextbookClaim);
+        //********************************* WfTextbookClaimItem  增删改  开始 *******************************************/
+        {
+            // 查出所有子级的id
+            List<WfTextbookClaimItem> wfTextbookClaimItemList = wfTextbookClaimWfTextbookClaimItemMapper.selectList(Wrappers.lambdaQuery(WfTextbookClaimItem.class).eq(WfTextbookClaimItem::getWfTextbookClaimId, wfTextbookClaim.getId()).select(WfTextbookClaimItem::getId));
+            List<Long> wfTextbookClaimItemIds = wfTextbookClaimItemList.stream().map(WfTextbookClaimItem::getId).collect(Collectors.toList());
+            //原有子表单 没有被删除的主键
+            List<Long> wfTextbookClaimItemOldIds = wfTextbookClaim.getWfTextbookClaimItemList().stream().map(WfTextbookClaimItem::getId).filter(Objects::nonNull).collect(Collectors.toList());
+            //找到需要删除的id
+            List<Long> wfTextbookClaimItemRemoveIds = wfTextbookClaimItemIds.stream().filter(item -> !wfTextbookClaimItemOldIds.contains(item)).collect(Collectors.toList());
+
+            for (WfTextbookClaimItem wfTextbookClaimItem : wfTextbookClaim.getWfTextbookClaimItemList()) {
+                //如果不等于空则修改
+                if (wfTextbookClaimItem.getId() != null) {
+                    wfTextbookClaimWfTextbookClaimItemMapper.updateById(wfTextbookClaimItem);
+                }
+                //如果等于空 则新增
+                else {
+                    //已经不存在的id 删除
+                    wfTextbookClaimItem.setWfTextbookClaimId(wfTextbookClaim.getId());
+                    wfTextbookClaimWfTextbookClaimItemMapper.insert(wfTextbookClaimItem);
+                }
+            }
+            //已经不存在的id 删除
+            if(wfTextbookClaimItemRemoveIds.size() > 0){
+                wfTextbookClaimWfTextbookClaimItemMapper.deleteBatchIds(wfTextbookClaimItemRemoveIds);
+            }
+        }
+        //********************************* WfTextbookClaimItem  增删改  结束 *******************************************/
+
+        return true;
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean delete(List<Long> ids) {
+        wfTextbookClaimWfTextbookClaimMapper.deleteBatchIds(ids);
+        wfTextbookClaimWfTextbookClaimItemMapper.delete(Wrappers.lambdaQuery(WfTextbookClaimItem.class).in(WfTextbookClaimItem::getWfTextbookClaimId, ids));
+
+        return true;
+    }
+
+    @Override
+    public IPage<WfTextbookClaimPageVo> getPage(WfTextbookClaimPageDto dto) {
+        IPage<WfTextbookClaimPageVo> page = wfTextbookClaimWfTextbookClaimMapper.getPage(ConventPage.getPage(dto),dto);
+        //拆分代领人
+        for (WfTextbookClaimPageVo wfTextbookClaimPageVo : page.getRecords()) {
+            String receiveUserIdStr = wfTextbookClaimPageVo.getReceiveUserId();
+            if(ObjectUtil.isNotNull(receiveUserIdStr) && !receiveUserIdStr.equals("")){
+                LambdaQueryWrapper<XjrUser> queryWrapper = new LambdaQueryWrapper<>();
+                queryWrapper
+                        .eq(XjrUser::getId,receiveUserIdStr);
+                List<XjrUser> xjrUserList = xjrUserMapper.selectList(queryWrapper);
+                if (ObjectUtil.isNotNull(xjrUserList) && xjrUserList.size() > 0){
+                    StringBuilder sb = new StringBuilder();
+                    for (XjrUser xjrUser : xjrUserList) {
+                        sb.append(xjrUser.getName());
+                    }
+                    wfTextbookClaimPageVo.setReceiveUserIdCN(sb.toString());
+                }
+            }
+        }
+        //加上申领项
+        for (WfTextbookClaimPageVo wfTextbookClaimPageVo : page.getRecords()) {
+            List<WfTextbookClaimItemVo> wfTextbookClaimItemVoList = wfTextbookClaimWfTextbookClaimItemMapper.getListByWfTextbookClaimId(Long.parseLong(wfTextbookClaimPageVo.getId()));
+
+            if(ObjectUtil.isNotNull(wfTextbookClaimItemVoList) && wfTextbookClaimItemVoList.size() > 0){
+                wfTextbookClaimPageVo.setWfTextbookClaimItemList(wfTextbookClaimItemVoList);
+            }
+        }
+        return page;
+    }
+}

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

@@ -3,12 +3,6 @@ package com.xjrsoft.module.textbook.vo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.time.LocalTime;
-import java.time.LocalDateTime;
-import java.math.BigDecimal;
-import java.util.List;
-import java.util.Date;
-
 /**
 * @title: 教材申领项表单出参
 * @Author szs
@@ -38,6 +32,11 @@ public class WfTextbookClaimItemVo {
     */
     @ApiModelProperty("教材管理编号")
     private Long textbookId;
+    /**
+     * 教材管理编号
+     */
+    @ApiModelProperty("教材管理编号")
+    private String textbookIdCN;
     /**
     * 申请数量
     */
@@ -49,6 +48,4 @@ public class WfTextbookClaimItemVo {
     @ApiModelProperty("已发放数量")
     private Integer issueNumber;
 
-
-
 }

src/main/java/com/xjrsoft/module/textbook/vo/WfStudentTextbookClaimPageVo.java → src/main/java/com/xjrsoft/module/textbook/vo/WfTextbookClaimPageVo.java

@@ -1,15 +1,9 @@
 package com.xjrsoft.module.textbook.vo;
 
-import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import com.xjrsoft.common.annotation.Trans;
-import com.xjrsoft.common.enums.TransType;
-import java.time.LocalTime;
-import java.time.LocalDateTime;
-import java.math.BigDecimal;
-import java.util.Date;
+import java.util.List;
 
 /**
 * @title: 教材申领分页列表出参
@@ -18,7 +12,7 @@ import java.util.Date;
 * @Version 1.0
 */
 @Data
-public class WfStudentTextbookClaimPageVo {
+public class WfTextbookClaimPageVo {
 
     /**
     * 主键编号
@@ -26,36 +20,6 @@ public class WfStudentTextbookClaimPageVo {
     @ApiModelProperty("主键编号")
     private String id;
     /**
-    * 创建人
-    */
-    @ApiModelProperty("创建人")
-    private Long createUserId;
-    /**
-    * 创建时间
-    */
-    @ApiModelProperty("创建时间")
-    private Date createDate;
-    /**
-    * 修改人
-    */
-    @ApiModelProperty("修改人")
-    private Long modifyUserId;
-    /**
-    * 修改时间
-    */
-    @ApiModelProperty("修改时间")
-    private Date modifyDate;
-    /**
-    * 删除标记
-    */
-    @ApiModelProperty("删除标记")
-    private Integer deleteMark;
-    /**
-    * 有效标志
-    */
-    @ApiModelProperty("有效标志")
-    private Integer enabledMark;
-    /**
     * 序号
     */
     @ApiModelProperty("序号")
@@ -65,21 +29,41 @@ public class WfStudentTextbookClaimPageVo {
     */
     @ApiModelProperty("申请人")
     private Long applicantUserId;
+    /**
+     * 申请人
+     */
+    @ApiModelProperty("申请人")
+    private String applicantUserIdCN;
     /**
     * 班级编号
     */
     @ApiModelProperty("班级编号")
     private Long classId;
+    /**
+     * 班级编号
+     */
+    @ApiModelProperty("班级编号")
+    private String classIdCN;
     /**
     * 学期ID(base_semester)
     */
     @ApiModelProperty("学期ID(base_semester)")
     private Long baseSemesterId;
+    /**
+     * 学期ID(base_semester)
+     */
+    @ApiModelProperty("学期ID(base_semester)")
+    private String baseSemesterIdCN;
     /**
     * 学生编号
     */
     @ApiModelProperty("学生编号")
     private Long studentUserId;
+    /**
+     * 学生编号
+     */
+    @ApiModelProperty("学生编号")
+    private String studentUserIdCN;
     /**
     * 领取地点
     */
@@ -90,15 +74,39 @@ public class WfStudentTextbookClaimPageVo {
     */
     @ApiModelProperty("申领类型(xjr_dictionary_item[claim_type])")
     private String claimType;
+    /**
+     * 申领类型(xjr_dictionary_item[claim_type])
+     */
+    @ApiModelProperty("申领类型(xjr_dictionary_item[claim_type])")
+    private String claimTypeCN;
     /**
     * 代领取人
     */
     @ApiModelProperty("代领取人")
     private String receiveUserId;
+    /**
+     * 代领取人
+     */
+    @ApiModelProperty("代领取人")
+    private String receiveUserIdCN;
+    /**
+    * 领取用户编号（申请人帮领取人申请去领取）
+    */
+    @ApiModelProperty("领取用户编号（申请人帮领取人申请去领取）")
+    private Long claimUserId;
+    /**
+     * 领取用户编号（申请人帮领取人申请去领取）
+     */
+    @ApiModelProperty("领取用户编号（申请人帮领取人申请去领取）")
+    private String claimUserIdCN;
     /**
     * 状态（1:结束 0:未结束）
     */
     @ApiModelProperty("状态（1:结束 0:未结束）")
     private Integer status;
-
+    /**
+     * wfTextbookClaimItem
+     */
+    @ApiModelProperty("wfTextbookClaimItem子表")
+    private List<WfTextbookClaimItemVo> wfTextbookClaimItemList;
 }

src/main/java/com/xjrsoft/module/textbook/vo/WfStudentTextbookClaimVo.java → src/main/java/com/xjrsoft/module/textbook/vo/WfTextbookClaimVo.java

@@ -17,7 +17,7 @@ import com.xjrsoft.module.textbook.entity.WfTextbookClaimItem;
 * @Version 1.0
 */
 @Data
-public class WfStudentTextbookClaimVo {
+public class WfTextbookClaimVo {
 
     /**
     * 主键编号
@@ -65,6 +65,11 @@ public class WfStudentTextbookClaimVo {
     @ApiModelProperty("代领取人")
     private String receiveUserId;
     /**
+    * 领取用户编号（申请人帮领取人申请去领取）
+    */
+    @ApiModelProperty("领取用户编号（申请人帮领取人申请去领取）")
+    private Long claimUserId;
+    /**
     * 状态（1:结束 0:未结束）
     */
     @ApiModelProperty("状态（1:结束 0:未结束）")

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

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.xjrsoft.module.textbook.mapper.WfTextbookClaimItemMapper">
+    <select id="getListByWfTextbookClaimId" parameterType="java.lang.Long"
+            resultType="com.xjrsoft.module.textbook.vo.WfTextbookClaimItemVo">
+        SELECT
+            t.*,
+            t1.book_name as textbookIdCN
+        FROM wf_textbook_claim_item t
+                 LEFT JOIN textbook t1 ON (t1.id = t.textbook_id)
+        WHERE t.delete_mark = 0
+        order by t.id;
+    </select>
+</mapper>

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

@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.xjrsoft.module.textbook.mapper.WfTextbookClaimMapper">
+    <select id="getPage" parameterType="com.xjrsoft.module.textbook.dto.WfTextbookClaimPageDto"
+            resultType="com.xjrsoft.module.textbook.vo.WfTextbookClaimPageVo">
+        SELECT
+            t.*,
+            t1.name as applicantUserIdCN,
+            t2.name as classIdCN,
+            t3.name as baseSemesterIdCN,
+            t4.name as studentUserIdCN,
+            t5.name as claimTypeCN,
+            t6.name as claimUserIdCN
+        FROM wf_textbook_claim t
+             LEFT JOIN xjr_user t1 ON (t1.id = t.applicant_user_id)
+             LEFT JOIN base_class t2 ON (t2.id = t.class_id)
+             LEFT JOIN base_semester t3 ON (t3.id = t.base_semester_id)
+             LEFT JOIN xjr_user t4 ON (t4.id = t.student_user_id)
+             LEFT JOIN xjr_dictionary_detail t5 ON (t5.code = t.claim_type)
+             LEFT JOIN xjr_user t6 ON (t6.id = t.claim_user_id)
+        WHERE t.delete_mark = 0
+        order by t.id;
+    </select>
+</mapper>

src/test/java/com/xjrsoft/xjrsoftboot/FreeMarkerGeneratorTest.java

@@ -1346,7 +1346,7 @@ public class FreeMarkerGeneratorTest {
     public void gcWfStudentTextbookClaim() throws IOException {
         List<TableConfig> tableConfigs = new ArrayList<>();
         TableConfig mainTable = new TableConfig();
-        mainTable.setTableName("wf_student_textbook_claim");//init_sql中的表名
+        mainTable.setTableName("wf_textbook_claim");//init_sql中的表名
         mainTable.setIsMain(true);//是否是主表，一般默认为true
         mainTable.setPkField(GlobalConstant.DEFAULT_PK);//设置主键
         mainTable.setPkType(GlobalConstant.DEFAULT_PK_TYPE);//设置主键类型