学生处分查询调整

src/main/java/com/xjrsoft/module/student/vo/BaseStudentPunishmentInfoPageVo.java

@@ -25,6 +25,9 @@ public class BaseStudentPunishmentInfoPageVo {
     @ApiModelProperty("处分学期")
     private String baseSemesterName;
 
+    @ApiModelProperty("学期id")
+    private Long baseSemesterId;
+
     /**
      * 处分类型id(base_punishment_type)
      */

src/main/java/com/xjrsoft/module/workflow/service/impl/WorkflowExecuteServiceImpl.java

@@ -4015,6 +4015,12 @@ public class WorkflowExecuteServiceImpl implements IWorkflowExecuteService {
             }
         }
 
+        //撤回后，删除xjr_workflow_form_relation表中的数据
+        formRelationService.remove(
+                new QueryWrapper<WorkflowFormRelation>().lambda()
+                        .eq(WorkflowFormRelation::getProcessId, dto.getProcessId())
+        );
+
         return true;
     }
 

src/main/resources/mapper/student/BaseStudentPunishmentInfoMapper.xml

@@ -88,7 +88,7 @@
             and t1.adjust_type is not null
         </if>
         <if test="dto.studentName != null and dto.studentName != ''">
-            and (t3.name like concat('$',#{dto.studentName},'%') or t3.credential_number like concat('$',#{dto.studentName},'%'))
+            and (t3.name like concat('%',#{dto.studentName},'%') or t3.credential_number like concat('%',#{dto.studentName},'%'))
         </if>
     </select>
 
@@ -161,7 +161,8 @@
         WHERE base_student_punishment_info_id = t.id
         ORDER BY adjust_date DESC LIMIT 1) as adjust_reason,
         (SELECT COUNT(*) FROM base_punishment_student_handle
-        WHERE base_student_punishment_info_id = t.id) as handle_count
+        WHERE base_student_punishment_info_id = t.id) as handle_count,
+        t.punishment_type_id,t.base_semester_id
         FROM base_student_punishment_info t
             INNER JOIN base_punishment_type t2 ON (t2.id = t.punishment_type_id)
             INNER JOIN xjr_user t5 ON (t.user_id = t5.id)