机台授权接口-新需求更改

cf-module-system/cf-module-system-biz/src/main/resources/mapper/machine/MachineBrandMapper.xml

@@ -7,6 +7,7 @@
 
         <result property="brandId" column="brandId"/>
         <result property="brand" column="brand"/>
+        <result property="machineType" column="machineType"/>
 
         <collection property="machineSimpleRespVOS" ofType="com.cf.imes.module.system.controller.admin.machine.vo.MachineSimpleRespVO" resultMap="MachineSimpleMap"/>
 
@@ -34,6 +35,19 @@
 
         where  smt.deleted = false and smb.machine_type = #{type}
 
+    <select id="selectMachineNoDefault"  resultMap="MachineMap">
+
+
+        select smb.id as brandId,
+               smb.machine_type as machineType,
+               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 smt.is_enabled = true and smt.is_default = false
 
 
     </select>

cf-module-system/cf-module-system-biz/src/main/resources/mapper/machine/MachineLimitMapper.xml

@@ -0,0 +1,33 @@
+<?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.MachineLimitMapper">
+
+
+    <select id="selectOrganMachinePage" resultType="com.cf.imes.module.system.controller.admin.machine.vo.OrganMachineResp" parameterType="map">
+
+
+
+        select sml.*
+        from system_machine_limit sml
+
+                 left join system_organization so on sml.organ_id = so.id
+                 left join system_machine_template smt on sml.setting like concat(smt.id, '%')
+        <where>
+            sml.deleted = false
+          and smt.deleted = false
+          and smt.is_enabled = true
+          and smt.is_default = false
+          and so.status = 0
+
+        <if test="machinePage.organName !=null">
+            and so.name like concat('%', #{machinePage.organName},'%')
+        </if>
+
+        <if test="machinePage.machineName !=null">
+            and smt.name like concat('%', #{machinePage.machineName},'%')
+        </if>
+
+        </where>
+
+    </select>
+</mapper>