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

# Conflicts:
#	watero-rst-core/src/main/java/com.iamberry.rst.core/order/ProductColor.java

watero-rst-core/src/main/java/com.iamberry.rst.core/fm/ComplaintDetectInfo.java

@@ -29,10 +29,13 @@ public class ComplaintDetectInfo implements Serializable {
     private String detectContent;//维修内容
     private Integer isMaintenance;//是否有故障1 有故障 2没有
     private String detectDesc;//备注
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern="yyyy-MM-dd",timezone = "GMT+8")
     private Date detectDate;//检测日期
     private Date detectCreateTime;//创建时间
     private Date detectUpdateTime;//修改时间
     private Integer customerId;//客诉id
+    private Integer signclosedId;//签收id
 
     private Integer productTypeId;//产品类型id
     private String productTypeName;//产品类型名称
@@ -49,9 +52,14 @@ public class ComplaintDetectInfo implements Serializable {
     private Integer procTypeId;//处理方式类型id
     private String procMethodName;//处理方式名称
     private String procTypeName;//处理方式类型名
-
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @JsonFormat(pattern="yyyy-MM-dd",timezone = "GMT+8")
     private Date customerCreateTime;//确认时间（客诉创建时间）
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @JsonFormat(pattern="yyyy-MM-dd",timezone = "GMT+8")
     private Date salesPayTime;//购买时间
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @JsonFormat(pattern="yyyy-MM-dd",timezone = "GMT+8")
     private Date signclosedDate;//签收时间
 
     public Integer getDetectId() {
@@ -333,4 +341,12 @@ public class ComplaintDetectInfo implements Serializable {
     public void setSignclosedDate(Date signclosedDate) {
         this.signclosedDate = signclosedDate;
     }
+
+    public Integer getSignclosedId() {
+        return signclosedId;
+    }
+
+    public void setSignclosedId(Integer signclosedId) {
+        this.signclosedId = signclosedId;
+    }
 }

watero-rst-core/src/main/java/com.iamberry.rst.core/fm/ComplaintSignclosedInfo.java

@@ -1,5 +1,8 @@
 package com.iamberry.rst.core.fm;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.Date;
@@ -21,6 +24,8 @@ public class ComplaintSignclosedInfo implements Serializable {
     private String signclosedAddrProvinces;//寄件地址（省）id
     private String signclosedAddrCity;//寄件地址（市）id
     private String signclosedAddrArea;//寄件地址（区）id
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @JsonFormat(pattern="yyyy-MM-dd",timezone = "GMT+8")
     private Date signclosedDate;//签收时间
     private Integer signclosedCustomerId;//客诉id
     private String signclosedDesc;//备注
@@ -39,6 +44,7 @@ public class ComplaintSignclosedInfo implements Serializable {
     private String signclosedAddrCityName;//寄件地址（市）
     private String signclosedAddrAreaName;//寄件地址（区）
     private Integer sendbackId;//客诉寄回id
+    private String signclosedLogisticsName;//物流公司名称
     public Integer getSignclosedId() {
         return signclosedId;
     }
@@ -246,4 +252,12 @@ public class ComplaintSignclosedInfo implements Serializable {
     public void setSendbackId(Integer sendbackId) {
         this.sendbackId = sendbackId;
     }
+
+    public String getSignclosedLogisticsName() {
+        return signclosedLogisticsName;
+    }
+
+    public void setSignclosedLogisticsName(String signclosedLogisticsName) {
+        this.signclosedLogisticsName = signclosedLogisticsName;
+    }
 }

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

@@ -245,6 +245,7 @@ public class ComplaintSignclosedInfoServiceImpl implements ComplaintSignclosedIn
                         detectInfo.setIsMaintenance(0);
                         detectInfo.setDetectRenovation(0);
                         detectInfo.setDetectProcessingResults(0);
+                        detectInfo.setSignclosedId(sigInfo.getSignclosedId());
                         try {
                             complaintDetectInfoMapper.insert(detectInfo);
                         } catch (Exception e) {

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

@@ -22,21 +22,23 @@
       detect_date detectDate,
       detect_create_time detectCreateTime,
       detect_update_time detectUpdateTime,
+      qd.describe_title questionTitle,
       detect_offer detectOffer,
       detect_renovation detectRenovation,
       detect_processing_results detectProcessingResults,
+      cd.signclosed_id signclosedId,
       pi.product_name productName,
       ci.color_name colorName,
       cci.customer_create_time customerCreateTime,
-	  oi.sales_pay_time salesPayTime,
-	  cs.signclosed_date signclosedDate
+	  oi.sales_pay_time salesPayTime
     from tb_rst_complaint_detect cd
+    LEFT JOIN tb_rst_cm_question_describe qd on cd.customer_id = qd.customer_id
     LEFT JOIN tb_rst_product_info pi ON cd.product_id = pi.product_id
     LEFT JOIN tb_rst_product_color ci on cd.product_color_id = ci.color_id
     LEFT JOIN tb_rst_cm_customer_info cci on cci.customer_id = cd.customer_id
     LEFT JOIN tb_rst_sales_order_info oi on oi.sales_customer_id = cci.customer_id
-    LEFT JOIN tb_rst_complaint_signclosed cs on cs.signclosed_customer_id = cd.customer_id
     where detect_id = #{detectId,jdbcType=INTEGER}
+    GROUP BY cci.customer_id
   </select>
   <select id="listComplaintDetect" resultType="ComplaintDetectInfo" parameterType="ComplaintDetectInfo" >
     select
@@ -49,6 +51,7 @@
     cd.detect_phenomenon detectPhenomenon,
     cd.detect_classification detectClassification,
     cd.detect_failure_cause detectFailureCause,
+    cd.signclosed_id signclosedId,
     cd.detect_results detectResults,
     cd.detect_point detectPoint,
     cd.detect_nalysis detectNalysis,
@@ -208,7 +211,8 @@
     customer_id,
     detect_offer,
     detect_renovation,
-    detect_processing_results
+    detect_processing_results,
+    signclosed_id
     )
     values
       (
@@ -231,7 +235,8 @@
       #{customerId},
       #{detectOffer},
       #{detectRenovation},
-      #{detectProcessingResults}
+      #{detectProcessingResults},
+      #{signclosedId}
       )
   </insert>
 

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

@@ -7,12 +7,17 @@ import com.iamberry.rst.core.order.ProductColor;
 import com.iamberry.rst.core.order.ProductType;
 import com.iamberry.rst.core.page.PageRequest;
 import com.iamberry.rst.core.page.PagedResult;
+import com.iamberry.rst.core.sys.Admin;
+import com.iamberry.rst.core.tools.LogisticsInfo;
 import com.iamberry.rst.faces.cm.CompanyInfoService;
+import com.iamberry.rst.faces.cm.SalesOrderService;
 import com.iamberry.rst.faces.fm.AwaitingSignclosedProductInfoService;
 import com.iamberry.rst.faces.fm.ComplaintDetectInfoService;
+import com.iamberry.rst.faces.fm.ComplaintSignclosedInfoService;
 import com.iamberry.rst.faces.fm.ComplaintSignclosedProductInfoService;
 import com.iamberry.rst.faces.product.ProductService;
 import com.iamberry.rst.service.fm.mapper.ComplaintSignclosedInfoMapper;
+import com.iamberry.rst.utils.AdminUtils;
 import com.iamberry.rst.utils.StitchAttrUtil;
 import com.iamberry.wechat.tools.ResponseJson;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
@@ -41,13 +46,15 @@ public class AdminDetectController {
     @Autowired
     private ProductService productService;
     @Autowired
-    private ComplaintSignclosedInfoMapper complaintSignclosedInfoMapper;
+    private ComplaintSignclosedInfoService complaintSignclosedInfoService;
     @Autowired
     private ComplaintSignclosedProductInfoService signclosedProductInfoService;
     @Autowired
     private AwaitingSignclosedProductInfoService awaitingSignclosedProductService;
     @Autowired
     private CompanyInfoService companyInfoService;
+    @Autowired
+    private SalesOrderService salesOrderService;
     /**
      * 跳转到添加检测记录页面
      *
@@ -251,7 +258,7 @@ public class AdminDetectController {
         }
         List<SignclosedProductInfo> signclosedProductInfo = null;
         List<AwaitingSignclosedProductInfo> awaitingSignclosedProductInfo = null;
-        ComplaintSignclosedInfo complaintSignclosedInfo = complaintSignclosedInfoMapper.getSignclosedById(Integer.valueOf(signclosedId));
+        ComplaintSignclosedInfo complaintSignclosedInfo = complaintSignclosedInfoService.getSignclosedById(Integer.valueOf(signclosedId));
         signclosedProductInfo = signclosedProductInfoService.listSignclosedById(complaintSignclosedInfo.getSignclosedId());
         mv.addObject("signclosedProductInfo",signclosedProductInfo);
         mv.addObject("signclosedInfo",complaintSignclosedInfo);
@@ -318,8 +325,24 @@ public class AdminDetectController {
             return msg;
         }else {
             List<ComplaintDetectImg> detectImg = complaintDetectInfoService.listDetectImg(detectId);
+            ComplaintSignclosedInfo signclosedInfo = complaintSignclosedInfoService.getSignclosedById(detectInfo.getSignclosedId());
+            LogisticsInfo info = new LogisticsInfo();
+            if(signclosedInfo != null){
+                info.setLogisticsRstCode(signclosedInfo.getSignclosedLogistics());
+                List<LogisticsInfo> logisticsInfos = salesOrderService.getLogisticsInfo(info);
+                if(logisticsInfos != null  && logisticsInfos.size() > 0){
+                    signclosedInfo.setSignclosedLogisticsName(logisticsInfos.get(0).getLogisticsName());
+                }else{
+                    signclosedInfo.setSignclosedLogisticsName("其它快递");
+                }
+            }
+            Admin admin = AdminUtils.getLoginAdmin();
+            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
             msg.addResponseKeyValue("detectImg",detectImg);
             msg.addResponseKeyValue("detectInfo",detectInfo);
+            msg.addResponseKeyValue("signclosedInfo",signclosedInfo);
+            msg.addResponseKeyValue("date",sdf.format(new Date()));//当前时间
+            msg.addResponseKeyValue("adminName",admin.getAdminName());//当前登录人
             msg.setResultCode(200);
             msg.setReturnCode(200);
             return msg;