修改sql语句
This commit is contained in:
parent
d21636425e
commit
bb2d49e944
|
|
@ -124,18 +124,18 @@
|
|||
|
||||
</select>
|
||||
<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
|
||||
FROM (
|
||||
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
|
||||
FROM
|
||||
mm_disassembly task
|
||||
LEFT JOIN mm_disold_record oldRecode ON task.ID = oldRecode.TASK_ID
|
||||
UNION
|
||||
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
|
||||
FROM
|
||||
mm_disassembly task
|
||||
|
|
|
|||
Loading…
Reference in New Issue