机具库存收藏修改

resources/mybatis/ma/GpsBindingMapper.xml

@@ -99,11 +99,16 @@
  	<select id="findGpsFlowPage" parameterType="com.bonus.ma.beans.GpsBindingBean" resultMap="gisBean">
         select DISTINCT
         mam.ID,matt.ID as tyoeId0,matt.`NAME` as typeName,mat.ID as tyoeId,mat.`NAME` as type,
-				mam.OUT_FAC_TIME as outFactortTime,mam.DEVICE_CODE as deviceCode,mam.OUT_FAC_NUM as outFactortNum,ROUND(mat.BUY_PRICE) as buyPrice,mam.PIC_URL as picUrl,
+        mam.OUT_FAC_TIME as outFactortTime,mam.DEVICE_CODE as deviceCode,mam.OUT_FAC_NUM as
-			    mam.IS_FIXED_ASSETS as isFixedAssets,mat.LEASE_PRICE as leasePrice,ROUND(mat.PAY_PRICE) as payPrice,	mam.ASSETS_NUM as assetNum,mam.CYCLE_NUM as outInNum,
+        outFactortNum,ROUND(mat.BUY_PRICE) as buyPrice,mam.PIC_URL as picUrl,
-				mam.REMARK as remarks,mam.PROPERTY_DEPARTMENT as propertyDepartment,mam.USE_DEPARTMENT as useDepartment,mam.SERVICE_LIFE as serviceLife,
+        mam.IS_FIXED_ASSETS as isFixedAssets,mat.LEASE_PRICE as leasePrice,ROUND(mat.PAY_PRICE) as payPrice,
-				mam.BATCH_STATUS as batchStatus,mam.GPS_CODE as gpsCode,mam.MAKE_ORDER_DATE as makeOrderDate,mam.INVOICE_DATE as invoiceDate,mam.QRCODE as qrcode,mam.DEVICE_TYPE as deviceType
+        mam.ASSETS_NUM as assetNum,mam.CYCLE_NUM as outInNum,
-				,org.NAME  companyName,mam.ORIGIN_NUM  originNum,rel.ORG_ID orgId ,mam.GPS_CODE  ,flow.OPERTER_TIME  optTime,flow.OPERTER,user.`NAME`  ,user.LOGIN_NAME userName
+        mam.REMARK as remarks,mam.PROPERTY_DEPARTMENT as propertyDepartment,mam.USE_DEPARTMENT as
+        useDepartment,mam.SERVICE_LIFE as serviceLife,
+        mam.BATCH_STATUS as batchStatus,mam.GPS_CODE as gpsCode,mam.MAKE_ORDER_DATE as makeOrderDate,mam.INVOICE_DATE as
+        invoiceDate,mam.QRCODE as qrcode,mam.DEVICE_TYPE as deviceType
+        ,org.NAME companyName,mam.ORIGIN_NUM originNum,rel.ORG_ID orgId ,mam.GPS_CODE ,flow.OPERTER_TIME
+        optTime,flow.OPERTER,user.`NAME` ,user.LOGIN_NAME userName
         ,flow.GIS_CODE gisCode,flow.type gisType
         from ma_gis_code_flow flow
         LEFT JOIN mm_machines mam on flow.MA_ID=mam.id
@@ -124,10 +129,10 @@
             and mam.DEVICE_TYPE = #{param.deviceType}
         </if>
         <if test="param.typeName != null and param.typeName != ''">
-				and matt.`NAME` = #{param.typeName}
+            and matt.`NAME` LIKE CONCAT('%', #{param.typeName},'%')
         </if>
         <if test="param.type != null and param.type != ''">
-				and mat.`NAME` = #{param.type}
+            and mat.`NAME` LIKE CONCAT('%',#{param.type},'%')
         </if>
         <if test="param.keyWord !=null and param.keyWord !=''">
             and (
@@ -137,7 +142,8 @@
             mam.QRCODE LIKE CONCAT('%',#{param.keyWord},'%') OR
             mam.BATCH_STATUS LIKE CONCAT('%',#{param.keyWord},'%') OR
             flow.GIS_CODE LIKE CONCAT('%',#{param.keyWord},'%') OR
-				  	user.LOGIN_NAME  LIKE CONCAT('%',#{param.keyWord},'%') 
+            user.LOGIN_NAME LIKE CONCAT('%',#{param.keyWord},'%') OR
+            org.NAME LIKE CONCAT('%',#{param.keyWord},'%')
             )
         </if>
 

resources/mybatis/scrap/ScrapApplyMapper.xml

@@ -29,6 +29,8 @@
 				wsa.`CODE` LIKE CONCAT('%',#{param.keyWord},'%')
 				OR wsa.CREATOR LIKE CONCAT('%',#{param.keyWord},'%')	
 				OR wsa.APPLY_REMARK LIKE CONCAT('%',#{param.keyWord},'%')
+			    OR pu.`NAME` LIKE CONCAT('%',#{param.keyWord},'%')
+			    OR mt2.`NAME` LIKE CONCAT('%',#{param.keyWord},'%')
 			)
 		</if>
 		GROUP BY wsa.id

resources/mybatis/scrap/ScrapAuditMapper.xml

@@ -59,6 +59,10 @@
             wsa.`CODE` LIKE CONCAT('%',#{param.keyWord},'%')
             or pu.`NAME` LIKE CONCAT('%',#{param.keyWord},'%')
             or pu2.`NAME` LIKE CONCAT('%',#{param.keyWord},'%')
+            OR wsa.CREATOR LIKE CONCAT('%',#{param.keyWord},'%')
+            OR wsa.APPLY_REMARK LIKE CONCAT('%',#{param.keyWord},'%')
+            OR pu.`NAME` LIKE CONCAT('%',#{param.keyWord},'%')
+            OR mt2.`NAME` LIKE CONCAT('%',#{param.keyWord},'%')
 
             )
         </if>

resources/mybatis/scrap/ScrapTaskRecordMapper.xml

@@ -32,6 +32,7 @@
 				OR mam.ASSETS_NUM LIKE CONCAT('%',#{param.keyWord},'%')	
 				OR mam.DEVICE_CODE LIKE CONCAT('%',#{param.keyWord},'%')	
 				OR mam.REMARK LIKE CONCAT('%',#{param.keyWord},'%')
+			    OR sup2.NUMBER LIKE CONCAT('%',#{param.keyWord},'%')
 			)
 		</if>
   	<!-- union