Merge pull request #261 from in27sung/shipment21

asdf
in27sung · Dec 24, 2024 · 2e019a3 · 2e019a3
2 parents d720e30 + 55309df
commit 2e019a3
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 20 deletions.
diff --git a/stockMate/src/main/java/com/stockm8/controller/ReceivingController.java b/stockMate/src/main/java/com/stockm8/controller/ReceivingController.java
@@ -128,7 +128,9 @@ public void searchGET(@RequestParam(value = "startDate", required = false) Strin
 	    int totalCount = 0;
 
 	    // 날짜와 키워드가 모두 있는 경우
-	    if (startDate != null && endDate != null && keyword != null) {
+	    if (startDate != null && !startDate.trim().isEmpty() && 
+	    	    endDate != null && !endDate.trim().isEmpty() && 
+	    	    keyword != null && !keyword.trim().isEmpty()) { 
 	        ReceivingList = rService.getHistoryByDateRange(startDate, endDate, keyword, cri, businessId);
 	        totalCount = rService.getTotalCountBySearch(startDate, endDate, keyword, businessId);
 

diff --git a/stockMate/src/main/java/com/stockm8/controller/ShipmentController.java b/stockMate/src/main/java/com/stockm8/controller/ShipmentController.java
@@ -128,7 +128,9 @@ public void searchGET(@RequestParam(value = "startDate", required = false) Strin
 	    int totalCount = 0;
 
 	    // 날짜와 키워드가 모두 있는 경우
-	    if (startDate != null && endDate != null && keyword != null) {
+	    if (startDate != null && !startDate.trim().isEmpty() && 
+	    	    endDate != null && !endDate.trim().isEmpty() && 
+	    	    keyword != null && !keyword.trim().isEmpty()) {
 	        ShipmentList = sService.getHistoryByDateRange(startDate, endDate, keyword, cri, businessId);
 	        totalCount = sService.getTotalCountBySearch(startDate, endDate, keyword, businessId);
 

diff --git a/stockMate/src/main/resources/mappers/receivingMapper.xml b/stockMate/src/main/resources/mappers/receivingMapper.xml
@@ -175,17 +175,18 @@ WHERE NOT EXISTS (
     JOIN warehouses w ON w.warehouse_id = r.warehouse_id
     JOIN users u on u.user_id = r.created_by
     <where>
-        <if test="startDate != ''">
-            r.created_at &gt;= #{startDate}
-        </if>
-        <if test="endDate != ''">
-            AND r.created_at &lt;= #{endDate}
-        </if>
-        <if test="keyword != ''">
-            AND (p.product_name LIKE CONCAT('%', #{keyword}, '%') )
-        </if>
+    <if test="startDate != null and startDate != ''">
+        r.created_at &gt;= #{startDate}
+    </if>
+    <if test="endDate != null and endDate != ''">
+        AND r.created_at &lt;= #{endDate}
+    </if>
+    <if test="keyword != null and keyword != ''">
+        AND p.product_name LIKE CONCAT('%', #{keyword}, '%')
+    </if>
         	AND transaction_type = 'INBOUND' 
         	AND u.business_id = #{businessId}
+
     </where>
     ORDER BY r.receiving_shipment_no desc
     limit #{cri.startPage},#{cri.pageSize};

diff --git a/stockMate/src/main/resources/mappers/shipmentMapper.xml b/stockMate/src/main/resources/mappers/shipmentMapper.xml
@@ -155,15 +155,15 @@ WHERE NOT EXISTS (
     JOIN warehouses w ON w.warehouse_id = r.warehouse_id
     JOIN users u on u.user_id = r.created_by
     <where>
-        <if test="startDate != ''">
-            r.created_at &gt;= #{startDate}
-        </if>
-        <if test="endDate != ''">
-            AND r.created_at &lt;= #{endDate}
-        </if>
-        <if test="keyword != ''">
-            AND (p.product_name LIKE CONCAT('%', #{keyword}, '%') )
-        </if>
+    <if test="startDate != null and startDate != ''">
+        r.created_at &gt;= #{startDate}
+    </if>
+    <if test="endDate != null and endDate != ''">
+        AND r.created_at &lt;= #{endDate}
+    </if>
+    <if test="keyword != null and keyword != ''">
+        AND p.product_name LIKE CONCAT('%', #{keyword}, '%')
+    </if>
         	AND transaction_type = 'OUTBOUND' 
         	AND u.business_id = #{businessId}
     </where>