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

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

@@ -2,6 +2,7 @@ package com.steerinfo.dil.controller;
 
 import com.steerinfo.dil.feign.ColumnDataFeign;
 import com.steerinfo.dil.feign.ESFeign;
+import com.steerinfo.dil.mapper.AmsContractTruckPriceMapper;
 import com.steerinfo.dil.model.AmsContractTransportPrice;
 import com.steerinfo.dil.service.IAmsContractTruckPriceService;
 import com.steerinfo.dil.util.BaseRESTfulController;
@@ -51,6 +52,9 @@ public class AmsContractTruckPriceController extends BaseRESTfulController {
     @Autowired
     ESFeign esFeign;
 
+    @Autowired
+    AmsContractTruckPriceMapper amsContractTruckPriceMapper;
+
     @ApiOperation(value="查询汽运单价信息")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "apiId(109)", value = "表头", required = false, dataType = "Interger")
@@ -339,4 +343,15 @@ public class AmsContractTruckPriceController extends BaseRESTfulController {
     public RESTfulResult insertLineNodePoint(@RequestBody(required = false)Map<String,Object>map){
         return success(amsContractTruckPriceService.insertLineNodePoint(map));
     }
+
+    @ApiOperation(value = "查询出收货地址ID")
+    @PostMapping("/queryPlaceId")
+    public BigDecimal queryPlaceId(@RequestBody(required = false) BigDecimal bigDecimal){
+        List<Map<String, Object>> maps = amsContractTruckPriceMapper.selectByPriceId(bigDecimal);
+        BigDecimal b=BigDecimal.ZERO;
+        for (Map<String, Object> map : maps) {
+            b = (BigDecimal) map.get("PLACE_ID");
+        }
+        return b;
+    }
 }

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

@@ -231,5 +231,19 @@ public class DilNoticeController extends BaseRESTfulController {
         return success(data);
     }
 
+    /**
+     * @author:zyf
+     * @version:1.0
+     * @Date:
+     * @Description:获取通知数据
+    */
+    @ApiOperation(value = "查询通知信息", notes = "根据传过来的orgcode查询")
+    @PostMapping(value = "/getNotice")
+    public RESTfulResult getNotice(@RequestBody(required = false) Map<String, Object> mapValue){
+        String orgcode= (String) mapValue.get("orgcodezs");
+        List<Map<String, Object>> noticeData = dilNoticeService.getNoticeData(orgcode);
+        return success(noticeData);
+    }
+
 
 }

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

@@ -29,4 +29,19 @@ public interface DilNoticeMapper extends IBaseMapper<DilNotice, BigDecimal> {
     List<Map<String, Object>> getClientNoticeList(Map<String, Object> mapVal);
     //根据不同的用户发放不同的最新消息
     List<Map<String, Object>> getNewNoticeByPermission(BigDecimal permission);
+
+    /**
+     * @author:zyf
+     * @version:1.0
+     * @Date:
+     * @Description: 根据不同的用户发放通知
+    */
+    List<Map<String, Object>> getNoticeData(BigDecimal permission);
+    /**
+     * @author:zyf
+     * @version:1.0
+     * @Date:
+     * @Description: 根据不同的用户发放通知1
+     */
+    List<Map<String, Object>> getNoticeData1();
 }

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

@@ -39,6 +39,8 @@ public interface IDilNoticeService {
 
     List<Map<String, Object>> getNewNoticeByPermission(BigDecimal permission);
 
+    public List<Map<String,Object>> getNoticeData(String orgcode);
+
 /*    List<Map<String,Object>> getCapacityTypeId();
 
     List<Map<String,Object>> getCarrierId();*/

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

@@ -10,6 +10,7 @@ import com.steerinfo.dil.model.RmsLineNodePoint;
 import com.steerinfo.dil.model.RmsReceivePlace;
 import com.steerinfo.dil.service.IAmsContractTruckPriceService;
 import com.steerinfo.dil.util.DataChange;
+import org.apache.commons.lang.math.NumberUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -206,6 +207,8 @@ public class AmsContractTruckPriceServiceImpl implements IAmsContractTruckPriceS
     @Override
     @Transactional
     public int batchUpdateTransportPriceByOilPrice(Map<String,Object> map) {
+        //正数的判断条件
+        String flag= (String) map.get("flag");
         //运输单价变化的条数
         int i = 0;
         //获取油品名称ID
@@ -223,7 +226,14 @@ public class AmsContractTruckPriceServiceImpl implements IAmsContractTruckPriceS
             BigDecimal n = (newOilPrice.subtract(oilpriceBase)).divide(oilpriceBase,4,4);
             //若油价变化率超过该条单价的油价变化率阈值，修改原单价为历史数据，新增一条单价
             if(n.abs().doubleValue()>oilpriceChangeThreshold.doubleValue()){
-                i+=addANewAmsContractTransportPrice(stringObjectMap,n,newOilPrice);
+                //加一个判断（如果数据为正数则需要二次判断，如果数据为负数则直接生效）
+                if(newOilPrice.compareTo(oilpriceBase)==-1){
+                    //直接降低油价
+                    i+=addANewAmsContractTransportPrice(stringObjectMap,n,newOilPrice);
+                }else if (newOilPrice.compareTo(oilpriceBase)==1 && "1".equals(flag)){
+                    //加上两个判断之后
+                    i+=addANewAmsContractTransportPrice(stringObjectMap,n,newOilPrice);
+                }
             }
         }
         return i;
@@ -322,7 +332,10 @@ public class AmsContractTruckPriceServiceImpl implements IAmsContractTruckPriceS
 //            }
 //        }
         // 得到油价联动公式id
-        BigDecimal formulaId = DataChange.dataToBigDecimal(stringObjectMap.get("cargonameId"));
+        //BigDecimal formulaId = DataChange.dataToBigDecimal(stringObjectMap.get("cargonameId"));
+        //BigDecimal formulaId= (BigDecimal) stringObjectMap.get("cargonameId");
+        String s= (String) stringObjectMap.get("cargonameId");
+        BigDecimal formulaId = NumberUtils.createBigDecimal(s.trim());
         amsContractTransportPrice.setCargonameId(formulaId);
         try {
             nowPriceValue = UpdatePureBenzenePriceValueByOilPrice(n.toString(),amsContractTransportPrice.getPriceValue(),formulaId);

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

@@ -100,7 +100,7 @@ public class AmstruckInwardRequirementServiceImpl extends BaseServiceImpl<Amstru
         amstruckInwardRequirement.setRequirementWorkContent(requirementWorkContent);
         amstruckInwardRequirement.setRequirementWorkEnvironment(requirementWorkEnvironment);
 
-        if (requirementEstimatedDuration!=null) {
+        if (requirementEstimatedDuration!=null && !requirementEstimatedDuration.equals("")) {
 
             amstruckInwardRequirement.setRequirementEstimatedDuration(new BigDecimal(requirementEstimatedDuration));
         }

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

@@ -5,6 +5,8 @@ import com.steerinfo.dil.model.DilNotice;
 import com.steerinfo.dil.service.IDilNoticeService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
 import java.util.Date;
 import java.math.BigDecimal;
 import java.util.List;
@@ -129,8 +131,28 @@ public class DilNoticeServiceImpl  implements IDilNoticeService {
         return dilNoticeMapper.getNoticeById(id);
     }
 
-
-
+    /**
+     * @author:zyf
+     * @version:1.0
+     * @Date:
+     * @Description: 获取通知信息数据
+    */
+    public List<Map<String,Object>> getNoticeData(String orgcode){
+        List<Map<String, Object>> noticeData=new ArrayList<>();
+        if ("chengyunshang".equals(orgcode)){
+            BigDecimal permission=BigDecimal.valueOf(1);
+            noticeData = dilNoticeMapper.getNoticeData(permission);
+        }else if ("xiaoshougongsi".equals(orgcode)){
+            BigDecimal permission=BigDecimal.valueOf(2);
+            noticeData = dilNoticeMapper.getNoticeData(permission);
+        }else if ("shouhuokehu".equals(orgcode)){
+            BigDecimal permission=BigDecimal.valueOf(3);
+            noticeData = dilNoticeMapper.getNoticeData(permission);
+        }else {
+            noticeData = dilNoticeMapper.getNoticeData1();
+        }
+        return noticeData;
+    }
     /*
      * 获取下拉框
      * */

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

@@ -3421,7 +3421,8 @@
            RM.MATERIAL_CODE                                                 AS "materialCode",
            ASM.MATERIAL_NUMBER                                              AS "materialNumber",
            ASM.STEEL_METER                                                  AS "steelMeters",
-           ASM.IS_POUND_SALE                                                AS "isPoundSale"
+           ASM.IS_POUND_SALE                                                AS "isPoundSale",
+           ASOM.TRUCK_REMARK                                                AS "truckRemark"
     FROM AMS_SALE_ORDER ASO
            LEFT JOIN AMS_SALE_ORDER_MATERIAL ASOM
                      ON ASO.SALE_ORDER_ID = ASOM.SALE_ORDER_ID
@@ -3438,16 +3439,18 @@
     WHERE ASO.SALE_ORDER_ID = #{saleOrderId}
   </select>
 
-  <select id="matchingAddressRecently" parameterType="DECIMAL" resultType="java.util.Map" >
-    SELECT DISTINCT *
-    FROM (SELECT RRP.PLACE_ID "placeId",
+  <select id="matchingAddressRecently" parameterType="DECIMAL" resultType="java.util.LinkedHashMap" >
+    SELECT
+    DISTINCT
+    RRP.PLACE_ID "placeId",
     RRP.ADDRESS_DELIVERY_ADDRESS "place",
     RRA.ADDRESS_ID "shipperAddressId",
     RRA.ADDRESS_PROVINCE "addressProvince",
     RRA.ADDRESS_DISTRICT "addressDistrict",
     RRA.ADDRESS_TOWN "addressTown",
     ASOM.SALE_ORDER_CONSIGNEE_TEL "saleOrderConsigneeTel",
-    RRA.ADDRESS_PROVINCE || RRA.ADDRESS_DISTRICT || RRA.ADDRESS_TOWN || RRP.ADDRESS_DELIVERY_ADDRESS "addressPlace"
+    RRA.ADDRESS_PROVINCE || RRA.ADDRESS_DISTRICT || RRA.ADDRESS_TOWN || RRP.ADDRESS_DELIVERY_ADDRESS "addressPlace",
+    max(ASOM.SALE_ORDER_MATERIAL_ID) as b
     FROM AMS_SALE_ORDER ASO
     LEFT JOIN AMS_SALE_ORDER_MATERIAL ASOM
     ON ASO.SALE_ORDER_ID = ASOM.SALE_ORDER_ID
@@ -3457,8 +3460,12 @@
     ON RRA.ADDRESS_ID = RRP.ADDRESS_ID
     WHERE ASO.RECEIVE_ID = #{receiveId}
     AND RRP.PLACE_ID IS NOT NULL
-    ORDER BY ASOM.SALE_ORDER_MATERIAL_ID DESC
-    )
+    GROUP BY RRP.PLACE_ID , RRP.ADDRESS_DELIVERY_ADDRESS , RRA.ADDRESS_ID ,
+             RRA.ADDRESS_PROVINCE ,
+             RRA.ADDRESS_DISTRICT ,
+             RRA.ADDRESS_TOWN ,
+             ASOM.SALE_ORDER_CONSIGNEE_TEL
+    ORDER BY b DESC
   </select>
 
   <select id="getSalerByReceiveId" parameterType="DECIMAL" resultType="java.util.Map" >
@@ -4394,7 +4401,8 @@
                      ON RRP.PLACE_ID = ACTP.PLACE_ID
     WHERE ACTP.CARRIER_ID = #{carrierId}
       AND RRP.ADDRESS_ID = #{addressId}
-      ORDER BY ACTP.PRICE_ID DESC
+      ORDER BY ACTP.OLD_DATE DESC
+      NULLS LAST
   </select>
 
   <select id="findSelfMention" parameterType="DECIMAL" resultType="java.lang.String" >

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

@@ -508,5 +508,27 @@
 
   </select>
 <!--  /*   DN.INSERT_TIME =  DN.PERMISSION =#{permission} OR DN.PERMISSION =0 AND*/-->
-  
+
+  <!--获取信息-->
+  <select id="getNoticeData" resultType="java.util.Map">
+    select t.NOTICE_TITLE AS "noticetitle",
+    t.NOTICE_CONTENT AS "noticecontent",
+    t.INSERT_USERNAME AS "insertusername",
+    t.INSERT_TIME AS "inserttime",
+    (select count(*) INSERT_USERNAME from DIL_NOTICE) AS "taskAllNum"
+    from DIL_NOTICE t
+    where t.PERMISSION=#{permission} or t.PERMISSION is null
+  </select>
+
+  <!--获取信息-->
+  <select id="getNoticeData1" resultType="java.util.Map">
+    select
+    t.NOTICE_TITLE AS "noticetitle",
+    t.NOTICE_CONTENT AS "noticecontent",
+    t.INSERT_USERNAME AS "insertusername",
+    t.INSERT_TIME AS "inserttime",
+    (select count(*) INSERT_USERNAME from DIL_NOTICE) AS "taskAllNum"
+    from DIL_NOTICE t
+    where t.PERMISSION is null
+  </select>
 </mapper>