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

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

@@ -155,12 +155,7 @@ public class WfTextbookClaimController {
     @SaCheckPermission("wftextbookclaim:edit")
     @XjrLog(value = "作废教材申领", saveResponseData = true)
     public RT<Boolean> nullify(@Valid @RequestBody NullifyWfTextbookClaimDto dto) {
-        WfTextbookClaim wfTextbookClaim = new WfTextbookClaim();
-        wfTextbookClaim.setId(dto.getId());
-        wfTextbookClaim.setWorkflowStatus(2);
-        wfTextbookClaim.setModifyDate(new Date());
-        wfTextbookClaim.setModifyUserId(StpUtil.getLoginIdAsLong());
-        return RT.ok(wfTextbookClaimService.updateById(wfTextbookClaim));
+        return RT.ok(wfTextbookClaimService.nullify(dto));
     }
 
     @DeleteMapping

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

@@ -125,7 +125,7 @@ public class WfTextbookClaim implements Serializable {
     /**
      * 流程状态（0：未结束，1：已结束，正常通过，2：已结束，未通过）
      */
-    @ApiModelProperty("流程状态（0：未结束，1：已结束，正常通过，2：已结束，未通过）")
+    @ApiModelProperty("流程状态（0：未结束，1：已结束，正常通过，2：已结束，未通过），3：作废")
     private Integer workflowStatus;
     /**
      * 当前申领项发放次数

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

@@ -2,10 +2,7 @@ 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.ClaimRecordsExportQueryDto;
-import com.xjrsoft.module.textbook.dto.ConfirmDistributeDto;
-import com.xjrsoft.module.textbook.dto.DistributePageDto;
-import com.xjrsoft.module.textbook.dto.WfTextbookClaimPageDto;
+import com.xjrsoft.module.textbook.dto.*;
 import com.xjrsoft.module.textbook.entity.WfTextbookClaim;
 import com.xjrsoft.module.textbook.vo.DistributePageVo;
 import com.xjrsoft.module.textbook.vo.DistributeRecordVo;
@@ -76,6 +73,8 @@ public interface IWfTextbookClaimService extends MPJBaseService<WfTextbookClaim>
      */
     Boolean confirmDistribute(ConfirmDistributeDto dto);
 
+    Boolean nullify(NullifyWfTextbookClaimDto dto);
+
     Boolean dataHandleAddClaimUserNode(Long id);
 
     ByteArrayOutputStream claimRecordsExportQuery(ClaimRecordsExportQueryDto dto);

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

@@ -4,6 +4,7 @@ import cn.dev33.satoken.stp.StpUtil;
 import com.alibaba.excel.EasyExcel;
 import com.alibaba.excel.support.ExcelTypeEnum;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.github.yulichang.base.MPJBaseServiceImpl;
@@ -12,6 +13,7 @@ import com.xjrsoft.common.enums.ClaimTypeEnum;
 import com.xjrsoft.common.enums.DeleteMark;
 import com.xjrsoft.common.enums.IssueModeEnum;
 import com.xjrsoft.common.exception.MyException;
+import com.xjrsoft.common.model.result.RT;
 import com.xjrsoft.common.page.ConventPage;
 import com.xjrsoft.common.utils.VoToColumnUtil;
 import com.xjrsoft.module.base.entity.BaseClass;
@@ -20,10 +22,7 @@ import com.xjrsoft.module.oa.entity.WfMeetingApply;
 import com.xjrsoft.module.system.entity.DictionaryDetail;
 import com.xjrsoft.module.teacher.entity.XjrUser;
 import com.xjrsoft.module.teacher.mapper.XjrUserMapper;
-import com.xjrsoft.module.textbook.dto.ClaimRecordsExportQueryDto;
-import com.xjrsoft.module.textbook.dto.ConfirmDistributeDto;
-import com.xjrsoft.module.textbook.dto.DistributePageDto;
-import com.xjrsoft.module.textbook.dto.WfTextbookClaimPageDto;
+import com.xjrsoft.module.textbook.dto.*;
 import com.xjrsoft.module.textbook.entity.*;
 import com.xjrsoft.module.textbook.mapper.*;
 import com.xjrsoft.module.textbook.service.IWfTextbookClaimService;
@@ -572,6 +571,25 @@ public class WfTextbookClaimServiceImpl extends MPJBaseServiceImpl<WfTextbookCla
         return true;
     }
 
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean nullify(NullifyWfTextbookClaimDto dto) {
+        // 作废申领流程数据，应该移除领取人记录
+        LambdaUpdateWrapper<TextbookClaimUser> textbookClaimUserLambdaUpdateWrapper = new LambdaUpdateWrapper<>();
+        textbookClaimUserLambdaUpdateWrapper
+                .eq(TextbookClaimUser::getWfTextbookClaimId, dto.getId())
+                ;
+        textbookClaimUserMapper.delete(textbookClaimUserLambdaUpdateWrapper);
+
+        WfTextbookClaim wfTextbookClaim = new WfTextbookClaim();
+        wfTextbookClaim.setId(dto.getId());
+        wfTextbookClaim.setWorkflowStatus(3);
+        wfTextbookClaim.setModifyDate(new Date());
+        wfTextbookClaim.setModifyUserId(StpUtil.getLoginIdAsLong());
+        this.updateById(wfTextbookClaim);
+        return true;
+    }
+
     @Override
     @Transactional
     public Boolean dataHandleAddClaimUserNode(Long id) {

src/main/resources/sqlScript/教材费用视图.sql

@@ -8,10 +8,10 @@ with all_stu as (select t.base_semester_id,
                           t.student_user_id)
 select t1.beltcode                                              AS `beltcode`,
        t1.beltname                                              AS `beltname`,
-       t5.speccode                                              AS `speccode`,
-       t5.specname                                              AS `specname`,
-       t6.speccode                                              AS `classcode`,
-       t6.specname                                              AS `classname`,
+       t4.code                                              AS `speccode`,
+       t4.name                                              AS `specname`,
+       t3.code                                              AS `classcode`,
+       t3.name                                              AS `classname`,
        '教材费'                                                 AS `feeitemname`,
        ifnull((select sum(a.price)
                from textbook_student_claim a
@@ -26,8 +26,6 @@ from all_stu t
          left join base_student_school_roll t2 on t2.user_id = t.student_user_id
          left join base_class t3 on t3.id = t2.class_id
          left join base_major_set t4 on t4.id = t3.major_set_id
-         left join pb_cse_spec1 t5 on t5.specname = t4.name
-         left join pb_cse_class1 t6 on t6.specname = t3.name
          left join xjr_user t7 on t7.id = t.student_user_id
 where t2.delete_mark = 0
   and t3.delete_mark = 0

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

@@ -18,7 +18,7 @@ class WfTextbookClaimServiceImplTest {
     private IWfTextbookClaimService wfTextbookClaimService;
     @Test
     void dataHandleAddClaimUserNode() {
-        wfTextbookClaimService.dataHandleAddClaimUserNode(1890353019495694336L);
+        wfTextbookClaimService.dataHandleAddClaimUserNode(1914215604160106496L);
     }
 
 }