优化

bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/domain/Machine.java

@@ -70,8 +70,8 @@ public class Machine extends BaseEntity
     /** 出厂日期 */
     @ApiModelProperty(value = "出厂日期")
     @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "出厂日期", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date outFacTime;
+    @Excel(name = "出厂日期")
+    private String outFacTime;
 
     /** 出厂编号 */
     @Excel(name = "出厂编号")

bonus-modules/bonus-material/src/main/resources/mapper/material/codeCollection/WsMaInfoMapper.xml

@@ -78,8 +78,11 @@
         SELECT *
         FROM ws_ma_info
         <where>
-            <if test="maCode != null">
-                ma_code like concat('%', #{maCode}, '%')
+            <if test="maCode != null and maCode != ''">
+                and ma_code like concat('%', #{maCode}, '%')
+            </if>
+            <if test="qrCode != null and qrCode != ''">
+                and qr_code = #{qrCode}
             </if>
         </where>
     </select>