Selaa lähdekoodia

'销售页面'

HUJIANGUO 3 vuotta sitten
vanhempi
commit
1748220c2a

+ 1 - 1
src/main/java/com/steerinfo/dil/mapper/AmsSaleOrderMapper.java

@@ -127,7 +127,7 @@ public interface AmsSaleOrderMapper extends IBaseMapper<AmsSaleOrder, BigDecimal
     // 副产品关闭未进厂的运单
     int closeOrderNotIn(BigDecimal saleOrderId);
     // 展示反审批的销售订单
-    List<Map<String, Object>> getSteelOrderDeletedList();
+    List<Map<String, Object>> getSteelOrderDeletedList(Map<String,Object> mapValue);
     // 展示所有状态销售订单列表
     List<Map<String, Object>> getAllSteelSaleOrderList(Map<String, Object> mapValue);
 }

+ 1 - 1
src/main/java/com/steerinfo/dil/service/impl/AmsSaleOrderServiceImpl.java

@@ -1532,7 +1532,7 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
      */
     @Override
     public List<Map<String, Object>> getSteelOrderDeletedList(Map<String, Object> mapValue) {
-        List<Map<String, Object>> mapList = amsSaleOrderMapper.getSteelOrderDeletedList();
+        List<Map<String, Object>> mapList = amsSaleOrderMapper.getSteelOrderDeletedList(mapValue);
         return mapList;
     }
 

+ 1 - 1
src/main/resources/bootstrap.yml

@@ -29,7 +29,7 @@ cache:
 redis:
   host: 10.10.50.28
   port: 6379
-  pwd: 123456
+  pwd: adhykdj
   project:
     prefix: sysmanage
   pool:

+ 3 - 0
src/main/resources/com/steerinfo/dil/mapper/AmsSaleOrderMapper.xml

@@ -1940,6 +1940,9 @@
     <if test="con != null">
       and (instr(r_consignee.CONSIGNEE_COMPANY_NAME, #{con}) > 0 or instr(a_s_order.SALE_NUMBER, #{con}) > 0)
     </if>
+    <if test="oneDate != null">
+      and to_date(#{oneDate}, 'yyyy-mm-dd hh24:mi:ss') &lt;= a_s_order.UPDATE_TIME
+    </if>
     <if test="startDate != null">
       and to_date(#{startDate}, 'yyyy-mm-dd hh24:mi:ss') &lt;= a_s_order.UPDATE_TIME
       and to_date(#{endDate}, 'yyyy-mm-dd hh24:mi:ss') >= a_s_order.UPDATE_TIME