Merge remote-tracking branch 'origin/dev' into dev

src/main/resources/mybatis/mapper/inout/IoOrderDao.xml

@@ -34,25 +34,25 @@
                     concat('%', #{corpName}, '%')
             </if>
             <if test="action != null and action != ''">
-                AND action = #{action}
+                AND io.action = #{action}
             </if>
             <if test="remark != null and remark != ''">
-                AND remark  like concat('%', #{remark}, '%')
+                AND io.remark like concat('%', #{remark}, '%')
             </if>
             <if test="mainAction != null and mainAction != ''">
-                AND mainAction = #{mainAction}
+                AND io.mainAction = #{mainAction}
             </if>
             <if test="billNo != null and billNo != ''">
-                AND billNo like concat('%', #{billNo}, '%')
+                AND io.billNo like concat('%', #{billNo}, '%')
             </if>
             <if test="corpOrderId != null and corpOrderId != ''">
-                AND corpOrderId = #{corpOrderId}
+                AND io.corpOrderId = #{corpOrderId}
             </if>
             <if test="fromCorp != null and fromCorp != ''">
-                AND fromCorp = #{fromCorp}
+                AND io.fromCorp = #{fromCorp}
             </if>
             <if test="deptCode != null and deptCode != ''">
-                AND deptCode = #{deptCode}
+                AND io.deptCode = #{deptCode}
             </if>
             <if test="invCode != null and invCode != ''">
                 AND io.invCode = #{invCode}
@@ -75,14 +75,14 @@
                         date_format(#{endAduditTime}, '%Y-%m-%d')
             </if>
             <if test="actions != null and actions.size() != 0">
-                AND `action` in
+                AND io.`action` in
                 <foreach collection="actions" index="index" item="item" open="(" close=")" separator=",">
                     #{item}
                 </foreach>
             </if>
 
             <if test="sourceTypes != null and sourceTypes.size() != 0">
-                AND fromType in
+                AND io.fromType in
                 <foreach collection="sourceTypes" index="index" item="item" open="(" close=")" separator=",">
                     #{item}
                 </foreach>
@@ -98,7 +98,7 @@
                 </foreach>
             </if>
             <if test="dealStatuses != null and dealStatuses.size() != 0">
-                AND dealStatus in
+                AND io.dealStatus in
                 <foreach collection="dealStatuses" index="index" item="item" open="(" close=")" separator=",">
                     #{item}
                 </foreach>
@@ -113,12 +113,12 @@
                 AND io.status = #{status}
             </if>
             <if test="orderType != null">
-                AND orderType = #{orderType}
+                AND io.orderType = #{orderType}
             </if>
 
             <if test="supInoivceSearch != null">
                 <if test="invoiceActions1 != null and invoiceActions2 == null">
-                    AND (`action` in
+                    AND (io.`action` in
                     <foreach collection="invoiceActions1" index="index" item="item" open="(" close=")" separator=",">
                         #{item}
                     </foreach>
@@ -127,7 +127,7 @@
 
                 <if test="invoiceActions1 == null and invoiceActions2 != null">
                     and (
-                            `action` in
+                            io.`action` in
                     <foreach collection="invoiceActions2" index="index" item="item" open="(" close=")" separator=",">
                         #{item}
                     </foreach>
@@ -136,7 +136,7 @@
                 </if>
 
                 <if test="invoiceActions1 != null and invoiceActions2 != null">
-                    AND ((`action` in
+                    AND ((io.`action` in
                     <foreach collection="invoiceActions1" index="index" item="item" open="(" close=")" separator=",">
                         #{item}
                     </foreach>
@@ -355,7 +355,7 @@
             </if>
             <if test="unionRemark != null and unionRemark != ''">
                 AND (io.remark like concat('%', #{unionRemark}, '%')
-                or io.outSickInfo like concat('%', #{unionRemark}, '%'))
+                        or io.outSickInfo like concat('%', #{unionRemark}, '%'))
             </if>
             <if test="busType != null">
                 AND busType = #{busType}
@@ -640,7 +640,7 @@
                 order by ${orderBy} ${sort}
             </when>
             <otherwise>
-                order by checkStatus asc,updateTime desc
+                order by checkStatus asc, updateTime desc
             </otherwise>
         </choose>
     </select>