1、解决床位调整变成混合寝室的问题

2、调整收费管理导出内容

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

@@ -12,7 +12,6 @@ import com.xjrsoft.module.student.dto.PbVXsxxsfytbPageDto;
 import com.xjrsoft.module.student.dto.PersonalPortraitFeeInformationDto;
 import com.xjrsoft.module.student.entity.BaseStudent;
 import com.xjrsoft.module.student.entity.BaseStudentSchoolRoll;
-import com.xjrsoft.module.student.entity.BaseStudentUser;
 import com.xjrsoft.module.student.entity.PbSemesterConfig;
 import com.xjrsoft.module.student.entity.PbVXsxxsfytb;
 import com.xjrsoft.module.student.mapper.PbVXsxxsfytbMapper;
@@ -29,7 +28,6 @@ import org.springframework.stereotype.Service;
 import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -155,7 +153,16 @@ public class PbVXsxxsfytbServiceImpl extends MPJBaseServiceImpl<PbVXsxxsfytbMapp
                 .selectAs(BaseSemester::getName, PbVXsxxsfytbExcelVo::getBaseSemesterCn)
                 .select(PbVXsxxsfytb.class, x -> VoToColumnUtil.fieldsToColumns(PbVXsxxsfytbExcelVo.class).contains(x.getProperty()))
         ;
-
-        return this.selectJoinList(PbVXsxxsfytbExcelVo.class, pbVXsxxsfytbMPJLambdaWrapper);
+        List<PbVXsxxsfytbExcelVo> list = this.selectJoinList(PbVXsxxsfytbExcelVo.class, pbVXsxxsfytbMPJLambdaWrapper);
+        for (PbVXsxxsfytbExcelVo pbVXsxxsfytbExcelVo : list) {
+            if(pbVXsxxsfytbExcelVo.getQfje().compareTo(BigDecimal.ZERO) > 0){//正数
+                pbVXsxxsfytbExcelVo.setQfje(pbVXsxxsfytbExcelVo.getQfje().abs());
+                pbVXsxxsfytbExcelVo.setKtje(BigDecimal.ZERO);
+            }else if(pbVXsxxsfytbExcelVo.getQfje().compareTo(BigDecimal.ZERO) < 0){
+                pbVXsxxsfytbExcelVo.setKtje(pbVXsxxsfytbExcelVo.getQfje().abs());
+                pbVXsxxsfytbExcelVo.setQfje(BigDecimal.ZERO);
+            }
+        }
+        return list;
     }
 }

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

@@ -53,13 +53,6 @@ public class PbVXsxxsfytbExcelVo {
     @ApiModelProperty("性别")
     private String sex;
     /**
-    * 收费标准金额
-    */
-    @ContentStyle(dataFormat = 49)
-    @ExcelProperty("收费标准金额")
-    @ApiModelProperty("收费标准金额")
-    private BigDecimal standardar;
-    /**
     * 应缴金额
     */
     @ContentStyle(dataFormat = 49)
@@ -67,20 +60,6 @@ public class PbVXsxxsfytbExcelVo {
     @ApiModelProperty("应缴金额 ")
     private BigDecimal factar;
     /**
-    * 调整（减免）金额
-    */
-    @ContentStyle(dataFormat = 49)
-    @ExcelProperty("调整（减免）金额")
-    @ApiModelProperty("调整（减免）金额")
-    private BigDecimal adjustmny;
-    /**
-    * 减免金额
-    */
-    @ContentStyle(dataFormat = 49)
-    @ExcelProperty("减免金额")
-    @ApiModelProperty("减免金额")
-    private BigDecimal jmje;
-    /**
     * 欠费金额
     */
     @ContentStyle(dataFormat = 49)
@@ -98,9 +77,16 @@ public class PbVXsxxsfytbExcelVo {
     * 退款金额
     */
     @ContentStyle(dataFormat = 49)
-    @ExcelProperty("退款金额")
-    @ApiModelProperty("退款金额")
+    @ExcelProperty("已退金额")
+    @ApiModelProperty("已退金额")
     private BigDecimal refundmny;
+    /**
+     * 可退金额
+     */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("可退金额")
+    @ApiModelProperty("可退金额")
+    private BigDecimal ktje;
     /**
     * 欠费金额
     */
@@ -108,13 +94,7 @@ public class PbVXsxxsfytbExcelVo {
     @ExcelProperty("欠费金额")
     @ApiModelProperty("欠费金额")
     private BigDecimal qfje;
-    /**
-    * 缴费状态
-    */
-    @ContentStyle(dataFormat = 49)
-    @ExcelProperty("缴费状态")
-    @ApiModelProperty("缴费状态")
-    private String jfzt;
+
     /**
     * 收费项目名称
     */
@@ -122,13 +102,6 @@ public class PbVXsxxsfytbExcelVo {
     @ExcelProperty("收费项目名称")
     @ApiModelProperty("收费项目名称")
     private String feeitemname;
-    /**
-    * 收费区间名称
-    */
-    @ContentStyle(dataFormat = 49)
-    @ExcelProperty("收费区间名称")
-    @ApiModelProperty("收费区间名称")
-    private String beltname;
     /**
      * 学期Id
      */

src/main/resources/mapper/room/RoomMapper.xml

@@ -94,7 +94,7 @@
 
     <!-- 将有多个班级的寝室设置为混合寝室 -->
     <update id="setIsmaxTrue">
-        UPDATE room SET is_max = 0 WHERE delete_mark = 0
+        UPDATE room SET is_max = 1 WHERE delete_mark = 0
         AND (
         SELECT COUNT(*) FROM (
         SELECT COUNT(*) FROM base_student_school_roll t1