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

src/main/java/com/xjrsoft/module/room/controller/RoomBedCheckRecordController.java

@@ -51,6 +51,15 @@ public class RoomBedCheckRecordController {
         return RT.ok(pageOutput);
     }
 
+    @GetMapping(value = "/page-mobile")
+    @ApiOperation(value="查寝记录列表(分页-移动)")
+    @SaCheckPermission("roombedcheckrecord:detail")
+    public RT<PageOutput<RoomBedCheckRecordPageVo>> pageMobile(@Valid RoomBedCheckRecordPageDto dto){
+        IPage<RoomBedCheckRecordPageVo> page = roomBedCheckRecordService.getPageMobile(dto);
+        PageOutput<RoomBedCheckRecordPageVo> pageOutput = ConventPage.getPageOutput(page, RoomBedCheckRecordPageVo.class);
+        return RT.ok(pageOutput);
+    }
+
     @GetMapping(value = "/info")
     @ApiOperation(value="根据id查询查寝记录信息")
     @SaCheckPermission("roombedcheckrecord:detail")

src/main/java/com/xjrsoft/module/room/controller/WfRoomStayOvernightController.java

@@ -52,6 +52,7 @@ public class WfRoomStayOvernightController {
         MPJLambdaWrapper<WfRoomStayOvernight> queryWrapper = new MPJLambdaWrapper<>();
         queryWrapper
                 .disableSubLogicDel()
+                .like(ObjectUtil.isNotNull(dto.getUserName()),"t1.name",dto.getUserName())
                 .like(ObjectUtil.isNotNull(dto.getClassName()),WfRoomStayOvernight::getClassName,dto.getClassName())
                 .like(ObjectUtil.isNotNull(dto.getGenderName()),WfRoomStayOvernight::getGenderName,dto.getGenderName())
                 .like(ObjectUtil.isNotNull(dto.getStudentId()),WfRoomStayOvernight::getStudentId,dto.getStudentId())

src/main/java/com/xjrsoft/module/room/dto/RoomBedCheckRecordPageDto.java

@@ -19,6 +19,11 @@ import java.time.LocalDateTime;
 @Data
 @EqualsAndHashCode(callSuper = false)
 public class RoomBedCheckRecordPageDto extends PageInput {
+    /**
+     * 用户编号
+     */
+    @ApiModelProperty(value = "用户编号",hidden = true)
+    private Long userId;
     /**
      * 班级编号
      */

src/main/java/com/xjrsoft/module/room/dto/WfRoomStayOvernightPageDto.java

@@ -20,6 +20,13 @@ import java.time.LocalDate;
 @EqualsAndHashCode(callSuper = false)
 public class WfRoomStayOvernightPageDto extends PageInput {
 
+    /**
+     * 姓名
+     */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("姓名")
+    @ApiModelProperty("姓名")
+    private String userName;
     /**
      * 班级
      */

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

@@ -49,6 +49,13 @@ public interface IRoomBedCheckRecordService extends MPJBaseService<RoomBedCheckR
      */
     IPage<RoomBedCheckRecordPageVo> getPage(RoomBedCheckRecordPageDto dto);
 
+    /**
+     * 获取分页
+     * @param dto
+     * @return
+     */
+    IPage<RoomBedCheckRecordPageVo> getPageMobile(RoomBedCheckRecordPageDto dto);
+
     RoomBedCheckRecordVo getInfo(Long id);
 
     RoomBedCheckRecordEchoVo getEcho();

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

@@ -59,6 +59,7 @@ public class RoomBedCheckRecordServiceImpl extends MPJBaseServiceImpl<RoomBedChe
     @Override
     @Transactional(rollbackFor = Exception.class)
     public Boolean add(RoomBedCheckRecord roomBedCheckRecord) {
+        roomBedCheckRecord.setUserId(StpUtil.getLoginIdAsLong());
         roomBedCheckRecordRoomBedCheckRecordMapper.insert(roomBedCheckRecord);
         for (RoomBedCheckRecordRelation roomBedCheckRecordRelation : roomBedCheckRecord.getRoomBedCheckRecordRelationList()) {
             roomBedCheckRecordRelation.setRoomBedCheckRecordId(roomBedCheckRecord.getId());
@@ -119,6 +120,25 @@ public class RoomBedCheckRecordServiceImpl extends MPJBaseServiceImpl<RoomBedChe
 
     @Override
     public IPage<RoomBedCheckRecordPageVo> getPage(RoomBedCheckRecordPageDto dto) {
+        MPJLambdaWrapper<RoomBedCheckRecord> queryRoomBedCheckRecord = new MPJLambdaWrapper<>();
+        queryRoomBedCheckRecord
+                .select(RoomBedCheckRecord::getId)
+                .selectAs(XjrUser::getName,RoomBedCheckRecordPageVo::getUserIdCN)
+                .selectAs(BaseClass::getName,RoomBedCheckRecordPageVo::getClassIdCN)
+                .select(RoomBedCheckRecord.class,x -> VoToColumnUtil.fieldsToColumns(RoomBedCheckRecordPageVo.class).contains(x.getProperty()))
+                .leftJoin(XjrUser.class,XjrUser::getId,RoomBedCheckRecord::getUserId)
+                .leftJoin(BaseClass.class,BaseClass::getId,RoomBedCheckRecord::getClassId)
+                .eq(ObjectUtil.isNotNull(dto.getClassId()), RoomBedCheckRecord::getClassId, dto.getClassId())
+                .between(ObjectUtil.isNotNull(dto.getCheckRecordTimeStart()) && ObjectUtil.isNotNull(dto.getCheckRecordTimeEnd()), RoomBedCheckRecord::getCheckRecordTime, dto.getCheckRecordTimeStart(), dto.getCheckRecordTimeEnd())
+                .disableSubLogicDel()
+                .orderByDesc(RoomBedCheckRecord::getId);
+
+        IPage<RoomBedCheckRecordPageVo> page = this.selectJoinListPage(ConventPage.getPage(dto), RoomBedCheckRecordPageVo.class, queryRoomBedCheckRecord);
+        return page;
+    }
+
+    @Override
+    public IPage<RoomBedCheckRecordPageVo> getPageMobile(RoomBedCheckRecordPageDto dto) {
         MPJLambdaWrapper<RoomBedCheckRecord> queryRoomBedCheckRecord = new MPJLambdaWrapper<>();
         queryRoomBedCheckRecord
                 .select(RoomBedCheckRecord::getId)
@@ -128,7 +148,7 @@ public class RoomBedCheckRecordServiceImpl extends MPJBaseServiceImpl<RoomBedChe
                 .leftJoin(XjrUser.class,XjrUser::getId,RoomBedCheckRecord::getUserId)
                 .leftJoin(BaseClass.class,BaseClass::getId,RoomBedCheckRecord::getClassId)
                 .eq(RoomBedCheckRecord::getUserId, StpUtil.getLoginIdAsLong())
-                .eq(ObjectUtil.isNotNull(dto.getClassId()), RoomBedCheckRecord::getUserId, StpUtil.getLoginIdAsLong())
+                .eq(ObjectUtil.isNotNull(dto.getClassId()), RoomBedCheckRecord::getClassId, dto.getClassId())
                 .between(ObjectUtil.isNotNull(dto.getCheckRecordTimeStart()) && ObjectUtil.isNotNull(dto.getCheckRecordTimeEnd()), RoomBedCheckRecord::getCheckRecordTime, dto.getCheckRecordTimeStart(), dto.getCheckRecordTimeEnd())
                 .disableSubLogicDel()
                 .orderByDesc(RoomBedCheckRecord::getId);
@@ -203,7 +223,7 @@ public class RoomBedCheckRecordServiceImpl extends MPJBaseServiceImpl<RoomBedChe
             MPJLambdaWrapper<Room> queryRoomByClass = new MPJLambdaWrapper<>();
             queryRoomByClass
                     .selectAs(Room::getId, RoomEchoVo::getRoomId)
-                    .selectAs(Room::getRoomName, RoomEchoVo::getRoomName)
+                    .select("CONCAT(t2.name,\"-\" , t3.name, t.room_name) as roomName")
                     .leftJoin(RoomBed.class, RoomBed::getRoomId, Room::getId)
                     .leftJoin(BaseStudentSchoolRoll.class, BaseStudentSchoolRoll::getUserId, RoomBed::getStudentUserId)
                     .leftJoin(BaseOfficeBuild.class, BaseOfficeBuild::getId, Room::getOfficeBuildId)
@@ -216,9 +236,12 @@ public class RoomBedCheckRecordServiceImpl extends MPJBaseServiceImpl<RoomBedChe
         MPJLambdaWrapper<Room> queryRoomByTeacherAppoint = new MPJLambdaWrapper<>();
         queryRoomByTeacherAppoint
                 .selectAs(Room::getId, RoomEchoVo::getRoomId)
-                .selectAs(Room::getRoomName, RoomEchoVo::getRoomName)
+                .select("CONCAT(t2.name,\"-\" , t3.name, t.room_name) as roomName")
                 .leftJoin(RoomTeacherAppoint.class, RoomTeacherAppoint::getRoomId, Room::getId)
-                .eq(RoomTeacherAppoint::getUserId, StpUtil.getLoginIdAsLong());
+                .leftJoin(BaseOfficeBuild.class, BaseOfficeBuild::getId, Room::getOfficeBuildId)
+                .leftJoin(DictionaryDetail.class, DictionaryDetail::getCode, Room::getGender)
+                .eq(RoomTeacherAppoint::getUserId, StpUtil.getLoginIdAsLong())
+                .disableSubLogicDel();
         List<RoomEchoVo> roomEchoVoByTeacherAppointList = roomMapper.selectJoinList(RoomEchoVo.class, queryRoomByTeacherAppoint);
 
         List<RoomEchoVo> roomEchoVoList = new ArrayList<>();

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

@@ -29,6 +29,7 @@ import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
@@ -308,7 +309,7 @@ public class TextbookServiceImpl extends MPJBaseServiceImpl<TextbookMapper, Text
                         if(ObjectUtil.isNotNull(wfExerciseBookItem.getSubscriptionType()) && wfExerciseBookItem.getSubscriptionType().equals(ExerciseBookeTypeEnum.ExerciseBook2.getCode())){
                             setBookName(ExerciseBookeTypeEnum.ExerciseBook2.getValue());
                         }
-
+                        setSpecificationsModels(wfExerciseBookItem.getSpecificationsModels());
                         setTextbookType(TextbookTypeEnum.TExerciseBook.getCode());
                         //年级id
                         if (ObjectUtil.isNotNull(wfExerciseBook.getClassId()) && wfExerciseBook.getClassId() > 0){
@@ -448,10 +449,18 @@ public class TextbookServiceImpl extends MPJBaseServiceImpl<TextbookMapper, Text
         updateTextbook.setId(textbook.getId());
         Integer oldStock = ObjectUtil.isNull(textbook.getStock()) ? 0 : textbook.getStock();
         updateTextbook.setStock(oldStock + (ObjectUtil.isNull(dto.getWarehouseNumber()) ? 0 : dto.getWarehouseNumber()));
+        BigDecimal price = ObjectUtil.isNull(dto.getPrice())?new BigDecimal(0):dto.getPrice();
+        updateTextbook.setPrice(price);
+        Double discount = ObjectUtil.isNull(dto.getDiscount())?10:dto.getDiscount();
+        updateTextbook.setDiscount(discount);
+        BigDecimal subtotal = price.multiply(new BigDecimal(discount/10));
+        updateTextbook.setSubtotal(subtotal);
+
         boolean isSuccess = this.updateById(updateTextbook);
 
         TextbookWarehouseRecord textbookWarehouseRecord = BeanUtil.toBean(dto, TextbookWarehouseRecord.class);
         textbookWarehouseRecord.setWarehouseMode(WarehouseModeEnum.WmManual.getCode());
+        textbookWarehouseRecord.setSubtotal(subtotal);
         isSuccess = textbookClassWarehouseService.save(textbookWarehouseRecord);
 
         return isSuccess;