学生处分，查询条件实现

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

@@ -138,10 +138,13 @@ public class BaseStudentPunishmentInfoController {
         handle.setCreateDate(new Date());
         handle.setBaseStudentPunishmentInfoId(dto.getPunishmentInfoId());
         boolean save = handleService.save(handle);
-        BaseStudentPunishmentInfo punishmentInfo = baseStudentPunishmentInfoService.getById(dto.getPunishmentInfoId());
-        punishmentInfo.setPunishmentTypeId(dto.getPunishmentTypeId());
-        punishmentInfo.setModifyDate(new Date());
-        baseStudentPunishmentInfoService.updateById(punishmentInfo);
+        if(dto.getPunishmentTypeId() != null){
+            BaseStudentPunishmentInfo punishmentInfo = baseStudentPunishmentInfoService.getById(dto.getPunishmentInfoId());
+            punishmentInfo.setPunishmentTypeId(dto.getPunishmentTypeId());
+            punishmentInfo.setModifyDate(new Date());
+            baseStudentPunishmentInfoService.updateById(punishmentInfo);
+        }
+
         return RT.ok(save);
     }
 }

src/main/java/com/xjrsoft/module/student/dto/BaseStudentPunishmentInfoPageDto.java

@@ -31,4 +31,11 @@ public class BaseStudentPunishmentInfoPageDto extends PageInput {
 
     @ApiModelProperty("处分类型id")
     private Long punishmentTypeId;
+
+    @ApiModelProperty("姓名")
+    private String name;
+
+    @ApiModelProperty("身份证")
+    private String credentialNumber;
+
 }

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

@@ -49,6 +49,9 @@
         <if test="dto.endTime != null and dto.endTime != ''">
             and t.end_time = #{dto.endTime}
         </if>
+        <if test="dto.credentialNumber != null and dto.endTime != ''">
+            and t.end_time = #{dto.credentialNumber}
+        </if>
         ORDER BY t.id DESC;
     </select>