From 12b495483b3ad2d4a02d59d53bb36137870107c5 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Thu, 6 Jun 2024 12:04:27 +0800
Subject: [PATCH] md

---
 .../java/com/xdadan/erp/emis/domain/EmisProblemType.java    | 2 +-
 .../main/java/com/xdadan/erp/emis/domain/EmisWaybill.java   | 2 +-
 .../com/xdadan/erp/emis/domain/EmisWaybillProblemInfo.java  | 2 +-
 .../com/xdadan/erp/emis/mapper/EmisProblemTypeMapper.java   | 2 +-
 .../java/com/xdadan/erp/emis/service/EmisBaseService.java   | 6 +++---
 .../erp/emis/service/impl/EmisTmsScanRecordServiceImpl.java | 2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisProblemType.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisProblemType.java
index 7b35cedd5..e60fbf97f 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisProblemType.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisProblemType.java
@@ -34,7 +34,7 @@ public class EmisProblemType extends BaseEntity
     private static final long serialVersionUID = 1L;
 
     /* 序号 */
-    private Long id;
+    private Integer id;
     /* 类型编号 */
     private String typeCode;
     /* 类型名称 */
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybill.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybill.java
index 57bf82da1..9694ea5d9 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybill.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybill.java
@@ -328,7 +328,7 @@ public class EmisWaybill extends BaseEntity
     /* 是否问题件 1-是 0-否 */
     private String blIsQuestion;
     /* 问题件类型 */
-    private String problemType;
+    private Integer problemType;
     /* 问题件原因 */
     private String problemCause;
     /* 问题件延期天数 */
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybillProblemInfo.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybillProblemInfo.java
index c2c1a974f..c4bd84763 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybillProblemInfo.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybillProblemInfo.java
@@ -38,7 +38,7 @@ public class EmisWaybillProblemInfo extends BaseEntity
     /* 运单号 */
     private String billCode;
     /* 问题类型: 航班拉货 */
-    private Long problemType;
+    private Integer problemType;
     /* 问题件标题 */
     private String problemTitle;
     /* 问题件原因 */
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisProblemTypeMapper.java b/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisProblemTypeMapper.java
index cf3d255aa..6ffce6bf1 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisProblemTypeMapper.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisProblemTypeMapper.java
@@ -26,7 +26,7 @@ public interface EmisProblemTypeMapper extends BaseMapper<EmisProblemType>
      * @param  id
      * @return 
      */
-    public EmisProblemType selectEmisProblemTypeById(Long id);
+    public EmisProblemType selectEmisProblemTypeById(Integer id);
 
     /**
      * 查询列表
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java
index 1457f42e9..ecb72a48a 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java
@@ -436,7 +436,7 @@ public class EmisBaseService {
       * 更新问题件状态
       * @param billCode
       */
-     public void updateProblemStatus(String billCode,String problemType,String problemCause) {
+     public void updateProblemStatus(String billCode,Integer problemType,String problemCause) {
          String mainBillCode = billCode;
          if(billCode.startsWith("T7080") && billCode.length()>14 ){
              mainBillCode=billCode.substring(0,14);
@@ -449,7 +449,7 @@ public class EmisBaseService {
          waybill.setProblemCause(problemCause);
 
          // 记录延迟天数
-         EmisProblemType emisProblemType =getEmisProblemTypebyTypeId(Long.valueOf(problemType));
+         EmisProblemType emisProblemType =getEmisProblemTypebyTypeId(problemType);
          waybill.setProblemDelayDays(emisProblemType.getDelayDay());
 
          // 重新计算预估时间
@@ -475,7 +475,7 @@ public class EmisBaseService {
 
      }
 
-     public EmisProblemType getEmisProblemTypebyTypeId(Long typeId){
+     public EmisProblemType getEmisProblemTypebyTypeId(Integer typeId){
          return emisProblemTypeMapper.selectEmisProblemTypeById(typeId);
      }
 
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsScanRecordServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsScanRecordServiceImpl.java
index 5116650fd..1eb4c89a0 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsScanRecordServiceImpl.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsScanRecordServiceImpl.java
@@ -510,7 +510,7 @@ public class EmisTmsScanRecordServiceImpl extends EmisBaseService implements IEm
 //                    "scanDate": "2024-05-02 12:03:05",
 //                    "scanWeight": "0.2"
 
-            String problemType = String.valueOf(scanDataItem.get("problemType"));
+            Integer problemType = Integer.valueOf(scanDataItem.get("problemType").toString());
             String notifySite = (String)scanDataItem.get("notifySite");
             String picUrl = (String)scanDataItem.get("picUrl");
             String remark = (String)scanDataItem.get("remark");