bug

luoyisheng

2025-04-07 2d98f8b5b6f72e4b274fd292c21e5bd49980a8c8

bug

 medicalWaste-admin/src/main/java/com/sinata/web/controller/applet/AppMwCollectRecordController.java

@@ -503,7 +503,7 @@
    @ApiOperation("库存详情")
    @PostMapping("/record1")
    public R<List<MwCollectRecord>> record1(@RequestParam String boxNumber) {
        List<MwCollectRecord> list = collectRecordService.lambdaQuery().isNull(MwCollectRecord::getCheckoutTime).eq(MwCollectRecord::getBoxNumber, boxNumber).orderByDesc(MwCollectRecord::getCollectTime).list();
        List<MwCollectRecord> list = collectRecordService.lambdaQuery().isNull(MwCollectRecord::getCheckoutTime).eq(MwCollectRecord::getStatus ,1).eq(MwCollectRecord::getBoxNumber, boxNumber).orderByDesc(MwCollectRecord::getCollectTime).list();
        return R.ok(list);
    }


 medicalWaste-system/src/main/resources/mapper/system/MwCheckoutRecordMapper.xml

@@ -306,7 +306,7 @@
        SELECT WASTE_TYPE as wasteType, WASTE_TYPE_STR as wasteTypeStr, COUNT(DISTINCT BOX_NUMBER) as boxNum, COUNT(1) as num, sum(WEIGHT) as weight
        FROM MEDICAL_WASTE.MW_COLLECT_RECORD
        <where>
            RECEIVE_USER_ID is not null AND RECEIVE_DEPARTMENT_ID = #{departmentId}
            RECEIVE_USER_ID is not null AND RECEIVE_DEPARTMENT_ID = #{departmentId} and STATUS = 4
            <if test="date != null">
                AND TRUNC(RECEIVE_TIME) = TO_DATE(#{date}, 'YYYY-MM-DD')
            </if>