发票查看已审核未审核，用户关联单据类型问题

src/main/resources/application-dev.yml

@@ -3,7 +3,7 @@ server:
 spring:
   datasource:
     driver-class-name: com.p6spy.engine.spy.P6SpyDriver
-    jdbc-url: jdbc:p6spy:mysql://127.0.0.1:3306/udi_spms_ph?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
+    jdbc-url: jdbc:p6spy:mysql://127.0.0.1:3306/udi_spms_pt?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
     username: root
     password: 123456
     hikari:

src/main/resources/mybatis/mapper/auth/WarehouseBussinessTypeDao.xml

@@ -138,7 +138,7 @@
         from auth_warehouse_bustype
                      inner join basic_bussiness_type on auth_warehouse_bustype.action = basic_bussiness_type.action
         where code = #{code}
-        group by auth_warehouse_bustype.id
+        group by auth_warehouse_bustype.code
     </select>
 
 

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

@@ -211,7 +211,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="startTime != null and startTime != '' and endTime != null and endTime != ''">
                 AND date_format(createTime, '%Y-%m-%d') between date_format(#{startTime}, '%Y-%m-%d') and date_format(#{endTime}, '%Y-%m-%d')
@@ -273,7 +273,7 @@
                     <foreach collection="invoiceActions2" index="index" item="item" open="(" close=")" separator=",">
                         #{item}
                     </foreach>
-                    and status = 7
+                    and (status = 7 or status = 10)
                             )
                 </if>
 
@@ -288,7 +288,7 @@
                     <foreach collection="invoiceActions2" index="index" item="item" open="(" close=")" separator=",">
                         #{item}
                     </foreach>
-                    and status = 7)
+                    and (status = 7 or status = 10))
                             )
                 </if>
             </if>
@@ -322,8 +322,8 @@
                 AND fromCorp = #{fromCorp}
             </if>
             <if test="unionRemark != null and unionRemark != ''">
-                AND (io.remark like concat('%', #{unionRemark}, '%')
+                AND (io_order.remark like concat('%', #{unionRemark}, '%')
-                or io.outSickInfo like concat('%', #{unionRemark}, '%'))
+                        or io_order.outSickInfo like concat('%', #{unionRemark}, '%'))
             </if>
             <if test="customerId != null and customerId != ''">
                 AND customerId = #{customerId}
@@ -474,7 +474,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="inCodeStatus != null">
                 AND io.inCodeStatus = #{inCodeStatus}