Browse Source

问题修改

xiaochen 2 years ago
parent
commit
2c30f0d2db

+ 1 - 1
src/main/java/com/tld/service/impl/ContainerServiceImpl.java

@@ -108,7 +108,7 @@ public class ContainerServiceImpl implements ContainerService {
             //导出数据汇总
             List<List<Object>> sheetDataList = new ArrayList<>();
             //表头数据
-            List<Object> head = Arrays.asList("部门", "类别", "容器code","容器名称","数量","创建时间");
+            List<Object> head = Arrays.asList("部门", "类别", "容器编号","容器名称","数量","创建时间");
             //查询数据
             PageHelper.startPage(container.getPage(), container.getLimit());
             PageInfo<Map<String, Object>> list = new PageInfo<>(containerMapper.export(container));

+ 1 - 1
src/main/resources/mapper/ReceiveGoodsMapper.xml

@@ -183,7 +183,7 @@
         left join tld_material b on a.material_id = b.tld_id
         left join tld_customer c on a.supplier_id = c.tld_id
         where
-            a.arrival_time <![CDATA[<]]> CURRENT_DAT() and type = '0'
+            a.arrival_time <![CDATA[<]]> CURDATE() and type = '0'
         <if test="orderCode != null and orderCode != ''">
             and a.order_code = #{orderCode}
         </if>