Public/cf_imes_server
6
0
Fork 0
mirror of http://192.168.1.205:9980/cf_devdept2/cf_imes_server.git synced 2026-08-12 21:02:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

修改机台模板权限表名

Browse Source
This commit is contained in:
yangsb
2024-04-12 08:53:24 +08:00
parent a452ecc7a5
commit e5115fe21a
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/dataobject/machinetemplate/OrganMachineDO.java
+1 -1
View File
@@ -14,7 +14,7 @@ import java.time.LocalDateTime;
* @author Beal * @author Beal
*/ */
@Data @Data
@TableName("system_organ_machine") @TableName("system_machine_template_limit")
@Builder @Builder
@AllArgsConstructor @AllArgsConstructor
@NoArgsConstructor @NoArgsConstructor
cf-module-system/cf-module-system-biz/src/main/resources/mapper/process/MachineTemplateMapper.xml
+5 -5
View File
@@ -69,7 +69,7 @@
<!--<select id="selectOrganTemplatePage" resultMap="orgMap"> <!--<select id="selectOrganTemplatePage" resultMap="orgMap">
select a.id as organId, a.name as organName, max(b.create_time) as updateTime, select a.id as organId, a.name as organName, max(b.create_time) as updateTime,
case when ('${vo.templateName}' != '') then '${vo.templateName}' else '' end as templateName case when ('${vo.templateName}' != '') then '${vo.templateName}' else '' end as templateName
from system_organization a, system_organ_machine b from system_organization a, system_machine_template_limit b
<where> <where>
a.id = b.organ_id a.id = b.organ_id
<if test="vo.organId != null"> <if test="vo.organId != null">
@@ -85,7 +85,7 @@
resultType="com.cf.imes.module.system.controller.admin.machine.vo.OrganTemplateVO"> resultType="com.cf.imes.module.system.controller.admin.machine.vo.OrganTemplateVO">
select b.organ_id organId, b.show_prior_facing, b.show_dual_workstation, b.show_auto_note_printer, select b.organ_id organId, b.show_prior_facing, b.show_dual_workstation, b.show_auto_note_printer,
c.name AS templateName, c.id AS templateId, c.machine_type c.name AS templateName, c.id AS templateId, c.machine_type
from system_organ_machine b from system_machine_template_limit b
inner join system_machine_template c on b.machine_id = c.id and c.deleted = 0 inner join system_machine_template c on b.machine_id = c.id and c.deleted = 0
<where> <where>
b.organ_id = #{organId} b.organ_id = #{organId}
@@ -99,7 +99,7 @@
select * from ( select * from (
select a.id as organId, a.name as organName, max(b.create_time) as updateTime, select a.id as organId, a.name as organName, max(b.create_time) as updateTime,
case when ('${vo.templateName}' != '') then '${vo.templateName}' else '' end as templateName case when ('${vo.templateName}' != '') then '${vo.templateName}' else '' end as templateName
from system_organization a, system_organ_machine b from system_organization a, system_machine_template_limit b
<where> <where>
a.id = b.organ_id a.id = b.organ_id
<if test="vo.organId !=null"> <if test="vo.organId !=null">
@@ -110,7 +110,7 @@
) t1 ) t1
LEFT JOIN ( LEFT JOIN (
select b.organ_id t2_organId select b.organ_id t2_organId
from system_organ_machine b inner join system_machine_template c on b.machine_id = c.id and c.deleted = 0 from system_machine_template_limit b inner join system_machine_template c on b.machine_id = c.id and c.deleted = 0
<where> <where>
<if test="vo.templateName !=null and vo.templateName !='' " > <if test="vo.templateName !=null and vo.templateName !='' " >
c.name like concat('%',#{vo.templateName},'%') c.name like concat('%',#{vo.templateName},'%')
@@ -125,7 +125,7 @@
<select id="selectOrganTemplate" resultMap="orgMap"> <select id="selectOrganTemplate" resultMap="orgMap">
select a.id as organId, a.name as organName, max(b.create_time) as updateTime select a.id as organId, a.name as organName, max(b.create_time) as updateTime
from system_organization a, system_organ_machine b from system_organization a, system_machine_template_limit b
<where> <where>
a.id = b.organ_id a.id = b.organ_id
and a.id = #{vo.organId} and a.id = #{vo.organId}