src/main/java/com/ruoyi/quality/controller/QualityTestStandardParamController.java
@@ -80,7 +80,9 @@ @Operation(summary = "检测指标维护查询") @Log(title = "检测指标维护查询", businessType = BusinessType.OTHER) public R<?> list(Long testStandardId) { return R.ok(qualityTestStandardParamService.list(Wrappers.<QualityTestStandardParam>lambdaQuery().eq(QualityTestStandardParam::getTestStandardId,testStandardId))); return R.ok(qualityTestStandardParamService.list(Wrappers.<QualityTestStandardParam>lambdaQuery() .eq(QualityTestStandardParam::getTestStandardId, testStandardId) .orderByDesc(QualityTestStandardParam::getCreateTime))); } } src/main/resources/mapper/quality/QualityTestStandardMapper.xml
@@ -19,6 +19,7 @@ <if test="c.inspectType != null "> AND inspect_type =#{c.inspectType} </if> order by create_time desc </select> <select id="getQualityTestStandardByProductId" resultType="com.ruoyi.quality.pojo.QualityTestStandard"> SELECT qts.* src/main/resources/mapper/quality/QualityUnqualifiedMapper.xml
@@ -26,23 +26,24 @@ END AS method FROM quality_unqualified qu LEFT JOIN product_model pm ON qu.model = pm.id where 1=1 <if test="qualityUnqualified.inspectType != null "> AND inspect_type = #{qualityUnqualified.inspectType} </if> <if test="qualityUnqualified.inspectState != null "> AND inspect_state = #{qualityUnqualified.inspectState} </if> <if test="qualityUnqualified.productName != null and qualityUnqualified.productName != '' "> AND product_name = #{qualityUnqualified.productName} </if> <if test="qualityUnqualified.entryDateStart != null and qualityUnqualified.entryDateStart != '' "> AND check_time >= DATE_FORMAT(#{qualityUnqualified.entryDateStart},'%Y-%m-%d') </if> <if test="qualityUnqualified.entryDateEnd != null and qualityUnqualified.entryDateEnd != '' "> AND check_time <= DATE_FORMAT(#{qualityUnqualified.entryDateEnd},'%Y-%m-%d') </if> <where> <if test="qualityUnqualified.inspectType != null "> AND inspect_type = #{qualityUnqualified.inspectType} </if> <if test="qualityUnqualified.inspectState != null "> AND inspect_state = #{qualityUnqualified.inspectState} </if> <if test="qualityUnqualified.productName != null and qualityUnqualified.productName != '' "> AND product_name = #{qualityUnqualified.productName} </if> <if test="qualityUnqualified.entryDateStart != null and qualityUnqualified.entryDateStart != '' "> AND check_time >= DATE_FORMAT(#{qualityUnqualified.entryDateStart},'%Y-%m-%d') </if> <if test="qualityUnqualified.entryDateEnd != null and qualityUnqualified.entryDateEnd != '' "> AND check_time <= DATE_FORMAT(#{qualityUnqualified.entryDateEnd},'%Y-%m-%d') </if> </where> order by qu.create_time desc </select> <select id="qualityUnqualifiedExport" resultType="com.ruoyi.quality.pojo.QualityUnqualified"> SELECT src/main/resources/mapper/warehouse/DocumentationBorrowManagementMapper.xml
@@ -51,6 +51,7 @@ <if test="documentationBorrowManagement.entryDateEnd != null and documentationBorrowManagement.entryDateEnd != ''"> and borrow_date <= DATE_FORMAT(#{documentationBorrowManagement.entryDateEnd},'%Y-%m-%d') </if> order by dbm.create_time desc </select> <select id="export" resultType="com.ruoyi.warehouse.dto.DocumentationBorrowManagementDto"> select dbm.*,doc.doc_name src/main/resources/mapper/warehouse/DocumentationMapper.xml
@@ -32,6 +32,7 @@ <if test="documentation.id != null"> and doc.id = #{documentation.id} </if> order by doc.create_time desc </select> <select id="listByDocumentClassificationId" resultType="com.ruoyi.warehouse.dto.DocumentationDto"> SELECT src/main/resources/mapper/warehouse/DocumentationReturnManagementMapper.xml
@@ -28,6 +28,7 @@ <if test="documentationReturnManagement.entryDateEnd != null and documentationReturnManagement.entryDateEnd != ''"> and return_date <= DATE_FORMAT(#{documentationReturnManagement.entryDateEnd},'%Y-%m-%d') </if> order by dbm.create_time desc </select> <select id="exportrevent" resultType="com.ruoyi.warehouse.dto.ReturnExportDto"> src/main/resources/mapper/warehouse/WarehouseGoodsShelvesRowcolMapper.xml
@@ -36,6 +36,7 @@ and wgsr.id = #{warehouseGoodsShelvesRowcol.id} </if> </where> order by wgsr.create_time desc </select> </mapper>