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

watero-rst-service/src/main/java/com/iamberry/rst/service/fm/mapper/complaintDetectInfoMapper.xml

@@ -182,6 +182,7 @@
     cd.detect_source detectSource,
     ssa.admin_name salesmanAdminName,
     cq.question_name questionName,
+    cq.question_profile questionProfile,
     cpms.proc_method_name methodName,
     cpts.proc_type_name typeName,
     cd.company_id companyId,

watero-rst-web/src/main/java/com/iamberry/rst/controllers/cm/AdminDetectController.java

@@ -820,7 +820,7 @@ public class AdminDetectController {
         }*/
         String[] cells = {
                 "维修编号","快递单号","产品名称","颜色","生产月份","机身条码","是否少件",
-                "退货地区","返厂日期","购买日期","客诉日期","客诉类型",
+                "退货地区","返厂日期","购买日期","确认日期","客诉日期","客诉类型",
                 "客诉问题","售后原因","售后处理类型","工厂检测现象","是否翻新机",
                 "故障原因","判断结果","故障指向","原因分析",
                 "维修内容","厚膜类型","浮子类型","版本号"
@@ -924,31 +924,61 @@ public class AdminDetectController {
             }else{
                 row.createCell(8).setCellValue(sdf.format(detect.getSignclosedDate()));
             }
-            if(detect.getSalesTime()==null){
-                row.createCell(9).setCellValue("");
-            }else{
+            if(detect.getDetectBuytime()!=null){
+                row.createCell(9).setCellValue(sdf.format(detect.getDetectBuytime()));
+            }else if(detect.getSalesTime()!=null){
                 row.createCell(9).setCellValue(sdf.format(detect.getSalesTime()));
             }
+            if(detect.getDetectConfirmTime()!=null){
+                row.createCell(10).setCellValue(sdf.format(detect.getDetectConfirmTime()));
+            }else if(detect.getCustomerCreateTime()!=null){
+                row.createCell(10).setCellValue(sdf.format(detect.getCustomerCreateTime()));
+            }
             if(detect.getCustomerCreateTime()==null){
-                row.createCell(10).setCellValue("");
+                row.createCell(11).setCellValue("");
             }else{
-                row.createCell(10).setCellValue(sdf.format(detect.getCustomerCreateTime()));
+                row.createCell(11).setCellValue(sdf.format(detect.getCustomerCreateTime()));
             }
 
-            row.createCell(11).setCellValue(detect.getProcTypeName()==null?"":detect.getProcTypeName());
-            row.createCell(12).setCellValue(detect.getQuestionTitle()==null?"":detect.getQuestionTitle());
-            row.createCell(13).setCellValue(detect.getDescribeHandleDesc()==null?"":detect.getDescribeHandleDesc());
-            row.createCell(14).setCellValue(detect.getProcMethodName()==null?"":detect.getProcMethodName());
-            row.createCell(15).setCellValue(detect.getDetectPhenomenon()==null?"":detect.getDetectPhenomenon());
-            row.createCell(16).setCellValue(detectIsRefurbishing);
-            row.createCell(17).setCellValue(detect.getDetectFailureCause()==null?"":detect.getDetectFailureCause());
-            row.createCell(18).setCellValue(detect.getDetectResults()==null?"":detect.getDetectResults());
-            row.createCell(19).setCellValue(detect.getDetectPoint()==null?"":detect.getDetectPoint());
-            row.createCell(20).setCellValue(detect.getDetectNalysis()==null?"":detect.getDetectNalysis());
-            row.createCell(21).setCellValue(detect.getDetectContent()==null?"":detect.getDetectContent());
-            row.createCell(22).setCellValue(detectFilmType);
-            row.createCell(23).setCellValue(detectFloatType);
-            row.createCell(24).setCellValue(detect.getDetectVersionNumber()==null?"":detect.getDetectVersionNumber());
+
+            if(detect.getProcTypeName()!=null){
+                row.createCell(12).setCellValue(detect.getProcTypeName());
+            }else if(detect.getTypeName()!=null){
+                row.createCell(12).setCellValue(detect.getTypeName());
+            }else{
+                row.createCell(12).setCellValue("");
+            }
+            if(detect.getQuestionTitle()!=null){
+                row.createCell(13).setCellValue(detect.getQuestionTitle());
+            }else if(detect.getQuestionName()!=null){
+                row.createCell(13).setCellValue(detect.getQuestionName());
+            }else{
+                row.createCell(13).setCellValue("");
+            }
+            if(detect.getDescribeHandleDesc()!=null){
+                row.createCell(14).setCellValue(detect.getDescribeHandleDesc());
+            }else if(detect.getQuestionProfile()!=null){
+                row.createCell(143).setCellValue(detect.getQuestionProfile());
+            }else{
+                row.createCell(14).setCellValue("");
+            }
+            if(detect.getProcMethodName()!=null){
+                row.createCell(15).setCellValue(detect.getProcMethodName());
+            }else if(detect.getMethodName()!=null){
+                row.createCell(15).setCellValue(detect.getMethodName());
+            }else{
+                row.createCell(15).setCellValue("");
+            }
+            row.createCell(16).setCellValue(detect.getDetectPhenomenon()==null?"":detect.getDetectPhenomenon());
+            row.createCell(17).setCellValue(detectIsRefurbishing);
+            row.createCell(18).setCellValue(detect.getDetectFailureCause()==null?"":detect.getDetectFailureCause());
+            row.createCell(19).setCellValue(detect.getDetectResults()==null?"":detect.getDetectResults());
+            row.createCell(20).setCellValue(detect.getDetectPoint()==null?"":detect.getDetectPoint());
+            row.createCell(21).setCellValue(detect.getDetectNalysis()==null?"":detect.getDetectNalysis());
+            row.createCell(22).setCellValue(detect.getDetectContent()==null?"":detect.getDetectContent());
+            row.createCell(23).setCellValue(detectFilmType);
+            row.createCell(24).setCellValue(detectFloatType);
+            row.createCell(25).setCellValue(detect.getDetectVersionNumber()==null?"":detect.getDetectVersionNumber());
 
 
 
@@ -1030,7 +1060,7 @@ public class AdminDetectController {
         }*/
         String[] cells = {
                 "维修编号","快递单号","产品简称","产品颜色","生产月份","机身条码","是否少件",
-                "退货地区","返厂日期","售后处理类型","工厂检测现象","是否翻新机","厚膜类型","浮子类型","版本号","检测日期"
+                "退货地区","返厂日期","确认日期","售后处理类型","工厂检测现象","是否翻新机","厚膜类型","浮子类型","版本号","检测日期"
         };
         exportExcel2(request,res,cells,detectList);
     }
@@ -1126,16 +1156,27 @@ public class AdminDetectController {
                 row.createCell(8).setCellValue(sdf.format(detect.getSignclosedDate()));
             }
             /*row.createCell(9).setCellValue(detect.getProcTypeName()==null?"":detect.getProcTypeName());*/
-            row.createCell(9).setCellValue(detect.getProcMethodName()==null?"":detect.getProcMethodName());
-            row.createCell(10).setCellValue(detect.getDetectPhenomenon()==null?"":detect.getDetectPhenomenon());
-            row.createCell(11).setCellValue(detectIsRefurbishing);
-            row.createCell(12).setCellValue(detectFilmType);
-            row.createCell(13).setCellValue(detectFloatType);
-            row.createCell(14).setCellValue(detect.getDetectVersionNumber()==null?"":detect.getDetectVersionNumber());
+            if(detect.getDetectConfirmTime()!=null){
+                row.createCell(9).setCellValue(sdf.format(detect.getDetectConfirmTime()));
+            }else if(detect.getCustomerCreateTime()!=null){
+                row.createCell(9).setCellValue(sdf.format(detect.getCustomerCreateTime()));
+            }
+            if(detect.getProcTypeName()!=null){
+                row.createCell(10).setCellValue(detect.getProcTypeName());
+            }else if(detect.getTypeName()!=null){
+                row.createCell(10).setCellValue(detect.getTypeName());
+            }else{
+                row.createCell(10).setCellValue("");
+            }
+            row.createCell(11).setCellValue(detect.getDetectPhenomenon()==null?"":detect.getDetectPhenomenon());
+            row.createCell(12).setCellValue(detectIsRefurbishing);
+            row.createCell(13).setCellValue(detectFilmType);
+            row.createCell(14).setCellValue(detectFloatType);
+            row.createCell(15).setCellValue(detect.getDetectVersionNumber()==null?"":detect.getDetectVersionNumber());
             if(detect.getDetectPrintTime()==null){
-                row.createCell(15).setCellValue( "");
+                row.createCell(16).setCellValue( "");
             }else{
-                row.createCell(15).setCellValue(sdf.format(detect.getDetectPrintTime()));
+                row.createCell(16).setCellValue(sdf.format(detect.getDetectPrintTime()));
             }
 
             if(detect.getDetectIsDownload() == 1){