tijiao

src/main/java/com/steerinfo/dil/controller/AmstruckInwardRequirementController.java

@@ -193,7 +193,7 @@ public class AmstruckInwardRequirementController extends BaseRESTfulController {
             mapValue.put("enableStatus",enableStatus);
         }
         if(planStatus != null){
-            mapValue.put("planStatus",planStatus);
+            mapValue.put("planStatus",DataChange.dataToBigDecimal(planStatus));
         }
         if(con != null && !"null".equals(con)){
             mapValue.put("con","%" + con + "%");

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

@@ -1349,10 +1349,10 @@
         <if test="planStatus != null">
             and AIP.PLAN_STATUS = #{planStatus}
         </if>
-        <if test="oneDate != null and planStatus not in(2, 3) ">
+        <if test="oneDate != null and planStatus != 2 and planStatus != 3  ">
             and to_date(#{oneDate}, 'yyyy-mm-dd hh24:mi:ss') &lt;= AIR.INSERT_TIME
         </if>
-        <if test="startDate != null and planStatus not in(2, 3)">
+        <if test="startDate != null and planStatus != 2 and planStatus != 3 ">
             and to_date(#{startDate}, 'yyyy-mm-dd hh24:mi:ss') &lt;= AIR.INSERT_TIME
             and to_date(#{endDate}, 'yyyy-mm-dd hh24:mi:ss') >= AIR.INSERT_TIME
         </if>