Merge remote-tracking branch 'origin/dev' into dev

Makefile

@@ -2,7 +2,7 @@ merge:
 	git checkout master;git merge dev;git push;git checkout dev;
 
 create-tag:
-	git checkout master;git tag v1.2.7;git push origin --tags;git checkout dev;
+	git checkout master;git tag v1.2.8;git push origin --tags;git checkout dev;
 
 remove-tag:
 	git tag -d v1.2.0;git push origin :refs/tags/v1.1.8;

src/main/java/com/xjrsoft/module/room/mapper/RoomBedMapper.java

@@ -44,9 +44,9 @@ public interface RoomBedMapper extends MPJBaseMapper<RoomBed> {
      */
     Page<RoomBedPageVo> getPage(Page<RoomBedPageVo> page, RoomBedPageDto dto);
 
-    Page<DistributeClassPageVo> getDistributeClassInfo(Page<DistributeClassPageVo> page, DistributeClassPageDto dto);
+    Page<DistributeClassPageVo> getDistributeClassInfo(Page<DistributeClassPageDto> page, DistributeClassPageDto dto);
 
-    Page<DistributeRoomBedPageVo> getDistributeRoomBedInfo(Page<DistributeRoomBedPageVo> page, DistributeRoomBedPageDto dto);
+    Page<DistributeRoomBedPageVo> getDistributeRoomBedInfo(Page<DistributeRoomBedPageDto> page, DistributeRoomBedPageDto dto);
 
     List<RoomBedVo> getBedInfo(List<Long> ids);
 
@@ -63,7 +63,7 @@ public interface RoomBedMapper extends MPJBaseMapper<RoomBed> {
      * @param dto
      * @return
      */
-    Page<AdjustBedClassPageVo> getClassStudetBed(Page<AdjustBedClassPageVo> page, @Param("dto") AdjustClassPageDto dto);
+    Page<AdjustBedClassPageVo> getClassStudetBed(Page<AdjustClassPageDto> page, @Param("dto") AdjustClassPageDto dto);
 
     /**
      * 调整床位，右边的床位学生信息
@@ -71,7 +71,7 @@ public interface RoomBedMapper extends MPJBaseMapper<RoomBed> {
      * @param dto
      * @return
      */
-    Page<AdjustBedStudentPageVo> getBedStudentInfo(Page<AdjustBedStudentPageVo> page, @Param("dto") AdjustBedPageDto dto);
+    Page<AdjustBedStudentPageVo> getBedStudentInfo(Page<AdjustBedPageDto> page, @Param("dto") AdjustBedPageDto dto);
 
 
     /**
@@ -80,6 +80,6 @@ public interface RoomBedMapper extends MPJBaseMapper<RoomBed> {
      * @param dto
      * @return
      */
-    Page<NoBedStudentPageVo> getNoBedStudent(Page<NoBedStudentPageVo> page, AdjustBedPageDto dto);
+    Page<NoBedStudentPageVo> getNoBedStudent(Page<AdjustBedPageDto> page, AdjustBedPageDto dto);
 
 }

src/main/java/com/xjrsoft/module/room/mapper/RoomTeacherAppointMapper.java

@@ -21,5 +21,5 @@ public interface RoomTeacherAppointMapper extends MPJBaseMapper<RoomTeacherAppoi
      * @param dto
      * @return
      */
-    Page<RoomTeacherAppointPageVo> getPage(Page<RoomTeacherAppointPageVo> page, RoomTeacherAppointPageDto dto);
+    Page<RoomTeacherAppointPageVo> getPage(Page<RoomTeacherAppointPageDto> page, RoomTeacherAppointPageDto dto);
 }

src/main/java/com/xjrsoft/module/room/service/IRoomBedService.java

@@ -47,7 +47,7 @@ public interface IRoomBedService extends MPJBaseService<RoomBed> {
      * @param dto
      * @return
      */
-    Page<DistributeClassPageVo> getDistributeClassInfo(Page<DistributeClassPageVo> page, DistributeClassPageDto dto);
+    Page<DistributeClassPageVo> getDistributeClassInfo(Page<DistributeClassPageDto> page, DistributeClassPageDto dto);
 
     /**
      * 分配床位，第二步查询班级
@@ -55,7 +55,7 @@ public interface IRoomBedService extends MPJBaseService<RoomBed> {
      * @param dto
      * @return
      */
-    Page<DistributeRoomBedPageVo> getDistributeRoomBedInfo(Page<DistributeRoomBedPageVo> page, DistributeRoomBedPageDto dto);
+    Page<DistributeRoomBedPageVo> getDistributeRoomBedInfo(Page<DistributeRoomBedPageDto> page, DistributeRoomBedPageDto dto);
 
     Boolean distributeRoomBed(DistributeRoomBedDto dto);
 
@@ -72,7 +72,7 @@ public interface IRoomBedService extends MPJBaseService<RoomBed> {
      * @param dto
      * @return
      */
-    Page<AdjustBedClassPageVo> getClassStudetBed(Page<AdjustBedClassPageVo> page, AdjustClassPageDto dto);
+    Page<AdjustBedClassPageVo> getClassStudetBed(Page<AdjustClassPageDto> page, AdjustClassPageDto dto);
 
     /**
      * 调整床位，右边的床位学生信息
@@ -80,7 +80,7 @@ public interface IRoomBedService extends MPJBaseService<RoomBed> {
      * @param dto
      * @return
      */
-    Page<AdjustBedStudentPageVo> getBedStudetInfo(Page<AdjustBedStudentPageVo> page, AdjustBedPageDto dto);
+    Page<AdjustBedStudentPageVo> getBedStudetInfo(Page<AdjustBedPageDto> page, AdjustBedPageDto dto);
 
     /**
      * 未分配床位的学生信息
@@ -88,5 +88,5 @@ public interface IRoomBedService extends MPJBaseService<RoomBed> {
      * @param dto
      * @return
      */
-    Page<NoBedStudentPageVo> getNoBedStudent(Page<NoBedStudentPageVo> page, AdjustBedPageDto dto);
+    Page<NoBedStudentPageVo> getNoBedStudent(Page<AdjustBedPageDto> page, AdjustBedPageDto dto);
 }

src/main/java/com/xjrsoft/module/room/service/IRoomTeacherAppointService.java

@@ -24,7 +24,7 @@ public interface IRoomTeacherAppointService extends MPJBaseService<RoomTeacherAp
      * @param dto
      * @return
      */
-    Page<RoomTeacherAppointPageVo> getPage(Page<RoomTeacherAppointPageVo> page, RoomTeacherAppointPageDto dto);
+    Page<RoomTeacherAppointPageVo> getPage(Page<RoomTeacherAppointPageDto> page, RoomTeacherAppointPageDto dto);
 
     Boolean clearAppoint(List<Long> ids);
 

src/main/java/com/xjrsoft/module/room/service/impl/RoomBedServiceImpl.java

@@ -89,12 +89,12 @@ public class RoomBedServiceImpl extends MPJBaseServiceImpl<RoomBedMapper, RoomBe
     }
 
     @Override
-    public Page<DistributeClassPageVo> getDistributeClassInfo(Page<DistributeClassPageVo> page, DistributeClassPageDto dto) {
+    public Page<DistributeClassPageVo> getDistributeClassInfo(Page<DistributeClassPageDto> page, DistributeClassPageDto dto) {
         return roomBedMapper.getDistributeClassInfo(page, dto);
     }
 
     @Override
-    public Page<DistributeRoomBedPageVo> getDistributeRoomBedInfo(Page<DistributeRoomBedPageVo> page, DistributeRoomBedPageDto dto) {
+    public Page<DistributeRoomBedPageVo> getDistributeRoomBedInfo(Page<DistributeRoomBedPageDto> page, DistributeRoomBedPageDto dto) {
         return roomBedMapper.getDistributeRoomBedInfo(page, dto);
     }
 
@@ -210,18 +210,18 @@ public class RoomBedServiceImpl extends MPJBaseServiceImpl<RoomBedMapper, RoomBe
     }
 
     @Override
-    public Page<AdjustBedClassPageVo> getClassStudetBed(Page<AdjustBedClassPageVo> page, AdjustClassPageDto dto) {
+    public Page<AdjustBedClassPageVo> getClassStudetBed(Page<AdjustClassPageDto> page, AdjustClassPageDto dto) {
         Page<AdjustBedClassPageVo> result = roomBedMapper.getClassStudetBed(page, dto);
         return result;
     }
 
     @Override
-    public Page<AdjustBedStudentPageVo> getBedStudetInfo(Page<AdjustBedStudentPageVo> page, AdjustBedPageDto dto) {
+    public Page<AdjustBedStudentPageVo> getBedStudetInfo(Page<AdjustBedPageDto> page, AdjustBedPageDto dto) {
         return roomBedMapper.getBedStudentInfo(page, dto);
     }
 
     @Override
-    public Page<NoBedStudentPageVo> getNoBedStudent(Page<NoBedStudentPageVo> page, AdjustBedPageDto dto) {
+    public Page<NoBedStudentPageVo> getNoBedStudent(Page<AdjustBedPageDto> page, AdjustBedPageDto dto) {
         return roomBedMapper.getNoBedStudent(page, dto);
     }
 }

src/main/java/com/xjrsoft/module/room/service/impl/RoomTeacherAppointServiceImpl.java

@@ -29,7 +29,7 @@ import java.util.List;
 public class RoomTeacherAppointServiceImpl extends MPJBaseServiceImpl<RoomTeacherAppointMapper, RoomTeacherAppoint> implements IRoomTeacherAppointService {
     private final RoomTeacherAppointMapper roomTeacherAppointMapper;
     @Override
-    public Page<RoomTeacherAppointPageVo> getPage(Page<RoomTeacherAppointPageVo> page, RoomTeacherAppointPageDto dto) {
+    public Page<RoomTeacherAppointPageVo> getPage(Page<RoomTeacherAppointPageDto> page, RoomTeacherAppointPageDto dto) {
         return roomTeacherAppointMapper.getPage(page, dto);
     }
 

src/main/java/com/xjrsoft/module/system/controller/MenuController.java

@@ -171,6 +171,7 @@ public class MenuController {
     @GetMapping("/simple-tree")
     @ApiOperation(value = "获取所有菜单（树结构）")
     public R menuAuthTree(@Valid MenuTreeDto dto) {
+        dto.setDisplay(null);
         List<MenuVo> list = menuService.getAuthMenuList(dto);
         List<MenuSimpleTreeVo> voList = BeanUtil.copyToList(list, MenuSimpleTreeVo.class);
         List<MenuSimpleTreeVo> treeVoList = TreeUtil.build(voList);

src/main/java/com/xjrsoft/module/system/dto/MenuTreeDto.java

@@ -30,4 +30,7 @@ public class MenuTreeDto {
     private String code;
 
     private Integer enabledMark;
+
+    // 菜单是否显示 0=隐藏 1=显示
+    private Integer display = 1;
 }

src/main/java/com/xjrsoft/module/system/service/impl/MenuServiceImpl.java

@@ -167,7 +167,7 @@ public class MenuServiceImpl extends MPJBaseServiceImpl<MenuMapper, Menu> implem
                         .like(StrUtil.isNotBlank(dto.getCode()), Menu::getCode, dto.getCode())
                         .like(StrUtil.isNotBlank(dto.getName()), Menu::getName, dto.getName())
                         .eq(ObjectUtil.isNotEmpty(dto.getSystemType()), Menu::getSystemType, dto.getSystemType())
-                        .eq(Menu::getDisplay, 1) // 只查询显示菜单
+                        .eq(ObjectUtil.isNotEmpty(dto.getDisplay()),Menu::getDisplay, dto.getDisplay())
                         .in(CollectionUtils.isNotEmpty(authMenuIdList), Menu::getId, authMenuIdList)
                         .select(Menu::getId)
                         .selectAs(Subsystem::getName, MenuVo::getSystemName)

src/main/java/com/xjrsoft/module/textbook/controller/TextbookController.java

@@ -73,7 +73,7 @@ public class TextbookController {
     public RT<TextbookVo> infoByissn(@RequestParam String issn){
         TextbookVo textbook = textbookService.getInfoByissn(issn);
         if (textbook == null) {
-            return RT.error("找不到此数据！");
+            return RT.ok();
         }
         return RT.ok(textbook);
     }

src/main/java/com/xjrsoft/module/weekly/controller/WeeklyDutyScheduleController.java

@@ -78,6 +78,7 @@ public class WeeklyDutyScheduleController {
 
     @GetMapping("/export")
     @ApiOperation(value = "导出")
+
     public ResponseEntity<byte[]> exportData(@Valid WeeklyDutySchedulePageDto dto, @RequestParam(defaultValue = "false") Boolean isTemplate) {
         List<WeeklyDutySchedule> list = weeklyDutyScheduleService.list();
         List<WeeklyDutyScheduleListVo> customerList = new ArrayList<>();

src/main/java/com/xjrsoft/module/weekly/service/impl/WeeklyDutyScheduleServiceImpl.java

@@ -1,9 +1,7 @@
 package com.xjrsoft.module.weekly.service.impl;
 
 import cn.dev33.satoken.stp.StpUtil;
-import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.ObjectUtil;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.github.yulichang.base.MPJBaseServiceImpl;
 import com.xjrsoft.common.enums.DeleteMark;
 import com.xjrsoft.common.enums.EnabledMark;
@@ -11,7 +9,6 @@ import com.xjrsoft.common.exception.MyException;
 import com.xjrsoft.module.weekly.entity.WeeklyDutySchedule;
 import com.xjrsoft.module.weekly.mapper.WeeklyDutyScheduleMapper;
 import com.xjrsoft.module.weekly.service.IWeeklyDutyScheduleService;
-import com.xjrsoft.module.weekly.vo.WeeklyDutySchedulePageVo;
 import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Service;
 

src/main/java/com/xjrsoft/module/weekly/vo/WeeklyDutyScheduleListVo.java

@@ -1,7 +1,12 @@
 package com.xjrsoft.module.weekly.vo;
 
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentFontStyle;
 import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadFontStyle;
+import com.alibaba.excel.annotation.write.style.HeadStyle;
+import com.alibaba.excel.enums.poi.FillPatternTypeEnum;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -12,8 +17,10 @@ import lombok.Data;
 * @Version 1.0
 */
 @Data
+@HeadStyle(fillPatternType = FillPatternTypeEnum.SOLID_FOREGROUND, fillForegroundColor = 40)
 public class WeeklyDutyScheduleListVo {
 
+    @HeadFontStyle(color = 9)
     @ContentStyle(dataFormat = 49)
     @ExcelProperty("序号")
     @ApiModelProperty("序号")
@@ -22,6 +29,8 @@ public class WeeklyDutyScheduleListVo {
     /**
     * 学号/工号
     */
+    @ColumnWidth(20)
+    @HeadFontStyle(color = 9)
     @ContentStyle(dataFormat = 60)
     @ExcelProperty("工号")
     @ApiModelProperty("工号")
@@ -29,6 +38,8 @@ public class WeeklyDutyScheduleListVo {
     /**
     * 姓名
     */
+    @ColumnWidth(15)
+    @HeadFontStyle(color = 9)
     @ContentStyle(dataFormat = 60)
     @ExcelProperty("姓名")
     @ApiModelProperty("姓名")
@@ -36,6 +47,8 @@ public class WeeklyDutyScheduleListVo {
     /**
     * 性别
     */
+    @ColumnWidth(15)
+    @HeadFontStyle(color = 9)
     @ContentStyle(dataFormat = 49)
     @ExcelProperty("性别")
     @ApiModelProperty("性别")
@@ -43,12 +56,16 @@ public class WeeklyDutyScheduleListVo {
     /**
      * 出生日期
      */
+    @ColumnWidth(20)
+    @HeadFontStyle(color = 9)
     @ApiModelProperty("出生日期")
     @ExcelProperty("出生日期")
     private String dateBirth;
     /**
     * 证件号码
     */
+    @ColumnWidth(20)
+    @HeadFontStyle(color = 9)
     @ContentStyle(dataFormat = 200)
     @ExcelProperty("证件号码")
     @ApiModelProperty("证件号码")
@@ -56,6 +73,7 @@ public class WeeklyDutyScheduleListVo {
     /**
     * 年龄
     */
+    @HeadFontStyle(color = 9)
     @ContentStyle(dataFormat = 49)
     @ExcelProperty("年龄")
     @ApiModelProperty("年龄")
@@ -63,6 +81,8 @@ public class WeeklyDutyScheduleListVo {
     /**
     * 备注
     */
+    @ColumnWidth(100)
+    @HeadFontStyle(color = 9)
     @ContentStyle(dataFormat = 49)
     @ExcelProperty("值周情况")
     @ApiModelProperty("值周情况")