提交

src/main/java/com/steerinfo/dil/service/impl/AmstruckInwardPlanServiceImpl.java

@@ -17,6 +17,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.math.BigDecimal;
+import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
@@ -91,6 +92,9 @@ public class AmstruckInwardPlanServiceImpl extends BaseServiceImpl<AmstruckInwar
     @Override
     public List<Map<String, Object>> getTruckPlanList(Map<String, Object> mapValue) {
         BigDecimal planStatus = (BigDecimal)mapValue.get("planStatus");
+//        在mapValue中存储当前时间
+        SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        mapValue.put("newTime",format.format(new Date()));
         List<Map<String,Object>> mapList;
         if (planStatus.intValue() == 0) {
             mapList = amstruckInwardPlanMapper.getTruckPlanList(mapValue);

src/main/resources/com/steerinfo/dil/mapper/AmstruckInwardPlanMapper.xml

@@ -639,13 +639,13 @@
             and AIP.PLAN_STATUS in (1,2)
         </if>
         <if test="planStatus == 4">
-            and AIP.PLAN_STATUS = 4
+            and to_date(#{newTime}, 'yyyy-mm-dd hh24:mi:ss') >= AIR.DUE_DATE
         </if>
         <if test="planStatus == 2">
             and AIP.PLAN_STATUS = 2
         </if>
         <if test="planStatus == 3">
-            and AIP.PLAN_STATUS = 3
+            and to_date(#{newTime}, 'yyyy-mm-dd hh24:mi:ss') &lt;= AIR.DUE_DATE
         </if>
         )
         <where>