处理toMap KEY

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

@@ -117,12 +117,12 @@ public class ContractServiceImpl implements ContractService {
     }};
 
     public static final Map<String, String> SHEET_NAMES_RESERVE = new HashMap() {{
-        put( "tkio","TrackingIO");
-        put( "dmp","DMP");
-        put( "fake","防作弊卫士");
-        put( "adi","ADI");
-        put( "ads","ADS");
-        put( "abtest","ABTEST");
+        put("tkio", "TrackingIO");
+        put("dmp", "DMP");
+        put("fake", "防作弊卫士");
+        put("adi", "ADI");
+        put("ads", "ADS");
+        put("abtest", "ABTEST");
     }};
 
     Logger logger = LoggerFactory.getLogger(ContractServiceImpl.class);
@@ -1269,7 +1269,7 @@ public class ContractServiceImpl implements ContractService {
         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)) {
@@ -2155,7 +2155,7 @@ public class ContractServiceImpl implements ContractService {
                     .stream().collect(Collectors.toMap(ContractBody::getName, ContractBody::getCode));
         } else {
             cBodyMap = contractBodyRepository.findAllDis()
-                    .stream().collect(Collectors.toMap(ContractBody::getName, ContractBody::getCode));
+                    .stream().collect(Collectors.toMap(ContractBody::getName, ContractBody::getCode,(v1,v2)->v1));
         }
 
         Row row = sheet.getRow(0);