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

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

@@ -496,7 +496,7 @@ public class AmsSaleOrderController extends BaseRESTfulController {
         DataChange.queryDataByDateTime(startTime, endTime, mapValue, sdfDateTime);//根据时间段查询数据
         PageHelper.startPage(pageNum,pageSize);
         List<Map<String, Object>> amsSaleOrder1 = amsSaleOrderService.getSaleOrderInfoes(mapValue);
-        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, null,amsSaleOrder1);
+        PageListAdd pageList = columnDataUtil.tableColumnData4(apiId, null,amsSaleOrder1);
         return success(pageList);
     }
 
@@ -522,7 +522,7 @@ public class AmsSaleOrderController extends BaseRESTfulController {
         DataChange.queryDataByDateTime(startTime, endTime, mapValue, sdfDateTime);//根据时间段查询数据
         PageHelper.startPage(pageNum,pageSize);
         List<Map<String, Object>> amsSaleOrder1 = amsSaleOrderService.getSaleOrderReportedes(mapValue);
-        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, null,amsSaleOrder1);
+        PageListAdd pageList = columnDataUtil.tableColumnData4(apiId, null,amsSaleOrder1);
         return success(pageList);
     }
 
@@ -554,9 +554,7 @@ public class AmsSaleOrderController extends BaseRESTfulController {
             mapValue.put("consigneeSsoId",consigneeSsoId);
         }
         mapValue.put("saleType",saleType);
-        if (saleType != null) {
-            DataChange.queryDataByDateTime(startTime, endTime, mapValue, sdfDateTime);//根据时间段查询数据
-        }
+        DataChange.queryDataByDateTime(startTime, endTime, mapValue, sdfDateTime);//根据时间段查询数据
 //        SimpleDateFormat simpleDateFormat=new SimpleDateFormat("yyyy-MM-dd");
 //        if(startDate != null  && !"".equals(startDate) && !"null".equals(startDate)){
 //            Date startTime=new Date(Long.parseLong(startDate));
@@ -572,7 +570,7 @@ public class AmsSaleOrderController extends BaseRESTfulController {
         PageHelper.startPage(pageNum,pageSize);
         //分页数据
         List<Map<String, Object>> saleOrderList = amsSaleOrderService.getSaleOrderListBySaleCompanyes(mapValue);
-        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, null,saleOrderList);
+        PageListAdd pageList = columnDataUtil.tableColumnData4(apiId, null,saleOrderList);
         return success(pageList);
     }
 
@@ -1022,17 +1020,20 @@ public class AmsSaleOrderController extends BaseRESTfulController {
                                             Integer pageSize,
                                             Integer apiId,
                                             String con,
-                                            BigDecimal deleted
+                                            BigDecimal deleted,
+                                            @RequestParam(required = false) String startTime,
+                                            @RequestParam(required = false)String endTime
     ) {
         if (con != null && !"".equals(con) && !"null".equals(con)) {
             mapValue.put("con", con);
         }
+        DataChange.queryDataByDateTime(startTime, endTime, mapValue, sdfDateTime);//根据时间段查询数据
         mapValue.put("deleted",deleted);
         //不分页筛选数据
         PageHelper.startPage(pageNum, pageSize);
         //分页数据
         List<Map<String, Object>> saleOrderList = amsSaleOrderService.getFuSaleOrderList(mapValue);
-        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, null, saleOrderList);
+        PageListAdd pageList = columnDataUtil.tableColumnData4(apiId, null, saleOrderList);
         return success(pageList);
     }
 
@@ -1120,4 +1121,11 @@ public class AmsSaleOrderController extends BaseRESTfulController {
         PageListAdd pageList = columnDataUtil.tableColumnData(apiId, null,saleOrderList);
         return success(pageList);
     }
+
+    @ApiModelProperty(value = "修改厂内未装货车辆的运单车牌号")
+    @PostMapping("/updateCapacityNumberInFactory")
+    public RESTfulResult updateCapacityNumberInFactory(@RequestBody Map<String,Object> mapValue) {
+        int result = amsSaleOrderService.updateCapacityNumberInFactory(mapValue);
+        return success(result);
+    }
 }

src/main/java/com/steerinfo/dil/mapper/AmsSaleOrderMapper.java

@@ -130,4 +130,6 @@ public interface AmsSaleOrderMapper extends IBaseMapper<AmsSaleOrder, BigDecimal
     List<Map<String, Object>> getSteelOrderDeletedList(Map<String,Object> mapValue);
     // 展示所有状态销售订单列表
     List<Map<String, Object>> getAllSteelSaleOrderList(Map<String, Object> mapValue);
+    // 修改厂内未装货车辆的运单车牌号
+    int updateCapacityNumberInFactory(Map<String, Object> mapValue);
 }

src/main/java/com/steerinfo/dil/service/IAmsSaleOrderService.java

@@ -155,4 +155,6 @@ public interface IAmsSaleOrderService {
     List<Map<String, Object>> getSteelOrderDeletedList(Map<String, Object> mapValue);
     // 展示所有状态销售订单列表
     List<Map<String, Object>> getAllSteelSaleOrderList(Map<String, Object> mapValue);
+    // 修改厂内未装货车辆的运单车牌号
+    int updateCapacityNumberInFactory(Map<String, Object> mapValue);
 }

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

@@ -1545,4 +1545,15 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
     public List<Map<String, Object>> getAllSteelSaleOrderList(Map<String, Object> mapValue) {
         return amsSaleOrderMapper.getAllSteelSaleOrderList(mapValue);
     }
+
+    /**
+     * 修改厂内未装货车辆的运单车牌号
+     * @param mapValue
+     * @return
+     */
+    @Override
+    public int updateCapacityNumberInFactory(Map<String, Object> mapValue) {
+        int result = amsSaleOrderMapper.updateCapacityNumberInFactory(mapValue);
+        return result;
+    }
 }

src/main/resources/bootstrap.yml

@@ -16,7 +16,10 @@ spring:
 eureka:
   client:
     service-url:
-      defaultZone: http://root:root@${EUREKA_HOST:172.16.33.166}:${EUREKA_PORT:8081}/eureka/
+      defaultZone: http://root:root@${EUREKA_HOST:172.16.33.161}:${EUREKA_PORT:8081}/eureka/
+    register-with-eureka: true #表示向EurekaServer注册自己 默认为true
+    fetch-registry: true #是否从EurekaServer抓取已有的注册信息，默认为true,单节点无所谓,集群必须设置为true才能配合ribbon使用负载均衡
+
   instance:
     prefer-ip-address: true
     status-page-url: http://${spring.cloud.client.ip-address}:${server.port}/swagger-ui.html#/

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

@@ -3611,6 +3611,13 @@
     <if test="consigneeSsoId != null">
       and r_consignee.CONSIGNEE_SSO_ID = #{consigneeSsoId}
     </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
+    </if>
     ORDER BY a_s_order.UPDATE_TIME DESC
     )
     <where>
@@ -4075,4 +4082,11 @@
       </if>
     </where>
   </select>
+
+  <!-- 修改厂内未装货车辆的运单车牌号 -->
+  <update id="updateCapacityNumberInFactory" parameterType="java.util.Map" >
+    UPDATE OMSTRUCK_ORDER OO
+    SET OO.CAPACITY_ID = #{capacityId}
+    WHERE OO.ORDER_ID = #{orderId}
+  </update>
 </mapper>