Merge branch 'master' of http://git.iamberry.com/hexiugang/iamberry-common-parent

watero-rst-service/src/main/java/com/iamberry/rst/service/fm/ComplaintDetectInfoServiceImpl.java

@@ -498,7 +498,7 @@ public class ComplaintDetectInfoServiceImpl implements ComplaintDetectInfoServic
                     }
                 }
                 if(detectInfo.getDetectProcessingResults() == 5){//原机退回
-                    detectInfo.setDetectState(37);//原机退回
+                    detectInfo.setDetectState(39);//原机退回
                 }
                 break;
             case 38:

watero-rst-web/src/main/java/com/iamberry/rst/controllers/order/AdminOrderController.java

@@ -2551,7 +2551,7 @@ public class AdminOrderController {
         ResponseJson responseJson = new ResponseJson();
         Product product = new Product();
         List<Product> productList = productService.listProductAndColorAndfittings(product);
-        HashMap<String,Set<String>> map = new HashMap<>();
+        HashMap<String,List<String>> map = new HashMap<>();
         for(Product pro : productList){
             for(ProductColor color : pro.getColorList()){
                 StringBuffer str = new StringBuffer(pro.getProductName());
@@ -2569,17 +2569,21 @@ public class AdminOrderController {
                 }else{
                     str.append(color.getColorName()+color.getColorAbbreviation());
                 }
-                if(color.getColorlabel() != null){
-                    str.append(color.getColorlabel());
-                }
-                System.out.println(color.getColorId()+"----"+str);
                 Set<String> setString = null;
                 try {
                     setString = AnalyzerUtil.productsplitWord(str.toString());
                 } catch (Exception e) {
                     e.printStackTrace();
                 }
-                map.put(color.getColorId().toString(),setString);
+
+                List<String> result = new ArrayList<>(setString);
+                if(color.getColorlabel() != null){
+                    String[] strArr = color.getColorlabel().split("@");
+                    for(String strs : strArr){
+                        result.add(strs);
+                    }
+                }
+                map.put(color.getColorId().toString(),result);
             }
         }
         RedisUtils.put("order_productList",map);
@@ -2601,15 +2605,6 @@ public class AdminOrderController {
             responseJson.setReturnCode(500);
             return responseJson;
         }
-        /*excelProductName = new String(excelProductName.getBytes("ISO-8859-1"),"UTF-8");*/
-        /*excelProductName = "watero滤芯T1";*/
-        /*excelProductName = "上朵lips牙刷幻影黑";*/
-        /*excelProductName = "WB-2水机珍珠白";*/
-        /*excelProductName = "银离子水箱";*/
-        /*excelProductName = "规格:滤芯组（T1/T2*2+T3/T4*1）;";*/
-        /*excelProductName = "水龙头净水器";*/
-        /*excelProductName = "果蔬机STY02";*/
-        /*excelProductName = "Watero净水机滤芯 T2";*/
 
         HashMap<String,JSONArray> map = RedisUtils.get("order_productList",HashMap.class);
         Set<String>  nameList = AnalyzerUtil.productsplitWord(excelProductName);

watero-rst-web/src/main/webapp/WEB-INF/views/cm/customer/update_relation.ftl

@@ -1010,6 +1010,9 @@
                                         <#if detect.detectState == 38>
                                             机器故障，待用户确认
                                         </#if>
+                                        <#if detect.detectState == 39>
+                                            机器无故障，原机退回
+                                        </#if>
                                         <#if detect.detectState == 20>
                                             待翻新入库
                                         </#if>
@@ -3106,6 +3109,9 @@
                                 case 38:
                                     detectStateName = "机器故障，待用户确认";
                                     break
+                                case 39:
+                                    detectStateName = "机器无故障，原机退回";
+                                    break
                                 case 20:
                                     detectStateName = "待翻新入库";
                                     break

watero-rst-web/src/main/webapp/WEB-INF/views/cm/inspection/detect_list.ftl

@@ -243,6 +243,9 @@
                         <#if detect.detectState == 23>
                             <span class="c-success">已报废回收</span>
                         </#if>
+                        <#if detect.detectState == 39>
+                            <span class="c-success">机器无故障，原机退回</span>
+                        </#if>
                     </td>
                     <td class="text-c" width="100"><#if detect.salesTime??> ${(detect.salesTime?string("yyyy-MM-dd"))!'-'} </#if></td>
                     <td class="text-c" width="100"><#if detect.signclosedName??> ${detect.signclosedName!''} </#if></td>