评价管理接口

src/main/java/com/xjrsoft/module/evaluate/controller/EvaluateObjectController.java

@@ -4,6 +4,7 @@ import cn.dev33.satoken.annotation.SaCheckPermission;
 import com.xjrsoft.common.model.result.RT;
 import com.xjrsoft.module.evaluate.dto.EvaluateObjectGradeListDto;
 import com.xjrsoft.module.evaluate.dto.EvaluateObjectListDto;
+import com.xjrsoft.module.evaluate.dto.ObjectGradeDeleteDto;
 import com.xjrsoft.module.evaluate.dto.SaveEvaluateObjectDto;
 import com.xjrsoft.module.evaluate.service.IEvaluateObjectService;
 import com.xjrsoft.module.evaluate.vo.EvaluateObjectGradeListVo;
@@ -47,6 +48,13 @@ public class EvaluateObjectController {
         return RT.ok(list);
     }
 
+    @DeleteMapping(value = "/object-grade-delete")
+    @ApiOperation(value = "删除根据年级评价对象根据年级分组的列表（已生成数据）")
+    @SaCheckPermission("evaluateobject:delete")
+    public RT<Boolean> objectGradeDelete(@Valid @RequestBody ObjectGradeDeleteDto dto){
+        return RT.ok(evaluateObjectService.objectGradeDelete(dto));
+    }
+
     @PostMapping
     @ApiOperation(value = "评价对象保存")
     @SaCheckPermission("evaluateobject:save")

src/main/java/com/xjrsoft/module/evaluate/dto/EvaluateManageScoreDto.java

@@ -0,0 +1,38 @@
+package com.xjrsoft.module.evaluate.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+
+/**
+* @title: 入参
+* @Author dzx
+* @Date: 2024-01-16
+* @Version 1.0
+*/
+@Data
+public class EvaluateManageScoreDto implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 评价管理编号
+    */
+    @ApiModelProperty("评价管理编号")
+    private List<Long> evaluateManageIdList;
+
+    /**
+     * 被评对象编号
+     */
+    @ApiModelProperty("被评对象编号")
+    private List<Long> evaluateObjectIdList;
+
+    /**
+     * 当前登录用户id
+     */
+    @ApiModelProperty("当前登录用户id")
+    private Long userId;
+}

src/main/java/com/xjrsoft/module/evaluate/dto/ObjectGradeDeleteDto.java

@@ -0,0 +1,29 @@
+package com.xjrsoft.module.evaluate.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+
+/**
+* @title: 评价对象根据年级分组的列表（已生成数据）删除入参
+* @Author dzx
+* @Date: 2024-01-16
+* @Version 1.0
+*/
+@Data
+public class ObjectGradeDeleteDto implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 评价管理编号
+    */
+    @ApiModelProperty("评价管理编号")
+    private String evaluateManageId;
+
+    @ApiModelProperty("年级主键编号")
+    private String gradeId;
+
+}

src/main/java/com/xjrsoft/module/evaluate/mapper/EvaluateManageMapper.java

@@ -3,6 +3,7 @@ package com.xjrsoft.module.evaluate.mapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.github.yulichang.base.MPJBaseMapper;
 import com.xjrsoft.module.evaluate.dto.EvaluateManagePageDto;
+import com.xjrsoft.module.evaluate.dto.EvaluateManageScoreDto;
 import com.xjrsoft.module.evaluate.dto.EvaluateWritePageDto;
 import com.xjrsoft.module.evaluate.entity.EvaluateManage;
 import com.xjrsoft.module.evaluate.vo.EvaluateManageItemVo;
@@ -48,5 +49,5 @@ public interface EvaluateManageMapper extends MPJBaseMapper<EvaluateManage> {
 
     List<EvaluateManageItemVo> getResultList(Long id, Long userId);
 
-    List<EvaluateManageScoreVo> getScoreList(@Param("userId") Long userId);
+    List<EvaluateManageScoreVo> getScoreList(@Param("dto")EvaluateManageScoreDto dto);
 }

src/main/java/com/xjrsoft/module/evaluate/mapper/EvaluateObjectMapper.java

@@ -2,6 +2,7 @@ package com.xjrsoft.module.evaluate.mapper;
 
 import com.github.yulichang.base.MPJBaseMapper;
 import com.xjrsoft.module.evaluate.dto.EvaluateObjectListDto;
+import com.xjrsoft.module.evaluate.dto.ObjectGradeDeleteDto;
 import com.xjrsoft.module.evaluate.entity.EvaluateObject;
 import com.xjrsoft.module.evaluate.vo.EvaluateExecuterVo;
 import com.xjrsoft.module.evaluate.vo.EvaluateObjectListVo;
@@ -29,4 +30,10 @@ public interface EvaluateObjectMapper extends MPJBaseMapper<EvaluateObject> {
 
     @Delete("DELETE FROM evaluate_object WHERE evaluate_manage_id = #{evaluateManageId}")
     Boolean deleteByEvaluateManageId(Long evaluateManageId);
+
+    Boolean objectGradeDeleteExecuter(@Param("dto") ObjectGradeDeleteDto dto);
+
+    Boolean objectGradeDeleteObject(@Param("dto") ObjectGradeDeleteDto dto);
+
+
 }

src/main/java/com/xjrsoft/module/evaluate/service/IEvaluateObjectService.java

@@ -3,6 +3,7 @@ package com.xjrsoft.module.evaluate.service;
 import com.github.yulichang.base.MPJBaseService;
 import com.xjrsoft.module.evaluate.dto.EvaluateObjectGradeListDto;
 import com.xjrsoft.module.evaluate.dto.EvaluateObjectListDto;
+import com.xjrsoft.module.evaluate.dto.ObjectGradeDeleteDto;
 import com.xjrsoft.module.evaluate.dto.SaveEvaluateObjectDto;
 import com.xjrsoft.module.evaluate.entity.EvaluateObject;
 import com.xjrsoft.module.evaluate.vo.EvaluateObjectGradeListVo;
@@ -23,6 +24,8 @@ public interface IEvaluateObjectService extends MPJBaseService<EvaluateObject> {
 
     List<EvaluateObjectGradeListVo> getObjectGradeList(EvaluateObjectGradeListDto dto);
 
+    Boolean objectGradeDelete(ObjectGradeDeleteDto dto);
+
     Boolean save(SaveEvaluateObjectDto dto);
 
     List<EvaluateObjectListVo> getNewObjectList(EvaluateObjectListDto dto);

src/main/java/com/xjrsoft/module/evaluate/service/impl/EvaluateManageServiceImpl.java

@@ -6,30 +6,24 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.github.yulichang.base.MPJBaseServiceImpl;
+import com.github.yulichang.wrapper.MPJLambdaWrapper;
 import com.xjrsoft.common.exception.MyException;
 import com.xjrsoft.module.evaluate.dto.EvaluateManagePageDto;
+import com.xjrsoft.module.evaluate.dto.EvaluateManageScoreDto;
 import com.xjrsoft.module.evaluate.dto.EvaluateWritePageDto;
-import com.xjrsoft.module.evaluate.entity.EvaluateExecuter;
-import com.xjrsoft.module.evaluate.entity.EvaluateItem;
-import com.xjrsoft.module.evaluate.entity.EvaluateManage;
-import com.xjrsoft.module.evaluate.entity.EvaluateManageItem;
-import com.xjrsoft.module.evaluate.entity.EvaluateObject;
-import com.xjrsoft.module.evaluate.mapper.EvaluateExecuterMapper;
-import com.xjrsoft.module.evaluate.mapper.EvaluateItemMapper;
-import com.xjrsoft.module.evaluate.mapper.EvaluateManageItemMapper;
-import com.xjrsoft.module.evaluate.mapper.EvaluateManageMapper;
-import com.xjrsoft.module.evaluate.mapper.EvaluateObjectMapper;
+import com.xjrsoft.module.evaluate.entity.*;
+import com.xjrsoft.module.evaluate.mapper.*;
 import com.xjrsoft.module.evaluate.service.IEvaluateManageService;
-import com.xjrsoft.module.evaluate.vo.EvaluateManageItemVo;
-import com.xjrsoft.module.evaluate.vo.EvaluateManagePageVo;
-import com.xjrsoft.module.evaluate.vo.EvaluateManageScoreVo;
-import com.xjrsoft.module.evaluate.vo.EvaluateWritePageVo;
-import com.xjrsoft.module.evaluate.vo.EvaluateWriteVo;
+import com.xjrsoft.module.evaluate.vo.*;
 import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
 * @title: 评价管理
@@ -108,18 +102,61 @@ public class EvaluateManageServiceImpl extends MPJBaseServiceImpl<EvaluateManage
     @Override
     public Page<EvaluateWritePageVo> getMobilePage(Page<EvaluateWritePageDto> page, EvaluateWritePageDto dto) {
         Page<EvaluateWritePageVo> mobilePage = evaluateManageMapper.getMobilePage(page, dto);
-        if(dto.getStatus() == 1){
-            List<EvaluateManageScoreVo> scoreList = evaluateManageMapper.getScoreList(StpUtil.getLoginIdAsLong());
+        //获取所有评价管理下的所有的已评对象的得分
+        Map<String, Map<String, Integer>> scoreByManageIdAndObject = new HashMap<>();
+        Map<String, Integer> itemScore = new HashMap<>();
+        if(dto != null && dto.getStatus() != null && dto.getStatus() == 1){
+            List<Long> evaluateManageIdList = new ArrayList<>();
+            List<Long> evaluateObjectIdList = new ArrayList<>();
             for (EvaluateWritePageVo record : mobilePage.getRecords()) {
-                for (EvaluateManageScoreVo evaluateManageScoreVo : scoreList) {
-                    if(!record.getId().equals(evaluateManageScoreVo.getEvaluateManageId())){
-                        continue;
+                evaluateManageIdList.add(Long.parseLong(record.getEvaluateManageId()));
+                evaluateObjectIdList.add(Long.parseLong(record.getEvaluateObjectId()));
+            }
+
+            //获取评价管理下的模板下的题目数量
+            if(evaluateManageIdList.size() > 0){
+                MPJLambdaWrapper<EvaluateManageItem> evaluateManageItemMPJLambdaWrapper = new MPJLambdaWrapper<>();
+                evaluateManageItemMPJLambdaWrapper
+                        .selectCount(EvaluateManageItem::getId, EvaluateWritePageVo::getItemCount)
+                        .selectAs(EvaluateManageItem::getEvaluateManageId, EvaluateWritePageVo::getEvaluateManageId)
+                        .in(EvaluateManageItem::getEvaluateManageId, evaluateManageIdList)
+                        .disableSubLogicDel();
+                List<EvaluateWritePageVo> evaluateWritePageVoList = evaluateManageItemMapper.selectJoinList(EvaluateWritePageVo.class, evaluateManageItemMPJLambdaWrapper);
+                for (EvaluateWritePageVo e : evaluateWritePageVoList) {
+                    itemScore.put(e.getEvaluateManageId(), e.getItemCount());
+                }
+            }
+
+            if(evaluateManageIdList.size() > 0 && evaluateObjectIdList.size() > 0){
+                List<EvaluateManageScoreVo> scoreList = evaluateManageMapper.getScoreList(new EvaluateManageScoreDto(){{
+                    setEvaluateManageIdList(evaluateManageIdList);
+                    setEvaluateObjectIdList(evaluateObjectIdList);
+                    setUserId(StpUtil.getLoginIdAsLong());
+                }});
+
+                //将scoreList解析成map
+                Map<String, List<EvaluateManageScoreVo>> scoreByManageId = scoreList.stream()
+                        .collect(Collectors.groupingBy(EvaluateManageScoreVo::getEvaluateManageId));
+
+                for (Map.Entry<String, List<EvaluateManageScoreVo>> entry : scoreByManageId.entrySet()) {
+                    Map<String, Integer> scoreByObject = new HashMap<>();
+                    for (EvaluateManageScoreVo evaluateManageScoreVo : entry.getValue()) {
+                        scoreByObject.put(evaluateManageScoreVo.getEvaluateObjectId(), evaluateManageScoreVo.getScore());
                     }
-                    record.setTotalScore(evaluateManageScoreVo.getScore());
+                    scoreByManageIdAndObject.put(entry.getKey(), scoreByObject);
                 }
             }
         }
 
+        for (EvaluateWritePageVo record : mobilePage.getRecords()) {
+            if(scoreByManageIdAndObject.size() > 0){
+                record.setTotalScore(scoreByManageIdAndObject.get(record.getEvaluateManageId()).get(record.getObjectId()));
+            }
+            if(itemScore.size() > 0){
+                record.setItemCount(itemScore.get(record.getEvaluateManageId()));
+            }
+        }
+
         return mobilePage;
     }
 

src/main/java/com/xjrsoft/module/evaluate/service/impl/EvaluateObjectServiceImpl.java

@@ -21,11 +21,10 @@ import com.xjrsoft.module.evaluate.vo.EvaluateObjectGradeListVo;
 import com.xjrsoft.module.evaluate.vo.EvaluateObjectListVo;
 import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Random;
+import java.util.*;
+import java.util.stream.Collectors;
 
 /**
 * @title: 评价管理
@@ -46,8 +45,13 @@ public class EvaluateObjectServiceImpl extends MPJBaseServiceImpl<EvaluateObject
     public List<EvaluateObjectListVo> getObjectList(EvaluateObjectListDto dto) {
         List<EvaluateObjectListVo> objectList = evaluateObjectMapper.getObjectList(dto);
         List<EvaluateExecuterVo> allExecuterList = evaluateObjectMapper.getExecuterList(dto);
+
+        Map<String, List<EvaluateExecuterVo>> groupEvaluateExecuterByEvaluateObjectId = allExecuterList.stream()
+                .collect(Collectors.groupingBy(EvaluateExecuterVo::getEvaluateObjectId));
         for (EvaluateObjectListVo objectVo : objectList) {
-            List<EvaluateExecuterVo> executerList = new ArrayList<>();
+            objectVo.setExecuterCount(groupEvaluateExecuterByEvaluateObjectId.get(objectVo.getId()).size());
+            objectVo.setExecuterList(groupEvaluateExecuterByEvaluateObjectId.get(objectVo.getId()));
+            /*List<EvaluateExecuterVo> executerList = new ArrayList<>();
             for (EvaluateExecuterVo executerVo : allExecuterList) {
                 if(objectVo.getId().equals(executerVo.getEvaluateObjectId())){
                     executerList.add(executerVo);
@@ -55,7 +59,7 @@ public class EvaluateObjectServiceImpl extends MPJBaseServiceImpl<EvaluateObject
             }
 
             objectVo.setExecuterCount(executerList.size());
-            objectVo.setExecuterList(executerList);
+            objectVo.setExecuterList(executerList);*/
         }
         return objectList;
     }
@@ -88,6 +92,14 @@ public class EvaluateObjectServiceImpl extends MPJBaseServiceImpl<EvaluateObject
         return this.selectJoinList(EvaluateObjectGradeListVo.class, evaluateObjectMPJLambdaWrapper);
     }
 
+    @Override
+    @Transactional
+    public Boolean objectGradeDelete(ObjectGradeDeleteDto dto) {
+        evaluateObjectMapper.objectGradeDeleteExecuter(dto);
+        evaluateObjectMapper.objectGradeDeleteObject(dto);
+        return true;
+    }
+
     @Override
     public Boolean save(SaveEvaluateObjectDto dto) {
         EvaluateManage manage = evaluateManageMapper.selectById(dto.getEvaluateManageId());

src/main/java/com/xjrsoft/module/evaluate/vo/EvaluateManageScoreVo.java

@@ -18,15 +18,10 @@ public class EvaluateManageScoreVo {
     @ApiModelProperty("评价管理编号")
     private String evaluateManageId;
     /**
-     * 被评对象id
+     * 评价对象编号
      */
-    @ApiModelProperty("被评对象id")
-    private Long objectId;
-    /**
-     * 被评对象id
-     */
-    @ApiModelProperty("被评对象id")
-    private String objectCN;
+    @ApiModelProperty("评价对象编号")
+    private String evaluateObjectId;
     /**
     * 题目分数（最小为0，只能整数）
     */

src/main/java/com/xjrsoft/module/evaluate/vo/EvaluateWritePageVo.java

@@ -18,7 +18,27 @@ public class EvaluateWritePageVo {
     * 主键编号
     */
     @ApiModelProperty("评价管理编号")
-    private String id;
+    private String evaluateManageId;
+    /**
+     * 评价对象编号
+     */
+    @ApiModelProperty("评价对象编号")
+    private String evaluateObjectId;
+    /**
+     * 评价对象具体人或班级编号
+     */
+    @ApiModelProperty("评价对象具体人或班级编号")
+    private String objectId;
+    /**
+     * 评价对象具体人或班级编号
+     */
+    @ApiModelProperty("评价对象具体人或班级编号")
+    private String objectIdCN;
+    /**
+     * 参评对象编号
+     */
+    @ApiModelProperty("参评对象编号")
+    private String evaluateUserId;
     /**
     * 评价类型-中文
     */

src/main/resources/mapper/evaluate/EvaluateManageMapper.xml

@@ -37,20 +37,37 @@
     </select>
 
     <select id="getMobilePage" parameterType="com.xjrsoft.module.evaluate.dto.EvaluateWritePageDto" resultType="com.xjrsoft.module.evaluate.vo.EvaluateWritePageVo">
-        SELECT t1.id, t1.name,t4.name AS evaluate_type_cn,t1.start_time,t1.end_time,t1.status,t2.user_id
-        FROM evaluate_manage t1
-        LEFT JOIN evaluate_executer t2 ON t1.id = t2.evaluate_manage_id
-        LEFT JOIN evaluate_template t3 ON t3.id = t1.evaluate_template_id
-        LEFT JOIN xjr_dictionary_detail t4 ON t4.code = t3.evaluate_type AND t4.item_id = 1746831039385366530
-        WHERE t1.delete_mark = 0 AND t2.delete_mark = 0 AND t1.status = 1
-        and t2.status = #{dto.status} and t2.user_id = #{dto.loginUserId}
+        select
+            t.id as evaluateObjectId,
+            t.object_id as objectId,
+            ifnull(t5.name, t6.name) as objectIdCN,
+            t1.id as evaluateManageId,
+            t1.name,
+            t4.name AS evaluate_type_cn,
+            t1.start_time,
+            t1.end_time,
+            t1.status,
+            t3.id as evaluateUserId,
+            (SELECT COUNT(id) FROM evaluate_manage_item a WHERE a.delete_mark = 0 AND a.evaluate_manage_id = t.evaluate_manage_id) AS item_count
+        from evaluate_object t
+                 left join evaluate_manage t1 on t1.id = t.evaluate_manage_id
+                 left join evaluate_template t2 on t2.id = t1.evaluate_template_id
+                 left join evaluate_executer t3 on t3.evaluate_object_id = t.id
+                 left join xjr_dictionary_detail t4 on t4.code = t2.evaluate_type
+                 left join xjr_user t5 on t5.id = t.object_id
+                 left join base_class t6 on t6.id = t.object_id
+        where t.delete_mark = 0
+          and t3.delete_mark = 0
+          and t1.status = 1
+          and t3.status = #{dto.status}
+          and t3.user_id = #{dto.loginUserId}
     </select>
 
     <select id="getWriteInfo" parameterType="com.xjrsoft.module.evaluate.dto.EvaluateWritePageDto" resultType="com.xjrsoft.module.evaluate.vo.EvaluateWriteVo">
         select t1.id, t1.name,t1.start_time,t1.end_time,
-        (SELECT COUNT(*) FROM evaluate_manage_item WHERE enabled_mark = 0 AND evaluate_item_id = t1.id) AS item_count
+               (SELECT COUNT(id) FROM evaluate_manage_item a WHERE t1.delete_mark = 0 AND a.evaluate_manage_id = t1.id) AS item_count
         from evaluate_manage t1
-        left join evaluate_template t2 on t2.id = t1.evaluate_template_id
+                 left join evaluate_template t2 on t2.id = t1.evaluate_template_id
         where t1.delete_mark = 0
         and t1.id = #{id}
     </select>
@@ -67,16 +84,29 @@
         AND t3.user_id = #{userId}
         ORDER BY t1.sort_code
     </select>
-    <select id="getScoreList" resultType="com.xjrsoft.module.evaluate.vo.EvaluateManageScoreVo">
-        select t2.evaluate_manage_id, t2.object_id, sum(t4.score)
-        from evaluate_executer t1
-                 left join evaluate_object t2 on t2.id = t1.evaluate_object_id
-                 left join evaluate_result t4 on t4.user_id = t1.id
-        where t1.delete_mark = 0
-          and t2.delete_mark = 0
-          and t1.user_id = #{userId}
+
+    <select id="getScoreList" parameterType="com.xjrsoft.module.evaluate.dto.EvaluateManageScoreDto" resultType="com.xjrsoft.module.evaluate.vo.EvaluateManageScoreVo">
+        select t.evaluate_manage_id,
+               t.id as evaluateObjectId,
+               sum(t2.score)
+        from evaluate_object t
+                 left join evaluate_executer t1 on t1.evaluate_object_id = t.id
+                 left join evaluate_result t2 on t2.evaluated_object_id = t.id
+        where t.delete_mark = 0
+          and t1.delete_mark = 0
+          and t.evaluate_manage_id in
+            <foreach item="evaluateManageItemId" index="index" collection="evaluateManageItemIdList" open="(" close=")"
+                     separator=",">
+                #{evaluateManageItemId}
+            </foreach>
+          and t.id in
+            <foreach item="evaluateManageItemId" index="index" collection="evaluateManageItemIdList" open="(" close=")"
+                     separator=",">
+                #{evaluateManageItemId}
+            </foreach>
+          and t1.user_id = #{dto.userId}
           and t1.status = 1
-        group by t2.evaluate_manage_id, t2.object_id
+        group by t.evaluate_manage_id, t.id
     </select>
 
 </mapper>

src/main/resources/mapper/evaluate/EvaluateObjectMapper.xml

@@ -5,7 +5,7 @@
 <mapper namespace="com.xjrsoft.module.evaluate.mapper.EvaluateObjectMapper">
     <select id="getObjectList" parameterType="com.xjrsoft.module.evaluate.dto.EvaluateObjectListDto"
             resultType="com.xjrsoft.module.evaluate.vo.EvaluateObjectListVo">
-        SELECT t1.id,t1.base_grade_id,t2.name AS grade_name,t1.object_id,t3.name AS object_name
+        SELECT distinct t1.id,t1.base_grade_id,t2.name AS grade_name,t1.object_id,t3.name AS object_name
         FROM evaluate_object t1
         LEFT JOIN base_grade t2 ON t2.id = t1.base_grade_id
         LEFT JOIN xjr_user t3 ON t3.id = t1.object_id
@@ -51,4 +51,15 @@
             and t1.grade_id = #{dto.gradeId}
         </if>
     </select>
+
+    <delete id="objectGradeDeleteExecuter" parameterType="com.xjrsoft.module.evaluate.dto.ObjectGradeDeleteDto">
+        delete t from evaluate_executer t
+        left join evaluate_object t1 on t1.id = t.evaluate_object_id
+        where t1.base_grade_id = #{dto.gradeId} and t.evaluate_manage_id = #{dto.evaluateManageId};
+    </delete>
+
+    <delete id="objectGradeDeleteObject" parameterType="com.xjrsoft.module.evaluate.dto.ObjectGradeDeleteDto">
+        delete from evaluate_object t
+        where t.base_grade_id = #{dto.gradeId} and t.evaluate_manage_id = #{dto.evaluateManageId};
+    </delete>
 </mapper>

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

@@ -34,7 +34,7 @@
         LEFT JOIN xjr_user t9 ON t1.receive_user_id = t9.id
         LEFT JOIN xjr_dictionary_detail t10 ON t3.textbook_type = t10.code AND t10.item_id = 1739209191193636865
         LEFT JOIN xjr_dictionary_detail t11 ON t1.issue_mode = t11.code AND t11.item_id = 1739821685805215745
-        WHERE t1.delete_mark = 0;
+        WHERE t1.delete_mark = 0
         <if test="dto.textbookType != null and dto.textbookType != ''">
             and t3.textbook_type = #{dto.textbookType}
         </if>