浏览代码

销售订单单证 日期查询表头

liuchaohui 3 年之前
父节点
当前提交
ab5812e3bc

+ 5 - 2
jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/orderData/controller/SyOrderDataController.java

@@ -1,5 +1,6 @@
 package org.jeecg.modules.documents.orderData.controller;
 
+import java.text.SimpleDateFormat;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
@@ -65,8 +66,10 @@ public class SyOrderDataController extends JeecgController<SyOrderData, ISyOrder
 								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
 								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
 								   HttpServletRequest req) {
-		QueryWrapper<SyOrderData> queryWrapper = QueryGenerator.initQueryWrapper(syOrderData, req.getParameterMap());
-		queryWrapper.orderByDesc("order_date");
+		if(oConvertUtils.isNotEmpty(syOrderData.getOrderDate())){
+			SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+			syOrderData.setDate(sdf.format(syOrderData.getOrderDate()));
+		}
 		Page<SyOrderData> page = new Page<SyOrderData>(pageNo, pageSize);
 		IPage<SyOrderData> pageList = syOrderDataService.queryList(syOrderData,page);
 		return Result.OK(pageList);

+ 2 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/orderData/entity/SyOrderData.java

@@ -193,4 +193,6 @@ public class SyOrderData {
 	/*接受 成衣面辅料判断*/
 	@TableField(exist = false)
 	private java.lang.String isProduct;
+	@TableField(exist = false)
+	private java.lang.String date;
 }

+ 2 - 2
jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/orderData/mapper/xml/SyOrderDataMapper.xml

@@ -48,8 +48,8 @@
              <if test="sy.customerAbbreviation != null and sy.customerAbbreviation !=''">
                  AND customer_abbreviation = #{sy.customerAbbreviation}
              </if>
-             <if test="sy.orderDate !=null and sy.orderDate !=''">
-                 AND order_date = #{sy.orderDate}
+             <if test="sy.date !=null and sy.date !=''">
+                 AND order_date = #{sy.date}
              </if>
              <if test="sy.account != null and sy.account !=''">
                  AND account = #{sy.account}

+ 1 - 1
jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/orderData/service/impl/SyOrderDataServiceImpl.java

@@ -161,7 +161,7 @@ public class SyOrderDataServiceImpl extends ServiceImpl<SyOrderDataMapper, SyOrd
                         " LEFT JOIN PayCondition p ON s.cPayCode = p.cPayCode" +
                         " LEFT JOIN Department de ON s.cDepCode = de.cDepCode" +
                         " LEFT JOIN Customer cc ON s.cCusCode = cc.cCusCode" +
-                        " left join Vendor v on s.cCusCode=v.cVenCode";
+                        " left join Vendor v on s.cCusCode=v.cVenCode where s.dDate > '"+lastTimeSf+"'";
                 List<Map<String, Object>> list = new ArrayList<>();
                 if(pkorgValue[0].equals("one")){
                     list = senYuDataSourceOne.queryForList(sql);