customer|manager|运单查询调整&运单状态字典查询

@@ -11,7 +11,7 @@ public class FindConsignmentsDto {
 
 
     private String recipientCompany;
     private String recipientCompany;
 
 
-    private String shipperCountry;
+    private String originCountry;
 
 
     private String docNondocFlag;
     private String docNondocFlag;
 
 
@@ -19,7 +19,7 @@ public class FindConsignmentsDto {
 
 
     private Date createTime;
     private Date createTime;
 
 
-    private Date commitTime;
+    private Date modifyTime;
 
 
     private String statusName;
     private String statusName;
 }
 }

@@ -51,4 +51,6 @@ public class ConsignmentQuery extends PageBase {
     private Long userId;
     private Long userId;
 
 
     private String uuid;
     private String uuid;
+
+    private String statusCode;
 }
 }

@@ -18,7 +18,7 @@
     c.CONSIGNMENT_CODE,
     c.CONSIGNMENT_CODE,
     c.RECIPIENT_CONTACT_NAME,
     c.RECIPIENT_CONTACT_NAME,
     c.RECIPIENT_COMPANY,
     c.RECIPIENT_COMPANY,
-    c.SHIPPER_COUNTRY,
+    c.ORIGIN_COUNTRY,
     CASE
     CASE
         WHEN c.DOC_NONDOC_FLAG = 'Y' THEN 'ITEM'
         WHEN c.DOC_NONDOC_FLAG = 'Y' THEN 'ITEM'
         WHEN c.DOC_NONDOC_FLAG = 'N' THEN 'DOC'
         WHEN c.DOC_NONDOC_FLAG = 'N' THEN 'DOC'
@@ -26,7 +26,7 @@
     END AS DOC_NONDOC_FLAG,
     END AS DOC_NONDOC_FLAG,
     c.CREATE_USER_NAME,
     c.CREATE_USER_NAME,
     c.CREATE_TIME,
     c.CREATE_TIME,
-    c.COMMIT_TIME,
+    c.MODIFY_TIME,
     c.STATUS_NAME
     c.STATUS_NAME
  </sql>
  </sql>
 
 
@@ -41,6 +41,9 @@
     (m.user_id = #{userId} AND m.consignment_id IS NOT NULL)
     (m.user_id = #{userId} AND m.consignment_id IS NOT NULL)
     OR c.user_uuid = #{uuid,jdbcType=VARCHAR}
     OR c.user_uuid = #{uuid,jdbcType=VARCHAR}
     )
     )
+    <if test="statusCode != null and statusCode != ''">
+      AND c.STATUS_CODE = #{statusCode}
+    </if>
     <if test="createTimeFrom != null and createTimeFrom != ''">
     <if test="createTimeFrom != null and createTimeFrom != ''">
       AND c.CREATE_TIME &gt;= TO_DATE(#{createTimeFrom}, 'YYYY-MM-DD HH24:MI:SS')
       AND c.CREATE_TIME &gt;= TO_DATE(#{createTimeFrom}, 'YYYY-MM-DD HH24:MI:SS')
     </if>
     </if>

@@ -30,7 +30,7 @@ public class UserConsignmentMappingRepositoryImpl extends BaseDao implements IUs
     }
     }
 
 
     @Override
     @Override
-    public UserConsignmentMapping save(UserConsignmentMapping entity) {
+    public UserConsignmentMapping saveOrUpdate(UserConsignmentMapping entity) {
         if(entity != null) {
         if(entity != null) {
             if (entity.getId() == null || entity.getId().longValue() <= 0) {
             if (entity.getId() == null || entity.getId().longValue() <= 0) {
                 userConsignmentMappingMapper.insertSelective(entity);
                 userConsignmentMappingMapper.insertSelective(entity);

@@ -23,4 +23,11 @@ public class DicEntriesController extends BaseController implements IDicEntriesC
         List<DictionaryEntries> countryList = dicEntriesService.getCountryAll();
         List<DictionaryEntries> countryList = dicEntriesService.getCountryAll();
         return responseUtils.success(countryList);
         return responseUtils.success(countryList);
     }
     }
+
+    @GetMapping("/getConsStatus")
+    @ApiOperation(value = "ResponseVo", notes = "获取运单状态")
+    public ResponseVo getConsStatus(){
+        List<DictionaryEntries> countryList = dicEntriesService.getConsStatus();
+        return responseUtils.success(countryList);
+    }
 }
 }

@@ -3,9 +3,9 @@ package com.fedex.connect.manager.controller.sys.impl;
 
 
 import com.fedex.connect.common.dependencies.authentication.SecurityConstants;
 import com.fedex.connect.common.dependencies.authentication.SecurityConstants;
 import com.fedex.connect.common.dependencies.cache.CacheSystem;
 import com.fedex.connect.common.dependencies.cache.CacheSystem;
+import com.fedex.connect.common.dependencies.contants.ParamConfigConstants;
 import com.fedex.connect.common.dependencies.contants.RedisConstants;
 import com.fedex.connect.common.dependencies.contants.RedisConstants;
 import com.fedex.connect.common.dependencies.date.vo.ResponseVo;
 import com.fedex.connect.common.dependencies.date.vo.ResponseVo;
-import com.fedex.connect.common.dependencies.enums.sys.ParamConfigEnum;
 import com.fedex.connect.common.dependencies.enums.sys.UserLoginTypeEnum;
 import com.fedex.connect.common.dependencies.enums.sys.UserLoginTypeEnum;
 import com.fedex.connect.common.dependencies.util.GsonUtils;
 import com.fedex.connect.common.dependencies.util.GsonUtils;
 import com.fedex.connect.common.dependencies.util.JwtTokenUtils;
 import com.fedex.connect.common.dependencies.util.JwtTokenUtils;
@@ -91,7 +91,7 @@ public class SysAuthController extends BaseController implements ISysAuthControl
                 ResponseVo tokenResult = sysAuthService.createFclToken(jsonObject);
                 ResponseVo tokenResult = sysAuthService.createFclToken(jsonObject);
                 if (tokenResult.isSuccess()){
                 if (tokenResult.isSuccess()){
                     String fcl_token_key  = String.valueOf(tokenResult.getData());
                     String fcl_token_key  = String.valueOf(tokenResult.getData());
-                    String redirectUrl = String.format("%s?token=%s", paramConfigUtil.getParamValue(ParamConfigEnum.FCL_LOGIN_URL.getEnMsg()), fcl_token_key);
+                    String redirectUrl = String.format("%s?token=%s", paramConfigUtil.getParamValue(ParamConfigConstants.FCL_PARAM_KEYS.FCL_LOGIN_URL), fcl_token_key);
                     System.out.println(redirectUrl);
                     System.out.println(redirectUrl);
                     res.sendRedirect(redirectUrl);
                     res.sendRedirect(redirectUrl);
                 }
                 }

@@ -6,4 +6,6 @@ import java.util.List;
 
 
 public interface IDicEntriesRepository {
 public interface IDicEntriesRepository {
     List<DictionaryEntries> getCountryAll();
     List<DictionaryEntries> getCountryAll();
+
+    List<DictionaryEntries> getConsStatus();
 }
 }

@@ -30,4 +30,9 @@ public class DicEntriesRepositoryImpl extends BaseDao implements IDicEntriesRepo
     public List<DictionaryEntries> getCountryAll(){
     public List<DictionaryEntries> getCountryAll(){
         return cacheSystem.getDictionarysByDicCode(DictionaryConstants.COUNTRY);
         return cacheSystem.getDictionarysByDicCode(DictionaryConstants.COUNTRY);
     }
     }
+
+    @Override
+    public List<DictionaryEntries> getConsStatus() {
+        return cacheSystem.getDictionarysByDicCode(DictionaryConstants.CONSIGNMENT_STATUS);
+    }
 }
 }

@@ -5,4 +5,6 @@ import java.util.List;
 
 
 public interface IDicEntriesService {
 public interface IDicEntriesService {
     List<DictionaryEntries> getCountryAll();
     List<DictionaryEntries> getCountryAll();
+
+    List<DictionaryEntries> getConsStatus();
 }
 }
\ No newline at end of file

@@ -14,4 +14,9 @@ public class DicEntriesServiceImpl extends BaseService implements IDicEntriesSer
     public List<DictionaryEntries> getCountryAll() {
     public List<DictionaryEntries> getCountryAll() {
         return dicEntriesRepository.getCountryAll();
         return dicEntriesRepository.getCountryAll();
     }
     }
+
+    @Override
+    public List<DictionaryEntries> getConsStatus() {
+        return dicEntriesRepository.getConsStatus();
+    }
 }
 }