修改bug文档bug

watero-rst-service/src/main/java/com/iamberry/rst/service/cm/CustomerServiceImpl.java

@@ -332,10 +332,10 @@ public class CustomerServiceImpl implements CustomerService {
             CustomerCommon customerCommon = customerInfo.getCustomerCommon();
             if(ccList.size() > 0){
                 cc = ccList.get(0);
-                customerCommon.setRelationBackStatus(cc.getRelationBackStatus()); //寄回状态 1：未寄回
-                customerCommon.setRelationSendStatus(cc.getRelationSendStatus()); //寄送状态 1：未寄送
-                customerCommon.setRelationIsTransfer(cc.getRelationIsTransfer());    //是否已转账邮费
-                customerCommon.setRelationBackPostage(cc.getRelationBackPostage());   //邮费
+                customerCommon.setRelationBackStatus(cc.getRelationBackStatus() == null ? 1:cc.getRelationBackStatus()); //寄回状态 1：未寄回
+                customerCommon.setRelationSendStatus(cc.getRelationSendStatus() == null ? 1:cc.getRelationSendStatus()); //寄送状态 1：未寄送
+                customerCommon.setRelationIsTransfer(cc.getRelationIsTransfer() == null ? 0:cc.getRelationIsTransfer());    //是否已转账邮费
+                customerCommon.setRelationBackPostage(cc.getRelationBackPostage() == null ? 0:cc.getRelationBackPostage());   //邮费
                 //旧的物流公司物流单号支付宝信息 邮费状态 efast订单号
                 customerCommon.setRelationBackLogisticsCompany(cc.getRelationBackLogisticsCompany());//寄回物流公司
                 customerCommon.setRelationBackLogisticsNo(cc.getRelationBackLogisticsNo());//寄回物流单号

watero-rst-service/src/main/java/com/iamberry/rst/service/cm/mapper/customerInfoMapper.xml

@@ -131,6 +131,9 @@
       <if test="describeTitle != null and describeTitle != ''">
         and d.describe_title like CONCAT('%',#{describeTitle},'%')
       </if>
+      <if test="questionId != null and questionId != ''">
+        and c.question_id  = #{questionId}
+      </if>
       <if test="customerSourceType != null and customerSourceType != ''">
         and c.customer_source_type = #{customerSourceType}
       </if>

watero-rst-web/src/main/webapp/WEB-INF/views/cm/report/customer_report.ftl

@@ -203,6 +203,9 @@
                             case 4:
                                 str += '<td class="text-c" style="'+ style_array[i] +'"><a href="javascript:void(0);" style="color: #06c;" onclick="showPieChart(' + table_array[index][i+1] + ',\'small\')">' + table_array[index][i] + '<a></td>';
                                 break;
+                            case 7:
+                                str += '<td class="text-c" style="'+ style_array[i] +'"><a href="javascript:void(0);" style="color: #06c;" onclick="to_customer_list(' + table_array[index][i+1] + ')">' + table_array[index][i] + '<a></td>';
+                                break;
                             case 10:
                                 str += '<td class="text-c" style="'+ style_array[i] +'background-size: ' + table_array[index][i] + ' 100%;">' + table_array[index][i] + '</td>';
                                 break;
@@ -345,6 +348,14 @@
             }
         }
     }
+
+    /**
+     *跳转到客诉列表页面
+     * @param employee
+     */
+    function to_customer_list(title) {
+        window.location.href= "${path}/admin/customer/select_customer_list?questionId="+title+"&isFirst=1";
+    }
 </script>
 
 </body>