...

shenhailong
src/main/java/com/agent/controller/agent/ManifestController.java
src/main/java/com/agent/controller/agent/SecurityDeclarationController.java
src/main/java/com/agent/repository/system/SecurityDeclarationRepository.java
src/main/java/com/agent/service/system/SecurityDeclarationService.java
--- a/src/main/java/com/agent/controller/agent/ManifestController.java
查看文件 @062deee
+++ b/src/main/java/com/agent/controller/agent/ManifestController.java
查看文件 @062deee
@@ -2565,7 +2565,7 @@ public class ManifestController extends BasicController {
 								manifestEntity.setShpcusid(arr.get(13));
 								// 发货人公司
 								manifestEntity.setCo_company(arr.get(14));
-								manifestEntity.setSh_name(arr.get(14));
+								manifestEntity.setCo_name(arr.get(14));
 								// 发货人地址
 								manifestEntity.setCo_address(arr.get(15));
 								// 发货人国家代码
@@ -2578,6 +2578,7 @@ public class ManifestController extends BasicController {
 								manifestEntity.setCnecusid(arr.get(19));
 								// 收货人公司
 								manifestEntity.setSh_company(arr.get(20));
+								manifestEntity.setSh_name(arr.get(20));
 								// 收货人地址
 								manifestEntity.setSh_address(arr.get(21));
 								// 收货人城市
@@ -2694,7 +2695,7 @@ public class ManifestController extends BasicController {
 									seconday.setShpcusid(arr.get(13));
 									// 发货人公司
 									seconday.setCo_company(arr.get(14));
-									seconday.setSh_name(arr.get(14));
+									seconday.setCo_name(arr.get(14));
 									// 发货人地址
 									seconday.setCo_address(arr.get(15));
 									// 发货人国家代码
@@ -2707,6 +2708,7 @@ public class ManifestController extends BasicController {
 									seconday.setCnecusid(arr.get(19));
 									// 收货人公司
 									seconday.setSh_company(arr.get(20));
+									seconday.setSh_name(arr.get(20));
 									// 收货人地址
 									seconday.setSh_address(arr.get(21));
 									// 收货人城市
--- a/src/main/java/com/agent/controller/agent/SecurityDeclarationController.java
查看文件 @062deee
+++ b/src/main/java/com/agent/controller/agent/SecurityDeclarationController.java
查看文件 @062deee
@@ -107,6 +107,8 @@ public class SecurityDeclarationController {
                     sdVo.setUser_id(sd.getUSERID());
                     if("1".equals(sd.getStatics())){
                         sdVo.setSd_static("已暂存");
+                    }else {
+                        sdVo.setSd_static("已发送");
                     }
                     sdVo.setOperation(sd.getOperation());
                     sdVo.setCustoms(sd.getCustoms());
@@ -216,7 +218,7 @@ public class SecurityDeclarationController {
             sd.setSd_iata_number(iataNumber);
             sd.setSd_transport_certificate(transportCertificate);
             sd.setSd_transportation_prove(transportationProve);
-            sd.setSd_static("1");
+            sd.setSd_static("2");
             SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
             String format = simpleDateFormat.format(new Date());
             sd.setOperation_time(format);
@@ -371,7 +373,7 @@ public class SecurityDeclarationController {
                 sd.setSd_iata_number(iataNumber);
                 sd.setSd_transport_certificate(transportCertificate);
                 sd.setSd_transportation_prove(transportationProve);
-                sd.setSd_static("1");
+                sd.setSd_static("2");
                 if (ue != null){
                     if (ue.getId() != null ){
                         sd.setUSER_ID(ue.getId());
@@ -652,7 +654,7 @@ public class SecurityDeclarationController {
         sd.setSd_iata_number(iataNumber);
         sd.setSd_transport_certificate(transportCertificate);
         sd.setSd_transportation_prove(transportationProve);
-        sd.setSd_static("1");
+        sd.setSd_static("2");
         sd.setUSER_ID(ue.getId());
         SimpleDateFormat simpleDateFormats = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         String format = simpleDateFormats.format(new Date());
--- a/src/main/java/com/agent/repository/system/SecurityDeclarationRepository.java
查看文件 @062deee
+++ b/src/main/java/com/agent/repository/system/SecurityDeclarationRepository.java
查看文件 @062deee
@@ -18,10 +18,10 @@ public interface SecurityDeclarationRepository extends PagingAndSortingRepositor
     @Transactional
     @Modifying
-    @Query(value = "update SECURITY_DECLARATION set SD_WAYBILL=?2, SD_CARGO_SHIPPER_NAME=?4, SD_CARGO_AGENT_NAME=?3, SD_IATA_NUMBER=?5, SD_TRANSPORT_CERTIFICATE=?6, SD_TRANSPORTATION_PROVE=?7, USER_ID=?8, OPERATION_TIME=?9 where id=?1", nativeQuery = true)
+    @Query(value = "update SECURITY_DECLARATION set SD_WAYBILL=?2, SD_CARGO_SHIPPER_NAME=?4, SD_CARGO_AGENT_NAME=?3, SD_IATA_NUMBER=?5, SD_TRANSPORT_CERTIFICATE=?6, SD_TRANSPORTATION_PROVE=?7, USER_ID=?8, OPERATION_TIME=?9, SD_STATIC=?10 where id=?1", nativeQuery = true)
     int update(Long id, String waybill,
                String cargoAgent, String cargoShipper,
-               String iata, String tranposrt, String prove, Long userId, String operation);
+               String iata, String tranposrt, String prove, Long userId, String operation, String statics);
     @Query(value = "select count(*) from SECURITY_DECLARATION where SD_WAYBILL = ?1", nativeQuery = true)
     int findWaybill(String waybill);
--- a/src/main/java/com/agent/service/system/SecurityDeclarationService.java
查看文件 @062deee
+++ b/src/main/java/com/agent/service/system/SecurityDeclarationService.java
查看文件 @062deee
@@ -74,7 +74,7 @@ public class SecurityDeclarationService extends BasicService<SecurityManifestEnt
         return securityDeclarationRepository.update(sd.getId(), sd.getSd_waybill(),
                 sd.getSd_cargo_agent_name(), sd.getSd_cargo_shipper_name(),
                 sd.getSd_iata_number(), sd.getSd_transport_certificate(),
-                sd.getSd_transportation_prove(), sd.getUSER_ID(), sd.getOperation_time());
+                sd.getSd_transportation_prove(), sd.getUSER_ID(), sd.getOperation_time(), sd.getSd_static());
     }