销售订单单证 新表头查询

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

@@ -41,7 +41,7 @@ public class SyOrderData {
 	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
     @DateTimeFormat(pattern="yyyy-MM-dd")
     @ApiModelProperty(value = "订单日期")
-	private java.util.Date orderDate;
+	private java.lang.String orderDate;
 	/**业务类型*/
 	@Excel(name = "业务类型", width = 15)
     @ApiModelProperty(value = "业务类型")

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

@@ -66,6 +66,9 @@
              <if test="(sy.isProduct != null and sy.isProduct != '') and (sy.isProduct == '1' or sy.isProduct == 1) ">
                  AND b.inventory_code not like '19%'
              </if>
+        <if test="(sy.isProduct != null and sy.isProduct != '') or (sy.dilivery != null and sy.dilivery != '')">
+        GROUP BY a.id
+        </if>
         ORDER BY
             order_date DESC
     </select>