修改

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

@@ -98,9 +98,9 @@ public class AmsshipCargoTransferResultController extends BaseRESTfulController
             @ApiImplicitParam(name = "amsshipDeliveryAttorney", value = "详细实体amsshipDeliveryAttorney", required = true, dataType = "amsshipDeliveryAttorney")
     })
     @PostMapping(value = "/editCargoTransferResult", produces = "application/json;charset=UTF-8")
-    public RESTfulResult editCargoTransferResult(@RequestBody AmsshipCargoTransferResult amsshipCargoTransferResult) {
-        amsshipCargoTransferResultService.updateByPrimaryKeySelective(amsshipCargoTransferResult);
-        return success(amsshipCargoTransferResult);
+    public RESTfulResult editCargoTransferResult(@RequestBody Map<String,Object> map) {
+        int i= amsshipCargoTransferResultService.update(map);
+        return success(i);
     }
 
     //删除

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

@@ -23,4 +23,7 @@ public interface DilBatchMapper extends IBaseMapper<DilBatch, Short> {
 
     //模糊查询江船船名
     List<Map<String,Object>> getShipNameList(String state);
+
+    //根据外轮船名和物资插曲查找外轮船名
+    List<Map<String,Object>> selectBatchIdByName(Map<String,Object> map);
 }

src/main/java/com/steerinfo/dil/model/DilBatch.java

@@ -152,4 +152,7 @@ public class DilBatch implements IBasePO<Short> {
     public void setId(Short aShort) {
 
     }
+
+    public void setBatchId() {
+    }
 }

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

@@ -56,5 +56,6 @@ public interface IAmsshipCargoTransferResultService{
     //展示货权转移单位列表
     List<Map<String,Object>> selectShipperName(Map<String,Object> map);
 
-
+    //更新货权转移
+    int update(Map<String, Object> amsshipCargoTransferResult);
 }

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

@@ -69,13 +69,14 @@ public class AmsshipCargoTransferResultServiceImpl implements IAmsshipCargoTrans
         Map<String, Object> selectMap = new HashMap<>();
         selectMap.put("foreignShipName", foreignShipName);
         selectMap.put("materialId", new BigDecimal(materialId));
-        List<DilBatch> dilBatchList = dilBatchMapper.selectByParameters(selectMap);
+        List<Map<String,Object>> dilBatchList = dilBatchMapper.selectBatchIdByName(selectMap);
         DilBatch dilBatch = new DilBatch();
         // 根据物资id和外轮船名判断批次是否已存在
         // 存在则只取到批次id
         if (dilBatchList != null && dilBatchList.size() != 0) {
-            dilBatch = dilBatchList.get(0);
-            amsshipCargoTransferResult.setBatchId(dilBatch.getBatchId());
+            Map<String,Object> dilBatch1 = dilBatchList.get(0);
+            BigDecimal batchId =DataChange.dataToBigDecimal(dilBatch1.get("batchId"));
+            amsshipCargoTransferResult.setBatchId(batchId);
         }
         // 若不存在则新增一个新的批次
         else {
@@ -92,7 +93,6 @@ public class AmsshipCargoTransferResultServiceImpl implements IAmsshipCargoTrans
                 dilBatch.setInsertUsername("admin");
                 dilBatchMapper.insertSelective(dilBatch);
             }
-
             //如果批次id为空，获取新增的批次
             if (batchIdByMaterialId == null) {
                 //获取批次id进行新增
@@ -197,6 +197,44 @@ public class AmsshipCargoTransferResultServiceImpl implements IAmsshipCargoTrans
             return amsshipCargoTransferResultMapper.selectShipperName(map);
         }
 
+    @Override
+    public int update(Map<String, Object> map) {
+
+        List<Map<String, Object>> mapList=null;
+        AmsshipCargoTransferResult amsshipCargoTransferResult=new AmsshipCargoTransferResult();
+//        if (materialId!=null&&foreignShipName!=null&&!foreignShipName.equals("")) {
+//            //通过外轮船名匹配批次
+//             mapList = dilBatchMapper.selectBatchIdByName(map);
+//        }
+//        if (mapList.size()!=0) {
+//            Map<String, Object> batchList = mapList.get(0);
+//            BigDecimal batchId =DataChange.dataToBigDecimal(batchList.get("batchId"));
+//            amsshipCargoTransferResult.setBatchId(batchId);
+//        }else {
+//            DilBatch batch=new DilBatch();
+//            BigDecimal batchId1 = dilBatchMapper.selectBatchId();
+//            batch.setBatchId(batchId1);
+//            batch.setInsertTime(new Date());
+//            batch.setResultForeignShipName(foreignShipName);
+//            batch.setMaterialId(materialId);
+//            dilBatchMapper.insertSelective(batch);
+//            amsshipCargoTransferResult.setBatchId(batchId1);
+//        }
+
+        amsshipCargoTransferResult.setCargoTransferResultId(DataChange.dataToBigDecimal(map.get("cargoTransferResultId")));
+        amsshipCargoTransferResult.setCarrierId(DataChange.dataToBigDecimal(map.get("carrierId")));
+        if (map.get("resultMemo")!=null) {
+            amsshipCargoTransferResult.setResultMemo((String) map.get("resultMemo"));
+        }
+        amsshipCargoTransferResult.setResultContactPerson((String) map.get("resultContactPerson"));
+        amsshipCargoTransferResult.setResultNumberOfLoans(DataChange.dataToBigDecimal(map.get("resultNumberOfLoans")));
+        amsshipCargoTransferResult.setResultTelephoneFax((String) map.get("resultTelephoneFax"));
+        if (map.get("resultFreignForwardingInfo")!=null) {
+            amsshipCargoTransferResult.setResultFreightForwardingInfo((String) map.get("resultFreignForwardingInfo"));
+        }
+        int i = amsshipCargoTransferResultMapper.updateByPrimaryKeySelective(amsshipCargoTransferResult);
+        return i;
+    }
 
 
 }

src/main/resources/bootstrap.yml

@@ -1,7 +1,7 @@
 api.version: api/v1/shipTms
 spring:
   profiles:
-    include: ${SPRING_PROFILES:prod}
+    include: ${SPRING_PROFILES:dev}
   jackson:
         date-format: yyyy-MM-dd HH:mm:ss
         time-zone: GMT+8

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

@@ -715,8 +715,9 @@
                t1.RESULT_MEMO                    "resultMemo",
                t1.GROUP_ID                       "groupId",
                t1.BATCH_ID                       "batchId",
-               RM.MATERIAL_NAME "materialName",
-               RP.PIER_NAME "receiver"
+               RM.MATERIAL_NAME                  "materialName",
+               RP.PIER_NAME                      "receiver",
+               DB.RESULT_FOREIGN_SHIP_NAME        "foreignShipName"
         from AMSSHIP_CARGO_TRANSFER_RESULT t1
         LEFT JOIN DIL_BATCH DB
         ON DB.BATCH_ID=t1.BATCH_ID

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

@@ -318,4 +318,12 @@
       from RMS_CAPACITY RC
       where RC.CAPACITY_NUMBER like #{state}
     </select>
+
+<!--  根据物资名称和外轮船名-->
+  <select id="selectBatchIdByName" resultType="java.util.Map" parameterType="java.util.Map">
+    select DB.BATCH_ID "batchId"
+    from DIL_BATCH DB
+    WHERE DB.RESULT_FOREIGN_SHIP_NAME=#{foreignShipName}
+    and DB.MATERIAL_ID=#{materialId}
+  </select>
 </mapper>

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

@@ -774,8 +774,7 @@
     </select>
 
     <select id="selectLoadShip" parameterType="DECIMAL" resultType="java.util.Map">
-        SELECT LOCATION_START_PORT_ID      "locationStartPortId",
-               ARRIVAL_PORT_ID             "arrivalPortId",
+        SELECT
                BATCH_ID                    "batchId",
                RESULT_DELIVERY_DATE        "resultDeliveryDate",
                RESULT_ACTUAL_INSTALLATIONS "resultActualInstallations",