开料，封边新增连带贴标，钻孔新增-逻辑新增，预打包翻页提示信息更改

2026-08-13 21:32:07 +08:00 · 2024-08-16 11:29:55 +08:00
parent a939049345
commit 97bab4fd24
18 changed files with 407 additions and 155 deletions
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.cf.imes.module.system.dal.mysql.machine.MachineBrandMapper">
+
+
+    <resultMap id="MachineMap" type="com.cf.imes.module.system.controller.admin.machine.vo.MachineBrandModelRespVO">
+
+        <result property="brandId" column="brandId"/>
+        <result property="brand" column="brand"/>
+
+        <collection property="machineSimpleRespVOS" ofType="com.cf.imes.module.system.controller.admin.machine.vo.MachineSimpleRespVO" resultMap="MachineSimpleMap"/>
+
+    </resultMap>
+
+
+    <resultMap id="MachineSimpleMap" type="com.cf.imes.module.system.controller.admin.machine.vo.MachineSimpleRespVO">
+
+        <result property="id" column="id"/>
+        <result property="name" column="name"/>
+
+    </resultMap>
+
+
+    <select id="selectMachineList"  resultMap="MachineMap">
+
+
+        select smb.id as brandId,
+               smb.brand,
+               smt.id,
+               smt.name
+
+        from system_machine_brand smb
+                 left join system_machine_template smt on smb.id = smt.brand_id
+
+        where  smt.deleted = false and smb.machine_type = #{type}
+
+
+
+    </select>
+</mapper>