杰生重构 标签管理

hx-service/storage-restructure/src/main/java/com/fjhx/controller/quality/QualityTestingController.java

@@ -89,6 +89,5 @@ public class QualityTestingController {
         return R.success(result);
     }
 
-
 }
 

hx-service/storage-restructure/src/main/java/com/fjhx/mapper/water/WaterTagMapper.xml

@@ -2,14 +2,19 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.fjhx.mapper.water.WaterTagMapper">
 
-    <select id="getPage" resultType="java.util.Map">
+    <select id="getPage" resultType="java.util.LinkedHashMap">
         select wt.id,
                wt.number,
                m.name materialName,
                m.code materialCode,
+               m.width,
+               m.unit_weight,
                wt.quantity,
                wt.create_time,
-               wt.rfid_code
+               wt.rfid_code,
+               wt.qr_code,
+               wt.create_time,
+               wt.had_printer
         from water_tag wt
                  left join material m on wt.material_id = m.id
             ${ew.customSqlSegment}

hx-service/storage-restructure/src/main/java/com/fjhx/service/water/impl/WaterTagServiceImpl.java

@@ -60,9 +60,17 @@ public class WaterTagServiceImpl extends ServiceImpl<WaterTagMapper, WaterTag> i
     public Page<Map<String, Object>> getPage(Condition condition) {
 
         Long waterBatchId = condition.getLong("waterBatchId");
+        Integer hadPrinter = condition.getInt("hadPrinter");
+        String keyword = condition.getKeyword();
 
         QueryWrapper<WaterTag> wrapper = Wrappers.<WaterTag>query()
-                .eq(waterBatchId != null, "wt.water_batch_id", waterBatchId);
+                .eq(waterBatchId != null, "wt.water_batch_id", waterBatchId)
+                .eq(hadPrinter != null, "wt.had_printer", hadPrinter)
+                .and(keyword != null, q -> q
+                        .like("m.name", keyword).or()
+                        .like("m.code", keyword).or()
+                        .like("wt.rfid_code", keyword)
+                );
 
         return baseMapper.getPage(condition.getPage(), wrapper);
     }