Merge branch 'master' of https://git.steerinfo.com/DAL-DAZHOU/DAL-DAZHOU-AMS-API

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

@@ -1254,7 +1254,7 @@ public class AmsSaleOrderController extends BaseRESTfulController {
         }
         else {
             // 调用EAS接口将车牌号传给金蝶
-            /*List<Map<String,Object>> mapList = new ArrayList<>();
+            List<Map<String,Object>> mapList = new ArrayList<>();
             mapList.add(mapValue);
             Map<String, Object> input = joinFeign.findCarNumberByOrderList(mapList);
             Map<String, Object> totalMap = easCapacityTestUtil.getTotalMap();
@@ -1265,7 +1265,7 @@ public class AmsSaleOrderController extends BaseRESTfulController {
             Map<String, Object> s = joinFeign.pushCarNumberToEas(totalMap);
             System.out.println("-------------------------------------");
             System.out.println(s);
-            System.out.println("-------------------------------------");*/
+            System.out.println("-------------------------------------");
             return success(result);
         }
     }

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

@@ -161,6 +161,14 @@ public class AmstruckInwardRequirementController extends BaseRESTfulController {
         PageHelper.startPage(pageNum, pageSize);
         //分页查询数据
         List<Map<String, Object>> columnList = amstruckInwardRequirementService.getTruckRequirementList(mapValue);
+        columnList.forEach(e->{
+            String tel = e.get("Tel").toString();
+            if (tel.length()==11){
+                return;
+            }
+            String telNew=tel.substring(0,11)+"-"+tel.substring(11,tel.length());
+            e.put("Tel",telNew);
+        });
         PageListAdd data = columnDataUtil.tableColumnData(apiId, null, columnList);
         return success(data);
     }

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

@@ -730,6 +730,7 @@
 --     where a_t_price.DELETED = 0
 --     and a_t_price.TYPE = 1 and a_t_price.DEPARTMENT = 2
     <where>
+        TYPE=1
         <if test="deleted != null">
           and a_t_price.DELETED = #{deleted}
         </if>

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

@@ -653,6 +653,7 @@
             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>
         <if test="con != null">