1

src/main/java/common/service/impl/ContractServiceImpl.java

@@ -1255,12 +1255,17 @@ public class ContractServiceImpl implements ContractService {
 
         Map<String, String> bodyMap = contractBodyRepository.findAllCodeDis().stream().collect(Collectors.toMap(ContractBody::getCode, ContractBody::getName));
 
-        Map<Long,String> tradeTypeMap = tradeTypeRepsitory.findAll().stream().collect(Collectors.toMap(TradeType::getId, TradeType::getName));
+        Map<String, String> tradeTypeMap = tradeTypeRepsitory.findAll().stream().collect(Collectors.toMap(v -> {
+            return v.getId().toString();
+        }, v -> {
+            return v.getName();
+        }));
 
         if (ValidateUtil.isValid(contractList)) {
             for (Contract c : contractList) {
                 c.setMyBodyName(bodyMap.get(c.getMyBodyCode()));
-                c.setTradeName(tradeTypeMap.get(c.getTradeType()));
+                c.setTradeName(tradeTypeMap.get(c.getTradeType()+""));
+
                 if ((c.getExtraFlow() != null && c.getExtraFlow() > 0) ||
                         (c.getDiscountTimeLong() != null && c.getDiscountTimeLong() > 0)) {