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

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

@@ -95,6 +95,9 @@ public class AmsContractTruckPriceController extends BaseRESTfulController {
             mapValue.put("con","%" + con + "%");
         }
         PageHelper.startPage(pageNum,pageSize);
+        if ("materialNames".equals(mapValue.get("orderField"))){
+            mapValue.put("orderField",null);
+        }
         List<Map<String, Object>> amsContractTransportPrice1 = amsContractTruckPriceService.getInwardContractPrice(mapValue);
         PageListAdd pageList = columnDataUtil.tableColumnData(apiId, null,amsContractTransportPrice1);
         return success(pageList);
@@ -331,10 +334,16 @@ public class AmsContractTruckPriceController extends BaseRESTfulController {
     public Map<String,Object> getInwardPriceBy(@RequestBody(required = false) Map<String,Object> mapvalue){
         //接受结算是内转计重还是计时还是计数
         String settleMentType = (String) mapvalue.get("requirementType");
+        String insertUpdateRemark = (String) mapvalue.get("insertUpdateRemark");
         BigDecimal type = null;
         if("计重".equals(settleMentType)){
-            //在单价表里内转计重是2
-            type = new BigDecimal(2);
+            if(insertUpdateRemark!=null && !"".equals(insertUpdateRemark) && insertUpdateRemark.contains("计时且过计量")){
+                //计重且计时，走计时流程
+                type = new BigDecimal(5);
+            }else{
+                //在单价表里内转计重是2
+                type = new BigDecimal(2);
+            }
         }else if("计时".equals(settleMentType)){
             //在单价表里内转计时是5
             type = new BigDecimal(5);

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

@@ -64,4 +64,6 @@ public interface AmsContractTruckPriceMapper extends IBaseMapper<AmsContractTran
     List<Map<String, Object>> selectwz(Map<String, Object> map);
 
     Map<String, Object> getcargonameId(Map<String, Object> map);
+
+
 }

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

@@ -18,10 +18,7 @@ import org.springframework.transaction.annotation.Transactional;
 import java.math.BigDecimal;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-import java.util.Stack;
+import java.util.*;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -609,6 +606,11 @@ public class AmsContractTruckPriceServiceImpl implements IAmsContractTruckPriceS
 
     @Override
     public List<Map<String, Object>> getInwardContractPrice(Map<String, Object> mapValue) {
+        String material="";
+//        if (mapValue.get("materialNames")!=null && mapValue.get("materialNames").toString().contains("、")) {
+//            material= mapValue.get("materialNames").toString();
+//            mapValue.put("materialNames",null);
+//        }
         List<Map<String,Object>>mapList =  amsContractTruckPriceMapper.getInwardContractPrice(mapValue);
         for (Map<String,Object>map:mapList
              ) {
@@ -633,6 +635,13 @@ public class AmsContractTruckPriceServiceImpl implements IAmsContractTruckPriceS
             }else if(((BigDecimal)map.get("type")).intValue() == 6){
                 map.put("type","元/趟");
             }
+//            if (material!=null &&
+//                    material.contains("、") &&
+//                    material.equals(materialNames)) {
+//                List<Map<String, Object>> newMapList=new ArrayList<>();
+//                newMapList.add(map);
+//                return newMapList;
+//            }
         }
         return mapList;
     }

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

@@ -999,7 +999,7 @@
           and a_t_price.DELETED = #{deleted}
         </if>
         <if test="con != null" >
-          and RGR.TRANS_RANGE_VALUE LIKE #{con}
+          and RGR.TRANS_RANGE_VALUE LIKE #{con} or r_c_type.CAPACITY_TYPE_NAME LIKE #{con}
         </if>)
         <include refid="whereLikeForeach"/>
         <include refid="orderBy"></include>
@@ -1017,7 +1017,9 @@
       on rtr.trans_range_id = actp.line_id
       where type = #{type}
       and actp.DELETED = 0
-      and acpm.DELETED = 0
+      <if test="type==2">
+        and acpm.DELETED = 0
+      </if>
       <if test="rangeId != null">
         and actp.LINE_ID = #{rangeId}
       </if>