Merge remote-tracking branch 'origin/master'

src/main/java/com/glxp/api/req/inv/FilterInvRemindMsgRequest.java

@@ -59,4 +59,8 @@ public class FilterInvRemindMsgRequest extends ListPageRequest {
      */
     private String supId;
 
+    /**
+     * 物资名称
+     */
+    private String productName;
 }

src/main/resources/mybatis/mapper/inv/InvRemindMsgDao.xml

@@ -28,8 +28,8 @@
                (select `name` from auth_space where `code` = irm.invSpaceCode and invCode = irm.invCode) invSpaceName,
                (select `name` from basic_corp where erpId = irm.supId)                                   supName
         from inv_remind_msg irm
-                     left join basic_udirel bu on bu.id = irm.relId
+                 left join basic_udirel bu on bu.id = irm.relId
-                     left join basic_products bp on bp.uuid = bu.uuid
+                 left join basic_products bp on bp.uuid = bu.uuid
         <where>
             <if test="relId != null and relId != ''">
                 AND irm.relId = #{relId}
@@ -50,7 +50,7 @@
                 AND irm.ignoreStatus = #{ignoreStatus}
             </if>
             <if test="ggxh != null and ggxh != ''">
-                AND bp.ggxh = #{ggxh}
+                AND bp.ggxh like concat('%', #{ggxh}, '%')
             </if>
             <if test="type != null and type != ''">
                 AND type = #{type}
@@ -58,6 +58,9 @@
             <if test="supId != null">
                 AND irm.supId = #{supId}
             </if>
+            <if test="productName != null and productName != ''">
+                AND bp.cpmctymc like concat('%', #{productName}, '%')
+            </if>
         </where>
         order by irm.updateTime desc
     </select>

src/main/resources/mybatis/mapper/inv/invProductDao.xml

@@ -252,9 +252,9 @@
                ip.productionDate,
                ip.expireDate,
                ip.supId,
-               sum(ip.inCount)  incount,
+               ip.inCount,
-               sum(ip.outCount) outCount,
+               ip.outCount,
-               sum(ip.reCount)  reCount
+               ip.reCount
         from inv_product ip
                      left join inv_product_detail ipd
                 on ip.relIdFk = ipd.relId and ifnull(ip.batchNo, 'empty') = ifnull(ipd.batchNo, 'empty')