Merge remote-tracking branch 'origin/zdsz3.0' into zdsz3.0

ruoyi-admin/src/main/java/com/ruoyi/web/controller/zdsz/ZEnginSpecificationsController.java

@@ -55,13 +55,6 @@ public class ZEnginSpecificationsController extends BaseController {
         return R.ok(iZEnginSpecificationsService.getEnginSpecifications(materId));
     }
     /**
-     * 全部材质规格
-     */
-    @GetMapping("/getEnginSpecificationsListAll")
-    public R getEnginSpecificationsListAll() {
-        return R.ok(iZEnginSpecificationsService.getEnginSpecificationsListAll());
-    }
-    /**
      * 导出工程材质规格列表
      */
     @SaCheckPermission("zdsz:enginSpecifications:export")

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/mapper/ZEnginSpecificationsMapper.java

@@ -22,6 +22,4 @@ public interface ZEnginSpecificationsMapper extends BaseMapperPlus<ZEnginSpecifi
     ZEnginSpecificationsVo getById(String id);
 
     List<ZEnginSpecificationsVo> getEnginSpecifications(String materId);
-
-    List<ZEnginSpecificationsVo> getEnginSpecificationsListAll();
 }

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/service/IZEnginSpecificationsService.java

@@ -49,6 +49,4 @@ public interface IZEnginSpecificationsService {
     Boolean deleteWithValidByIds(Collection<String> ids, Boolean isValid);
 
     List<ZEnginSpecificationsVo> getEnginSpecifications(String materId);
-
-    List<ZEnginSpecificationsVo> getEnginSpecificationsListAll();
 }

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/service/impl/ZEnginSpecificationsServiceImpl.java

@@ -114,9 +114,4 @@ public class ZEnginSpecificationsServiceImpl implements IZEnginSpecificationsSer
     public List<ZEnginSpecificationsVo> getEnginSpecifications(String materId) {
         return baseMapper.getEnginSpecifications(materId);
     }
-
-    @Override
-    public List<ZEnginSpecificationsVo> getEnginSpecificationsListAll() {
-        return baseMapper.getEnginSpecificationsListAll();
-    }
 }

ruoyi-zdsz/src/main/resources/mapper/zdsz/ZEnginSpecificationsMapper.xml

@@ -51,8 +51,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             and ze.mater_id = #{materId}
         </if>
     </select>
-
-    <select id="getEnginSpecificationsListAll" resultType="com.ruoyi.zdsz.domain.vo.ZEnginSpecificationsVo">
-        select * from z_engin_specifications as ze where ze.del_flag = '0'
-    </select>
 </mapper>