Merge remote-tracking branch 'origin/master'

puzhibing

2024-11-02 8f075185ed923d896793eba28e1e46ed12df6ef4

Merge remote-tracking branch 'origin/master'

# Conflicts:
#	ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TParkingRecordController.java

 ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppUserController.java

@@ -549,6 +549,9 @@
            if (data != null) {
                byId.setGoodType(data.getOrderType());
            }
        }else if (byId.getChangeType()==4){
            TAppUser byId1 = appUserService.getById(byId.getExtension());
            byId.setExtension(byId1.getPhone());
        }
        return R.ok(byId);
    }

 ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TParkingRecordController.java

@@ -76,6 +76,7 @@
                .between(query.getTimePeriod()!=null,TParkingRecord::getInParkingTime,s1,s2)
                .or()
                .between(query.getTimePeriod()!=null,TParkingRecord::getOutParkingTime,s1,s2)
                .orderByDesc(TParkingRecord::getCreateTime)
                .page(Page.of(query.getPageCurr(), query.getPageSize()));

        for (TParkingRecord record : page.getRecords()) {

 ruoyi-service/ruoyi-chargingPile/src/main/resources/mapper/chargingPile/TParkingRecordMapper.xml

@@ -83,7 +83,7 @@
    </select>
    <select id="parkingData" resultType="java.util.Map">
        SELECT
            DATE_FORMAT( create_time, '%Y-%m-%d %H' ) AS time,
            DATE_FORMAT( create_time, '%H:00' ) AS time,
    count( 1 ) AS orders,
    SUM( timeout_amount ) AS timeoutAmount
        FROM