大数据与最优化研究所 hai 9 meses
pai
achega
56e9f2f5c7

+ 1 - 1
src/main/java/com/xjrsoft/common/enums/IssueModeEnum.java

@@ -10,7 +10,7 @@ public enum IssueModeEnum {
     /**
      * 学生
      * */
-    Imtudent("im_student", "学生领取"),
+    ImStudent("im_student", "学生领取"),
 
     /**
      * 教师

+ 5 - 0
src/main/java/com/xjrsoft/module/textbook/entity/WfTextbookClaim.java

@@ -106,6 +106,11 @@ public class WfTextbookClaim implements Serializable {
     */
     @ApiModelProperty("申领类型(xjr_dictionary_item[claim_type])")
     private String claimType;
+    /**
+     * 选择教材范围(1:全部,2:本班)
+     */
+    @ApiModelProperty("选择教材范围(1:全部,2:本班)")
+    private String  textbookScope;
     /**
     * 代领取人
     */

+ 2 - 0
src/main/java/com/xjrsoft/module/textbook/service/impl/TextbookIssueRecordServiceImpl.java

@@ -9,6 +9,7 @@ import com.github.yulichang.base.MPJBaseServiceImpl;
 import com.github.yulichang.wrapper.MPJLambdaWrapper;
 import com.xjrsoft.common.enums.ArchivesStatusEnum;
 import com.xjrsoft.common.enums.ClaimTypeEnum;
+import com.xjrsoft.common.enums.IssueModeEnum;
 import com.xjrsoft.common.enums.RecedeTypeEnum;
 import com.xjrsoft.common.exception.MyException;
 import com.xjrsoft.common.page.ConventPage;
@@ -348,6 +349,7 @@ public class TextbookIssueRecordServiceImpl extends MPJBaseServiceImpl<TextbookI
                                         wra -> wra
                                                 .selectAs(BaseClassroom::getName, TextbookClaimRecordExportVo::getClassroomIdCn)
                                 )
+                                .ne(WfTextbookClaim::getTextbookScope, 1)
                 )
                 .leftJoin(Textbook.class, Textbook::getId, TextbookIssueRecord::getTextbookId,
                         wrapper -> wrapper

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

@@ -403,7 +403,7 @@ public class WfTextbookClaimServiceImpl extends MPJBaseServiceImpl<WfTextbookCla
                 if (ObjectUtils.isNotEmpty(wfTextbookClaim.getClaimType())
                         && wfTextbookClaim.getClaimType().equals(ClaimTypeEnum.ClaimStudent.getCode())
                 ) {
-                    textbookIssueRecord.setIssueMode(IssueModeEnum.Imtudent.getCode());
+                    textbookIssueRecord.setIssueMode(IssueModeEnum.ImStudent.getCode());
                 }
                 if (ObjectUtils.isNotEmpty(wfTextbookClaim.getClaimType())
                         && wfTextbookClaim.getClaimType().equals(ClaimTypeEnum.ClaimClass.getCode())