修改bug

src/main/java/com/template/controller/HouseNumberStateController.java

@@ -1206,7 +1206,7 @@ public class HouseNumberStateController implements HouseNumberStateAPI {
             HouseNumberState one = houseNumberStateService.getOne(wrapperHns);
             one.setEndTime(sdf.format(new Date()));
 
-            houseNumberStateService.updateById(one);
+//            houseNumberStateService.updateById(one);
             houseNumberStateService.removeById(one.getId());
 
 //        修改换的房间
@@ -1501,25 +1501,25 @@ public class HouseNumberStateController implements HouseNumberStateAPI {
             }
             dateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
 //        设置房态的结束时间
-            houseNumberState.setEndTime(LocalDateTime.now().format(dateTimeFormatter));
+//            houseNumberState.setEndTime(LocalDateTime.now().format(dateTimeFormatter));
 
 //         修改房间状态（置脏）
 //            HouseNumber houseNumber = houseNumberService.getById(houseNumberId);
             houseNumber.setHouseStatus(2);
 
             //            判断该房间是否免费的房间，是则需要支付水电费，并改成带结账状态
-            BigDecimal payPrice = houseOrder.getPayPrice();
-            if (ObjectUtils.isNotEmpty(payPrice) && payPrice.doubleValue() <= 0) {
-                houseOrder.setOrderStatus("5");
-                BigDecimal electricCost = houseOrder.getElectricCost();
-                BigDecimal waterCost = houseOrder.getWaterCost();
-                BigDecimal total = electricCost.add(waterCost);
-                houseOrder.setPayPrice(total);
-            }
+//            BigDecimal payPrice = houseOrder.getPayPrice();
+//            if (ObjectUtils.isNotEmpty(payPrice) && payPrice.doubleValue() <= 0) {
+//                houseOrder.setOrderStatus("5");
+//                BigDecimal electricCost = houseOrder.getElectricCost();
+//                BigDecimal waterCost = houseOrder.getWaterCost();
+//                BigDecimal total = electricCost.add(waterCost);
+//                houseOrder.setPayPrice(total);
+//            }
 
 
             houseOrderService.updateById(houseOrder);
-            houseNumberStateService.updateById(houseNumberState);
+//            houseNumberStateService.updateById(houseNumberState);
             houseNumberStateService.removeById(houseNumberState.getId());
             houseNumberService.updateById(houseNumber);
 
@@ -2110,7 +2110,7 @@ public class HouseNumberStateController implements HouseNumberStateAPI {
             return CommonResult.fail("无维修房间");
         }
         houseNumberState.setEndTime(format);
-        houseNumberStateService.updateById(houseNumberState);
+//        houseNumberStateService.updateById(houseNumberState);
         houseNumberStateService.removeById(houseNumberState.getId());
 
         houseNumber.setHouseStatus(1);

src/main/java/com/template/controller/HouseOrderController.java

@@ -694,7 +694,7 @@ public class HouseOrderController implements HouseOrderAPI {
             houseNumberState.setEndTime(sdf.format(new Date()));
 
             houseOrderService.updateById(houseOrder);
-            houseNumberStateService.updateById(houseNumberState);
+//            houseNumberStateService.updateById(houseNumberState);
             houseNumberStateService.removeById(houseNumberState.getId());
             return CommonResult.ok();
 
@@ -1169,24 +1169,24 @@ public class HouseOrderController implements HouseOrderAPI {
             }
             dateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
 //        设置房态的结束时间
-            houseNumberState.setEndTime(LocalDateTime.now().format(dateTimeFormatter));
+//            houseNumberState.setEndTime(LocalDateTime.now().format(dateTimeFormatter));
 
 //         修改房间状态（置脏）
 //            HouseNumber houseNumber = houseNumberService.getById(houseNumberId);
             houseNumber.setHouseStatus(2);
 
 //            判断该房间是否免费的房间，是则需要支付水电费，并改成带结账状态
-            BigDecimal payPrice = houseOrder.getPayPrice();
-            if (ObjectUtils.isNotEmpty(payPrice) && payPrice.doubleValue() <= 0) {
-                houseOrder.setOrderStatus("5");
-                BigDecimal electricCost = houseOrder.getElectricCost();
-                BigDecimal waterCost = houseOrder.getWaterCost();
-                BigDecimal total = electricCost.add(waterCost);
-                houseOrder.setPayPrice(total);
-            }
+//            BigDecimal payPrice = houseOrder.getPayPrice();
+//            if (ObjectUtils.isNotEmpty(payPrice) && payPrice.doubleValue() <= 0) {
+//                houseOrder.setOrderStatus("5");
+//                BigDecimal electricCost = houseOrder.getElectricCost();
+//                BigDecimal waterCost = houseOrder.getWaterCost();
+//                BigDecimal total = electricCost.add(waterCost);
+//                houseOrder.setPayPrice(total);
+//            }
 
             houseOrderService.updateById(houseOrder);
-            houseNumberStateService.updateById(houseNumberState);
+//            houseNumberStateService.updateById(houseNumberState);
             houseNumberStateService.removeById(houseNumberState.getId());
             houseNumberService.updateById(houseNumber);
 
@@ -1309,7 +1309,7 @@ public class HouseOrderController implements HouseOrderAPI {
             HouseNumberState one = houseNumberStateService.getOne(wrapperHns);
             one.setEndTime(sdf.format(new Date()));
 
-            houseNumberStateService.updateById(one);
+//            houseNumberStateService.updateById(one);
             houseNumberStateService.removeById(one.getId());
 
 //        修改换的房间
@@ -2509,7 +2509,7 @@ public class HouseOrderController implements HouseOrderAPI {
 //            }
 
             houseOrderService.updateById(houseOrder);
-            houseNumberStateService.updateById(houseNumberState);
+//            houseNumberStateService.updateById(houseNumberState);
             houseNumberStateService.removeById(houseNumberState.getId());
             houseNumberService.updateById(houseNumber);
 
@@ -3281,8 +3281,13 @@ public class HouseOrderController implements HouseOrderAPI {
                     houseOrders.add(houseOrder);
                     houseNumbers.add(houseNumber);
                 }
-                houseOrderService.updateBatchById(houseOrders);
-                houseNumberService.updateBatchById(houseNumbers);
+                    if (ObjectUtils.isNotEmpty(houseOrders)) {
+                        houseOrderService.updateBatchById(houseOrders);
+                    }
+                    if (ObjectUtils.isNotEmpty(houseNumbers)) {
+                        houseNumberService.updateBatchById(houseNumbers);
+                    }
+
             }
         }
 

src/main/java/com/template/model/vo/HouseNumberPageVo.java

@@ -46,5 +46,7 @@ public class HouseNumberPageVo {
 
     @ApiModelProperty(value = "房型名称")
     private String houseName;
+    private String building;
+    private String element;
 
 }

src/main/resources/mapper/template/ApplicationProcedureTemporaryMapper.xml

@@ -29,7 +29,7 @@
         ap.start_time,
         ap.end_time ,
         ap.department,
-        ap.reason_application ,
+        ap.reason_application,
         ap.submission_time,
         ap.status,
         ap.approver_id ,
@@ -39,11 +39,13 @@
         ap.secondary_examine_and_approve_time ,
         ap.secondary_examine_and_approve_remark,
         a.name as approverName,
-        a2.name as secondaryApproverName
+        a2.name as secondaryApproverName,
+        u.user_name as userName
         FROM
         `application_procedure_temporary` ap
         LEFT JOIN admin a on a.id=ap.approver_id
         LEFT JOIN admin a2 on a2.id=ap.secondary_approver_id
+        LEFT JOIN users u on u.id=ap.users_id
         WHERE ap.deleted=0
         ) apu
         <where>
@@ -52,7 +54,7 @@
             </if>
 
             <if test="key != null and key != ''">
-                AND ( apu.user_name LIKE '%' #{key} '%' OR apu.reason_application LIKE '%' #{key} '%' )
+                AND ( apu.approverName LIKE '%' #{key} '%' OR apu.secondaryApproverName LIKE '%' #{key} '%'  OR apu.userName LIKE '%' #{key} '%'  )
             </if>
 
             <if test="examineAndApproveStartTime != null and examineAndApproveStartTime != '' and examineAndApproveEndTime != null and examineAndApproveEndTime != '' ">
@@ -107,11 +109,13 @@
         ap.secondary_examine_and_approve_time ,
         ap.secondary_examine_and_approve_remark,
         a.name as approverName,
-        a2.name as secondaryApproverName
+        a2.name as secondaryApproverName,
+        u.user_name as userName
         FROM
         `application_procedure_temporary` ap
         LEFT JOIN admin a on a.id=ap.approver_id
         LEFT JOIN admin a2 on a2.id=ap.secondary_approver_id
+        LEFT JOIN users u on u.id=ap.users_id
         WHERE ap.deleted=0 and FIND_IN_SET(ap.status,#{type})
         ) apu
         <where>
@@ -120,7 +124,7 @@
             </if>
 
             <if test="key != null and key != ''">
-                AND ( apu.user_name LIKE '%' #{key} '%' OR apu.reason_application LIKE '%' #{key} '%' )
+                AND ( apu.approverName LIKE '%' #{key} '%' OR apu.secondaryApproverName LIKE '%' #{key} '%'  OR apu.userName LIKE '%' #{key} '%'  )
             </if>
 
             <if test="examineAndApproveStartTime != null and examineAndApproveStartTime != '' and examineAndApproveEndTime != null and examineAndApproveEndTime != '' ">

src/main/resources/mapper/template/HouseNumberMapper.xml

@@ -310,7 +310,9 @@
         hn.water_equipment_meter_name as waterEquipmentMeterName,
         hn.create_time as createTime,
         h.room_name as houseName,
-        h.room_type as roomType
+        h.room_type as roomType,
+        b.building as building,
+        b.element,
         FROM
         `house_number` hn
         LEFT JOIN house h on h.id=hn.house_id AND h.deleted=0