12.15修改

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

@@ -146,7 +146,7 @@ public class TmsshipWaterQualityResultController extends BaseRESTfulController {
         if(con != null){
             if(!"undefined".equals(con)){
                 //设置要查询的索引名称
-                String index="get_water_quality_list";
+                String index="get_water_qualityy_list";
                 //获取查询结果
                 return success(esFeign.getConResult(mapVal,index,apiId,pageNum,pageSize,con));
             }
@@ -159,7 +159,7 @@ public class TmsshipWaterQualityResultController extends BaseRESTfulController {
             detailListTotal = tmsshipWaterQualityResultService.selectWaterQualityList(null);
             Map<String, Object> map = new HashMap<>();
             //添加索引
-            map.put("index", "get_water_quality_list");
+            map.put("index", "get_water_qualityy_list");
             //添加id
             map.put("indexId", "waterResultId");
             detailListTotal.add(map);

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

@@ -5,6 +5,7 @@ import com.steerinfo.dil.model.TmsshipLoadShipResult;
 import com.steerinfo.dil.model.TmsshipWaterQualityResult;
 import com.steerinfo.dil.mapper.TmsshipWaterQualityResultMapper;
 import com.steerinfo.dil.service.ITmsshipWaterQualityResultService;
+import com.steerinfo.dil.util.DataChange;
 import io.swagger.models.auth.In;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -83,6 +84,9 @@ public class TmsshipWaterQualityResultServiceImpl implements ITmsshipWaterQualit
        //计划日期
         Date resultPlannedDate = new Date((Long) mapVal.get("resultPlannedDate"));
          tmsshipWaterQualityResult.setResultPlannedDate(resultPlannedDate);
+         //预计放货日期
+        Date expectNoticeDate=new Date((Long)mapVal.get("expectNoticeDate"));
+        tmsshipWaterQualityResult.setResultEsDeliveryDate(expectNoticeDate);
         //含水率
         BigDecimal resultMoistureContent = new BigDecimal((String)mapVal.get("resultMoistureContent"));
         tmsshipWaterQualityResult.setResultMoistureContent(resultMoistureContent);
@@ -90,11 +94,11 @@ public class TmsshipWaterQualityResultServiceImpl implements ITmsshipWaterQualit
         String purchaseContractMoisture=(String)mapVal.get("contractMoistureValue");
         amsshipDeliveryNotice.setPurchaseContractMoisture(purchaseContractMoisture);
         //实装吨位
-        BigDecimal resultActualInstallations=(BigDecimal)mapVal.get("realWeight");
+        BigDecimal resultActualInstallations = DataChange.dataToBigDecimal(mapVal.get("realWeight"));
         tmsshipLoadShipResult.setResultActualInstallations( resultActualInstallations);
         //水分吨位
-        BigDecimal resultWaterTonnage = new BigDecimal((Integer)mapVal.get("resultWaterTonnage")) ;
-        tmsshipWaterQualityResult.setResultWaterTonnage(resultWaterTonnage);
+       BigDecimal moistureTonnage = new BigDecimal((String) mapVal.get("moistureTonnage"));
+        tmsshipWaterQualityResult.setResultWaterTonnage(moistureTonnage);
         //装船比例
         BigDecimal instructionsId = selectInstructionsId(orderId);
         BigDecimal weights = tmsshipLoadShipResultService.selectAllWeight(instructionsId);
@@ -167,6 +171,7 @@ public class TmsshipWaterQualityResultServiceImpl implements ITmsshipWaterQualit
     public List<Map<String, Object>> selectWaterQualityList(Map<String, Object> mapVal) {
         List<Map<String, Object>> mapList = tmsshipWaterQualityResultMapper.selectWaterQualityList(mapVal);
         String result;
+        DecimalFormat df = new DecimalFormat("0.0000");
         for (Map<String, Object> map : mapList) {
             if(((BigDecimal)map.get("resultEmptyHeavyWaterMeter")).intValue() == 0){
                 result="电子磅交接";
@@ -174,8 +179,13 @@ public class TmsshipWaterQualityResultServiceImpl implements ITmsshipWaterQualit
             else {
                 result="地磅交接";
             }
-            map.remove("resultEmptyHeavyWaterMeter");
             map.put("resultEmptyHeavyWaterMeter",result);
+            Object waterWeight = map.get("waterWeight");
+            if(waterWeight != null){
+                BigDecimal data = DataChange.dataToBigDecimal(waterWeight);
+                String weightFormat = df.format(data);
+                map.put("waterWeight", weightFormat);
+            }
         }
         return mapList;
     }
@@ -235,10 +245,9 @@ public class TmsshipWaterQualityResultServiceImpl implements ITmsshipWaterQualit
         amsshipDeliveryNotice.setPurchaseContractMoisture(purchaseContractMoisture);
        //根据获得的含水率和实装吨位，计算水分吨位
         DecimalFormat df=new DecimalFormat("#.0000");
-        Double WaterTonnage=(resultActualInstallations.doubleValue() * (1-resultMoistureContent.doubleValue()));
-        BigDecimal resultWaterTonnage=(new BigDecimal(df.format(WaterTonnage)));
-        tmsshipWaterQualityResult.setResultWaterTonnage(resultWaterTonnage);
+        String resultWaterTonnage=df.format(resultActualInstallations.doubleValue() * resultMoistureContent.doubleValue());
 
+         tmsshipWaterQualityResult.setResultWaterTonnage(new BigDecimal(resultWaterTonnage));
         Map<String,Object> map1=new HashMap<>();
        // map1.put("batchId",batchId );
         map1.put("purchaseContractMoisture",purchaseContractMoisture);

src/main/resources/bootstrap.yml

@@ -18,6 +18,7 @@ openfeign:
   ColumnDataFeign:
     url: ${COLUMNDATAFEIGN_URL:172.16.33.166:8083}
 
+
 #eureka设置
 eureka:
   client:
@@ -57,4 +58,4 @@ mybatis:
     call-setters-on-nulls: true
 
 server:
-  port: 8090
+  port: 8003

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

@@ -587,14 +587,14 @@
         rpo.PORT_NAME as "loadPort",
         twqr.RESULT_PLANNED_DATE as "planDate",
         twqr.RESULT_ES_DELIVERY_DATE as "expectNoticeDate",
-        twqr.RESULT_CARGO_RIGHTS_DATE as "cargoDate",
+        actr.RESULT_DATE_OF_LOANS as "cargoDate",
         adn.PURCHASE_CONTRACT_MOISTURE as "purchaseContractMoisture",
         tlsr.RESULT_LOAD_SHIP_DATE as "loadTime",
         oic.INSTRUCTION_PLANNED_LOADING as "planWeight",
         rc.CAPACITY_NUMBER as "capacityName",
         tlsr.RESULT_ACTUAL_INSTALLATIONS as "realWeight",
         twqr.RESULT_EMPTY_HEAVY_WATER_METER as "resultEmptyHeavyWaterMeter",
-        twqr.RESULT_MOISTURE_CONTENT as "moistureContent",
+        to_char(twqr.RESULT_MOISTURE_CONTENT, '0.0000') as "moistureContent",
         twqr.RESULT_WATER_TONNAGE as "waterWeight",
         twqr.RESULT_INSPECTION_FEES as "testFee",
         twqr.RESULT_SHIPMENT_RATIO as "loadRatio"
@@ -619,6 +619,8 @@
         ON ada.PORT_ID = rpo.PORT_ID
         LEFT JOIN AMSSHIP_DELIVERY_NOTICE adn
         ON adn.BATCH_ID = db.BATCH_ID
+        LEFT JOIN AMSSHIP_CARGO_TRANSFER_RESULT actr
+        ON actr.BATCH_ID=db.BATCH_ID
         WHERE twqr.DELETED = 0)
         <where>
             <if test="materialName != null">