报错调整

src/main/java/com/xjrsoft/module/student/controller/BaseStudentPunishmentInfoController.java

@@ -12,6 +12,7 @@ import com.xjrsoft.module.student.dto.BaseStudentPunishmentInfoMobilePageDto;
 import com.xjrsoft.module.student.dto.BaseStudentPunishmentInfoPageDto;
 import com.xjrsoft.module.student.dto.UpdateBaseStudentPunishmentInfoDto;
 import com.xjrsoft.module.student.entity.BaseStudentPunishmentInfo;
+import com.xjrsoft.module.student.service.IBasePunishmentTypeService;
 import com.xjrsoft.module.student.service.IBaseStudentPunishmentInfoService;
 import com.xjrsoft.module.student.vo.BaseStudentPunishmentInfoDetailVo;
 import com.xjrsoft.module.student.vo.BaseStudentPunishmentInfoMobileDetailVo;
@@ -43,8 +44,7 @@ import java.util.List;
 @Api(value = "/student"  + "/basestudentpunishmentinfo",tags = "学生处分信息管理代码")
 @AllArgsConstructor
 public class BaseStudentPunishmentInfoController {
-
-
+    private final IBasePunishmentTypeService punishmentTypeService;
     private final IBaseStudentPunishmentInfoService baseStudentPunishmentInfoService;
 
     @GetMapping(value = "/page")

src/main/java/com/xjrsoft/module/student/service/IBasePunishmentTypeService.java

@@ -0,0 +1,15 @@
+package com.xjrsoft.module.student.service;
+
+import com.github.yulichang.base.MPJBaseService;
+import com.xjrsoft.module.student.entity.BasePunishmentType;
+
+/**
+* @title: 学生处分类型管理
+* @Author dzx
+* @Date: 2023-11-15
+* @Version 1.0
+*/
+
+public interface IBasePunishmentTypeService extends MPJBaseService<BasePunishmentType> {
+
+}

src/main/java/com/xjrsoft/module/student/service/impl/BasePunishmentTypeServiceImpl.java

@@ -0,0 +1,19 @@
+package com.xjrsoft.module.student.service.impl;
+
+import com.github.yulichang.base.MPJBaseServiceImpl;
+import com.xjrsoft.module.student.entity.BasePunishmentType;
+import com.xjrsoft.module.student.mapper.BasePunishmentTypeMapper;
+import com.xjrsoft.module.student.service.IBasePunishmentTypeService;
+import lombok.AllArgsConstructor;
+import org.springframework.stereotype.Service;
+
+/**
+* @title: 学生处分信息管理
+* @Author dzx
+* @Date: 2023-11-15
+* @Version 1.0
+*/
+@Service
+@AllArgsConstructor
+public class BasePunishmentTypeServiceImpl extends MPJBaseServiceImpl<BasePunishmentTypeMapper, BasePunishmentType> implements IBasePunishmentTypeService {
+}

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

@@ -943,6 +943,8 @@ public class TextbookServiceImpl extends MPJBaseServiceImpl<TextbookMapper, Text
                     .orElse("no");
             textbook.setIsTextbookPlan(isTextbookPlan);
 
+
+
             // 处理教材类型映射
             String textbookTypeCn = textbookImportDto.getTextbookTypeCn();
             String textbookTypeCode = Optional.ofNullable(textbookTypeCn)

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

@@ -141,16 +141,19 @@
             t1.object_id as objectId
         from evaluate_result t
                  left join evaluate_object t1 on t1.id = t.evaluated_object_id
-        where t.evaluate_item_id in
-        <foreach item="evaluateManageItemId" index="index" collection="evaluateManageItemIdList" open="(" close=")"
-                 separator=",">
-            #{evaluateManageItemId}
-        </foreach>
-          and t1.object_id in
-        <foreach item="evaluateObjectId" index="index" collection="evaluateObjectIdList" open="(" close=")"
-                 separator=",">
-            #{evaluateObjectId}
-        </foreach>
+        where 1 = 1
+        <if test="evaluateObjectIdList != null and evaluateObjectIdList.size() > 0">
+            and t.evaluate_item_id in
+            <foreach item="evaluateManageItemId" index="index" collection="evaluateManageItemIdList" open="(" close=")" separator=",">
+                #{evaluateManageItemId}
+            </foreach>
+        </if>
+        <if test="evaluateObjectIdList != null and evaluateObjectIdList.size() > 0">
+            and t1.object_id in
+            <foreach item="evaluateObjectId" index="index" collection="evaluateObjectIdList" open="(" close=")" separator=",">
+                #{evaluateObjectId}
+            </foreach>
+        </if>
         group by t1.object_id, t.evaluate_item_id;
     </select>
 
@@ -161,16 +164,19 @@
         from evaluate_result t
         left join evaluate_object t1 on t1.id = t.evaluated_object_id
         left join evaluate_manage_item t2 on t2.id = t.evaluate_item_id
-        where t.evaluate_item_id in
-        <foreach item="evaluateManageItemId" index="index" collection="evaluateManageItemIdList" open="(" close=")"
-                 separator=",">
-            #{evaluateManageItemId}
-        </foreach>
-        and t1.object_id in
-        <foreach item="evaluateObjectId" index="index" collection="evaluateObjectIdList" open="(" close=")"
-                 separator=",">
-            #{evaluateObjectId}
-        </foreach>
+        where 1 = 1
+        <if test="evaluateObjectIdList != null and evaluateObjectIdList.size() > 0">
+            and t.evaluate_item_id in
+            <foreach item="evaluateManageItemId" index="index" collection="evaluateManageItemIdList" open="(" close=")" separator=",">
+                #{evaluateManageItemId}
+            </foreach>
+        </if>
+        <if test="evaluateObjectIdList != null and evaluateObjectIdList.size() > 0">
+            and t1.object_id in
+            <foreach item="evaluateObjectId" index="index" collection="evaluateObjectIdList" open="(" close=")" separator=",">
+                #{evaluateObjectId}
+            </foreach>
+        </if>
         group by t1.object_id, t2.topic;
     </select>
 
@@ -179,16 +185,19 @@
         t1.object_id       as objectId
         from evaluate_result t
         left join evaluate_object t1 on t1.id = t.evaluated_object_id
-        where t.evaluate_item_id in
-        <foreach item="evaluateManageItemId" index="index" collection="evaluateManageItemIdList" open="(" close=")"
-                 separator=",">
-            #{evaluateManageItemId}
-        </foreach>
-        and t1.object_id in
-        <foreach item="evaluateObjectId" index="index" collection="evaluateObjectIdList" open="(" close=")"
-                 separator=",">
-            #{evaluateObjectId}
-        </foreach>
+        where 1 = 1
+        <if test="evaluateObjectIdList != null and evaluateObjectIdList.size() > 0">
+            and t.evaluate_item_id in
+            <foreach item="evaluateManageItemId" index="index" collection="evaluateManageItemIdList" open="(" close=")" separator=",">
+                #{evaluateManageItemId}
+            </foreach>
+        </if>
+        <if test="evaluateObjectIdList != null and evaluateObjectIdList.size() > 0">
+            and t1.object_id in
+            <foreach item="evaluateObjectId" index="index" collection="evaluateObjectIdList" open="(" close=")" separator=",">
+                #{evaluateObjectId}
+            </foreach>
+        </if>
         group by t1.object_id;
     </select>