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

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

watero-rst-core/src/main/java/com.iamberry.rst.core/cm/ComplaintTypeInfo.java

@@ -22,6 +22,7 @@ public class ComplaintTypeInfo implements Serializable {
     private Integer complaintClassState;      //类型状态
     private Date complaintCreateTime;      //创建时间
     private Date complaintUpdateTime;      //修改时间
+    private Integer complaintType;      //与产品类型表绑定  1净水机2电动牙刷3净水花洒4软水机5果蔬机6净水龙头
 
     private Integer complaintNum;       //查询数量
 
@@ -98,4 +99,12 @@ public class ComplaintTypeInfo implements Serializable {
     public void setComplaintNum(Integer complaintNum) {
         this.complaintNum = complaintNum;
     }
+
+    public Integer getComplaintType() {
+        return complaintType;
+    }
+
+    public void setComplaintType(Integer complaintType) {
+        this.complaintType = complaintType;
+    }
 }

watero-rst-core/src/main/java/com.iamberry.rst.core/order/ProductType.java

@@ -29,6 +29,8 @@ public class ProductType implements Serializable {
 
     private Integer typeCompany;    // 所属商城
 
+    private Integer complaintType;    // 与客诉问题标绑定 1净水机2电动牙刷3净水花洒4软水机5果蔬机6净水龙头
+
     public Integer getTypeId() {
         return typeId;
     }
@@ -84,4 +86,12 @@ public class ProductType implements Serializable {
     public void setTypeCompany(Integer typeCompany) {
         this.typeCompany = typeCompany;
     }
+
+    public Integer getComplaintType() {
+        return complaintType;
+    }
+
+    public void setComplaintType(Integer complaintType) {
+        this.complaintType = complaintType;
+    }
 }

watero-rst-interface/src/main/java/com/iamberry/rst/faces/fm/ComplaintDetectInfoService.java

@@ -194,4 +194,16 @@ public interface ComplaintDetectInfoService {
      * @return
      */
     ComplaintAfterSalesNum getDetectCount();
+
+    /**
+     * 检测超时查询
+     * @return
+     */
+    List<ComplaintDetectInfo> listMaintenanceCutNotice();
+
+    /**
+     * 维修超时查询
+     * @return
+     */
+    List<ComplaintDetectInfo> listCompleteCutNotice();
 }

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

@@ -29,6 +29,9 @@
       <if test="complaintConsultingType !=null">
         AND complaint_consulting_type = #{complaintConsultingType}
       </if>
+      <if test="complaintType !=null and complaintType != 0 ">
+        AND complaint_type = #{complaintType}
+      </if>
       AND complaint_class_state = 1
     </where>
   </select>

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

@@ -561,5 +561,15 @@ public class ComplaintDetectInfoServiceImpl implements ComplaintDetectInfoServic
         return complaintDetectInfoMapper.getDetectCount();
     }
 
+    @Override
+    public List<ComplaintDetectInfo> listMaintenanceCutNotice() {
+        return complaintDetectInfoMapper.listMaintenanceCutNotice();
+    }
+
+    @Override
+    public List<ComplaintDetectInfo> listCompleteCutNotice() {
+        return complaintDetectInfoMapper.listCompleteCutNotice();
+    }
+
 
 }

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

@@ -176,5 +176,17 @@ public interface ComplaintDetectInfoMapper {
      */
     ComplaintAfterSalesNum getDetectCount();
 
+    /**
+     * 检测超时查询
+     * @return
+     */
+    List<ComplaintDetectInfo> listMaintenanceCutNotice();
+
+    /**
+     * 维修超时查询
+     * @return
+     */
+    List<ComplaintDetectInfo> listCompleteCutNotice();
+
 
 }

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

@@ -791,4 +791,22 @@
     FROM
     tb_rst_complaint_detect
   </select>
+
+  <select id="listMaintenanceCutNotice" resultType="ComplaintDetectInfo">
+    SELECT
+        *
+    FROM
+        tb_rst_complaint_detect
+    WHERE
+        to_days(NOW( ))-to_days(maintenance_cut_time) = -1
+  </select>
+
+  <select id="listCompleteCutNotice" resultType="ComplaintDetectInfo">
+    SELECT
+        *
+    FROM
+        tb_rst_complaint_detect
+    WHERE
+        to_days(NOW( ))-to_days(complete_cut_time) = -1
+  </select>
 </mapper>

watero-rst-service/src/main/java/com/iamberry/rst/util/SmsConfig.java

@@ -79,8 +79,8 @@ public class SmsConfig {
     public static String CUSTOMER_RETURN="";
     public static String CUSTOMER_CONTACT="";
 
-
-
+    /* 维修即将超时通知短信 */
+    public static String DETECTION_TIMEOUT_NOTIFICATION="";
 
 
     static {
@@ -132,6 +132,7 @@ public class SmsConfig {
             CUSTOMER_EXCHANGE=pro.getProperty("CUSTOMER_EXCHANGE");
             CUSTOMER_RETURN=pro.getProperty("CUSTOMER_RETURN");
             CUSTOMER_CONTACT=pro.getProperty("CUSTOMER_CONTACT");
+            DETECTION_TIMEOUT_NOTIFICATION=pro.getProperty("DETECTION_TIMEOUT_NOTIFICATION");
         } catch (Exception e) {
             e.printStackTrace();
         }