修改xml文件名

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

@@ -1,17 +1,22 @@
 package com.iamberry.rst.service.cm.mapper;
 
 import com.iamberry.rst.core.cm.AwaitingSignclosedProductInfo;
-
+/**
+ * 客诉-待签收产品mapper
+ */
 public interface AwaitingSignclosedProductInfoMapper {
-    int deleteByPrimaryKey(Integer productId);
-
+    /**
+     * 添加单个待签收产品
+     * @return
+     */
     int insert(AwaitingSignclosedProductInfo record);
-
-    int insertSelective(AwaitingSignclosedProductInfo record);
-
-    AwaitingSignclosedProductInfo selectByPrimaryKey(Integer productId);
-
-    int updateByPrimaryKeySelective(AwaitingSignclosedProductInfo record);
-
-    int updateByPrimaryKey(AwaitingSignclosedProductInfo record);
+    /**
+     * 获取单个待签收产品
+     */
+    AwaitingSignclosedProductInfo getByPrimaryId(Integer productId);
+    /**
+     * 修改单个待签收产品
+     * @return
+     */
+    int updateById(AwaitingSignclosedProductInfo record);
 }

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

@@ -1,17 +1,23 @@
 package com.iamberry.rst.service.cm.mapper;
 
 import com.iamberry.rst.core.cm.ComplaintDetectInfo;
-
+/**
+ * 客诉-品质检测产品mapper
+ */
 public interface ComplaintDetectInfoMapper {
-    int deleteByPrimaryKey(Integer detectId);
-
+    /**
+     * 添加单个品质检测产品
+     * @return
+     */
     int insert(ComplaintDetectInfo record);
-
-    int insertSelective(ComplaintDetectInfo record);
-
-    ComplaintDetectInfo selectByPrimaryKey(Integer detectId);
-
-    int updateByPrimaryKeySelective(ComplaintDetectInfo record);
-
-    int updateByPrimaryKey(ComplaintDetectInfo record);
+    /**
+     * 查询单个品质检测产品
+     * @return
+     */
+    ComplaintDetectInfo getComplaintDetectById(Integer detectId);
+    /**
+     * 修改单个待品质检测产品
+     * @return
+     */
+    int updateComplaintDetectById(ComplaintDetectInfo record);
 }

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

@@ -1,17 +1,23 @@
 package com.iamberry.rst.service.cm.mapper;
 
 import com.iamberry.rst.core.cm.ComplaintMaintenanceInfo;
-
+/**
+ * 客诉-生产维修mapper
+ */
 public interface ComplaintMaintenanceInfoMapper {
-    int deleteByPrimaryKey(Integer maintenanceId);
-
+    /**
+     * 添加单个品质检测产品
+     * @return
+     */
     int insert(ComplaintMaintenanceInfo record);
-
-    int insertSelective(ComplaintMaintenanceInfo record);
-
-    ComplaintMaintenanceInfo selectByPrimaryKey(Integer maintenanceId);
-
-    int updateByPrimaryKeySelective(ComplaintMaintenanceInfo record);
-
-    int updateByPrimaryKey(ComplaintMaintenanceInfo record);
+    /**
+     * 查询单个品质检测产品
+     * @return
+     */
+    ComplaintMaintenanceInfo getMaintenanceByid(Integer maintenanceId);
+    /**
+     * 修改单个品质检测产品
+     * @return
+     */
+    int updateMaintenanceById(ComplaintMaintenanceInfo record);
 }

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

@@ -1,19 +1,23 @@
 package com.iamberry.rst.service.cm.mapper;
 
 import com.iamberry.rst.core.cm.ComplaintQuestionInfo;
-
+/**
+ * 客诉-客诉问题mapper
+ */
 public interface ComplaintQuestionInfoMapper {
-    int deleteByPrimaryKey(Integer questionId);
-
+    /**
+     * 添加单个客诉问题
+     * @return
+     */
     int insert(ComplaintQuestionInfo record);
-
-    int insertSelective(ComplaintQuestionInfo record);
-
-    ComplaintQuestionInfo selectByPrimaryKey(Integer questionId);
-
-    int updateByPrimaryKeySelective(ComplaintQuestionInfo record);
-
-    int updateByPrimaryKeyWithBLOBs(ComplaintQuestionInfo record);
-
-    int updateByPrimaryKey(ComplaintQuestionInfo record);
+    /**
+     * 查询单个客诉问题
+     * @return
+     */
+    ComplaintQuestionInfo getQuestionById(Integer questionId);
+    /**
+     * 修改单个客诉问题
+     * @return
+     */
+    int updateQuestionById(ComplaintQuestionInfo record);
 }

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

@@ -1,148 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="com.iamberry.rst.service.cm.mapper.ComplaintQuestionInfoMapper" >
-  <resultMap id="BaseResultMap" type="ComplaintQuestionInfo" >
-    <id column="question_id" property="questionId" jdbcType="INTEGER" />
-    <result column="small_class_id" property="smallClassId" jdbcType="INTEGER" />
-    <result column="question_name" property="questionName" jdbcType="VARCHAR" />
-    <result column="question_state" property="questionState" jdbcType="BIT" />
-    <result column="question_is_qc_detect" property="questionIsQcDetect" jdbcType="BIT" />
-    <result column="question_create_time" property="questionCreateTime" jdbcType="TIMESTAMP" />
-    <result column="question_update_time" property="questionUpdateTime" jdbcType="TIMESTAMP" />
-  </resultMap>
-  <resultMap id="ResultMapWithBLOBs" type="ComplaintQuestionInfo" extends="BaseResultMap" >
-    <result column="question_profile" property="questionProfile" jdbcType="LONGVARCHAR" />
-  </resultMap>
-  <sql id="Base_Column_List" >
-    question_id, small_class_id, question_name, question_state, question_is_qc_detect, 
-    question_create_time, question_update_time
-  </sql>
-  <sql id="Blob_Column_List" >
-    question_profile
-  </sql>
-  <select id="selectByPrimaryKey" resultMap="ResultMapWithBLOBs" parameterType="java.lang.Integer" >
-    select 
-    <include refid="Base_Column_List" />
-    ,
-    <include refid="Blob_Column_List" />
-    from tb_rst_complaint_question
-    where question_id = #{questionId,jdbcType=INTEGER}
-  </select>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
-    delete from tb_rst_complaint_question
-    where question_id = #{questionId,jdbcType=INTEGER}
-  </delete>
-  <insert id="insert" parameterType="ComplaintQuestionInfo" >
-    insert into tb_rst_complaint_question (question_id, small_class_id, question_name, 
-      question_state, question_is_qc_detect, question_create_time, 
-      question_update_time, question_profile
-      )
-    values (#{questionId,jdbcType=INTEGER}, #{smallClassId,jdbcType=INTEGER}, #{questionName,jdbcType=VARCHAR}, 
-      #{questionState,jdbcType=BIT}, #{questionIsQcDetect,jdbcType=BIT}, #{questionCreateTime,jdbcType=TIMESTAMP}, 
-      #{questionUpdateTime,jdbcType=TIMESTAMP}, #{questionProfile,jdbcType=LONGVARCHAR}
-      )
-  </insert>
-  <insert id="insertSelective" parameterType="ComplaintQuestionInfo" >
-    insert into tb_rst_complaint_question
-    <trim prefix="(" suffix=")" suffixOverrides="," >
-      <if test="questionId != null" >
-        question_id,
-      </if>
-      <if test="smallClassId != null" >
-        small_class_id,
-      </if>
-      <if test="questionName != null" >
-        question_name,
-      </if>
-      <if test="questionState != null" >
-        question_state,
-      </if>
-      <if test="questionIsQcDetect != null" >
-        question_is_qc_detect,
-      </if>
-      <if test="questionCreateTime != null" >
-        question_create_time,
-      </if>
-      <if test="questionUpdateTime != null" >
-        question_update_time,
-      </if>
-      <if test="questionProfile != null" >
-        question_profile,
-      </if>
-    </trim>
-    <trim prefix="values (" suffix=")" suffixOverrides="," >
-      <if test="questionId != null" >
-        #{questionId,jdbcType=INTEGER},
-      </if>
-      <if test="smallClassId != null" >
-        #{smallClassId,jdbcType=INTEGER},
-      </if>
-      <if test="questionName != null" >
-        #{questionName,jdbcType=VARCHAR},
-      </if>
-      <if test="questionState != null" >
-        #{questionState,jdbcType=BIT},
-      </if>
-      <if test="questionIsQcDetect != null" >
-        #{questionIsQcDetect,jdbcType=BIT},
-      </if>
-      <if test="questionCreateTime != null" >
-        #{questionCreateTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="questionUpdateTime != null" >
-        #{questionUpdateTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="questionProfile != null" >
-        #{questionProfile,jdbcType=LONGVARCHAR},
-      </if>
-    </trim>
-  </insert>
-  <update id="updateByPrimaryKeySelective" parameterType="ComplaintQuestionInfo" >
-    update tb_rst_complaint_question
-    <set >
-      <if test="smallClassId != null" >
-        small_class_id = #{smallClassId,jdbcType=INTEGER},
-      </if>
-      <if test="questionName != null" >
-        question_name = #{questionName,jdbcType=VARCHAR},
-      </if>
-      <if test="questionState != null" >
-        question_state = #{questionState,jdbcType=BIT},
-      </if>
-      <if test="questionIsQcDetect != null" >
-        question_is_qc_detect = #{questionIsQcDetect,jdbcType=BIT},
-      </if>
-      <if test="questionCreateTime != null" >
-        question_create_time = #{questionCreateTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="questionUpdateTime != null" >
-        question_update_time = #{questionUpdateTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="questionProfile != null" >
-        question_profile = #{questionProfile,jdbcType=LONGVARCHAR},
-      </if>
-    </set>
-    where question_id = #{questionId,jdbcType=INTEGER}
-  </update>
-  <update id="updateByPrimaryKeyWithBLOBs" parameterType="ComplaintQuestionInfo" >
-    update tb_rst_complaint_question
-    set small_class_id = #{smallClassId,jdbcType=INTEGER},
-      question_name = #{questionName,jdbcType=VARCHAR},
-      question_state = #{questionState,jdbcType=BIT},
-      question_is_qc_detect = #{questionIsQcDetect,jdbcType=BIT},
-      question_create_time = #{questionCreateTime,jdbcType=TIMESTAMP},
-      question_update_time = #{questionUpdateTime,jdbcType=TIMESTAMP},
-      question_profile = #{questionProfile,jdbcType=LONGVARCHAR}
-    where question_id = #{questionId,jdbcType=INTEGER}
-  </update>
-  <update id="updateByPrimaryKey" parameterType="ComplaintQuestionInfo" >
-    update tb_rst_complaint_question
-    set small_class_id = #{smallClassId,jdbcType=INTEGER},
-      question_name = #{questionName,jdbcType=VARCHAR},
-      question_state = #{questionState,jdbcType=BIT},
-      question_is_qc_detect = #{questionIsQcDetect,jdbcType=BIT},
-      question_create_time = #{questionCreateTime,jdbcType=TIMESTAMP},
-      question_update_time = #{questionUpdateTime,jdbcType=TIMESTAMP}
-    where question_id = #{questionId,jdbcType=INTEGER}
-  </update>
-</mapper>

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

@@ -12,17 +12,13 @@
   <sql id="Base_Column_List" >
     product_id, signclosed_id, product_name, product_num, signclosed_create_time, signclosed_update_time
   </sql>
-  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
+  <select id="getByPrimaryId" resultMap="AwaitingSignclosedProductInfo" parameterType="java.lang.Integer" >
     select 
     <include refid="Base_Column_List" />
     from tb_rst_complaint_awaiting_signclosed_product
     where product_id = #{productId,jdbcType=INTEGER}
   </select>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
-    delete from tb_rst_complaint_awaiting_signclosed_product
-    where product_id = #{productId,jdbcType=INTEGER}
-  </delete>
-  <insert id="insert" parameterType="AwaitingSignclosedProductInfo" >
+  <insert id="insert" parameterType="AwaitingSignclosedProductInfo" useGeneratedKeys="true" keyProperty="productId">
     insert into tb_rst_complaint_awaiting_signclosed_product (product_id, signclosed_id, product_name, 
       product_num, signclosed_create_time, signclosed_update_time
       )
@@ -30,50 +26,8 @@
       #{productNum,jdbcType=INTEGER}, #{signclosedCreateTime,jdbcType=TIMESTAMP}, #{signclosedUpdateTime,jdbcType=TIMESTAMP}
       )
   </insert>
-  <insert id="insertSelective" parameterType="AwaitingSignclosedProductInfo" >
-    insert into tb_rst_complaint_awaiting_signclosed_product
-    <trim prefix="(" suffix=")" suffixOverrides="," >
-      <if test="productId != null" >
-        product_id,
-      </if>
-      <if test="signclosedId != null" >
-        signclosed_id,
-      </if>
-      <if test="productName != null" >
-        product_name,
-      </if>
-      <if test="productNum != null" >
-        product_num,
-      </if>
-      <if test="signclosedCreateTime != null" >
-        signclosed_create_time,
-      </if>
-      <if test="signclosedUpdateTime != null" >
-        signclosed_update_time,
-      </if>
-    </trim>
-    <trim prefix="values (" suffix=")" suffixOverrides="," >
-      <if test="productId != null" >
-        #{productId,jdbcType=INTEGER},
-      </if>
-      <if test="signclosedId != null" >
-        #{signclosedId,jdbcType=INTEGER},
-      </if>
-      <if test="productName != null" >
-        #{productName,jdbcType=VARCHAR},
-      </if>
-      <if test="productNum != null" >
-        #{productNum,jdbcType=INTEGER},
-      </if>
-      <if test="signclosedCreateTime != null" >
-        #{signclosedCreateTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="signclosedUpdateTime != null" >
-        #{signclosedUpdateTime,jdbcType=TIMESTAMP},
-      </if>
-    </trim>
-  </insert>
-  <update id="updateByPrimaryKeySelective" parameterType="AwaitingSignclosedProductInfo" >
+
+  <update id="updateById" parameterType="AwaitingSignclosedProductInfo" >
     update tb_rst_complaint_awaiting_signclosed_product
     <set >
       <if test="signclosedId != null" >
@@ -94,13 +48,4 @@
     </set>
     where product_id = #{productId,jdbcType=INTEGER}
   </update>
-  <update id="updateByPrimaryKey" parameterType="AwaitingSignclosedProductInfo" >
-    update tb_rst_complaint_awaiting_signclosed_product
-    set signclosed_id = #{signclosedId,jdbcType=INTEGER},
-      product_name = #{productName,jdbcType=VARCHAR},
-      product_num = #{productNum,jdbcType=INTEGER},
-      signclosed_create_time = #{signclosedCreateTime,jdbcType=TIMESTAMP},
-      signclosed_update_time = #{signclosedUpdateTime,jdbcType=TIMESTAMP}
-    where product_id = #{productId,jdbcType=INTEGER}
-  </update>
 </mapper>

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

@@ -25,16 +25,12 @@
     detect_point, detect_analysis, detect_customer_id, detect_revolution_produced, detect_desc, 
     signclosed_create_time, signclosed_update_time
   </sql>
-  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
+  <select id="getComplaintDetectById" resultMap="ComplaintDetectInfo" parameterType="java.lang.Integer" >
     select 
     <include refid="Base_Column_List" />
     from tb_rst_complaint_detect
     where detect_id = #{detectId,jdbcType=INTEGER}
   </select>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
-    delete from tb_rst_complaint_detect
-    where detect_id = #{detectId,jdbcType=INTEGER}
-  </delete>
   <insert id="insert" parameterType="ComplaintDetectInfo" >
     insert into tb_rst_complaint_detect (detect_id, customer_id, detect_product_type, 
       detect_product_number, detect_state, detect_phenomenon, 
@@ -51,110 +47,8 @@
       #{detectDesc,jdbcType=VARCHAR}, #{signclosedCreateTime,jdbcType=TIMESTAMP}, #{signclosedUpdateTime,jdbcType=TIMESTAMP}
       )
   </insert>
-  <insert id="insertSelective" parameterType="ComplaintDetectInfo" >
-    insert into tb_rst_complaint_detect
-    <trim prefix="(" suffix=")" suffixOverrides="," >
-      <if test="detectId != null" >
-        detect_id,
-      </if>
-      <if test="customerId != null" >
-        customer_id,
-      </if>
-      <if test="detectProductType != null" >
-        detect_product_type,
-      </if>
-      <if test="detectProductNumber != null" >
-        detect_product_number,
-      </if>
-      <if test="detectState != null" >
-        detect_state,
-      </if>
-      <if test="detectPhenomenon != null" >
-        detect_phenomenon,
-      </if>
-      <if test="detectFailureClassification != null" >
-        detect_failure_classification,
-      </if>
-      <if test="detectFailureCause != null" >
-        detect_failure_cause,
-      </if>
-      <if test="detectResults != null" >
-        detect_results,
-      </if>
-      <if test="detectPoint != null" >
-        detect_point,
-      </if>
-      <if test="detectAnalysis != null" >
-        detect_analysis,
-      </if>
-      <if test="detectCustomerId != null" >
-        detect_customer_id,
-      </if>
-      <if test="detectRevolutionProduced != null" >
-        detect_revolution_produced,
-      </if>
-      <if test="detectDesc != null" >
-        detect_desc,
-      </if>
-      <if test="signclosedCreateTime != null" >
-        signclosed_create_time,
-      </if>
-      <if test="signclosedUpdateTime != null" >
-        signclosed_update_time,
-      </if>
-    </trim>
-    <trim prefix="values (" suffix=")" suffixOverrides="," >
-      <if test="detectId != null" >
-        #{detectId,jdbcType=INTEGER},
-      </if>
-      <if test="customerId != null" >
-        #{customerId,jdbcType=INTEGER},
-      </if>
-      <if test="detectProductType != null" >
-        #{detectProductType,jdbcType=BIT},
-      </if>
-      <if test="detectProductNumber != null" >
-        #{detectProductNumber,jdbcType=VARCHAR},
-      </if>
-      <if test="detectState != null" >
-        #{detectState,jdbcType=BIT},
-      </if>
-      <if test="detectPhenomenon != null" >
-        #{detectPhenomenon,jdbcType=VARCHAR},
-      </if>
-      <if test="detectFailureClassification != null" >
-        #{detectFailureClassification,jdbcType=VARCHAR},
-      </if>
-      <if test="detectFailureCause != null" >
-        #{detectFailureCause,jdbcType=VARCHAR},
-      </if>
-      <if test="detectResults != null" >
-        #{detectResults,jdbcType=VARCHAR},
-      </if>
-      <if test="detectPoint != null" >
-        #{detectPoint,jdbcType=VARCHAR},
-      </if>
-      <if test="detectAnalysis != null" >
-        #{detectAnalysis,jdbcType=VARCHAR},
-      </if>
-      <if test="detectCustomerId != null" >
-        #{detectCustomerId,jdbcType=INTEGER},
-      </if>
-      <if test="detectRevolutionProduced != null" >
-        #{detectRevolutionProduced,jdbcType=BIT},
-      </if>
-      <if test="detectDesc != null" >
-        #{detectDesc,jdbcType=VARCHAR},
-      </if>
-      <if test="signclosedCreateTime != null" >
-        #{signclosedCreateTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="signclosedUpdateTime != null" >
-        #{signclosedUpdateTime,jdbcType=TIMESTAMP},
-      </if>
-    </trim>
-  </insert>
-  <update id="updateByPrimaryKeySelective" parameterType="ComplaintDetectInfo" >
+
+  <update id="updateComplaintDetectById" parameterType="ComplaintDetectInfo" >
     update tb_rst_complaint_detect
     <set >
       <if test="customerId != null" >
@@ -205,23 +99,4 @@
     </set>
     where detect_id = #{detectId,jdbcType=INTEGER}
   </update>
-  <update id="updateByPrimaryKey" parameterType="ComplaintDetectInfo" >
-    update tb_rst_complaint_detect
-    set customer_id = #{customerId,jdbcType=INTEGER},
-      detect_product_type = #{detectProductType,jdbcType=BIT},
-      detect_product_number = #{detectProductNumber,jdbcType=VARCHAR},
-      detect_state = #{detectState,jdbcType=BIT},
-      detect_phenomenon = #{detectPhenomenon,jdbcType=VARCHAR},
-      detect_failure_classification = #{detectFailureClassification,jdbcType=VARCHAR},
-      detect_failure_cause = #{detectFailureCause,jdbcType=VARCHAR},
-      detect_results = #{detectResults,jdbcType=VARCHAR},
-      detect_point = #{detectPoint,jdbcType=VARCHAR},
-      detect_analysis = #{detectAnalysis,jdbcType=VARCHAR},
-      detect_customer_id = #{detectCustomerId,jdbcType=INTEGER},
-      detect_revolution_produced = #{detectRevolutionProduced,jdbcType=BIT},
-      detect_desc = #{detectDesc,jdbcType=VARCHAR},
-      signclosed_create_time = #{signclosedCreateTime,jdbcType=TIMESTAMP},
-      signclosed_update_time = #{signclosedUpdateTime,jdbcType=TIMESTAMP}
-    where detect_id = #{detectId,jdbcType=INTEGER}
-  </update>
 </mapper>

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

@@ -23,16 +23,12 @@
     maintenance_customer_id, maintenance_id_repair, maintenance_content, maintenance_content_date, 
     maintenance_create_time, maintenance_update_time
   </sql>
-  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
+  <select id="getMaintenanceByid" resultMap="ComplaintMaintenanceInfo" parameterType="java.lang.Integer" >
     select 
     <include refid="Base_Column_List" />
     from tb_rst_complaint_maintenance
     where maintenance_id = #{maintenanceId,jdbcType=INTEGER}
   </select>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
-    delete from tb_rst_complaint_maintenance
-    where maintenance_id = #{maintenanceId,jdbcType=INTEGER}
-  </delete>
   <insert id="insert" parameterType="ComplaintMaintenanceInfo" >
     insert into tb_rst_complaint_maintenance (maintenance_id, detect_id, maintenance_equipment_number, 
       maintenance_product_type, maintenance_product_number, 
@@ -49,98 +45,8 @@
       #{maintenanceCreateTime,jdbcType=TIMESTAMP}, #{maintenanceUpdateTime,jdbcType=TIMESTAMP}
       )
   </insert>
-  <insert id="insertSelective" parameterType="ComplaintMaintenanceInfo" >
-    insert into tb_rst_complaint_maintenance
-    <trim prefix="(" suffix=")" suffixOverrides="," >
-      <if test="maintenanceId != null" >
-        maintenance_id,
-      </if>
-      <if test="detectId != null" >
-        detect_id,
-      </if>
-      <if test="maintenanceEquipmentNumber != null" >
-        maintenance_equipment_number,
-      </if>
-      <if test="maintenanceProductType != null" >
-        maintenance_product_type,
-      </if>
-      <if test="maintenanceProductNumber != null" >
-        maintenance_product_number,
-      </if>
-      <if test="maintenanceResults != null" >
-        maintenance_results,
-      </if>
-      <if test="maintenanceState != null" >
-        maintenance_state,
-      </if>
-      <if test="maintenanceAnalysis != null" >
-        maintenance_analysis,
-      </if>
-      <if test="maintenanceCustomerId != null" >
-        maintenance_customer_id,
-      </if>
-      <if test="maintenanceIdRepair != null" >
-        maintenance_id_repair,
-      </if>
-      <if test="maintenanceContent != null" >
-        maintenance_content,
-      </if>
-      <if test="maintenanceContentDate != null" >
-        maintenance_content_date,
-      </if>
-      <if test="maintenanceCreateTime != null" >
-        maintenance_create_time,
-      </if>
-      <if test="maintenanceUpdateTime != null" >
-        maintenance_update_time,
-      </if>
-    </trim>
-    <trim prefix="values (" suffix=")" suffixOverrides="," >
-      <if test="maintenanceId != null" >
-        #{maintenanceId,jdbcType=INTEGER},
-      </if>
-      <if test="detectId != null" >
-        #{detectId,jdbcType=INTEGER},
-      </if>
-      <if test="maintenanceEquipmentNumber != null" >
-        #{maintenanceEquipmentNumber,jdbcType=INTEGER},
-      </if>
-      <if test="maintenanceProductType != null" >
-        #{maintenanceProductType,jdbcType=BIT},
-      </if>
-      <if test="maintenanceProductNumber != null" >
-        #{maintenanceProductNumber,jdbcType=VARCHAR},
-      </if>
-      <if test="maintenanceResults != null" >
-        #{maintenanceResults,jdbcType=VARCHAR},
-      </if>
-      <if test="maintenanceState != null" >
-        #{maintenanceState,jdbcType=BIT},
-      </if>
-      <if test="maintenanceAnalysis != null" >
-        #{maintenanceAnalysis,jdbcType=VARCHAR},
-      </if>
-      <if test="maintenanceCustomerId != null" >
-        #{maintenanceCustomerId,jdbcType=INTEGER},
-      </if>
-      <if test="maintenanceIdRepair != null" >
-        #{maintenanceIdRepair,jdbcType=BIT},
-      </if>
-      <if test="maintenanceContent != null" >
-        #{maintenanceContent,jdbcType=VARCHAR},
-      </if>
-      <if test="maintenanceContentDate != null" >
-        #{maintenanceContentDate,jdbcType=TIMESTAMP},
-      </if>
-      <if test="maintenanceCreateTime != null" >
-        #{maintenanceCreateTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="maintenanceUpdateTime != null" >
-        #{maintenanceUpdateTime,jdbcType=TIMESTAMP},
-      </if>
-    </trim>
-  </insert>
-  <update id="updateByPrimaryKeySelective" parameterType="ComplaintMaintenanceInfo" >
+
+  <update id="updateMaintenanceById" parameterType="ComplaintMaintenanceInfo" >
     update tb_rst_complaint_maintenance
     <set >
       <if test="detectId != null" >
@@ -185,21 +91,5 @@
     </set>
     where maintenance_id = #{maintenanceId,jdbcType=INTEGER}
   </update>
-  <update id="updateByPrimaryKey" parameterType="ComplaintMaintenanceInfo" >
-    update tb_rst_complaint_maintenance
-    set detect_id = #{detectId,jdbcType=INTEGER},
-      maintenance_equipment_number = #{maintenanceEquipmentNumber,jdbcType=INTEGER},
-      maintenance_product_type = #{maintenanceProductType,jdbcType=BIT},
-      maintenance_product_number = #{maintenanceProductNumber,jdbcType=VARCHAR},
-      maintenance_results = #{maintenanceResults,jdbcType=VARCHAR},
-      maintenance_state = #{maintenanceState,jdbcType=BIT},
-      maintenance_analysis = #{maintenanceAnalysis,jdbcType=VARCHAR},
-      maintenance_customer_id = #{maintenanceCustomerId,jdbcType=INTEGER},
-      maintenance_id_repair = #{maintenanceIdRepair,jdbcType=BIT},
-      maintenance_content = #{maintenanceContent,jdbcType=VARCHAR},
-      maintenance_content_date = #{maintenanceContentDate,jdbcType=TIMESTAMP},
-      maintenance_create_time = #{maintenanceCreateTime,jdbcType=TIMESTAMP},
-      maintenance_update_time = #{maintenanceUpdateTime,jdbcType=TIMESTAMP}
-    where maintenance_id = #{maintenanceId,jdbcType=INTEGER}
-  </update>
+
 </mapper>

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

@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.iamberry.rst.service.cm.mapper.ComplaintQuestionInfoMapper" >
+  <resultMap id="BaseResultMap" type="ComplaintQuestionInfo" >
+    <id column="question_id" property="questionId" jdbcType="INTEGER" />
+    <result column="small_class_id" property="smallClassId" jdbcType="INTEGER" />
+    <result column="question_name" property="questionName" jdbcType="VARCHAR" />
+    <result column="question_state" property="questionState" jdbcType="BIT" />
+    <result column="question_is_qc_detect" property="questionIsQcDetect" jdbcType="BIT" />
+    <result column="question_create_time" property="questionCreateTime" jdbcType="TIMESTAMP" />
+    <result column="question_update_time" property="questionUpdateTime" jdbcType="TIMESTAMP" />
+  </resultMap>
+  <resultMap id="ResultMapWithBLOBs" type="ComplaintQuestionInfo" extends="BaseResultMap" >
+    <result column="question_profile" property="questionProfile" jdbcType="LONGVARCHAR" />
+  </resultMap>
+  <sql id="Base_Column_List" >
+    question_id, small_class_id, question_name, question_state, question_is_qc_detect, 
+    question_create_time, question_update_time
+  </sql>
+  <sql id="Blob_Column_List" >
+    question_profile
+  </sql>
+  <select id="getQuestionById" resultMap="ResultMapWithBLOBs" parameterType="java.lang.Integer" >
+    select 
+    <include refid="Base_Column_List" />
+    ,
+    <include refid="Blob_Column_List" />
+    from tb_rst_complaint_question
+    where question_id = #{questionId,jdbcType=INTEGER}
+  </select>
+  <insert id="insert" parameterType="ComplaintQuestionInfo" >
+    insert into tb_rst_complaint_question (question_id, small_class_id, question_name, 
+      question_state, question_is_qc_detect, question_create_time, 
+      question_update_time, question_profile
+      )
+    values (#{questionId,jdbcType=INTEGER}, #{smallClassId,jdbcType=INTEGER}, #{questionName,jdbcType=VARCHAR}, 
+      #{questionState,jdbcType=BIT}, #{questionIsQcDetect,jdbcType=BIT}, #{questionCreateTime,jdbcType=TIMESTAMP}, 
+      #{questionUpdateTime,jdbcType=TIMESTAMP}, #{questionProfile,jdbcType=LONGVARCHAR}
+      )
+  </insert>
+  <update id="updateQuestionById" parameterType="ComplaintQuestionInfo" >
+    update tb_rst_complaint_question
+    <set >
+      <if test="smallClassId != null" >
+        small_class_id = #{smallClassId,jdbcType=INTEGER},
+      </if>
+      <if test="questionName != null" >
+        question_name = #{questionName,jdbcType=VARCHAR},
+      </if>
+      <if test="questionState != null" >
+        question_state = #{questionState,jdbcType=BIT},
+      </if>
+      <if test="questionIsQcDetect != null" >
+        question_is_qc_detect = #{questionIsQcDetect,jdbcType=BIT},
+      </if>
+      <if test="questionCreateTime != null" >
+        question_create_time = #{questionCreateTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="questionUpdateTime != null" >
+        question_update_time = #{questionUpdateTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="questionProfile != null" >
+        question_profile = #{questionProfile,jdbcType=LONGVARCHAR},
+      </if>
+    </set>
+    where question_id = #{questionId,jdbcType=INTEGER}
+  </update>
+</mapper>

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

@@ -35,16 +35,12 @@
     signclosed_urged_num, old_efast_id, new_efast_id, signclosed_customer_desc, signclosed_desc, 
     signclosed_create_time, signclosed_update_time
   </sql>
-  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
+  <select id="getSignclosedById" resultMap="ComplaintSignclosedInfo" parameterType="java.lang.Integer" >
     select 
     <include refid="Base_Column_List" />
     from tb_rst_complaint_signclosed
     where signclosed_id = #{signclosedId,jdbcType=INTEGER}
   </select>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
-    delete from tb_rst_complaint_signclosed
-    where signclosed_id = #{signclosedId,jdbcType=INTEGER}
-  </delete>
   <insert id="insert" parameterType="ComplaintSignclosedInfo" >
     insert into tb_rst_complaint_signclosed (signclosed_id, signclosed_type, signclosed_type_name, 
       machine_no, signclosed_logistics, signclosed_logistics_number, 
@@ -67,158 +63,7 @@
       #{signclosedDesc,jdbcType=VARCHAR}, #{signclosedCreateTime,jdbcType=TIMESTAMP}, 
       #{signclosedUpdateTime,jdbcType=TIMESTAMP})
   </insert>
-  <insert id="insertSelective" parameterType="ComplaintSignclosedInfo" >
-    insert into tb_rst_complaint_signclosed
-    <trim prefix="(" suffix=")" suffixOverrides="," >
-      <if test="signclosedId != null" >
-        signclosed_id,
-      </if>
-      <if test="signclosedType != null" >
-        signclosed_type,
-      </if>
-      <if test="signclosedTypeName != null" >
-        signclosed_type_name,
-      </if>
-      <if test="machineNo != null" >
-        machine_no,
-      </if>
-      <if test="signclosedLogistics != null" >
-        signclosed_logistics,
-      </if>
-      <if test="signclosedLogisticsNumber != null" >
-        signclosed_logistics_number,
-      </if>
-      <if test="signclosedSendName != null" >
-        signclosed_send_name,
-      </if>
-      <if test="signclosedSendTel != null" >
-        signclosed_send_tel,
-      </if>
-      <if test="signclosedAddrProvinces != null" >
-        signclosed_addr_provinces,
-      </if>
-      <if test="signclosedAddrCity != null" >
-        signclosed_addr_city,
-      </if>
-      <if test="signclosedIsFittings != null" >
-        signclosed_is_fittings,
-      </if>
-      <if test="signclosedDate != null" >
-        signclosed_date,
-      </if>
-      <if test="signclosedIsQuality != null" >
-        signclosed_is_quality,
-      </if>
-      <if test="signclosedIsInto != null" >
-        signclosed_is_into,
-      </if>
-      <if test="signclosedState != null" >
-        signclosed_state,
-      </if>
-      <if test="signclosedObjectsState != null" >
-        signclosed_objects_state,
-      </if>
-      <if test="signclosedCustomerId != null" >
-        signclosed_customer_id,
-      </if>
-      <if test="signclosedUrgedNum != null" >
-        signclosed_urged_num,
-      </if>
-      <if test="oldEfastId != null" >
-        old_efast_id,
-      </if>
-      <if test="newEfastId != null" >
-        new_efast_id,
-      </if>
-      <if test="signclosedCustomerDesc != null" >
-        signclosed_customer_desc,
-      </if>
-      <if test="signclosedDesc != null" >
-        signclosed_desc,
-      </if>
-      <if test="signclosedCreateTime != null" >
-        signclosed_create_time,
-      </if>
-      <if test="signclosedUpdateTime != null" >
-        signclosed_update_time,
-      </if>
-    </trim>
-    <trim prefix="values (" suffix=")" suffixOverrides="," >
-      <if test="signclosedId != null" >
-        #{signclosedId,jdbcType=INTEGER},
-      </if>
-      <if test="signclosedType != null" >
-        #{signclosedType,jdbcType=BIT},
-      </if>
-      <if test="signclosedTypeName != null" >
-        #{signclosedTypeName,jdbcType=VARCHAR},
-      </if>
-      <if test="machineNo != null" >
-        #{machineNo,jdbcType=VARCHAR},
-      </if>
-      <if test="signclosedLogistics != null" >
-        #{signclosedLogistics,jdbcType=VARCHAR},
-      </if>
-      <if test="signclosedLogisticsNumber != null" >
-        #{signclosedLogisticsNumber,jdbcType=VARCHAR},
-      </if>
-      <if test="signclosedSendName != null" >
-        #{signclosedSendName,jdbcType=VARCHAR},
-      </if>
-      <if test="signclosedSendTel != null" >
-        #{signclosedSendTel,jdbcType=VARCHAR},
-      </if>
-      <if test="signclosedAddrProvinces != null" >
-        #{signclosedAddrProvinces,jdbcType=INTEGER},
-      </if>
-      <if test="signclosedAddrCity != null" >
-        #{signclosedAddrCity,jdbcType=INTEGER},
-      </if>
-      <if test="signclosedIsFittings != null" >
-        #{signclosedIsFittings,jdbcType=BIT},
-      </if>
-      <if test="signclosedDate != null" >
-        #{signclosedDate,jdbcType=DATE},
-      </if>
-      <if test="signclosedIsQuality != null" >
-        #{signclosedIsQuality,jdbcType=INTEGER},
-      </if>
-      <if test="signclosedIsInto != null" >
-        #{signclosedIsInto,jdbcType=BIT},
-      </if>
-      <if test="signclosedState != null" >
-        #{signclosedState,jdbcType=BIT},
-      </if>
-      <if test="signclosedObjectsState != null" >
-        #{signclosedObjectsState,jdbcType=BIT},
-      </if>
-      <if test="signclosedCustomerId != null" >
-        #{signclosedCustomerId,jdbcType=INTEGER},
-      </if>
-      <if test="signclosedUrgedNum != null" >
-        #{signclosedUrgedNum,jdbcType=INTEGER},
-      </if>
-      <if test="oldEfastId != null" >
-        #{oldEfastId,jdbcType=VARCHAR},
-      </if>
-      <if test="newEfastId != null" >
-        #{newEfastId,jdbcType=VARCHAR},
-      </if>
-      <if test="signclosedCustomerDesc != null" >
-        #{signclosedCustomerDesc,jdbcType=VARCHAR},
-      </if>
-      <if test="signclosedDesc != null" >
-        #{signclosedDesc,jdbcType=VARCHAR},
-      </if>
-      <if test="signclosedCreateTime != null" >
-        #{signclosedCreateTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="signclosedUpdateTime != null" >
-        #{signclosedUpdateTime,jdbcType=TIMESTAMP},
-      </if>
-    </trim>
-  </insert>
-  <update id="updateByPrimaryKeySelective" parameterType="ComplaintSignclosedInfo" >
+  <update id="updateSignclosedById" parameterType="ComplaintSignclosedInfo" >
     update tb_rst_complaint_signclosed
     <set >
       <if test="signclosedType != null" >
@@ -293,31 +138,4 @@
     </set>
     where signclosed_id = #{signclosedId,jdbcType=INTEGER}
   </update>
-  <update id="updateByPrimaryKey" parameterType="ComplaintSignclosedInfo" >
-    update tb_rst_complaint_signclosed
-    set signclosed_type = #{signclosedType,jdbcType=BIT},
-      signclosed_type_name = #{signclosedTypeName,jdbcType=VARCHAR},
-      machine_no = #{machineNo,jdbcType=VARCHAR},
-      signclosed_logistics = #{signclosedLogistics,jdbcType=VARCHAR},
-      signclosed_logistics_number = #{signclosedLogisticsNumber,jdbcType=VARCHAR},
-      signclosed_send_name = #{signclosedSendName,jdbcType=VARCHAR},
-      signclosed_send_tel = #{signclosedSendTel,jdbcType=VARCHAR},
-      signclosed_addr_provinces = #{signclosedAddrProvinces,jdbcType=INTEGER},
-      signclosed_addr_city = #{signclosedAddrCity,jdbcType=INTEGER},
-      signclosed_is_fittings = #{signclosedIsFittings,jdbcType=BIT},
-      signclosed_date = #{signclosedDate,jdbcType=DATE},
-      signclosed_is_quality = #{signclosedIsQuality,jdbcType=INTEGER},
-      signclosed_is_into = #{signclosedIsInto,jdbcType=BIT},
-      signclosed_state = #{signclosedState,jdbcType=BIT},
-      signclosed_objects_state = #{signclosedObjectsState,jdbcType=BIT},
-      signclosed_customer_id = #{signclosedCustomerId,jdbcType=INTEGER},
-      signclosed_urged_num = #{signclosedUrgedNum,jdbcType=INTEGER},
-      old_efast_id = #{oldEfastId,jdbcType=VARCHAR},
-      new_efast_id = #{newEfastId,jdbcType=VARCHAR},
-      signclosed_customer_desc = #{signclosedCustomerDesc,jdbcType=VARCHAR},
-      signclosed_desc = #{signclosedDesc,jdbcType=VARCHAR},
-      signclosed_create_time = #{signclosedCreateTime,jdbcType=TIMESTAMP},
-      signclosed_update_time = #{signclosedUpdateTime,jdbcType=TIMESTAMP}
-    where signclosed_id = #{signclosedId,jdbcType=INTEGER}
-  </update>
 </mapper>

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

@@ -23,8 +23,13 @@ public class SmsConfig {
     public static String THROUGH_TEXT="";
     /**		通知发货模板	*/
     public static String DELIVERY_TEXT="";
-    /**		通知发送滤芯短信	*/
+    /**		通知发送滤芯物流短信	*/
     public static String SEND_NOTICE="";
+    /**		通知发送滤芯短信	*/
+    public static String SEND_NOTICE_INFORM="";
+    /**		通知发送滤芯短信2	*/
+    public static String SEND_NOTICE_INFORM2="";
+
 
 
     static {
@@ -44,6 +49,8 @@ public class SmsConfig {
             THROUGH_TEXT=pro.getProperty("THROUGH_TEXT");
             DELIVERY_TEXT=pro.getProperty("DELIVERY_TEXT");
             SEND_NOTICE=pro.getProperty("SEND_NOTICE");
+            SEND_NOTICE_INFORM=pro.getProperty("SEND_NOTICE_INFORM");
+            SEND_NOTICE_INFORM2=pro.getProperty("SEND_NOTICE_INFORM2");
         } catch (Exception e) {
             e.printStackTrace();
         }