'焦炭一车多趟'

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

@@ -3,6 +3,7 @@ package com.steerinfo.dil.controller;
 import com.steerinfo.dil.service.impl.StatisticalReportImpl;
 import com.steerinfo.dil.util.BaseRESTfulController;
 import com.steerinfo.dil.util.ColumnDataUtil;
+import com.steerinfo.dil.util.DataChange;
 import com.steerinfo.dil.util.PageListAdd;
 import com.steerinfo.framework.controller.RESTfulResult;
 import com.steerinfo.framework.service.pagehelper.PageHelper;
@@ -15,6 +16,8 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.text.SimpleDateFormat;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -34,6 +37,8 @@ public class StatisticalReportController extends BaseRESTfulController {
     @Autowired
     ColumnDataUtil columnDataUtil;
 
+    private final SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+
     @ApiOperation(value="查询辅料燃料统计报表")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
@@ -47,9 +52,12 @@ public class StatisticalReportController extends BaseRESTfulController {
                                                Integer apiId,
                                                Integer pageNum,
                                                Integer pageSize,
+                                               String startTime,
+                                               String endTime,
                                                Integer orderType
     ){
         mapValue.put("orderTypee", orderType);
+        DataChange.queryDataByDate(startTime, endTime, mapValue, sdf);//根据时间段查询数据
         List<Map<String, Object>> allReport =  statisticalReportService.getAllPurchaseFLRLReport(mapValue);
         PageHelper.startPage(pageNum, pageSize);
         //分页数据
@@ -71,6 +79,8 @@ public class StatisticalReportController extends BaseRESTfulController {
                                        Integer apiId,
                                        Integer pageNum,
                                        Integer pageSize,
+                                       String startTime,
+                                       String endTime,
                                        String carrierSsoId
     ){
         if(carrierSsoId != null){
@@ -78,6 +88,7 @@ public class StatisticalReportController extends BaseRESTfulController {
                 mapValue.put("carrierSsoId", carrierSsoId);
             }
         }
+        DataChange.queryDataByDate(startTime, endTime, mapValue, sdf);//根据时间段查询数据
         List<Map<String, Object>> allReport =  statisticalReportService.getAllSaleReportNum(mapValue);
         PageHelper.startPage(pageNum, pageSize);
         //分页数据
@@ -99,13 +110,32 @@ public class StatisticalReportController extends BaseRESTfulController {
                                           Integer apiId,
                                           Integer pageNum,
                                           Integer pageSize,
-                                          String carrierSsoId
+                                          String startTime,
+                                          String endTime,
+                                          String carrierSsoId,
+                                          String userId,
+                                           String userIds,
+                                           String con,
+                                           Integer orderType
     ){
-        if(carrierSsoId != null){
-            if(!"null".equals(carrierSsoId)){
+        if(carrierSsoId != null) {
+            if (!"null".equals(carrierSsoId)) {
                 mapValue.put("carrierSsoId", carrierSsoId);
             }
         }
+        DataChange.queryDataByDate(startTime, endTime, mapValue, sdf);//根据时间段查询数据
+            if (userId!=null){
+                mapValue.put("userId",userId);
+            }
+            if (orderType!=null){
+                mapValue.put("orderType",orderType);
+            }
+            if (userIds!=null){
+                mapValue.put("userIds",userIds);
+            }
+            if (con!=null&&!con.equals("undefined")){
+                mapValue.put("con","%"+con+"%");
+            }
         List<Map<String, Object>> allReport =  statisticalReportService.getSporadicSuppliesReportNum1(mapValue);
         PageHelper.startPage(pageNum, pageSize);
         //分页数据
@@ -127,13 +157,32 @@ public class StatisticalReportController extends BaseRESTfulController {
                                                    Integer apiId,
                                                    Integer pageNum,
                                                    Integer pageSize,
-                                                   String carrierSsoId
+                                                   String startTime,
+                                                   String endTime,
+                                                   String carrierSsoId,
+                                                    String userId,
+                                                    String userIds,
+                                                    String con,
+                                                    Integer orderType
     ){
         if(carrierSsoId != null){
             if(!"null".equals(carrierSsoId)){
                 mapValue.put("carrierSsoId", carrierSsoId);
             }
         }
+        DataChange.queryDataByDate(startTime, endTime, mapValue, sdf);//根据时间段查询数据
+        if (con!=null&&!con.equals("undefined")){
+            mapValue.put("con","%"+con+"%");
+        }
+        if (userId!=null){
+            mapValue.put("userId",userId);
+        }
+        if (orderType!=null){
+            mapValue.put("orderType",orderType);
+        }
+        if (userIds!=null){
+            mapValue.put("userIds",userIds);
+        }
         List<Map<String, Object>> allReport =  statisticalReportService.getSporadicSuppliesReportNum2(mapValue);
         PageHelper.startPage(pageNum, pageSize);
         //分页数据

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

@@ -57,9 +57,24 @@ public class TmstruckEnfactoryResultController extends BaseRESTfulController {
                                        Integer pageNum,
                                        Integer pageSize,
                                        Integer orderType,
-                                       String con
+                                       String con,
+                                       String userId,
+                                       String userIds
                                        ){
-        mapValue.put("orderTypee", orderType);
+        int count=0;
+        if (userId!=null){
+            mapValue.put("userId",userId);
+            count++;
+        }
+        if (userIds!=null){
+            mapValue.put("userIds",userIds);
+            count++;
+        }
+        if (orderType!=null){
+            mapValue.put("orderTypee", orderType);
+            count++;
+        }
+
         //框计算
         if(con != null){
             if(!"undefined".equals(con)){
@@ -71,7 +86,7 @@ public class TmstruckEnfactoryResultController extends BaseRESTfulController {
         }
         List<Map<String, Object>> allEnFactoryResult = null;
         //如果有条件查询则跳过初始化，和创建索引
-        if(mapValue.size() == 1){
+        if(mapValue.size() == count){
             //将查询结果存入索引中
             allEnFactoryResult = tmstruckEnfactoryResultService.getAllEnFactoryResult(mapValue);
             Map<String, Object> map = new HashMap<>();

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

@@ -70,12 +70,27 @@ public class TmstruckLeaveFactoryResultController extends BaseRESTfulController
     })
     @PostMapping("/getLeaveFactoryResult")
     public RESTfulResult getLeaveFactoryResult(@RequestBody(required=false) Map<String,Object> mapValue,
-                                          Integer apiId,
-                                          Integer pageNum,
-                                          Integer pageSize,
-                                          Integer orderType,
-                                          String con, String carrierSsoId){
-        mapValue.put("orderTypee", orderType);
+                                               Integer apiId,
+                                               Integer pageNum,
+                                               Integer pageSize,
+                                               Integer orderType,
+                                               String con,
+                                               String carrierSsoId,
+                                               String userId,
+                                               String userIds){
+        int count=0;
+        if (userId!=null){
+            mapValue.put("userId",userId);
+            count++;
+        }
+        if (userIds!=null){
+            mapValue.put("userIds",userIds);
+            count++;
+        }
+        if (orderType!=null){
+            mapValue.put("orderTypee", orderType);
+            count++;
+        }
         if(carrierSsoId != null){
             if(!"null".equals(carrierSsoId)){
                 mapValue.put("carrierSsoId", carrierSsoId);
@@ -90,7 +105,7 @@ public class TmstruckLeaveFactoryResultController extends BaseRESTfulController
         }
         List<Map<String, Object>> allLeaveFactoryResult = null;
         //如果有条件查询则跳过初始化，和创建索引
-        if(mapValue.size() == 1){
+        if(mapValue.size() == count){
             //将查询结果存入索引中
             allLeaveFactoryResult = tmstruckLeaveFactoryResultService.getLeaveFactoryResult(mapValue);
             Map<String, Object> map = new HashMap<>();

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

@@ -126,9 +126,26 @@ public class TmstruckLoadResultController extends BaseRESTfulController {
                                         Integer pageSize,
                                         Integer status,
                                         Integer orderType,
-                                        String con){
-        mapValue.put("status", status);
-        mapValue.put("orderTypee", orderType);
+                                        String con,
+                                        String userId,
+                                        String userIds){
+        int count=0;
+        if (status!=null){
+            mapValue.put("status", status);
+            count++;
+        }
+        if (orderType!=null){
+            mapValue.put("orderTypee", orderType);
+            count++;
+        }
+        if (userId!=null){
+            mapValue.put("userId",userId);
+            count++;
+        }
+        if (userIds!=null){
+            mapValue.put("userIds",userIds);
+            count++;
+        }
         //框计算
         if(con != null){
             if(!"undefined".equals(con)){
@@ -139,7 +156,7 @@ public class TmstruckLoadResultController extends BaseRESTfulController {
         //不分页筛选数据
         List<Map<String, Object>> allLoadResult = null;
         //如果有条件查询则跳过初始化，和创建索引
-        if(mapValue.size() == 2){
+        if(mapValue.size() == count){
             //将查询结果存入索引中
             allLoadResult = tmstruckLoadResultService.getAllLoadResult(mapValue);
             Map<String, Object> map = new HashMap<>();

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

@@ -57,9 +57,24 @@ public class TmstruckUnloadResultController extends BaseRESTfulController {
                                            Integer apiId,
                                            Integer pageNum,
                                            Integer pageSize,
-                                           Integer orderType,String con
+                                           Integer orderType,
+                                           String con,
+                                           String userId,
+                                           String  userIds
     ){
-        mapValue.put("orderTypee", orderType);
+        int count=0;
+        if (orderType!=null){
+            mapValue.put("orderTypee", orderType);
+            count++;
+        }
+        if (userId!=null){
+            mapValue.put("userId",userId);
+            count++;
+        }
+        if (userIds!=null){
+            mapValue.put("userIds",userIds);
+            count++;
+        }
         //框计算
         if(con != null){
             if(!"undefined".equals(con)){
@@ -70,7 +85,7 @@ public class TmstruckUnloadResultController extends BaseRESTfulController {
         //不分页筛选数据
         List<Map<String, Object>> allUnloadResult = null;
         //如果有条件查询则跳过初始化，和创建索引
-        if(mapValue.size() == 1){
+        if(mapValue.size() == count){
             //将查询结果存入索引中
             allUnloadResult = tmstruckUnloadResultService.getUnloadResult(mapValue);
             Map<String, Object> map = new HashMap<>();

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

@@ -71,9 +71,23 @@ public class TmstruckWeightResultController extends BaseRESTfulController {
                                                Integer pageNum,
                                                Integer pageSize,
                                                Integer orderType,
-                                               String con
+                                               String con,
+                                               String userId,
+                                               String usersId
     ){
-        mapValue.put("orderTypee", orderType);
+        int count=0;
+        if (orderType!=null) {
+            mapValue.put("orderTypee", orderType);
+            count++;
+        }
+        if (userId!=null){
+            mapValue.put("userId",userId);
+            count++;
+        }
+        if (usersId!=null){
+            mapValue.put("usersId",usersId);
+            count++;
+        }
         //框计算
         if(con != null){
             if(!"undefined".equals(con)){
@@ -83,7 +97,7 @@ public class TmstruckWeightResultController extends BaseRESTfulController {
         }
         List<Map<String, Object>> allJiMaoResult = null;
         //如果有条件查询则跳过初始化，和创建索引
-        if(mapValue.size() == 1){
+        if(mapValue.size() == count){
             //将查询结果存入索引中
             allJiMaoResult = tmstruckWeightResultService.getAllJiMaoResult(mapValue);
             Map<String, Object> map = new HashMap<>();
@@ -122,10 +136,23 @@ public class TmstruckWeightResultController extends BaseRESTfulController {
                                            Integer pageNum,
                                            Integer pageSize,
                                            Integer orderType,
-                                           String con
+                                           String con,
+                                           String userId,
+                                           String userIds
     ){
-
-        mapValue.put("orderTypee", orderType);
+        int count=0;
+        if (orderType!=null) {
+            mapValue.put("orderTypee", orderType);
+            count++;
+        }
+        if (userId!=null) {
+            mapValue.put("userId",userId);
+            count++;
+        }
+        if (userIds!=null){
+            mapValue.put("usersId",userIds);
+            count++;
+        }
         //框计算
         if(con != null){
             if(!"undefined".equals(con)){
@@ -136,7 +163,7 @@ public class TmstruckWeightResultController extends BaseRESTfulController {
         //不分页筛选数据
         List<Map<String, Object>> allJiPiResult = null;
         //如果有条件查询则跳过初始化，和创建索引
-        if(mapValue.size() == 1){
+        if(mapValue.size() == count){
             //将查询结果存入索引中
             allJiPiResult = tmstruckWeightResultService.getAllJiPiResult(mapValue);
             Map<String, Object> map = new HashMap<>();

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

@@ -21,6 +21,6 @@ public interface StatisticalReportMapper {
 //    查询零星物资进厂统计报表
     List<Map<String, Object>> getSporadicSuppliesReport1(Map<String, Object> mapValue);
 
-    //    查询零星物资进厂统计报表
+    //    查询零星物资出厂统计报表
     List<Map<String, Object>> getSporadicSuppliesReport2(Map<String, Object> mapValue);
 }

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

@@ -51,6 +51,7 @@ public interface TmstruckLeaveFactoryResultMapper extends IBaseMapper<TmstruckLe
     Map<String, Object> getDeliveryOrder(String orderNumber);
 
     List<Map<String,Object>> getDeliveryOrderMaterial(String orderNumber);
+
     // 查询零星物资出厂列表
     List<Map<String,Object>> getSporadicLeaveFactory(Map<String, Object> mapValue);
 }

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

@@ -63,7 +63,7 @@ public interface UtilsMapper {
     //查询最大路段顺序号 以及当前订单路段顺序号（执行到哪一步）
     Map<String, Object> getLineSeqAndOrderSeq(Map<String, Object> map);
 
-    //通过订单ID查询物资ID（针对单拼）
+    //通过订单ID查询物资ID (除了单拼外会有多个)
     List<Integer> getMaterialIdByOrderId(BigDecimal orderId);
 
     //查询订单ID查询第一个计量的物资Id（物资子表）
@@ -74,4 +74,7 @@ public interface UtilsMapper {
 
     //查询订单是否确认
     Integer getDriverConfirmation(BigDecimal orderId);
+
+    //通过路段顺序号和线路ID查找 线路子表的子表的ID 和门岗ID或汽车衡ID
+    List<Integer> getLineSegmentGateCalcId(Map<String, Object> map);
 }

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

@@ -53,7 +53,7 @@ public class TmstruckEnfactoryResultServiceImpl implements ITmstruckEnfactoryRes
 
     /**
      * 派单时新增进厂实绩
-     * map: 总实绩Id、线路起点
+     * map: 总实绩Id、线路Id、路段顺序号
      * @param map
      * @return
      */
@@ -61,16 +61,14 @@ public class TmstruckEnfactoryResultServiceImpl implements ITmstruckEnfactoryRes
     public int addEnFactoryResult(Map<String, Object> map) {
         TmstruckEnfactoryResult tmstruckEnfactoryResult = new TmstruckEnfactoryResult();
         BigDecimal resultTotalId = DataChange.dataToBigDecimal(map.get("resultTotalId"));
-        //生成进厂作业主键Id
+        tmstruckEnfactoryResult.setResultTotalId(resultTotalId);
         //添加主键
         tmstruckEnfactoryResult.setResultId(tmstruckEnfactoryResultMapper.selectMaxId());
-        //通过总实绩ID查询订单类型
-        Map<String, Object> mesMap = utilsMapper.getOrderTypeByTotalId(resultTotalId);
-        int gatepostId = rulesService.calculateDxGatepostId(mesMap);
-        //添加门岗ID
+        List<Integer> gatepostIdList = utilsMapper.getLineSegmentGateCalcId(map);
+        //随机取门岗Id
+        Integer gatepostId = utilsService.randomGetValue(gatepostIdList);
+        //获取门岗ID
         tmstruckEnfactoryResult.setGatepostId(new BigDecimal(gatepostId));
-        //添加实绩总表Id
-        tmstruckEnfactoryResult.setResultTotalId(resultTotalId);
         // 添加路段顺序号
         tmstruckEnfactoryResult.setSegmenSqe(DataChange.dataToBigDecimal(map.get("segmentSqe")));
         return tmstruckEnfactoryResultMapper.insertSelective(tmstruckEnfactoryResult);
@@ -160,47 +158,18 @@ public class TmstruckEnfactoryResultServiceImpl implements ITmstruckEnfactoryRes
         int checkMeasureCommission = 0;
         switch (orderType.intValue()){
             case 1:
-            case 4:
                 //查询未装车实绩
                 List<Map<String, Object>> mapList = rulesService.judgeLastMaterial(DataChange.dataToBigDecimal(map.get("orderId")));
-                if(mapList.size() == 1){
-                    //如果是单拼 不需要走计算 直接走钢材的汽车衡(钢材)
-                    Map<String, Object> mesMap = new HashMap<>();
-                    mesMap.put("materialId",mapList.get(0).get("materialId"));
-                    map.put("materialId", mapList.get(0).get("materialId"));
-                    mesMap.put("nature", 1);
-                    mesMap.put("orderId", orderId);
-                    mesMap.put("orderType", orderType);
-                    //计算计皮汽车衡
-                    int tarePlaceId = rulesService.calculateWeighbridge(mesMap);
-                    mesMap.put("tarePlaceId", tarePlaceId);
-                    //更新汽车衡
-                    i += tmstruckWeightResultService.updateWeightResult(mesMap);
-                }else {
-                    //如果是多拼
-                    Map<String, Object> mesMap = rulesService.calculateMaterial(mapList);
-                    //获取物资ID
-                    HashMap<String, Object> calculateMap = new HashMap<>();
-                    calculateMap.put("orderId", map.get("orderId"));
-                    calculateMap.put("materialId", mesMap.get("materialId"));
-                    calculateMap.put("nature", 1); // 1：进厂秤
-                    //计算计皮汽车衡
-                    int tarePlaceId = rulesService.calculateWeighbridge(calculateMap);
-                    calculateMap.put("tarePlaceId", tarePlaceId);
-                    //更新汽车衡
-                    i += tmstruckWeightResultService.updateWeightResult(calculateMap);
-                }
+                map.put("materialId", mapList.get(0).get("materialId"));
                 checkMeasureCommission = tmstruckMeasureCommissionService.addXSMeasureCommission(map); //添加计皮委托
                 break;
+            case 4:
+                break;
             case 2:
             case 3:
-                Map<String, Object> mesMap = new HashMap<>();
-                mesMap.put("orderId", orderId);
-                mesMap.put("orderType", orderType);
-                int tarePlaceId = rulesService.calculateWeighbridge(mesMap);
-                mesMap.put("tarePlaceId", tarePlaceId);
-                //更新汽车衡
-                i += tmstruckWeightResultService.updateWeightResult(mesMap);
+                //通过物资ID查询订单ID（针对单拼）
+                List<Integer> materialIdList = utilsMapper.getMaterialIdByOrderId(orderId);
+                map.put("materialId", materialIdList.get(0));
                 checkMeasureCommission = tmstruckMeasureCommissionService.addXSMeasureCommission(map); //添加计皮委托
                 break;
             case 5:
@@ -210,31 +179,12 @@ public class TmstruckEnfactoryResultServiceImpl implements ITmstruckEnfactoryRes
             case 9:
             case 17:
             case 18:
-                //计算计毛汽车衡并更新计量实绩 (暂时无法计算汽车衡)  需要写一个单独的方法 先计皮再计毛的
-                HashMap<String, Object> calculateMap56789 = new HashMap<>();
-                calculateMap56789.put("orderId", map.get("orderId"));
-                calculateMap56789.put("orderType", orderType);
-                //计算计量汽车衡
-                int grossPlaceId = rulesService.calculateWeighbridge(calculateMap56789);
-                calculateMap56789.put("grossPlaceId", grossPlaceId);
-                i += tmstruckWeightResultService.updateWeightResult(calculateMap56789);
                 //通过订单ID查询物资Id
-                List<Integer> materialIdList = utilsMapper.getMaterialIdByOrderId(DataChange.dataToBigDecimal(map.get("orderId")));
-                map.put("materialId", materialIdList.get(0));
+                List<Integer> materialIds = utilsMapper.getMaterialIdByOrderId(DataChange.dataToBigDecimal(map.get("orderId")));
+                map.put("materialId", materialIds.get(0));
                 checkMeasureCommission = tmstruckMeasureCommissionService.addMaoMeasureCommission(map); //添加计毛委托 并发送计毛委托
                 break;
             case 10:
-                HashMap<String, Object> calculateMap10 = new HashMap<>();
-                calculateMap10.put("orderId", map.get("orderId"));
-                calculateMap10.put("orderType", orderType);
-                //计算计量汽车衡并更新计量实绩
-                int placeId = rulesService.calculateWeighbridge(calculateMap10);
-                if(placeId == 15){ //第一次计量
-                    calculateMap10.put("tarePlaceId", placeId); //皮重
-                }else {
-                    calculateMap10.put("grossPlaceId", placeId); //毛重
-                }
-                i += tmstruckWeightResultService.updateWeightResult(calculateMap10);
                 checkMeasureCommission = tmstruckMeasureCommissionService.addMaoMeasureCommission(map); //添加计量委托
                 break;
             case 11:
@@ -243,25 +193,11 @@ public class TmstruckEnfactoryResultServiceImpl implements ITmstruckEnfactoryRes
             case 13:
             case 16:
             case 15:
-                //无法确定汽车衡
-                HashMap<String, Object> calculateMap1213 = new HashMap<>();
-                calculateMap1213.put("orderId", map.get("orderId"));
-                calculateMap1213.put("orderType", orderType);
-                //计算计量汽车衡并更新计量实绩
-                int placeId1213 = rulesService.calculateWeighbridge(calculateMap1213);
-                if(orderType.intValue() == 12){
-                    calculateMap1213.put("grossPlaceId", placeId1213);
-                }else {
-                    calculateMap1213.put("tarePlaceId", placeId1213);
-                }
-                i += tmstruckWeightResultService.updateWeightResult(calculateMap1213);
                 //发送计量委托(查询物资顺序第一个装卸货的物资)
                 //拿到需要计量的物资ID
                 Integer materialId = utilsMapper.getLxFirstMaterialId(DataChange.dataToBigDecimal(map.get("orderId")));
                 map.put("materialId", materialId);
                 checkMeasureCommission += tmstruckMeasureCommissionService.addLXMeasureCommission(map);
-            
-
         }
 
         if(checkMeasureCommission == 0){

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

@@ -18,10 +18,7 @@ import org.springframework.transaction.annotation.Transactional;
 
 import java.math.BigDecimal;
 import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 /**
  * TmstruckLeaveFactoryResult服务实现：
@@ -46,7 +43,7 @@ public class TmstruckLeaveFactoryResultServiceImpl implements ITmstruckLeaveFact
     private TmstruckEnfactoryResultMapper tmstruckEnfactoryResultMapper;
 
     @Autowired
-    private IUtilsService utilsService;
+    private UtilsServiceImpl utilsService;
 
     @Autowired
     private UtilsMapper utilsMapper;
@@ -85,9 +82,10 @@ public class TmstruckLeaveFactoryResultServiceImpl implements ITmstruckLeaveFact
         //添加总实绩ID
         BigDecimal resultTotalId = DataChange.dataToBigDecimal(map.get("resultTotalId"));
         tmstruckLeaveFactoryResult.setResultTotalId(resultTotalId);
-        //通过总实绩ID查询订单类型
-        Map<String, Object> mesMap = utilsMapper.getOrderTypeByTotalId(resultTotalId);
-        int gatepostId = rulesService.calculateDxGatepostId(mesMap);
+        List<Integer> gatepostIdList = utilsMapper.getLineSegmentGateCalcId(map);
+        //随机取门岗值
+        Integer gatepostId = utilsService.randomGetValue(gatepostIdList);
+        //获取门岗ID
         tmstruckLeaveFactoryResult.setGatepostId(new BigDecimal(gatepostId));
         //添加路段顺序号
         tmstruckLeaveFactoryResult.setSegmentSqe(DataChange.dataToBigDecimal(map.get("segmentSqe")));

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

@@ -60,8 +60,21 @@ public class TmstruckLoadResultServiceImpl implements ITmstruckLoadResultService
     @Autowired
     private TmstruckWeightResultServiceImpl tmstruckWeightResultService;
 
-    @Autowired
-    private TmstruckMeasureCommissionServiceImpl tmstruckMeasureCommissionService;
+    /**
+     * 生成销售装车实绩（虚拟装车实绩）
+     * @param map
+     * @return
+     */
+    public int addLoadResult(Map<String, Object> map){
+        TmstruckLoadResult tmstruckLoadResult = new TmstruckLoadResult();
+        //添加主键Id
+        tmstruckLoadResult.setResultId(tmstruckLoadResultMapper.selectMaxId());
+        //添加总实绩ID
+        tmstruckLoadResult.setResultTotalId(DataChange.dataToBigDecimal(map.get("resultTotalId")));
+        // 添加路段顺序号
+        tmstruckLoadResult.setSegmentSqe(DataChange.dataToBigDecimal(map.get("segmentSqe")));
+        return tmstruckLoadResultMapper.insertSelective(tmstruckLoadResult);
+    }
 
     /**
      * 查询所有装车实绩
@@ -96,7 +109,7 @@ public class TmstruckLoadResultServiceImpl implements ITmstruckLoadResultService
             case 13:
             case 15:
             case 16:
-                 return tmstruckLoadResultMapper.getSporadicSuppliesLoadResult(map); //apiId = 404
+                 return tmstruckLoadResultMapper.getSporadicSuppliesLoadResult(map); //apiId = 430
         }
         return null;
     }
@@ -158,24 +171,6 @@ public class TmstruckLoadResultServiceImpl implements ITmstruckLoadResultService
     }
 
 
-    /**
-     * 生成销售装车实绩（虚拟装车实绩）
-     * @param map
-     * @return
-     */
-    public int addLoadResult(Map<String, Object> map){
-        TmstruckLoadResult tmstruckLoadResult = new TmstruckLoadResult();
-        //添加主键Id
-        tmstruckLoadResult.setResultId(tmstruckLoadResultMapper.selectMaxId());
-        //添加物资Id
-        tmstruckLoadResult.setMaterialId(DataChange.dataToBigDecimal(map.get("materialId")));
-        //添加总实绩ID
-        tmstruckLoadResult.setResultTotalId(DataChange.dataToBigDecimal(map.get("resultTotalId")));
-        // 添加路段顺序号
-        tmstruckLoadResult.setSegmentSqe(DataChange.dataToBigDecimal(map.get("segmentSqe")));
-        return tmstruckLoadResultMapper.insertSelective(tmstruckLoadResult);
-    }
-
     /**
      * 更新装车实绩表
      * @return

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

@@ -163,33 +163,16 @@ public class TmstruckUnloadResultServiceImpl implements ITmstruckUnloadResultSer
             case 7:
             case 8:
             case 9:
+            case 10:
+            case 15:
             case 17:
             case 18:
-                //计算计皮汽车衡 (当前无法计算汽车衡)
-                int placeId = rulesService.calculateWeighbridge(mesMap);
-                mesMap.put("tarePlaceId", placeId);
-                i += tmstruckWeightResultService.updateWeightResult(mesMap);
-                i += tmstruckReceiptResultService.addReceiptResult(map); //新增完卸车实绩后新增一条收货实绩
-
-                //计算出厂门岗 （暂时定死）
-//                Integer gatepostId = 2;
-                //计皮委托发送后更新出厂门岗
-//                i += tmstruckLeaveFactoryResultService.updateLeaveFactoryGatepostId(resultTotalId.intValue(), gatepostId);
-                break;
-            case 10:
-                //计算计皮汽车衡 (当前无法计算汽车衡)
-                int placeId10 = rulesService.calculateWeighbridge(mesMap);
-                mesMap.put("tarePlaceId", placeId10);
-                i += tmstruckWeightResultService.updateWeightResult(mesMap);
                 i += tmstruckReceiptResultService.addReceiptResult(map); //新增完卸车实绩后新增一条收货实绩
                 break;
             case 11:
                 //判断出厂路段顺序号是否为最后一个
                 i += utilsService.closeOrderNormally(map);
             case 12:
-                int placeId12 = rulesService.calculateWeighbridge(mesMap);
-                mesMap.put("tarePlaceId", placeId12);
-                i += tmstruckWeightResultService.updateWeightResult(mesMap);
                 //判断是否还有物资，如果还有物资就执行发送计量委托
                 materialIdIsNorWeight(map);
                 break;

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

@@ -18,10 +18,7 @@ import java.math.BigDecimal;
 import java.text.DecimalFormat;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 /**
  * TmstruckWeightResult服务实现：
@@ -48,6 +45,9 @@ public class TmstruckWeightResultServiceImpl implements ITmstruckWeightResultSer
     @Autowired
     private UtilsServiceImpl utilsService;
 
+    @Autowired
+    private UtilsMapper utilsMapper;
+
     @Autowired
     private RulesServiceImpl rulesService;
 
@@ -55,6 +55,52 @@ public class TmstruckWeightResultServiceImpl implements ITmstruckWeightResultSer
     @Autowired
     OmsFeign omsFeign;
 
+    /**
+     * 派单时新增计重实绩
+     * 总实绩ID、计皮点、计毛点
+     * @return
+     */
+    @Override
+    public int addWeightResult(Map<String, Object> map) {
+        TmstruckWeightResult tmstruckWeightResult = new TmstruckWeightResult();
+        //生成最大主键ID
+        tmstruckWeightResult.setWeightTaskResultId(tmstruckWeightResultMapper.selectMaxId());
+        BigDecimal resultTotalId = DataChange.dataToBigDecimal(map.get("resultTotalId"));
+        tmstruckWeightResult.setResultTotalId(resultTotalId);
+        // 添加路段顺序号以及汽车衡
+        List<Integer> calculateList = null;
+        Integer calculateId = 0;
+        Object grossSegmentSqe = map.get("grossSegmentSqe");
+        //获取毛重汽车衡
+        if(grossSegmentSqe != null){
+            tmstruckWeightResult.setGrossSegmentSqe(DataChange.dataToBigDecimal(grossSegmentSqe));
+            map.put("segmentSqe", grossSegmentSqe);
+            calculateList = utilsMapper.getLineSegmentGateCalcId(map);
+            //取汽车衡的Id
+            calculateId = utilsService.randomGetValue(calculateList);
+            tmstruckWeightResult.setResultGrossPlaceId(new BigDecimal(calculateId));
+        }
+        Object tareSegmentSqe = map.get("tareSegmentSqe");
+        if(tareSegmentSqe != null){
+            tmstruckWeightResult.setTareSegmentSqe(DataChange.dataToBigDecimal(tareSegmentSqe));
+            map.put("segmentSqe", tareSegmentSqe);
+            calculateList = utilsMapper.getLineSegmentGateCalcId(map);
+            calculateId = utilsService.randomGetValue(calculateList);
+            tmstruckWeightResult.setResultTarePlaceId(new BigDecimal(calculateId));
+        }
+        if(map.get("isdeduct") == null){
+            //添加是否需要扣水扣杂
+            //通过总实绩ID查询订单类型
+            Integer orderType = tmstruckWeightResultMapper.getOrderTypeByTotalId(resultTotalId);
+            if("67".contains(orderType.toString()) || orderType == 10){
+                tmstruckWeightResult.setIsdeduct(new BigDecimal(1));
+            }
+        }else {
+            tmstruckWeightResult.setIsdeduct(DataChange.dataToBigDecimal(map.get("isdeduct")));
+        }
+        return tmstruckWeightResultMapper.insertSelective(tmstruckWeightResult);
+    }
+
     /**
      * 查询所有计毛实绩
      * @param map
@@ -123,9 +169,9 @@ public class TmstruckWeightResultServiceImpl implements ITmstruckWeightResultSer
             case 11:
                 break;
             case 12:
-                return tmstruckWeightResultMapper.getSporadicSuppliesJiPiResult(map);//apiId:392
+//                return tmstruckWeightResultMapper.getSporadicSuppliesJiPiResult(map);//apiId:392
             case 13:
-                return tmstruckWeightResultMapper.getFactorySkinSporadicJIPi(map); //apiId=401
+//                return tmstruckWeightResultMapper.getFactorySkinSporadicJIPi(map); //apiId=401
             case 15:
             case 16:
                 return tmstruckWeightResultMapper.getFactorySkinSporadicWeight(map); //apiId=401
@@ -133,38 +179,6 @@ public class TmstruckWeightResultServiceImpl implements ITmstruckWeightResultSer
         return null;
     }
 
-    /**
-     * 派单时新增计重实绩
-     * 总实绩ID、计皮点、计毛点
-     * @return
-     */
-    @Override
-    public int addWeightResult(Map<String, Object> map) {
-        TmstruckWeightResult tmstruckWeightResult = new TmstruckWeightResult();
-        //生成最大主键ID
-        tmstruckWeightResult.setWeightTaskResultId(tmstruckWeightResultMapper.selectMaxId());
-        BigDecimal resultTotalId = DataChange.dataToBigDecimal(map.get("resultTotalId"));
-        tmstruckWeightResult.setResultTotalId(resultTotalId);
-        //通过总实绩ID查询订单类型
-        if(map.get("isdeduct") == null){
-            //添加是否需要扣水扣杂
-            Integer orderType = tmstruckWeightResultMapper.getOrderTypeByTotalId(resultTotalId);
-            if("67".contains(orderType.toString()) || orderType == 10){
-                tmstruckWeightResult.setIsdeduct(new BigDecimal(1));
-            }
-        }else {
-            tmstruckWeightResult.setIsdeduct(DataChange.dataToBigDecimal(map.get("isdeduct")));
-        }
-        // 添加物资Id (销售、内转到异地库）
-        if(map.get("materialId") != null)
-            tmstruckWeightResult.setMaterialId(DataChange.dataToBigDecimal(map.get("materialId")));
-        // 添加路段顺序号
-        if(map.get("grossSegmentSqe") != null) //毛重路段顺序号
-            tmstruckWeightResult.setGrossSegmentSqe(DataChange.dataToBigDecimal(map.get("grossSegmentSqe")));
-        if(map.get("tareSegmentSqe") != null) //皮重路段顺序号
-            tmstruckWeightResult.setTareSegmentSqe(DataChange.dataToBigDecimal(map.get("tareSegmentSqe")));
-        return tmstruckWeightResultMapper.insertSelective(tmstruckWeightResult);
-    }
 
     /**
      * 更新计量实绩  计皮点  计毛点  皮重

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

@@ -166,5 +166,18 @@ public class UtilsServiceImpl implements IUtilsService {
     }
 
 
-
+    public int randomGetValue(List<Integer> dataList){
+        if(dataList.size() != 0){
+            if(dataList.size() == 1){
+                return dataList.get(0);
+            }else {
+                //如果有多个值则随机取一个
+                Random random = new Random();
+                int i = random.nextInt(dataList.size());
+                return dataList.get(i);
+            }
+        }else {
+            return 0;
+        }
+    }
 }

src/main/java/com/steerinfo/dil/util/DataChange.java

@@ -51,7 +51,7 @@ public class DataChange {
                     try {
                         decimal = new BigDecimal(str);
                     } catch (Exception e) {
-                        e.printStackTrace();
+                        System.out.println(data + "：数据解析失败！返回0");
                         return new BigDecimal(0);
                     }
                 }
@@ -166,4 +166,26 @@ public class DataChange {
         return sb.toString();
     }
 
+    /**
+     * 根据时间段查询数据
+     * @Author TXF
+     * @Date 2022/1/10 23:21
+     * @param startTime
+     * @param endTime
+     * @param map
+     * @param sdf
+     * @return
+     **/
+    public static void queryDataByDate(String startTime, String endTime, Map<String, Object> map, SimpleDateFormat sdf){
+        if (startTime != null && !"null".equals(startTime) && endTime != null && !"null".equals(endTime)) {
+            map.put("startDate", sdf.format(new Date(Long.parseLong(startTime))));
+            map.put("endDate", sdf.format(new Date(Long.parseLong(endTime) + 86400000)));
+        } else if (startTime != null && !"null".equals(startTime)) {
+            map.put("oneDate", sdf.format(new Date(Long.parseLong(startTime))));
+        } else if (endTime != null && !"null".equals(endTime)) {
+            map.put("oneDate", sdf.format(new Date(Long.parseLong(endTime))));
+        } else {
+            map.put("oneDate", sdf.format(new Date()));
+        }
+    }
 }

src/main/resources/application-dev.yml

@@ -37,7 +37,7 @@ openfeign:
   QmsFeign:
     url: ${QMSFEIGN_URL:172.16.33.162:8017}
   ImFeign:
-    url: ${IMFEIGN_URL:172.16.33.162:8055}
+    url: ${IMFEIGN_URL:172.16.33.166:8055}
   AmsFeign:
     url: ${AMSFEIGN_URL:172.16.33.162:8015}
 

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

@@ -32,6 +32,7 @@
                      CONCAT(CONCAT(RM.MATERIAL_SPECIFICATION, '('), CONCAT(RM.MATERIAL_MODEL, ')')) "materialCode",
                         <if test="orderTypee == 17 or orderTypee == 18">
                             RS.SUPPLIER_NAME           "supplierName",
+                            RCON.CONSIGNEE_COMPANY_NAME "receiveName",
                         </if>
                      TWR.RESULT_TARE_WEIGHT_TIME    "resultTareWeightTime"
               from OMSTRUCK_ORDER OO
@@ -75,6 +76,13 @@
                        </if>
               where OO.ORDER_STATUS in (5, 8, 9, 1, 2)
                 and OO.ORDER_TYPE = #{orderTypee}
+                    <if test="oneDate != null">
+                        and to_char(TER.RESULT_ENTRY_GATE_TIME, 'YYYY-MM-DD') = #{oneDate}
+                    </if>
+                    <if test="startDate != null">
+                        and to_date(#{startDate}, 'yyyy-mm-dd') &lt;= TER.RESULT_ENTRY_GATE_TIME
+                        and to_date(#{endDate}, 'yyyy-mm-dd') >= TER.RESULT_ENTRY_GATE_TIME
+                    </if>
              )
         <where>
             <if test="orderNumber != null">
@@ -204,6 +212,13 @@
                           <if test="carrierSsoId != null">
                               and RCA.CARRIER_SSO_ID = #{carrierSsoId}
                           </if>
+                          <if test="oneDate != null">
+                              and to_char(TER.RESULT_ENTRY_GATE_TIME, 'YYYY-MM-DD') = #{oneDate}
+                          </if>
+                          <if test="startDate != null">
+                              and to_date(#{startDate}, 'yyyy-mm-dd') &lt;= TER.RESULT_ENTRY_GATE_TIME
+                              and to_date(#{endDate}, 'yyyy-mm-dd') >= TER.RESULT_ENTRY_GATE_TIME
+                          </if>
              )
         <where>
             <if test="orderNumber != null">
@@ -347,6 +362,26 @@
         <if test="carrierSsoId != null">
             and RCA.CARRIER_SSO_ID = #{carrierSsoId}
         </if>
+        <if test="oneDate != null">
+            and to_char(TER.RESULT_ENTRY_GATE_TIME, 'YYYY-MM-DD') = #{oneDate}
+        </if>
+        <if test="startDate != null">
+            and to_date(#{startDate}, 'yyyy-mm-dd') &lt;= TER.RESULT_ENTRY_GATE_TIME
+            and to_date(#{endDate}, 'yyyy-mm-dd') >= TER.RESULT_ENTRY_GATE_TIME
+        </if>
+        <if test="con!=null">
+            where  "receiveName" like #{con} or  "sendName" like #{con} or "materialName" like #{con}
+            or "capacityNumber" like #{con}
+        </if>
+        <if test="userId!=null">
+            and ASO.INSERT_USERNAME=#{userId}
+        </if>
+        <if test="userIds!=null">
+            and ASO.UPDATE_USERNAME=#{userIds}
+        </if>
+        <if test="orderType!=null">
+            and OO.ORDER_TYPE=#{orderType}
+        </if>
         )
         <where>
             <if test="orderNumber != null">
@@ -490,6 +525,26 @@
         <if test="carrierSsoId != null">
             and RCA.CARRIER_SSO_ID = #{carrierSsoId}
         </if>
+        <if test="oneDate != null">
+            and to_char(TER.RESULT_ENTRY_GATE_TIME, 'YYYY-MM-DD') = #{oneDate}
+        </if>
+        <if test="startDate != null">
+            and to_date(#{startDate}, 'yyyy-mm-dd') &lt;= TER.RESULT_ENTRY_GATE_TIME
+            and to_date(#{endDate}, 'yyyy-mm-dd') >= TER.RESULT_ENTRY_GATE_TIME
+        </if>
+        <if test="con!=null">
+            where  "receiveName" like #{con} or  "sendName" like #{con} or "materialName" like #{con}
+           or "capacityNumber" like #{con}
+        </if>
+        <if test="userId!=null">
+            and ASO.INSERT_USERNAME=#{userId}
+        </if>
+        <if test="userIds!=null">
+            and ASO.UPDATE_USERNAME=#{userIds}
+        </if>
+        <if test="orderType!=null">
+            and OO.ORDER_TYPE=#{orderType}
+        </if>
         )
         <where>
             <if test="orderNumber != null">

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

@@ -1192,7 +1192,13 @@
         on RG.GATEPOST_ID = TER.GATEPOST_ID
         left join RMS_CAPACITY RC
         on RC.CAPACITY_ID = OO.CAPACITY_ID
-        WHERE OO.ORDER_TYPE = #{orderTypee}
+        WHERE OO.ORDER_TYPE = #{orderTypee} and TER.RESULT_ENTRY_GATE_TIME IS NOT NULL
+            <if test="userId">
+               and ASO.INSERT_USERNAME=#{userId}
+            </if>
+            <if test="userIds">
+               and ASO.UPDATE_USERNAME=#{userIds}
+            </if>
         )
         <where>
             <if test="orderNumber != null">

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

@@ -1112,6 +1112,12 @@
         on RG.GATEPOST_ID = TLFR.GATEPOST_ID
         where RESULT_OUT_GATE_TIME is not null
         and OO.ORDER_TYPE = #{orderTypee}
+            <if test="userId!=null">
+             AND ASO.INSERT_USERNAME=#{userId}
+            </if>
+            <if test="userIds!=null">
+              AND ASO.UPDATE_USERNAME=#{userIds}
+            </if>
         )
         <where>
             <if test="orderNumber != null">

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

@@ -1510,6 +1510,13 @@
         left join RMS_CAPACITY RC
         on RC.CAPACITY_ID = OO.CAPACITY_ID
         where TLR.STATUS = #{status} and OO.ORDER_TYPE = #{orderTypee}
+          and TLR.RESULT_LOAD_START_TIME IS NOT NULL
+          <if test="userId!=null">
+             AND  ASO.INSERT_USERNAME=#{userId}
+          </if>
+           <if test="userIds!=null">
+             and ASO.UPDATE_USERNAME = #{userIds}
+            </if>
         )
         <where>
             <if test="orderNumber != null">

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

@@ -945,6 +945,12 @@
         ON RW.WAREHOUSE_ID = TUR.RESULT_UNLOAD_PLACE_ID
         WHERE TUR.RESULT_END_TIME IS NOT NULL
         AND OO.ORDER_TYPE = #{orderTypee}
+         <if test="userId != null">
+             and ASO.INSERT_USERNAME=#{userId}
+         </if>
+         <if test="userIds!=null">
+              and ASO.UPDATE_USERNAME=#{userIds}
+         </if>
         )
         <where>
             <if test="orderNumber != null">

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

@@ -2216,6 +2216,12 @@
         on RTC.TRUCK_CALCULATE_ID = TWR.RESULT_GROSS_PLACE_ID
         where RESULT_GROSS_WEIGHT_TIME is not null and
         OO.ORDER_TYPE = #{orderTypee}
+            <if test="userId!=null">
+                and ASO.INSERT_USERNAME=#{userId}
+            </if>
+            <if test="usersId!=null">
+                and ASO.UPDATE_USERNAME=#{usersId}
+            </if>
         )
         <where>
             <if test="purchaseOrderNo != null">
@@ -2292,7 +2298,8 @@
         on OOM.ORDER_ID = OO.ORDER_ID
         left join RMS_MATERIAL RM
         on RM.MATERIAL_ID = OOM.MATERIAL_ID
-        where RESULT_TARE_WEIGHT_TIME is not null and OO.ORDER_TYPE = 12
+        where RESULT_TARE_WEIGHT_TIME is not null
+              and OO.ORDER_TYPE = 12
         )
         <where>
             <if test="purchaseOrderNo != null">
@@ -2378,7 +2385,7 @@
         from (
         select
         TWR.WEIGHT_TASK_RESULT_ID "weightTaskResultId",
-        APO.SPORADIC_ORDER_NO "purchaseOrderNo",
+        ASO.SPORADIC_ORDER_NO "purchaseOrderNo",
         RM.MATERIAL_NAME "materialName",
         OO.ORDER_NUMBER "orderNumber",
         RC.CAPACITY_NUMBER "capacityNumber",
@@ -2394,8 +2401,8 @@
         on TWR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
         left join OMSTRUCK_ORDER OO
         on TTR.ORDER_ID = OO.ORDER_ID
-        left join AMSTRUCK_SPORADIC_ORDER APO
-        on APO.SPORADIC_ORDER_ID = OO.ORDER_PLAN_ID
+        left join AMSTRUCK_SPORADIC_ORDER ASO
+        on ASO.SPORADIC_ORDER_ID = OO.ORDER_PLAN_ID
         left join RMS_CAPACITY RC
         on RC.CAPACITY_ID = OO.CAPACITY_ID
         left join RMS_TRUCK_CALCULATE RTC
@@ -2404,7 +2411,14 @@
         on OOM.ORDER_ID = OO.ORDER_ID
         left join RMS_MATERIAL RM
         on RM.MATERIAL_ID = OOM.MATERIAL_ID
-        where RESULT_TARE_WEIGHT_TIME is not null and OO.ORDER_TYPE = #{orderTypee}
+        where RESULT_TARE_WEIGHT_TIME is not null
+              and OO.ORDER_TYPE = #{orderTypee}
+        <if test="userId!=null">
+            and ASO.INSERT_USERNAME=#{userId}
+        </if>
+        <if test="userIds!=null">
+            and ASO.UPDATE_USERNAME=#{userIds}
+        </if>
         )
         <where>
             <if test="purchaseOrderNo != null">

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

@@ -168,4 +168,14 @@
         from OMSTRUCK_ORDER OO
         where OO.ORDER_ID = #{orderId}
     </select>
+
+    <!--  通过路段顺序号和线路ID查找 线路子表的子表的ID 和门岗ID或汽车衡ID   -->
+    <select id="getLineSegmentGateCalcId" parameterType="map" resultType="java.lang.Integer">
+        select
+            RLGC.GATE_CAL_ID "gateCalId"
+        from RMS_LINE_SEGEMNT RLS
+                 left join RMS_LINE_GATEPOST_CALCULATE RLGC
+                           on RLGC.SEGMENT_ID = RLS.SEGMENT_ID
+        where RLS.LINE_ID = #{lineId} and RLS.SEGMENT_SQE = #{segmentSqe}
+    </select>
 </mapper>