检斤列表增加时间筛选

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/WeighingManagement.java

@@ -154,6 +154,20 @@ public class WeighingManagement extends BaseModel<WeighingManagement> {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date tareDate;
+    /**
+     * 开始时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @TableField(exist = false)
+    private Date startDate;
+    /**
+     * 结束时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @TableField(exist = false)
+    private Date endDate;
     /**
      * 水分
      */

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/WeighingManagementServiceImpl.java

@@ -66,6 +66,8 @@ public class WeighingManagementServiceImpl extends ServiceImpl<WeighingManagemen
         }
         pageView.put("compId", weighingManagement.getCompId());
         pageView.put("searchKeyWord", weighingManagement.getSearchKeyWord());
+        pageView.put("startDate", weighingManagement.getStartDate());
+        pageView.put("endDate", weighingManagement.getEndDate());
         if(StringUtils.isEmpty(weighingManagement.getViewFlag())){
             pageView.put("pageSize", weighingManagement.getPageSize());
             pageView.put("currentPage", weighingManagement.getCurrentPage());

winsea-haixin-plugin-yiliangyiyun/src/main/resources/mapper/WeighingManagementMapper.xml

@@ -14,6 +14,14 @@
             OR lower(car_number) like lower(CONCAT('%',#{searchKeyWord},'%'))
             OR lower(contract_no) like lower(CONCAT('%',#{searchKeyWord},'%')))
         </if>
+        <if test="startDate != null">
+            AND (DATE_FORMAT(tare_date,"%Y%m%d") &gt;=
+            DATE_FORMAT(#{startDate},"%Y%m%d"))
+        </if>
+        <if test="endDate != null">
+            AND (DATE_FORMAT(tare_date,"%Y%m%d") &lt;=
+            DATE_FORMAT(#{endDate},"%Y%m%d"))
+        </if>
         <if test="warehouseName != null and warehouseName != ''">
             AND warehouse_name= #{warehouseName}
         </if>
@@ -61,6 +69,14 @@
             OR lower(a.car_number) like lower(CONCAT('%',#{searchKeyWord},'%'))
             OR lower(a.contract_no) like lower(CONCAT('%',#{searchKeyWord},'%')))
         </if>
+        <if test="startDate != null">
+            AND (DATE_FORMAT(tare_date,"%Y%m%d") &gt;=
+            DATE_FORMAT(#{startDate},"%Y%m%d"))
+        </if>
+        <if test="endDate != null">
+            AND (DATE_FORMAT(tare_date,"%Y%m%d") &lt;=
+            DATE_FORMAT(#{endDate},"%Y%m%d"))
+        </if>
         <if test="warehouseName != null and warehouseName != ''">
             AND a.warehouse_name= #{warehouseName}
         </if>