bonus
/
GZMachinesWeb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改sql语句

This commit is contained in:
马三炮 2026-01-23 10:17:18 +08:00
parent d21636425e
commit bb2d49e944
1 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
resources/mybatis/ma/DisassemblyManagementMapper.xml
View File

@ -124,18 +124,18 @@
</select> </select>
<select id="findByPageTwo" parameterType="com.bonus.ma.beans.DisassemblyManagementBean" resultMap="disassem"> <select id="findByPageTwo" parameterType="com.bonus.ma.beans.DisassemblyManagementBean" resultMap="disassem">
SELECT b.ID,B.OPT_TIME optTime,b.OPTER,b.TYPE_ID,b.OLD_DEVICE_CODE oldCode,b.DEVICE_CODE deviceCode,b.NEW_DEVICE_CODE newCode,org.NAME companyName, SELECT b.ID,b.OPT_TIME optTime,b.OPTER,b.TYPE_ID,b.OLD_DEVICE_CODE oldCode,b.DEVICE_CODE deviceCode,b.NEW_DEVICE_CODE newCode,org.NAME companyName,
mat.`NAME` typeName,matt.`NAME` name ,user.`NAME` userNAME ,b.TYPE,b.orgId as orgId mat.`NAME` typeName,matt.`NAME` name ,user.`NAME` userNAME ,b.TYPE,b.orgId as orgId
FROM ( FROM (
SELECT DISTINCT SELECT DISTINCT
TASK.ID ID,task.TYPE,task.OPT_TIME,task.OPTER,oldRecode.TYPE_ID,'' AS OLD_DEVICE_CODE, task.ID ID,task.TYPE,task.OPT_TIME,task.OPTER,oldRecode.TYPE_ID,'' AS OLD_DEVICE_CODE,
oldRecode.DEVICE_CODE,oldRecode.NEW_DEVICE_CODE, MA_ID,'老设备' ,task.ORG_ID as orgId oldRecode.DEVICE_CODE,oldRecode.NEW_DEVICE_CODE, MA_ID,'老设备' ,task.ORG_ID as orgId
FROM FROM
mm_disassembly task mm_disassembly task
LEFT JOIN mm_disold_record oldRecode ON task.ID = oldRecode.TASK_ID LEFT JOIN mm_disold_record oldRecode ON task.ID = oldRecode.TASK_ID
UNION UNION
SELECT DISTINCT SELECT DISTINCT
TASK.ID,task.TYPE,task.OPT_TIME,task.OPTER,newRecode.TYPE_ID,newRecode.DEVICE_CODE OLD_DEVICE_CODE,newRecode.NEW_DEVICE_CODE DEVICE_CODE, task.ID,task.TYPE,task.OPT_TIME,task.OPTER,newRecode.TYPE_ID,newRecode.DEVICE_CODE OLD_DEVICE_CODE,newRecode.NEW_DEVICE_CODE DEVICE_CODE,
'' AS NEW_DEVICE_CODE, MA_ID, '新设备' ,task.ORG_ID '' AS NEW_DEVICE_CODE, MA_ID, '新设备' ,task.ORG_ID
FROM FROM
mm_disassembly task mm_disassembly task